From patchwork Wed May 18 12:48:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 9118751 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 20424BF29F for ; Wed, 18 May 2016 12:50:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 79106201FE for ; Wed, 18 May 2016 12:50:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1D9E201FA for ; Wed, 18 May 2016 12:50:11 +0000 (UTC) Received: from localhost ([::1]:44785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b30vS-00008X-TT for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 May 2016 08:50:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b30tq-0007lI-Su for qemu-devel@nongnu.org; Wed, 18 May 2016 08:48:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b30tn-00040N-O4 for qemu-devel@nongnu.org; Wed, 18 May 2016 08:48:30 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:38120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b30tn-0003xd-GF; Wed, 18 May 2016 08:48:27 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 99F7241788; Wed, 18 May 2016 15:48:22 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id B4074ADA; Wed, 18 May 2016 15:48:21 +0300 (MSK) Received: (nullmailer pid 21048 invoked by uid 1000); Wed, 18 May 2016 12:48:21 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 18 May 2016 15:48:20 +0300 Message-Id: <1463575700-21007-1-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PATCH trivial] docs: "specify" spell fix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Michael Tokarev Reviewed-by: Eric Blake --- docs/qapi-code-gen.txt | 2 +- qemu-options.hx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt index d7d6987..eff2075 100644 --- a/docs/qapi-code-gen.txt +++ b/docs/qapi-code-gen.txt @@ -322,7 +322,7 @@ enum. The value for each branch can be of any type. A flat union definition avoids nesting on the wire, and specifies a set of common members that occur in all variants of the union. The -'base' key must specifiy either a type name (the type must be a +'base' key must specify either a type name (the type must be a struct, not a union), or a dictionary representing an anonymous type. All branches of the union must be complex types, and the top-level members of the union dictionary on the wire will be combination of diff --git a/qemu-options.hx b/qemu-options.hx index 6106520..068f8cd 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -569,7 +569,7 @@ These options have the same definition as they have in @option{-hdachs}. @var{discard} is one of "ignore" (or "off") or "unmap" (or "on") and controls whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) requests are ignored or passed to the filesystem. Some machine types may not support discard requests. @item format=@var{format} Specify which disk @var{format} will be used rather than detecting -the format. Can be used to specifiy format=raw to avoid interpreting +the format. Can be used to specify format=raw to avoid interpreting an untrusted format header. @item serial=@var{serial} This option specifies the serial number to assign to the device. @@ -894,7 +894,7 @@ mouse. Also overrides the PS/2 mouse emulation when activated. @item disk:[format=@var{format}]:@var{file} Mass storage device based on file. The optional @var{format} argument -will be used rather than detecting the format. Can be used to specifiy +will be used rather than detecting the format. Can be used to specify @code{format=raw} to avoid interpreting an untrusted format header. @item host:@var{bus}.@var{addr}