svn commit: r47834 - head/en_US.ISO8859-1/books/handbook/x11

[Warren Block]

Author: wblock
Date: Tue Dec  8 21:51:11 2015
New Revision: 47834
URL: https://svnweb.freebsd.org/changeset/doc/47834

Log:
  Correct the instructions on setting up DontZap.  Suggested by ak on IRC.

Modified:
  head/en_US.ISO8859-1/books/handbook/x11/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Dec  8 20:44:31 2015	(r47833)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Dec  8 21:51:11 2015	(r47834)
@@ -787,23 +787,16 @@ EndSection</programlisting>
 	    Keyboard</term>
 
 	    <listitem>
-	      <para>A combination of keys is available to close the X
-		system.  This option is disabled by default because it
+	      <para>X can be closed with a combination of keys.
+		By default, that key combination is not set because it
 		conflicts with keyboard commands for some
 		applications.  Enabling this option requires changes
-		to both <literal>ServerLayout</literal> and keyboard
-		<literal>InputDevice</literal> sections:</para>
+		to the keyboard <literal>InputDevice</literal>
+		section:</para>
 
 	      <example>
 		<title>Enabling Keyboard Exit from X</title>
 
-		<para><filename>/usr/local/etc/X11/xorg.conf.d/serverlayout-enablezap.conf</filename></para>
-
-		<programlisting>Section "ServerLayout"
-	Identifier "EnableZap"
-	Option     "DontZap" "Off"
-EndSection</programlisting>
-
 		<para><filename>/usr/local/etc/X11/xorg.conf.d/keyboard-zap.conf</filename></para>
 
 		<programlisting>Section	"InputClass"