From patchwork Sun Jan 15 20:30:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 9517701 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 25DB3600F6 for ; Sun, 15 Jan 2017 20:30:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0B2628355 for ; Sun, 15 Jan 2017 20:30:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2CB328402; Sun, 15 Jan 2017 20:30:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 53A1428355 for ; Sun, 15 Jan 2017 20:30:36 +0000 (UTC) Received: from localhost ([::1]:52806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSrRj-0000Tz-T6 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Jan 2017 15:30:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSrRU-0000Tj-3u for qemu-devel@nongnu.org; Sun, 15 Jan 2017 15:30:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSrRT-0001OE-C2 for qemu-devel@nongnu.org; Sun, 15 Jan 2017 15:30:20 -0500 Received: from hera.aquilenet.fr ([2a01:474::1]:51856) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSrRT-0001Nc-5U for qemu-devel@nongnu.org; Sun, 15 Jan 2017 15:30:19 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 65070A542; Sun, 15 Jan 2017 21:30:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Az8GsJN8xdxr; Sun, 15 Jan 2017 21:30:14 +0100 (CET) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:181:c200:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id BEE939F1; Sun, 15 Jan 2017 21:30:14 +0100 (CET) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.88) (envelope-from ) id 1cSrRO-00039U-9d; Sun, 15 Jan 2017 21:30:14 +0100 Date: Sun, 15 Jan 2017 21:30:14 +0100 From: Samuel Thibault To: Paolo Bonzini , Stefan Hajnoczi , "Michael S. Tsirkin" , Michael Tokarev , Jason Wang Message-ID: <20170115203014.GA12068@var.home> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:474::1 Subject: [Qemu-devel] [PATCH] Drop duplicate display option documentation 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-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The curses and none possibilities are already documented on a separate line, so documenting it on the sdl line was both unneeded and confusing. Signed-off-by: Samuel Thibault Reviewed-by: Marc-André Lureau diff --git a/qemu-options.hx b/qemu-options.hx index c534a2f7f9..9c81d3752d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -927,7 +927,7 @@ ETEXI DEF("display", HAS_ARG, QEMU_OPTION_display, "-display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off]\n" - " [,window_close=on|off][,gl=on|off]|curses|none|\n" + " [,window_close=on|off][,gl=on|off]\n" "-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n" "-display vnc=[,]\n" "-display curses\n"