Merge remote-tracking branch 'frr/master' into rip-vrf

Merge commit to solve a bunch of conflicts with other PRs that were
merged in the previous weeks.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

1 files changed, 10 insertions, 3 deletions

diff --git a/doc/user/conf.py b/doc/user/conf.py
index 57a7c08473..5582847431 100644
--- a/doc/user/conf.py
+++ b/doc/user/conf.py
@@ -168,12 +168,19 @@ todo_include_todos = True
 # a list of builtin themes.
 html_theme = 'default'
 
+try:
+    import sphinx_rtd_theme
+
+    html_theme = 'sphinx_rtd_theme'
+except ImportError:
+    pass
+
 # 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 = {
-    'sidebarbgcolor': '#374249'
-}
+#html_theme_options = {
+#    'sidebarbgcolor': '#374249'
+#}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []