diff options
| author | Markus Armbruster | 2022-09-08 15:08:42 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2022-09-30 18:02:30 +0200 |
| commit | 7f118b433a2e8c98fe5a8d73f0dd529aada327d1 (patch) | |
| tree | e94ba498ceeabaa18d103524dee6b86a86e7cc9d | |
| parent | block/qcow2-bitmap: Add missing cast to silent GCC error (diff) | |
| download | qemu-7f118b433a2e8c98fe5a8d73f0dd529aada327d1.tar.gz qemu-7f118b433a2e8c98fe5a8d73f0dd529aada327d1.tar.xz qemu-7f118b433a2e8c98fe5a8d73f0dd529aada327d1.zip | |
qemu-img: Wean documentation and help output off '?' for help
'?' for help is deprecated since commit c8057f951d "Support 'help' as
a synonym for '?' in command line options", v1.2.0. We neglected to
update output of qemu-img --help and the manual. Do that now.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220908130842.641410-1-armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | docs/tools/qemu-img.rst | 2 | ||||
| -rw-r--r-- | qemu-img.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst index 85a6e05b35..15aeddc6d8 100644 --- a/docs/tools/qemu-img.rst +++ b/docs/tools/qemu-img.rst @@ -57,7 +57,7 @@ cases. See below for a description of the supported disk formats. *OUTPUT_FMT* is the destination format. *OPTIONS* is a comma separated list of format specific options in a -name=value format. Use ``-o ?`` for an overview of the options supported +name=value format. Use ``-o help`` for an overview of the options supported by the used format or see the format descriptions below for details. *SNAPSHOT_PARAM* is param used for internal snapshot, format is diff --git a/qemu-img.c b/qemu-img.c index 7d4b33b3da..cab9776f42 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -164,8 +164,8 @@ void help(void) " 'output_filename' is the destination disk image filename\n" " 'output_fmt' is the destination format\n" " 'options' is a comma separated list of format specific options in a\n" - " name=value format. Use -o ? for an overview of the options supported by the\n" - " used format\n" + " name=value format. Use -o help for an overview of the options supported by\n" + " the used format\n" " 'snapshot_param' is param used for internal snapshot, format\n" " is 'snapshot.id=[ID],snapshot.name=[NAME]', or\n" " '[ID_OR_NAME]'\n" |