diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-03 11:14:24 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-03 11:14:24 +0000 |
| commit | f31160c7d1b89cfb4dd4001a23575b42141cb0ec (patch) | |
| tree | a769e4396e5fcc4134965b3774bb27d5227942ed /docs/conf.py | |
| parent | 035b21977ce1791a630c5cbf46e482e54552e05b (diff) | |
| parent | 78813586b04e89639754cfdcef23802dc9f54ff4 (diff) | |
| download | focaccia-qemu-f31160c7d1b89cfb4dd4001a23575b42141cb0ec.tar.gz focaccia-qemu-f31160c7d1b89cfb4dd4001a23575b42141cb0ec.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-docs-20200203' into staging
docs: * Fix Makefile concurrency bug where we could run Sphinx twice in parallel on the same manual (which makes it crash) * Support handling hxtool doc fragments for rST manuals * Convert qemu-img docs to rST * Convert qemu-trace-stap docs to rST * Convert virtfs-proxy-helper docs to rST # gpg: Signature made Mon 03 Feb 2020 11:11:44 GMT # gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE # gpg: issuer "peter.maydell@linaro.org" # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate] # gpg: aka "Peter Maydell <pmaydell@gmail.com>" [ultimate] # gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate] # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE * remotes/pmaydell/tags/pull-docs-20200203: virtfs-proxy-helper: Convert documentation to rST scripts/qemu-trace-stap: Convert documentation to rST qemu-img-cmds.hx: Remove texinfo document fragments qemu-img: Convert invocation documentation to rST qemu-img-cmds.hx: Add rST documentation fragments docs/sphinx: Add new hxtool Sphinx extension hxtool: Support SRST/ERST directives Makefile: Ensure we don't run Sphinx in parallel for manpages Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index 259c6049da..ee7faa6b4e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,7 +54,7 @@ needs_sphinx = '1.3' # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions = ['kerneldoc', 'qmp_lexer'] +extensions = ['kerneldoc', 'qmp_lexer', 'hxtool'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -221,3 +221,4 @@ texinfo_documents = [ # find everything. kerneldoc_bin = os.path.join(qemu_docdir, '../scripts/kernel-doc') kerneldoc_srctree = os.path.join(qemu_docdir, '..') +hxtool_srctree = os.path.join(qemu_docdir, '..') |