2 commits - en-US/Xorg.xml
Paul W. Frields
pfrields at fedoraproject.org
Thu Apr 2 21:55:53 UTC 2009
en-US/Xorg.xml | 88 +++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 61 insertions(+), 27 deletions(-)
New commits:
commit a34a4b5456291dbd7d38f17d465c1584dc640d40
Author: Paul W. Frields <stickster at gmail.com>
Date: Thu Apr 2 17:55:37 2009 -0400
Fix tagging in Xorg beat
diff --git a/en-US/Xorg.xml b/en-US/Xorg.xml
index 2af7833..640f146 100644
--- a/en-US/Xorg.xml
+++ b/en-US/Xorg.xml
@@ -5,7 +5,8 @@
<section>
<title>X Window System (Graphics)</title>
- <remark>This beat is located here: <ulink type="http" url="https://fedoraproject.org/wiki/Docs/Beats/Xorg">https://fedoraproject.org/wiki/Docs/Beats/Xorg</ulink>
+ <remark>This beat is located here: <ulink type="http"
+ url="https://fedoraproject.org/wiki/Docs/Beats/Xorg">https://fedoraproject.org/wiki/Docs/Beats/Xorg</ulink>
</remark>
<para>
This section contains information related to the X Window System
@@ -16,24 +17,26 @@
<title>X server</title>
<para>
- The key combination Ctrl-Alt-Backspace 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
- xorg.conf file. If one does not exist, you can create it manually
- at /etc/X11/xorg.conf using a text editor and Xorg will honor that
- setting.
+ 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.
</para>
<screen>
Section "ServerFlags"
Option "DontZap" "false"
EndSection
- </screen>
+</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
+ If you use kickstart or want to use scripts to change this
+ setting automatically across multiple systems, you can use the
+ following snippet:
</para>
<screen>
%post
@@ -49,14 +52,20 @@ if [ $append -ne 0 ]; then
fi
%end
- </screen>
+</screen>
<para>
- The Xorg project has changed the default DontZap setting to "true"
- after complaints from desktop users that accidentally hit
- Ctrl+Alt+Backspace when trying to type Alt+Backspace,
- Ctrl+Backspace, or Shift+Backspace, or who had StickyKeys enabled.
- Ctrl+Alt+Backspace is also a keyboard shortcut for deleting
- certain expressions in C and Java modes in Emacs.
+ 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.
</para>
</section>
@@ -64,10 +73,10 @@ fi
<title>Third-party Video Drivers</title>
<para>
- Refer to the Xorg third-party drivers page for detailed guidelines
- on using third-party video drivers:
- <ulink type="http" url="http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers ">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers
- </ulink>
+ Refer to the Xorg third-party drivers page for detailed
+ guidelines on using third-party video drivers: <ulink
+ type="http"
+ url="http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>
</para>
</section>
</section>
commit 82dc028aff50ce06404f34588a93daf487c27daa
Author: Paul W. Frields <stickster at gmail.com>
Date: Thu Apr 2 17:44:35 2009 -0400
Reformat Xorg beat so later diffs make sense
diff --git a/en-US/Xorg.xml b/en-US/Xorg.xml
index 7cf6138..2af7833 100644
--- a/en-US/Xorg.xml
+++ b/en-US/Xorg.xml
@@ -1,25 +1,41 @@
<?xml version='1.0'?>
+
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section>
- <title>X Window System (Graphics)</title>
- <remark>This beat is located here: <ulink type="http" url="https://fedoraproject.org/wiki/Docs/Beats/Xorg">https://fedoraproject.org/wiki/Docs/Beats/Xorg</ulink></remark>
- <para>This section contains information related to the X Window System implementation, X.Org, provided with Fedora.</para>
- <section>
- <title>X server</title>
- <para>
- The key combination Ctrl-Alt-Backspace 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 xorg.conf file. If one does not exist, you can create it manually at /etc/X11/xorg.conf using a text editor and Xorg will honor that setting.
- </para>
- <screen>
+ <title>X Window System (Graphics)</title>
+ <remark>This beat is located here: <ulink type="http" url="https://fedoraproject.org/wiki/Docs/Beats/Xorg">https://fedoraproject.org/wiki/Docs/Beats/Xorg</ulink>
+ </remark>
+ <para>
+ This section contains information related to the X Window System
+ implementation, X.Org, provided with Fedora.
+ </para>
+
+ <section>
+ <title>X server</title>
+
+ <para>
+ The key combination Ctrl-Alt-Backspace 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
+ xorg.conf file. If one does not exist, you can create it manually
+ at /etc/X11/xorg.conf using a text editor and Xorg will honor that
+ setting.
+ </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>
- <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>
+<screen>
%post
grep -q -s DontZap /etc/X11/xorg.conf
@@ -34,15 +50,24 @@ fi
%end
</screen>
- <para>
- The Xorg project has changed the default DontZap setting to "true" after complaints from desktop users that accidentally hit Ctrl+Alt+Backspace when trying to type Alt+Backspace, Ctrl+Backspace, or Shift+Backspace, or who had StickyKeys enabled. Ctrl+Alt+Backspace is also a keyboard shortcut for deleting certain expressions in C and Java modes in Emacs.
- </para>
-
- </section>
- <section>
- <title>Third-party Video Drivers</title>
- <para>
- Refer to the Xorg third-party drivers page for detailed guidelines on using third-party video drivers: <ulink type="http" url="http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers ">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers </ulink>
- </para>
- </section>
- </section>
+ <para>
+ The Xorg project has changed the default DontZap setting to "true"
+ after complaints from desktop users that accidentally hit
+ Ctrl+Alt+Backspace when trying to type Alt+Backspace,
+ Ctrl+Backspace, or Shift+Backspace, or who had StickyKeys enabled.
+ Ctrl+Alt+Backspace is also a keyboard shortcut for deleting
+ certain expressions in C and Java modes in Emacs.
+ </para>
+ </section>
+
+ <section>
+ <title>Third-party Video Drivers</title>
+
+ <para>
+ Refer to the Xorg third-party drivers page for detailed guidelines
+ on using third-party video drivers:
+ <ulink type="http" url="http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers ">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers
+ </ulink>
+ </para>
+ </section>
+</section>
More information about the Fedora-docs-commits
mailing list