diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-05-22 14:30:45 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-09 09:18:17 +0200 |
| commit | 7dbf1a7bef3e5ec586b050c81a2afbb8eac18ce6 (patch) | |
| tree | 95284b2704f25a0662336dc34f1c08add31cbd1d /Documentation | |
| parent | 3213acb17a4bbf4da3eaf5206579fab6dcf554d7 (diff) | |
| download | linux-stable-7dbf1a7bef3e5ec586b050c81a2afbb8eac18ce6.tar.gz linux-stable-7dbf1a7bef3e5ec586b050c81a2afbb8eac18ce6.tar.bz2 linux-stable-7dbf1a7bef3e5ec586b050c81a2afbb8eac18ce6.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.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py index 63857d33778c..329c519158b6 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -37,7 +37,7 @@ needs_sphinx = '1.3' extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure'] # 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") |