diff mbox

Drop duplicate display option documentation

Message ID 20170115203014.GA12068@var.home
State New
Headers show

Commit Message

Samuel Thibault Jan. 15, 2017, 8:30 p.m. UTC
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 <samuel.thibault@ens-lyon.org>

Comments

Marc-André Lureau Jan. 16, 2017, 12:10 p.m. UTC | #1
Hi

On Mon, Jan 16, 2017 at 12:30 AM Samuel Thibault <samuel.thibault@gnu.org>
wrote:

> 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 <samuel.thibault@ens-lyon.org>
>

Introduced in commit f04ec5afbb7d60a56863add800fd90ceee66f362


Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>




> 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=<display>[,<optargs>]\n"
>      "-display curses\n"
>
> --
Marc-André Lureau
Paolo Bonzini Jan. 16, 2017, 12:26 p.m. UTC | #2
Cc: qemu-trivial@nongnu.org

On 15/01/2017 21:30, Samuel Thibault wrote:
> 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 <samuel.thibault@ens-lyon.org>
> 
> 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=<display>[,<optargs>]\n"
>      "-display curses\n"
> 
>
Michael Tokarev Jan. 21, 2017, 4:36 p.m. UTC | #3
15.01.2017 23:30, Samuel Thibault wrote:
> The curses and none possibilities are already documented on a separate line,
> so documenting it on the sdl line was both unneeded and confusing.

Applied to -trivial, thanks!

/mjt
diff mbox

Patch

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=<display>[,<optargs>]\n"
     "-display curses\n"