[PATCH v3 2/8] docs: conf.py: disable automarkup for Sphinx 3.x

Mauro Carvalho Chehab
2020-09-25T06:30:58Z

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>
---
Documentation/conf.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/conf.py b/Documentation/conf.py
index 0a102d57437d..4bae94e756da 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' ]

#
@@ -51,7 +51,7 @@ if major >= 3:
in the generated output.
''')
else:
- extensions.append('cdomain')
+ extensions.append('cdomain', 'automarkup')

# Ensure that autosectionlabel will produce unique names
autosectionlabel_prefix_document = True
--
2.26.2