Commit 3e893e16 authored Dec 08, 2023 by Jonathan Corbet

docs: Raise the minimum Sphinx requirement to 2.4.4



Commit 31abfdda (docs: Deprecate use of Sphinx < 2.4.x) in 6.2 added a
warning that support for older versions of Sphinx would be going away.
There have been no complaints, so the time has come.  Raise the minimum
Sphinx version to 2.4.4 and clean out some compatibility code that we no
longer need.

Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Link: https://lore.kernel.org/r/874jgs47fq.fsf@meer.lwn.net


Signed-off-by: Jonathan Corbet <corbet@lwn.net>

parent 50709576

Documentation/conf.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ from load_config import loadConfig
		# -- General configuration ------------------------------------------------

		# If your documentation needs a minimal Sphinx version, state it here.
		needs_sphinx = '1.7'
		needs_sphinx = '2.4.4'

		# Add any Sphinx extension module names here, as strings. They can be
		# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

Documentation/doc-guide/sphinx.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ Sphinx Install
		==============

		The ReST markups currently used by the Documentation/ files are meant to be
		built with ``Sphinx`` version 1.7 or higher.
		built with ``Sphinx`` version 2.4.4 or higher.

		There's a script that checks for the Sphinx requirements. Please see
		:ref:`sphinx-pre-install` for further details.

Documentation/process/changes.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ mcelog 0.6 mcelog --version
		iptables 1.4.2 iptables -V
		openssl & libcrypto 1.0.0 openssl version
		bc 1.06.95 bc --version
		Sphinx\ [#f1]_ 1.7 sphinx-build --version
		Sphinx\ [#f1]_ 2.4.4 sphinx-build --version
		cpio any cpio --version
		GNU tar 1.28 tar --version
		gtags (optional) 6.6.5 gtags --version

Documentation/sphinx/automarkup.py

+1 −5

Original line number	Diff line number	Diff line
		@@ -7,10 +7,6 @@
		from docutils import nodes
		import sphinx
		from sphinx import addnodes
		if sphinx.version_info[0] < 2 or \
		sphinx.version_info[0] == 2 and sphinx.version_info[1] < 1:
		from sphinx.environment import NoUri
		else:
		from sphinx.errors import NoUri
		import re
		from itertools import chain

Documentation/sphinx/cdomain.py

+1 −5

Original line number	Diff line number	Diff line
		@@ -127,10 +127,6 @@ def setup(app):

		# Handle easy Sphinx 3.1+ simple new tags: :c:expr and .. c:namespace::
		app.connect('source-read', c_markups)

		if (major == 1 and minor < 8):
		app.override_domain(CDomain)
		else:
		app.add_domain(CDomain, override=True)

		return dict(