From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Michael Tokarev <mjt@tls.msk.ru>,
Laurent Vivier <laurent@vivier.eu>
Subject: [PULL v2 07/16] qemu-img: Fix doc typo for 'bitmap' subcommand
Date: Wed, 10 Jun 2020 15:10:02 +0200 [thread overview]
Message-ID: <20200610131011.1941209-8-laurent@vivier.eu> (raw)
In-Reply-To: <20200610131011.1941209-1-laurent@vivier.eu>
From: Eric Blake <eblake@redhat.com>
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>
---
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
next prev parent reply other threads:[~2020-06-10 13:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 13:09 [PULL v2 00/16] Trivial branch for 5.1 patches Laurent Vivier
2020-06-10 13:09 ` [PULL v2 01/16] Fix parameter type in vhost migration log path Laurent Vivier
2020-06-10 13:09 ` [PULL v2 02/16] net: Do not include a newline in the id of -nic devices Laurent Vivier
2020-06-10 13:09 ` [PULL v2 03/16] .mailmap: Update Fred Konrad email address Laurent Vivier
2020-06-10 13:09 ` [PULL v2 04/16] hw/unicore32/puv3: Use qemu_log_mask(ERROR) instead of debug printf() Laurent Vivier
2020-06-10 13:10 ` [PULL v2 05/16] hw/isa/apm: Convert debug printf()s to trace events Laurent Vivier
2020-06-10 13:10 ` [PULL v2 06/16] hw/misc/auxbus: Use qemu_log_mask(UNIMP) instead of debug printf Laurent Vivier
2020-06-10 13:10 ` Laurent Vivier [this message]
2020-06-10 13:10 ` [PULL v2 08/16] hw/arm/aspeed: Correct DRAM container region size Laurent Vivier
2020-06-10 13:10 ` [PULL v2 09/16] hw/hppa/dino: Use the IEC binary prefix definitions Laurent Vivier
2020-06-10 13:10 ` [PULL v2 10/16] hw/i386/xen/xen-hvm: " Laurent Vivier
2020-06-10 13:10 ` [PULL v2 11/16] target/i386/cpu: " Laurent Vivier
2020-06-10 13:10 ` [PULL v2 12/16] target/unicore32: Remove unused headers Laurent Vivier
2020-06-10 13:10 ` [PULL v2 13/16] target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR) Laurent Vivier
2020-06-10 13:10 ` [PULL v2 14/16] target/unicore32: Prefer qemu_semihosting_log_out() over curses Laurent Vivier
2020-06-10 13:10 ` [PULL v2 15/16] hw/openrisc/openrisc_sim: Add assertion to silence GCC warning Laurent Vivier
2020-06-10 13:10 ` [PULL v2 16/16] semihosting: remove the pthread include which seems unused Laurent Vivier
2020-06-11 20:19 ` [PULL v2 00/16] Trivial branch for 5.1 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200610131011.1941209-8-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=mjt@tls.msk.ru \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).