From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jan 2023 16:35:26 +0000 (-0600)
Subject: Merge tag 'docs-6.2-fixes' of git://git.lwn.net/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=40d92fc4fa81a93b4659b98512dcb9d0ccd94cfd;p=linux.git

Merge tag 'docs-6.2-fixes' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "Three documentation fixes (or rather two and one warning):

   - Sphinx 6.0 broke our configuration mechanism, so fix it

   - I broke our configuration for non-Alabaster themes; Akira fixed it

   - Deprecate Sphinx < 2.4 with an eye toward future removal"

* tag 'docs-6.2-fixes' of git://git.lwn.net/linux:
  docs/conf.py: Use about.html only in sidebar of alabaster theme
  docs: Deprecate use of Sphinx < 2.4.x
  docs: Fix the docs build with Sphinx 6.0
---

40d92fc4fa81a93b4659b98512dcb9d0ccd94cfd