| Message ID | 20190522205034.25724-8-corbet@lwn.net |
|---|---|
| State | Accepted |
| Commit | 3bc8088464712fdcb078eefb68837ccfcc413c88 |
| Headers | show |
| Series | docs: Fixes for recent versions of Sphinx | expand |
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")
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> --- Documentation/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0