[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1080-g522f022

[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  522f022cab57570a8f7032882b120fe52dc6ead5 (commit)
       via  5eb4f36a6c9a39c81265e3afa5a368146c3c5a6c (commit)
      from  e278ef4a699d40ca1f172a5bd1e9e80a67cd7a67 (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=522f022cab57570a8f7032882b120fe52dc6ead5
commit 522f022cab57570a8f7032882b120fe52dc6ead5
Merge: e278ef4 5eb4f36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 15 09:34:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 15 09:34:19 2015 -0400

    Merge topic 'sphinx-classic-theme' into next
    
    5eb4f36a Revert "Utilities/Sphinx: Use 'classic' theme for Sphinx >= 1.3"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5eb4f36a6c9a39c81265e3afa5a368146c3c5a6c
commit 5eb4f36a6c9a39c81265e3afa5a368146c3c5a6c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 15 09:34:00 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 15 09:34:00 2015 -0400

    Revert "Utilities/Sphinx: Use 'classic' theme for Sphinx >= 1.3"
    
    This reverts commit e59a7d7ec541f588335974bd00efb0e6275c308b.
    We have other references to 'default' that need to be updated too.

diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index 179ff5b..eb24a6e 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -13,7 +13,6 @@ import sys
 import os
 import re
 import glob
-from sphinx import version_info
 
 sys.path.insert(0, r'@conf_path@')
 
@@ -60,11 +59,7 @@ man_show_urls = False
 html_show_sourcelink = True
 html_static_path = ['@conf_path@/static']
 html_style = 'cmake.css'
-if isinstance(version_info, tuple) and \
-   (version_info[0]*100 + version_info[1]) > 102:
-    html_theme = 'classic'
-else:
-    html_theme = 'default'
+html_theme = 'default'
 html_title = 'CMake %s Documentation' % release
 html_short_title = '%s Documentation' % release
 html_favicon = '@conf_path@/static/cmake-favicon.ico'

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

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


hooks/post-receive
-- 
CMake