Merge branch 'docs-mw' into docs-next

author Jonathan Corbet <corbet@lwn.net>

Tue, 27 Sep 2022 19:23:18 +0000 (13:23 -0600)

committer Jonathan Corbet <corbet@lwn.net>

Tue, 27 Sep 2022 19:23:18 +0000 (13:23 -0600)
author Jonathan Corbet <corbet@lwn.net>
Tue, 27 Sep 2022 19:23:18 +0000 (13:23 -0600)
committer Jonathan Corbet <corbet@lwn.net>
Tue, 27 Sep 2022 19:23:18 +0000 (13:23 -0600)
diff --cc Documentation/admin-guide/README.rst
Simple merge
diff --cc Documentation/conf.py
Simple merge
author	Jonathan Corbet <corbet@lwn.net>
	Tue, 27 Sep 2022 19:23:18 +0000 (13:23 -0600)
committer	Jonathan Corbet <corbet@lwn.net>
	Tue, 27 Sep 2022 19:23:18 +0000 (13:23 -0600)
		1	2
Documentation/admin-guide/README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/conf.py	patch \|	diff1 \|	diff2 \|	blob \| history