[PATCH v2 0/2] Build all docs in a single manual

Peter Maydell posted 2 patches 3 years, 4 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210108161416.21129-1-peter.maydell@linaro.org
Maintainers: Peter Maydell <peter.maydell@linaro.org>
docs/conf.py         | 46 ++++++++++++++++++++++++++++++-
docs/devel/conf.py   | 15 ----------
docs/index.html.in   | 17 ------------
docs/interop/conf.py | 28 -------------------
docs/meson.build     | 65 ++++++++++++++++++--------------------------
docs/specs/conf.py   | 16 -----------
docs/system/conf.py  | 28 -------------------
docs/tools/conf.py   | 37 -------------------------
docs/user/conf.py    | 15 ----------
9 files changed, 71 insertions(+), 196 deletions(-)
delete mode 100644 docs/devel/conf.py
delete mode 100644 docs/index.html.in
delete mode 100644 docs/interop/conf.py
delete mode 100644 docs/specs/conf.py
delete mode 100644 docs/system/conf.py
delete mode 100644 docs/tools/conf.py
delete mode 100644 docs/user/conf.py
[PATCH v2 0/2] Build all docs in a single manual
Posted by Peter Maydell 3 years, 4 months ago
Changes from v1 up top since they're minor:
 * rebase to account for two new manpages
 * patch 1 fixes the accidental omission of one of the
   new manpages from the meson.build list
 * patch 2 has been reviewed already

Summary of the patchset:

When we first converted our documentation to Sphinx, we split it into
multiple manuals (system, interop, tools, etc), which are all built
separately.  The primary driver for this was wanting to be able to
avoid shipping the 'devel' manual to end-users.  However, this is
working against the grain of the way Sphinx wants to be used and
causes some annoyances:
 * Cross-references between documents become much harder or
   possibly impossible
 * There is no single index to the whole documentation
 * Within one manual there's no links or table-of-contents info
   that lets you easily navigate to the others
 * The devel manual doesn't get published on the QEMU website
   (it would be nice to able to refer to it there)

Merely hiding our developer documentation from end users seems like
it's not enough benefit for these costs.  Combine all the
documentation into a single manual (the same way that the readthedocs
site builds it) and install the whole thing.  The previous manual
divisions remain as the new top level sections in the manual.

thanks
-- PMM

Peter Maydell (2):
  docs: Add qemu-storage-daemon(1) manpage to meson.build
  docs: Build and install all the docs in a single manual

 docs/conf.py         | 46 ++++++++++++++++++++++++++++++-
 docs/devel/conf.py   | 15 ----------
 docs/index.html.in   | 17 ------------
 docs/interop/conf.py | 28 -------------------
 docs/meson.build     | 65 ++++++++++++++++++--------------------------
 docs/specs/conf.py   | 16 -----------
 docs/system/conf.py  | 28 -------------------
 docs/tools/conf.py   | 37 -------------------------
 docs/user/conf.py    | 15 ----------
 9 files changed, 71 insertions(+), 196 deletions(-)
 delete mode 100644 docs/devel/conf.py
 delete mode 100644 docs/index.html.in
 delete mode 100644 docs/interop/conf.py
 delete mode 100644 docs/specs/conf.py
 delete mode 100644 docs/system/conf.py
 delete mode 100644 docs/tools/conf.py
 delete mode 100644 docs/user/conf.py

-- 
2.20.1


Re: [PATCH v2 0/2] Build all docs in a single manual
Posted by Peter Maydell 3 years, 4 months ago
On Fri, 8 Jan 2021 at 16:14, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> Changes from v1 up top since they're minor:
>  * rebase to account for two new manpages
>  * patch 1 fixes the accidental omission of one of the
>    new manpages from the meson.build list
>  * patch 2 has been reviewed already

I'm applying this to target-arm.next so we can get it into
master before somebody adds another manpage :-)

-- PMM