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

[PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand

Eric Blake posted 1 patch 3 years, 11 months ago

Download mbox

Test docker-mingw@fedora passed

Test checkpatch passed

Test docker-quick@centos7 passed

Test FreeBSD passed

Test asan passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200529144527.1943527-1-eblake@redhat.com

docs/tools/qemu-img.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand

Posted by Eric Blake 3 years, 11 months ago

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

Re: [PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand

Posted by Vladimir Sementsov-Ogievskiy 3 years, 11 months ago

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

Re: [PATCH] qemu-img: Fix doc typo for 'bitmap' subcommand

Posted by Laurent Vivier 3 years, 10 months ago

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