Merge "Fix build timeout & upgrade sphinx"

diff --git a/docs/conf.py b/docs/conf.py
index aa98ecd..5cab846 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -137,9 +137,10 @@ html_theme = 'sphinx_rtd_theme'
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = { 'style_nav_header_background': 'white',
-                                               'sticky_navigation': False,
-                                               'collapse_navigation': False}
+html_theme_options = {
+       'style_nav_header_background': 'white',
+       'sticky_navigation': False
+       }
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()

diff --git a/etc/requirements.txt b/etc/requirements.txt
index 5ba09a6..fc22c14 100644 (file)
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -1,5 +1,5 @@
 tox
-Sphinx==1.8.1
+Sphinx==1.8.4
 doc8
 docutils
 setuptools