aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2020-05-29 09:45:27 -0500
committerLaurent Vivier <laurent@vivier.eu>2020-06-09 19:58:53 +0200
commit547f8f6452579506fbde2f0a1aa5fc0469dc45a3 (patch)
tree8f5d405b1de068b1284c68a0dc43a6518d0d0940
parentd263425bce8620d608410e68e492adb7ef072465 (diff)
downloadqemu-547f8f6452579506fbde2f0a1aa5fc0469dc45a3.zip
qemu-547f8f6452579506fbde2f0a1aa5fc0469dc45a3.tar.gz
qemu-547f8f6452579506fbde2f0a1aa5fc0469dc45a3.tar.bz2
qemu-img: Fix doc typo for 'bitmap' subcommand
Prefer a consistent naming for the --merge argument. Fixes: 3b51ab4bf Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20200529144527.1943527-1-eblake@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
-rw-r--r--docs/tools/qemu-img.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
index 69cd9a3..7f07374 100644
--- a/docs/tools/qemu-img.rst
+++ b/docs/tools/qemu-img.rst
@@ -300,7 +300,7 @@ Command description:
``--disable`` to change *BITMAP* to stop recording future edits.
- ``--merge`` to merge the contents of *SOURCE_BITMAP* into *BITMAP*.
+ ``--merge`` to merge the contents of the *SOURCE* bitmap into *BITMAP*.
Additional options include ``-g`` which sets a non-default
*GRANULARITY* for ``--add``, and ``-b`` and ``-F`` which select an