From 0ff5fa527c3ab29d35fcac620263da07cf0c2a56 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 4 Oct 2020 22:45:26 +0900 Subject: [PATCH] Close #7996: manpage: Make a section directory on build manpage by default --- CHANGES | 2 ++ doc/usage/configuration.rst | 3 ++- sphinx/builders/manpage.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index f6181d90175..dbd2f9b10aa 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,8 @@ Incompatible changes MathJax configuration may have to set the old MathJax path or update their configuration for version 3. See :mod:`sphinx.ext.mathjax`. * #7784: i18n: The msgid for alt text of image is changed +* #7996: manpage: Make a section directory on build manpage by default (see + :confval:`man_make_section_directory`) Deprecated ---------- diff --git a/doc/usage/configuration.rst b/doc/usage/configuration.rst index b4682dd21bd..e6d76a551d6 100644 --- a/doc/usage/configuration.rst +++ b/doc/usage/configuration.rst @@ -2248,9 +2248,10 @@ These options influence manual page output. .. confval:: man_make_section_directory - If true, make a section directory on build man page. Default is False. + If true, make a section directory on build man page. Default is True. .. versionadded:: 3.3 + .. versionchanged:: 4.0 .. _texinfo-options: diff --git a/sphinx/builders/manpage.py b/sphinx/builders/manpage.py index 2a10ba62f63..442abb91586 100644 --- a/sphinx/builders/manpage.py +++ b/sphinx/builders/manpage.py @@ -120,7 +120,7 @@ def setup(app: Sphinx) -> Dict[str, Any]: app.add_config_value('man_pages', default_man_pages, None) app.add_config_value('man_show_urls', False, None) - app.add_config_value('man_make_section_directory', False, None) + app.add_config_value('man_make_section_directory', True, None) return { 'version': 'builtin',