diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2020-03-20 02:18:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-24 10:10:00 -0400 |
| commit | 9b544c9eb312741e8e27bb738329bcf2737168ad (patch) | |
| tree | 9b4a3af44d85199249d95b861d8d1905281d430b /doc/conf.py | |
| parent | 9e3c94d117bb3a196ad6e03babb8bc30da4b3ff0 (diff) | |
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.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
[rebase for u-boot]
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Diffstat (limited to 'doc/conf.py')
| -rw-r--r-- | doc/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/conf.py b/doc/conf.py index 0772fb6f0c..8bb27ad9e2 100644 --- a/doc/conf.py +++ b/doc/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") |