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, 11 insertions, 4 deletions

diff --git a/doc/developer/conf.py b/doc/developer/conf.py
index 254c9f6bfc..af8673e5fa 100644
--- a/doc/developer/conf.py
+++ b/doc/developer/conf.py
@@ -131,7 +131,7 @@ language = None
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build', 'building-libyang.rst']
+exclude_patterns = ['_build', 'building-libyang.rst', 'topotests-snippets.rst']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -167,12 +167,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 = []