| From 627f01eab93d8671d4e4afee9b148f9998d20e7c Mon Sep 17 00:00:00 2001 |
| From: Akira Yokosawa <akiyks@gmail.com> |
| Date: Wed, 1 Jun 2022 23:34:06 +0900 |
| Subject: docs/conf.py: Cope with removal of language=None in Sphinx 5.0.0 |
| |
| From: Akira Yokosawa <akiyks@gmail.com> |
| |
| 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> |
| --- |
| Documentation/conf.py | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/Documentation/conf.py |
| +++ b/Documentation/conf.py |
| @@ -96,7 +96,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: |
