From: Jonathan Corbet <corbet@lwn.net>
Date: Wed, 22 May 2019 20:30:45 +0000 (-0600)
Subject: docs: Fix conf.py for Sphinx 2.0
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3bc8088464712fdcb078eefb68837ccfcc413c88;p=linux.git

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>
---

diff --git a/Documentation/conf.py b/Documentation/conf.py
index 72647a38b5c2a..7ace3f8852bd8 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")