* [PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand
@ 2020-05-29 14:45 Eric Blake
2020-05-30 8:17 ` Vladimir Sementsov-Ogievskiy
2020-06-09 17:25 ` Laurent Vivier
0 siblings, 2 replies; 3+ messages in thread
From: Eric Blake @ 2020-05-29 14:45 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, vsementsov, jsnow, qemu-block
Prefer a consistent naming for the --merge argument.
Fixes: 3b51ab4bf
Signed-off-by: Eric Blake <eblake@redhat.com>
---
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(-)
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
index 69cd9a30373a..7f0737488ade 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
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand
2020-05-29 14:45 [PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand Eric Blake
@ 2020-05-30 8:17 ` Vladimir Sementsov-Ogievskiy
2020-06-09 17:25 ` Laurent Vivier
1 sibling, 0 replies; 3+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2020-05-30 8:17 UTC (permalink / raw)
To: Eric Blake, qemu-devel; +Cc: qemu-trivial, jsnow, qemu-block
29.05.2020 17:45, Eric Blake wrote:
> 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>
--
Best regards,
Vladimir
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand
2020-05-29 14:45 [PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand Eric Blake
2020-05-30 8:17 ` Vladimir Sementsov-Ogievskiy
@ 2020-06-09 17:25 ` Laurent Vivier
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2020-06-09 17:25 UTC (permalink / raw)
To: Eric Blake, qemu-devel; +Cc: qemu-trivial, vsementsov, jsnow, qemu-block
Le 29/05/2020 à 16:45, Eric Blake a écrit :
> Prefer a consistent naming for the --merge argument.
>
> Fixes: 3b51ab4bf
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>
> 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(-)
>
> diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
> index 69cd9a30373a..7f0737488ade 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
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-09 17:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-29 14:45 [PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand Eric Blake
2020-05-30 8:17 ` Vladimir Sementsov-Ogievskiy
2020-06-09 17:25 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).