Merge branch 'doc-fix-html-favicon' into release

This commit is contained in:
Brad King 2014-11-07 09:52:46 -05:00
commit 51bb383dbf
1 changed files with 1 additions and 1 deletions

View File

@ -60,7 +60,7 @@ html_style = 'cmake.css'
html_theme = 'default'
html_title = 'CMake %s Documentation' % release
html_short_title = '%s Documentation' % release
html_favicon = 'cmake-favicon.ico'
html_favicon = '@conf_path@/static/cmake-favicon.ico'
# Not supported yet by sphinx:
# https://bitbucket.org/birkenfeld/sphinx/issue/1448/make-qthelp-more-configurable
# qthelp_namespace = "org.cmake"