[PATCH] xfree86: Document terminate not mapped by default (bug 25083)

[Peter Hutterer]

On Wed, Aug 25, 2010 at 01:48:29PM -0700, Jesse Adkins wrote:
> Document that terminate is not mapped to Ctrl+Alt+Backspace by default, to help alleviate some confusion.
> 
> Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>
> ---
>  hw/xfree86/doc/man/Xorg.man.pre |   10 ++++++++++
>  1 files changed, 10 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
> index 46d0e44..805f3a3 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,14 @@ 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
> +It should be noted that zapping is triggered by the
> +.B Terminate_Server
> +action in the keyboard map. This action is not part of the default keymaps
> +but can be enabled with the XKB option
> +.B \*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

merged into input-next, thanks.

Cheers,
  Peter