diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-05-22 14:30:45 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-05-24 09:09:32 -0600 |
| commit | 3bc8088464712fdcb078eefb68837ccfcc413c88 (patch) | |
| tree | 81cebe7295e9aa16e2302d59ffd637e9e80f1ea8 /Documentation | |
| parent | bbb30909e0fd9ec01c25b88f635085bf481a7ea9 (diff) | |
| download | linux-3bc8088464712fdcb078eefb68837ccfcc413c88.tar.bz2 | |
docs: Fix conf.py for Sphinx 2.0
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>
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 72647a38b5c2..7ace3f8852bd 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") |