From 1ddd8bd1e16c2fcbd79fa0476619aea8c259c688 Mon Sep 17 00:00:00 2001
From: patrick96
Date: Sun, 9 May 2021 21:19:15 +0200
Subject: [PATCH] fix(build): Disable sphinx manpage section dirs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Before sphinx 4.0, this was the default but was changed in 4.0.
Now by default the folder structure looks like this:
man
├── 1
│ └── polybar.1
└── 5
└── polybar.5
This restores the old behavior where there weren't individual folders
for the different sections.
Fixes #2424
Ref: https://www.sphinx-doc.org/en/master/changes.html#id14
---
CHANGELOG.md | 3 +++
doc/conf.py | 3 +++
2 files changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44988bd1..2d03d7c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
+### Build
+- Support building documentation on sphinx 4.0 ([`#2424`](https://github.com/polybar/polybar/issues/2424))
+
## [3.5.5] - 2021-03-01
### Build
- Support older python sphinx versions again ([`#2356`](https://github.com/polybar/polybar/issues/2356))
diff --git a/doc/conf.py b/doc/conf.py
index 9bd12125..656c7291 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -185,6 +185,9 @@ man_pages = [
('man/polybar.5', 'polybar', 'configuration file for polybar(1)', [], 5)
]
+man_make_section_directory = False
+
+
# -- Options for Texinfo output ----------------------------------------------
# Grouping the document tree into Texinfo files. List of tuples