en-US/Xorg.xml

[John J. McDonough]

 en-US/Xorg.xml |   66 +++++++++++++++++++--------------------------------------
 1 file changed, 23 insertions(+), 43 deletions(-)

New commits:
commit e12de093efa4589c92ae06123ec8e81a868fc5a4
Author: John J. McDonough <jjmcd at fedoraproject.org>
Date:   Thu Apr 30 20:09:22 2009 -0400

    Significant changes to Xorg explaining the don't zap behavior

diff --git a/en-US/Xorg.xml b/en-US/Xorg.xml
index 640f146..63a3855 100644
--- a/en-US/Xorg.xml
+++ b/en-US/Xorg.xml
@@ -10,7 +10,7 @@
   </remark>
   <para>
     This section contains information related to the X Window System
-    implementation, X.Org, provided with Fedora.
+    implementation, Xorg, provided with Fedora.
   </para>
 
   <section>
@@ -19,53 +19,33 @@
     <para>
       The key combination
       <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Backspace</keycap></keycombo>
-      to kill the X server has been <ulink type="http"
-      url="http://cgit.freedesktop.org/xorg/xserver/commit/?id=9d135ac10a7374c7ccda705f1eeb02cc53076c34">disabled
-      by default</ulink> as a decision of the upstream Xorg
-      project. You can change the default by adding the following
-      section to your <filename>xorg.conf</filename> file. If one does
-      not exist, you can create it manually at
-      <filename>/etc/X11/xorg.conf</filename> using a text editor and
-      Xorg will honor that setting.
+      to kill the X server has been removed from the default XKB
+      maps. To restore it, you must enable the xkb option
+      <code>terminate:ctrl_alt_bksp</code>.  From the main menu,
+      select <guimenu>System > Preferences > Keyboard</guimenu>.  In
+      the <code>Keyboard Preferences</code> dialog, select the
+      <code>Layout</code> tab, then select <code>Layout
+      Options</code>.  Select <code>Key sequence to kill the X
+      server</code> and then tick the checkbox for
+      <keycap>Control</keycap> + <keycap>Alt</keycap> +
+      <keycap>Backspace</keycap>.
     </para>
-<screen>
-Section "ServerFlags"
-Option "DontZap" "false"
-EndSection
-</screen>
     <para>
-      If you use kickstart or want to use scripts to change this
-      setting automatically across multiple systems, you can use the
-      following snippet:
-    </para>
+      Alternatively, run the following command to enable the key
+      combination temporarily:
 <screen>
-%post
-
-grep -q -s DontZap /etc/X11/xorg.conf
-append=$?
-if [ $append -ne 0 ]; then
-  cat >> /etc/X11/xorg.conf << EOF
-  Section "ServerFlags"
-  Option "DontZap" "false"
-  EndSection
-  EOF
-fi
-
-%end
+setxkbmap -option "terminate:ctrl_alt_bksp"
 </screen>
+    </para>
     <para>
-      The Xorg project has changed the default DontZap setting to
-      "true" after complaints from desktop users that accidentally hit
-      <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Backspace</keycap></keycombo>
-      when trying to type
-      <keycombo><keycap>Alt</keycap><keycap>Backspace</keycap></keycombo>,
-      <keycombo><keycap>Ctrl</keycap><keycap>Backspace</keycap></keycombo>,
-      or
-      <keycombo><keycap>Shift</keycap><keycap>Backspace</keycap></keycombo>,
-      or who had StickyKeys enabled.
-      <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Backspace</keycap></keycombo>
-      is also a keyboard shortcut for deleting certain expressions in
-      C and Java modes in Emacs.
+      The package <package>fedora-setup-keyboard</package>
+      automatically merges this XKB option at X server startup, making
+      the <keycap>Control</keycap> + <keycap>Alt</keycap> +
+      <keycap>Backspace</keycap> key combination functional in gdm, or
+      if the server is started without the GNOME desktop
+      environment. It is deactivated once GNOME applies the
+      user-configured keyboard layout unless the user has enabled it
+      in the preferences menu as detailed above.
     </para>
   </section>