The only difference from the v3 patchset is that I've changed a -d to -e in patch 10 as suggested by RTH.
thanks -- PMM The following changes since commit 32694e98b8d7a246345448a8f707d2e11d6c65e2: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-06 18:52:19 +0000) are available in the Git repository at: https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-sphinx-20190307 for you to fetch changes up to c10e01b996df09f6cb4eceb2b7a9754bece927c9: MAINTAINERS: Add entry for Sphinx documentation infrastructure (2019-03-07 14:26:47 +0000) ---------------------------------------------------------------- Enable building and installing rST docs with Sphinx ---------------------------------------------------------------- Peter Maydell (12): docs/cpu-hotplug.rst: Fix rST markup issues docs: Convert memory.txt to rst format docs: Commit initial files from sphinx-quickstart docs/conf.py: Disable unused _static directory docs/conf.py: Configure the 'alabaster' theme docs/conf.py: Don't include rST sources in HTML build docs/conf.py: Disable option warnings docs: Provide separate conf.py for each manual we want Makefile, configure: Support building rST documentation Makefile: Abstract out "identify the pkgversion" code docs/conf.py: Don't hard-code QEMU version MAINTAINERS: Add entry for Sphinx documentation infrastructure configure | 15 ++- Makefile | 78 ++++++++---- .gitignore | 1 + MAINTAINERS | 6 + docs/conf.py | 216 ++++++++++++++++++++++++++++++++++ docs/cpu-hotplug.rst | 2 +- docs/devel/conf.py | 15 +++ docs/devel/index.rst | 21 ++++ docs/devel/{memory.txt => memory.rst} | 128 +++++++++++--------- docs/index.rst | 15 +++ docs/interop/conf.py | 15 +++ docs/interop/index.rst | 18 +++ 12 files changed, 449 insertions(+), 81 deletions(-) create mode 100644 docs/conf.py create mode 100644 docs/devel/conf.py create mode 100644 docs/devel/index.rst rename docs/devel/{memory.txt => memory.rst} (85%) create mode 100644 docs/index.rst create mode 100644 docs/interop/conf.py create mode 100644 docs/interop/index.rst
