summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAkira Yokosawa <akiyks@gmail.com>2022-06-01 23:34:06 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-14 16:59:30 +0200
commit8c547cac6848e039eff6aa70db3605a69a12490c (patch)
tree0f2ad3baee3396744cec2568a3aeb00a6487e1e5 /Documentation
parent621a4bcfb7aa031e7760d7b156bad7a45df58387 (diff)
downloadlinux-stable-8c547cac6848e039eff6aa70db3605a69a12490c.tar.gz
linux-stable-8c547cac6848e039eff6aa70db3605a69a12490c.tar.bz2
linux-stable-8c547cac6848e039eff6aa70db3605a69a12490c.zip
docs/conf.py: Cope with removal of language=None in Sphinx 5.0.0
commit 627f01eab93d8671d4e4afee9b148f9998d20e7c upstream. One of the changes in Sphinx 5.0.0 [1] says [sic]: 5.0.0 final - #10474: language does not accept None as it value. The default value of language becomes to 'en' now. [1]: https://www.sphinx-doc.org/en/master/changes.html#release-5-0-0-released-may-30-2022 It results in a new warning from Sphinx 5.0.0 [sic]: WARNING: Invalid configuration value found: 'language = None'. Update your configuration to a valid langauge code. Falling back to 'en' (English). Silence the warning by using 'en'. It works with all the Sphinx versions required for building kernel documentation (1.7.9 or later). Signed-off-by: Akira Yokosawa <akiyks@gmail.com> Link: https://lore.kernel.org/r/bd0c2ddc-2401-03cb-4526-79ca664e1cbe@gmail.com Cc: stable@vger.kernel.org Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 22c1a6d96f9e..f3cf0111bbd2 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -95,7 +95,7 @@ finally:
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: