[PATCH v3.1 2/8] docs: conf.py: disable automarkup for Sphinx 3.x
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: 2020-09-25 12:12:38
Also in:
lkml
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The class types changed after the C domain rewrite on Sphinx 3.x. Due to that, the automarkup extension is just generating additional noise when trying to convert structs and other markups into cross references. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- v3.1: Sphinx actually complains when append has more than one item. So, let's call extensions.append() twice.
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 0a102d57437d..3875401486de 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py@@ -37,7 +37,7 @@ needs_sphinx = '1.3' # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', - 'kfigure', 'sphinx.ext.ifconfig', 'automarkup', + 'kfigure', 'sphinx.ext.ifconfig', 'maintainers_include', 'sphinx.ext.autosectionlabel' ] #
@@ -52,6 +52,7 @@ if major >= 3: ''') else: extensions.append('cdomain') + extensions.append('automarkup') # Ensure that autosectionlabel will produce unique names autosectionlabel_prefix_document = True