| From 3bc8088464712fdcb078eefb68837ccfcc413c88 Mon Sep 17 00:00:00 2001 |
| From: Jonathan Corbet <corbet@lwn.net> |
| Date: Wed, 22 May 2019 14:30:45 -0600 |
| Subject: docs: Fix conf.py for Sphinx 2.0 |
| |
| From: Jonathan Corbet <corbet@lwn.net> |
| |
| 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> |
| |
| --- |
| Documentation/conf.py | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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") |
