aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/books/handbook/x11
diff options
context:
space:
mode:
authorWarren Block <wblock@FreeBSD.org>2015-12-08 21:51:11 +0000
committerWarren Block <wblock@FreeBSD.org>2015-12-08 21:51:11 +0000
commit8e0688ec12df0e4a93312ec86240dce0f8ba989b (patch)
tree0b75df01073c72ee2d7cf269f12d2bed9ee56a0f /en_US.ISO8859-1/books/handbook/x11
parent0f8a5b0088ff028984357dc9ac3d354b06fc7b8b (diff)
downloaddoc-8e0688ec12df0e4a93312ec86240dce0f8ba989b.tar.gz
doc-8e0688ec12df0e4a93312ec86240dce0f8ba989b.zip
Correct the instructions on setting up DontZap. Suggested by ak on IRC.
Notes
Notes: svn path=/head/; revision=47834
Diffstat (limited to 'en_US.ISO8859-1/books/handbook/x11')
-rw-r--r--en_US.ISO8859-1/books/handbook/x11/chapter.xml15
1 files changed, 4 insertions, 11 deletions
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.xml b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
index 686d5ba368..246aa28ac7 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -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"