diff options
| author | Stephen Finucane <stephen@that.guru> | 2017-04-18 11:26:49 +0100 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-04-21 14:30:43 -0700 |
| commit | f631f6e95998b01720504c548651be276d47c23a (patch) | |
| tree | f413f72c32579d56937a2726930d8ab6618e7b87 /Documentation/conf.py | |
| parent | 47f1bb15668dd2a5190ee1b8f9bca7d0748df077 (diff) | |
| download | openvswitch-f631f6e95998b01720504c548651be276d47c23a.tar.gz | |
doc: Don't override default theme
Sphinx 1.3 renamed the 'default' theme to 'classic' and configured the
'alabaster' theme as the new default. To prevent breaking existing
builds, the 'default' name was reserved as an alias for 'classic' [1].
However, initially this raised a warning [1] with a message to use
'classic' instead. This warning was removed in 1.3.2 [2], but it will
result in errors (due to the use of the '-W' flag) for Sphinx 1.3.0 and
1.3.1 users.
Mitigate the issue by not setting a theme if the 'ovs_sphinx_theme'
package is absent. This will result in Sphinx using its default theme,
be that 'classic' (Sphinx < 1.3) or 'alabaster'.
[1] https://github.com/sphinx-doc/sphinx/commit/68021b0bd
[2] https://github.com/sphinx-doc/sphinx/commit/034c4e942
Signed-off-by: Stephen Finucane <stephen@that.guru>
Cc: Matthew Thode <mthode@mthode.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'Documentation/conf.py')
| -rw-r--r-- | Documentation/conf.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py index 929c8636a..655574748 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -90,8 +90,6 @@ linkcheck_anchors = False # if use_ovs_theme: html_theme = 'ovs' -else: - html_theme = 'default' # Add any paths that contain custom themes here, relative to this directory. if use_ovs_theme: |