Skip to contentSkip to conversation

qemu-img: Fix doc typo for 'bitmap' subcommand

PATCH Applied Eric Blake 3 participants 3 messages May 29, 2020 – Jun 9, 2020

lore
Share & tools
lore

Eric Blake

author
#0 lore raw

PATCH 1/1 qemu-img: Fix doc typo for 'bitmap' subcommand

Prefer a consistent naming for the --merge argument.

Fixes 3b51ab4bf

---

I'm happy for this to go in through my bitmaps queue or through the trivial tree, whichever picks it up first.

 docs/tools/qemu-img.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
docs/tools/qemu-img.rst +1 -1
index 69cd9a30373a..7f0737488ade 100644
@@ -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
Signature · 1 line
2.26.2
#2 lore raw
In reply to Eric Blake

Le 29/05/2020 à 16:45, Eric Blake a écrit :

Quoted 18 lines

Prefer a consistent naming for the --merge argument.

Fixes 3b51ab4bf

---

I'm happy for this to go in through my bitmaps queue or through the trivial tree, whichever picks it up first.

 docs/tools/qemu-img.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
docs/tools/qemu-img.rst +0 -0
index 69cd9a30373a..7f0737488ade 100644

docs/tools/qemu-img.rst Command description: · line 306

Quoted 8 lines
docs/tools/qemu-img.rst +1 -1
@@ -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

Applied to my trivial-patches branch.

Thanks,
Laurent