From owner-svn-doc-all@freebsd.org  Tue Dec  8 21:51:12 2015
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC2CE9A0630;
 Tue,  8 Dec 2015 21:51:12 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 795F112E4;
 Tue,  8 Dec 2015 21:51:12 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB8LpBeg069700;
 Tue, 8 Dec 2015 21:51:11 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8LpBXG069699;
 Tue, 8 Dec 2015 21:51:11 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201512082151.tB8LpBXG069699@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 8 Dec 2015 21:51:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r47834 - head/en_US.ISO8859-1/books/handbook/x11
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Dec 2015 21:51:12 -0000

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"