summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2019-05-22 14:30:45 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-09 09:17:20 +0200
commit301b18edbf5673ceabd096e95bff0d4cd228a854 (patch)
tree266fb6d5254aa5649ba2c0041169463cac229771 /Documentation
parent871953434bd952a8820832452d3ce2b9ee236cb8 (diff)
downloadlinux-stable-301b18edbf5673ceabd096e95bff0d4cd228a854.tar.gz
linux-stable-301b18edbf5673ceabd096e95bff0d4cd228a854.tar.bz2
linux-stable-301b18edbf5673ceabd096e95bff0d4cd228a854.zip
docs: Fix conf.py for Sphinx 2.0
commit 3bc8088464712fdcb078eefb68837ccfcc413c88 upstream. Our version check in Documentation/conf.py never envisioned a world where Sphinx moved beyond 1.x. Now that the unthinkable has happened, fix our version check to handle higher version numbers correctly. Cc: stable@vger.kernel.org Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index b691af4831fa..22c1a6d96f9e 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -37,7 +37,7 @@ needs_sphinx = '1.3'
extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure', 'sphinx.ext.ifconfig']
# The name of the math extension changed on Sphinx 1.4
-if major == 1 and minor > 3:
+if (major == 1 and minor > 3) or (major > 1):
extensions.append("sphinx.ext.imgmath")
else:
extensions.append("sphinx.ext.pngmath")