[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-196-ge3562a6

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e3562a65a1a99e918969bccc6bbac892416bbdab (commit)
       via  ca83c39ce0732237c175f60e6d5b204ce5f907e7 (commit)
      from  b1b779ec2e7ae2cee14c0f199828ae956f4d3774 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3562a65a1a99e918969bccc6bbac892416bbdab
commit e3562a65a1a99e918969bccc6bbac892416bbdab
Merge: b1b779e ca83c39
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 29 11:44:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 29 11:44:57 2014 -0400

    Merge topic 'doc-fix-html-favicon' into next
    
    ca83c39c Utilities/Sphinx: Fix html_favicon configuration


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca83c39ce0732237c175f60e6d5b204ce5f907e7
commit ca83c39ce0732237c175f60e6d5b204ce5f907e7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 29 11:42:03 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 29 11:43:55 2014 -0400

    Utilities/Sphinx: Fix html_favicon configuration
    
    The value must be either a full path or relative to the configuration
    directory, not relative to the 'static' directory.  Use a full path.
    This avoids a warning:
    
     WARNING: favicon file 'cmake-favicon.ico' does not exist
    
    It worked before because all 'static' directory content is copied to the
    '_static' directory of html output anyway.

diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index d81bbcf..fc26790 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -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"

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Sphinx/conf.py.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake