From nobody Sun May 19 06:23:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1662643260; cv=none; d=zohomail.com; s=zohoarc; b=OXfUETqcNDzNGTSFFwqZXAvPWCJnulUP6i74PHFZkv7NuopPx491493s919WIaPX/k2ch1BnwZlhRxnhV3JiB+cSIfZZ1c1GHqlg9ZgFweVJY50hWUSZF5Du/QPJiIJkOyYamXcRJzc+bXqXZVRfdHLjGK08cuUB45k6Q7aQ7sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662643260; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=WZt/9UcazvTSK2LPeKnnNG+7PZ/qsgvimBFmXGuTC/g=; b=Onda0bH8ZUNYbEN3jvYOdJgRx7HKctlpzscGmU+IcBJKSQDUDntEyiY37IYzjHIFDKn8eYlUI/ktbOx0C87uIU+OccoLAkLh4aXebIrsFqpDht63Psv+rdLogpgA/918/So8w47pJAMDRZrjnItJ8kVBcVamUsozqe3T9ejLjb8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662643260514776.5794393784826; Thu, 8 Sep 2022 06:21:00 -0700 (PDT) Received: from localhost ([::1]:45706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWHSh-00035L-9L for importer@patchew.org; Thu, 08 Sep 2022 09:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWHH3-0007wk-Bh for qemu-devel@nongnu.org; Thu, 08 Sep 2022 09:08:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWHGx-0007VP-NU for qemu-devel@nongnu.org; Thu, 08 Sep 2022 09:08:49 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-630-O9eaw_eTO8qBU9Dp2upERA-1; Thu, 08 Sep 2022 09:08:44 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 43CF13801F61; Thu, 8 Sep 2022 13:08:44 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.166]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 200342166B26; Thu, 8 Sep 2022 13:08:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D6C5C21E6900; Thu, 8 Sep 2022 15:08:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662642525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZt/9UcazvTSK2LPeKnnNG+7PZ/qsgvimBFmXGuTC/g=; b=aOljHL9Djkx0COu5wvHWJn30n2311fJ0+yJUkYzONDSm7NlnYCfmxdFT5vvNhZtFXei1jv AAKpMJ6aQEp0pQjp7xvBKJUu78rjOnh86eLuzHPoj2AaJv00HplnPo9zqZ4BbS2NI8OZgV 3TJo/Kty0EkQAhRcKmro5uDbOM+Z7vI= X-MC-Unique: O9eaw_eTO8qBU9Dp2upERA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, qemu-block@nongnu.org Subject: [PATCH] qemu-img: Wean documentation and help output off '?' for help Date: Thu, 8 Sep 2022 15:08:42 +0200 Message-Id: <20220908130842.641410-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1662643260984100001 Content-Type: text/plain; charset="utf-8" '?' 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 --- docs/tools/qemu-img.rst | 2 +- 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. =20 *OPTIONS* is a comma separated list of format specific options in a -name=3Dvalue format. Use ``-o ?`` for an overview of the options supported +name=3Dvalue format. Use ``-o help`` for an overview of the options suppor= ted by the used format or see the format descriptions below for details. =20 *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 optio= ns in a\n" - " name=3Dvalue format. Use -o ? for an overview of the optio= ns supported by the\n" - " used format\n" + " name=3Dvalue format. Use -o help for an overview of the op= tions supported by\n" + " the used format\n" " 'snapshot_param' is param used for internal snapshot, format= \n" " is 'snapshot.id=3D[ID],snapshot.name=3D[NAME]', or\n" " '[ID_OR_NAME]'\n" --=20 2.37.2