aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-02-25 10:45:13 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-02-25 10:48:05 +0000
commitbb43ee6c4f32026d911cba2db570847fabbfa7a4 (patch)
tree362e47eca473d079f54bf2890f68f86da8f2587e /docs
parent65c3542b1f4e6ad5648a6ee0f7ebc8bcc39035d3 (diff)
downloadqemu-bb43ee6c4f32026d911cba2db570847fabbfa7a4.zip
qemu-bb43ee6c4f32026d911cba2db570847fabbfa7a4.tar.gz
qemu-bb43ee6c4f32026d911cba2db570847fabbfa7a4.tar.bz2
docs: Move qemu-option-trace.rst.inc to docs/
The qemu-option-trace.rst.inc file contains a rST documentation fragment which describes trace options common to qemu-nbd and qemu-img. We put this file into interop/, but we'd like to move the qemu-nbd and qemu-img files into the tools/ manual. We could move the .rst.inc file along with them, but we're eventually going to want to use it for the main QEMU binary options documentation too, and that will be in system/. So move qemu-option-trace.rst.inc to the top-level docs/ directory, where all these files can include it via .. include:: ../qemu-option-trace.rst.inc This does have the slight downside that we now need to explicitly tell Make which manuals use this file rather than relying on a wildcard for all .rst.inc in the manual. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 20200217155415.30949-3-peter.maydell@linaro.org
Diffstat (limited to 'docs')
-rw-r--r--docs/interop/qemu-img.rst2
-rw-r--r--docs/interop/qemu-nbd.rst2
-rw-r--r--docs/qemu-option-trace.rst.inc (renamed from docs/interop/qemu-option-trace.rst.inc)0
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/interop/qemu-img.rst b/docs/interop/qemu-img.rst
index 5f40137..0080f83 100644
--- a/docs/interop/qemu-img.rst
+++ b/docs/interop/qemu-img.rst
@@ -34,7 +34,7 @@ Standard options:
.. option:: -T, --trace [[enable=]PATTERN][,events=FILE][,file=FILE]
- .. include:: qemu-option-trace.rst.inc
+ .. include:: ../qemu-option-trace.rst.inc
The following commands are supported:
diff --git a/docs/interop/qemu-nbd.rst b/docs/interop/qemu-nbd.rst
index e548403..667861c 100644
--- a/docs/interop/qemu-nbd.rst
+++ b/docs/interop/qemu-nbd.rst
@@ -188,7 +188,7 @@ driver options if ``--image-opts`` is specified.
.. option:: -T, --trace [[enable=]PATTERN][,events=FILE][,file=FILE]
- .. include:: qemu-option-trace.rst.inc
+ .. include:: ../qemu-option-trace.rst.inc
Examples
--------
diff --git a/docs/interop/qemu-option-trace.rst.inc b/docs/qemu-option-trace.rst.inc
index 23cfcb4..23cfcb4 100644
--- a/docs/interop/qemu-option-trace.rst.inc
+++ b/docs/qemu-option-trace.rst.inc