From: Jani Nikula <jani@nikula.org>
Date: Tue, 18 May 2021 21:40:44 +0000 (+0300)
Subject: doc: fix man page build for Sphinx 4.x
X-Git-Tag: archive/debian/0.33_rc0-1~86
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=59c953656dbd2e65265a2c850f2375afc9d69589

doc: fix man page build for Sphinx 4.x

Sphinx 4.0 changed the default value of man_make_section_directory
from False to True. We create the section directories and move the
files manually, so fix the immediate man build failure by disabling
the feature.

The Sphinx documentation on this [1] is confusing, and has the change
backwards. Git history says the default changed from False to True.

[1] https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-man_make_section_directory
---

diff --git a/doc/conf.py b/doc/conf.py
index 1a5c217b..d0f7f66c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -87,6 +87,8 @@ html_use_smartypants = False
 
 notmuch_authors = u'Carl Worth and many others'
 
+man_make_section_directory = False
+
 man_pages = [
     ('man1/notmuch', 'notmuch',
      u'thread-based email index, search, and tagging',