[PATCH] xfree86: Document mapping terminate to Ctrl+Alt+Backspace. (#25083)

[Peter Hutterer]

On Tue, Aug 24, 2010 at 02:32:51PM -0700, Jesse Adkins wrote:
> Explain how to map terminate in xorg.conf, and with setxkbmap.
> 
> Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
> ---
>  hw/xfree86/doc/man/Xorg.man.pre |   15 +++++++++++++++
>  1 files changed, 15 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
> index 46d0e44..a41de75 100644
> --- a/hw/xfree86/doc/man/Xorg.man.pre
> +++ b/hw/xfree86/doc/man/Xorg.man.pre
> @@ -1,4 +1,6 @@
>  .\" $XdotOrg: xserver/xorg/hw/xfree86/doc/man/Xorg.man.pre,v 1.3 2005/07/04 18:41:01 ajax Exp $
> +.\" shorthand for double quote that works everywhere.
> +.ds q \N'34'
>  .TH __xservername__ __appmansuffix__ __vendorversion__
>  .SH NAME
>  __xservername__ - X11R7 X server
> @@ -440,6 +442,19 @@ Immediately kills the server -- no questions asked. It can be disabled by
>  setting the
>  .B DontZap
>  __xconfigfile__(__filemansuffix__) file option to a TRUE value.
> +.PP
> +.RS 8
> +Newer versions of __xservername__ do not come with
> +.B Ctrl+Alt+Backspace
> +mapped in XKB. You can specify this in keyboard section of the
> +__xconfigfile__(__filemansuffix__) file with the line
> +.PP
> +.BI "Option " "\*qXKBOption\*q \*qterminate:ctrl_alt_bksp\*q"
> +.PP
> +You can also set this mapping at runtime, with the command
> +.PP
> +.BI "setxkbmap -option " "\*qterminate:ctrl_alt_bksp\*q"
> +.RE
>  .TP 8
>  .B Ctrl+Alt+Keypad-Plus
>  Change video mode to next one specified in the configuration file.
> -- 
> 1.7.0.4

yes, but not in this form :)

How about: "Zapping is triggered by the Terminate_Server action in the
keyboard map. This action is not part of the default keymaps but can be
enabled with the XKB option "terminate:ctrl_alt_bksp"

I think I'd rather avoid describing xorg.conf options or setxkbmap since
there's plenty of other ways to enable it (the desktop environment being one
of them).
 
Cheers,
  Peter