From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 28 Mar 2018 23:02:21 +0000 (-0700)
Subject: Use Sphinx defaults when config values are missing
X-Git-Tag: v0.2.1~4
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=255554fd868f98da0b8e3a7b9cec959cc7945b59;p=releng%2Fdocs-conf.git

Use Sphinx defaults when config values are missing

More of these should be verified and moved into defaults.yaml where it
makes sense. We should not change those that make sense such as
'source_suffix', and 'master_doc'.

Change-Id: Iced9fbe6ddd20145d8aa354fdef5edb0638dbbdb
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/docs_conf/conf.py b/docs_conf/conf.py
index c66aa4d..54995b8 100644
--- a/docs_conf/conf.py
+++ b/docs_conf/conf.py
@@ -89,10 +89,10 @@ templates_path = cfg.get('templates_path', ['_templates'])
 todo_include_todos = cfg.get('todo_include_todos', False)
 
 html_extra_path = cfg.get('html_extra_path', [])
-html_favicon = cfg.get('html_favicon', 'favicon.ico')
-html_logo = cfg.get('html_logo', '_static/logo.png')
+html_favicon = cfg.get('html_favicon', None)
+html_logo = cfg.get('html_logo', None)
 html_sidebars = cfg.get('html_sidebars', {'**': ['localtoc.html', 'relations.html'], })
-html_static_path = cfg.get('html_static_path', ['_static'])
+html_static_path = cfg.get('html_static_path', [])
 html_theme = cfg.get('html_theme', 'bootstrap')
 html_theme_options = cfg.get('html_theme_options', {
     'bootswatch_theme': "cerulean",