[PULL 0/3] docs queue

Peter Maydell posted 3 patches 5 years, 8 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
Makefile                                        | 41 +++++++++++++++----------
docs/index.html.in                              |  1 +
docs/index.rst                                  |  1 +
docs/interop/conf.py                            | 12 --------
docs/interop/index.rst                          |  5 ---
docs/{interop => }/qemu-option-trace.rst.inc    |  0
docs/tools/conf.py                              | 33 ++++++++++++++++++++
docs/tools/index.rst                            | 17 ++++++++++
docs/{interop => tools}/qemu-img.rst            |  2 +-
docs/{interop => tools}/qemu-nbd.rst            |  2 +-
docs/{interop => tools}/qemu-trace-stap.rst     |  0
docs/{interop => tools}/virtfs-proxy-helper.rst |  0
docs/{interop => tools}/virtiofsd.rst           |  0
13 files changed, 78 insertions(+), 36 deletions(-)
rename docs/{interop => }/qemu-option-trace.rst.inc (100%)
create mode 100644 docs/tools/conf.py
create mode 100644 docs/tools/index.rst
rename docs/{interop => tools}/qemu-img.rst (99%)
rename docs/{interop => tools}/qemu-nbd.rst (99%)
rename docs/{interop => tools}/qemu-trace-stap.rst (100%)
rename docs/{interop => tools}/virtfs-proxy-helper.rst (100%)
rename docs/{interop => tools}/virtiofsd.rst (100%)
[PULL 0/3] docs queue
Posted by Peter Maydell 5 years, 8 months ago
Just the "create the tools manual" patches; I'd like to
get this into master because it'll be a dependency for
some other stuff (even if only textually due to Makefile
changes).

thanks
-- PMM

The following changes since commit c1e667d2598b9b3ce62b8e89ed22dd38dfe9f57f:

  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2020-02-24 11:38:54 +0000)

are available in the Git repository at:

  https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-docs-20200225

for you to fetch changes up to a08b4a9fe6cb3c23755db764c9a40510a40a8731:

  docs: Move tools documentation to tools manual (2020-02-25 10:48:06 +0000)

----------------------------------------------------------------
 * create a new 'tools' manual, and move the documentation for
   qemu-img, qemu-nbd, virtfs-proxy-helper, qemu-trace-stap and
   virtiofsd to it

----------------------------------------------------------------
Peter Maydell (3):
      docs: Create new 'tools' manual
      docs: Move qemu-option-trace.rst.inc to docs/
      docs: Move tools documentation to tools manual

 Makefile                                        | 41 +++++++++++++++----------
 docs/index.html.in                              |  1 +
 docs/index.rst                                  |  1 +
 docs/interop/conf.py                            | 12 --------
 docs/interop/index.rst                          |  5 ---
 docs/{interop => }/qemu-option-trace.rst.inc    |  0
 docs/tools/conf.py                              | 33 ++++++++++++++++++++
 docs/tools/index.rst                            | 17 ++++++++++
 docs/{interop => tools}/qemu-img.rst            |  2 +-
 docs/{interop => tools}/qemu-nbd.rst            |  2 +-
 docs/{interop => tools}/qemu-trace-stap.rst     |  0
 docs/{interop => tools}/virtfs-proxy-helper.rst |  0
 docs/{interop => tools}/virtiofsd.rst           |  0
 13 files changed, 78 insertions(+), 36 deletions(-)
 rename docs/{interop => }/qemu-option-trace.rst.inc (100%)
 create mode 100644 docs/tools/conf.py
 create mode 100644 docs/tools/index.rst
 rename docs/{interop => tools}/qemu-img.rst (99%)
 rename docs/{interop => tools}/qemu-nbd.rst (99%)
 rename docs/{interop => tools}/qemu-trace-stap.rst (100%)
 rename docs/{interop => tools}/virtfs-proxy-helper.rst (100%)
 rename docs/{interop => tools}/virtiofsd.rst (100%)

Re: [PULL 0/3] docs queue
Posted by Peter Maydell 5 years, 8 months ago
On Tue, 25 Feb 2020 at 11:02, Peter Maydell <peter.maydell@linaro.org> wrote:
>
>
> Just the "create the tools manual" patches; I'd like to
> get this into master because it'll be a dependency for
> some other stuff (even if only textually due to Makefile
> changes).
>
> thanks
> -- PMM


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM