From patchwork Fri Jul 19 09:11:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 260220 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 44AB42C007E for ; Fri, 19 Jul 2013 19:22:00 +1000 (EST) Received: from localhost ([::1]:46141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V06sw-0006Qi-1p for incoming@patchwork.ozlabs.org; Fri, 19 Jul 2013 05:21:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V06ro-0005Lr-Tr for qemu-devel@nongnu.org; Fri, 19 Jul 2013 05:20:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V06rl-0005l9-Ht for qemu-devel@nongnu.org; Fri, 19 Jul 2013 05:20:48 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:40724) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V06rl-0005kX-7J; Fri, 19 Jul 2013 05:20:45 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id D9A1E41D88; Fri, 19 Jul 2013 13:11:18 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 50EBF1D8; Fri, 19 Jul 2013 13:11:17 +0400 (MSK) From: Michael Tokarev To: Anthony Liguori Date: Fri, 19 Jul 2013 13:11:13 +0400 Message-Id: <1374225073-12959-6-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1374225073-12959-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1374225073-12959-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL trivial 5/5] doc: monitor multiplexing rewording X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Michael Tokarev --- qemu-options.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 4e98b4f..2dbfd42 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2493,8 +2493,8 @@ listening on port 4444 would be: @table @code @item -serial mon:telnet::4444,server,nowait @end table -When monitor is multiplexed to stdio this way, Ctrl+C will not terminate -QEMU anymore but will be passed to the guest instead. +When the monitor is multiplexed to stdio in this way, Ctrl+C will not terminate +QEMU any more but will be passed to the guest instead. @item braille Braille device. This will use BrlAPI to display the braille output on a real