X Strike Force XFree86 SVN commit: r2191 - in trunk/debian: . local
Author: branden
Date: 2005-02-12 14:52:58 -0500 (Sat, 12 Feb 2005)
New Revision: 2191
Modified:
trunk/debian/CHANGESETS
trunk/debian/local/FAQ.xhtml
Log:
(cosmetic) Fix extraneous word.
(cosmetic) Wrap long lines where possible.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-02-12 19:48:11 UTC (rev 2190)
+++ trunk/debian/CHANGESETS 2005-02-12 19:52:58 UTC (rev 2191)
@@ -8,4 +8,7 @@
(It should always be safe to merge the latest version of TODO or CHANGESETS
files anywhere.)
+Miscellaneous cosmetic fixes.
+ 2191
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/local/FAQ.xhtml
===================================================================
--- trunk/debian/local/FAQ.xhtml 2005-02-12 19:48:11 UTC (rev 2190)
+++ trunk/debian/local/FAQ.xhtml 2005-02-12 19:52:58 UTC (rev 2191)
@@ -857,10 +857,10 @@
found in <code class="filespec">/etc/X11/app-defaults</code> (or a localized
subdirectory of <code class="filespec">/etc/X11</code>).</p>
-<p>App-defaults are specified using a class/instance syntax and look very similar
-to X resource files (<a href="#defresourc">see the previous question</a>), but
-there are three very important differences between app-defaults and X
-resources:</p>
+<p>App-defaults are specified using a class/instance syntax and look very
+similar to X resource files (<a href="#defresourc">see the previous
+question</a>), but there are three very important differences between
+app-defaults and X resources:</p>
<ol>
<li>A client's app-defaults are generally essential for its useful operation,
@@ -1188,8 +1188,8 @@
<h3><a id="changecoldepth">How do I change the color depth of my X
server?</a></h3>
-<p>There are two answers to this question; one for version 3.x XFree86 X servers,
-and one for version 4.x of the XFree86 X server.</p>
+<p>There are two answers to this question; one for version 3.x XFree86 X
+servers, and one for version 4.x of the XFree86 X server.</p>
<p>You can find out which version you are using by running "X -version" (you do
not need to be root to execute this command).</p>
@@ -1372,13 +1372,13 @@
X Window System, use the <code class="command">gpm</code>-based approach,
described below.</p>
-<p>The <code class="command">gpm</code> approach is to feed X with the mouse data
-coming from <code class="command">gpm</code>, a cut-and-paste utility and mouse
-server for virtual consoles. The <code class="command">gpm</code> utility is of
-interest here because it can be configured to handle left-handed mouse devices.
-This approach has the drawback that all the users of the system have to share
-the same <code class="command">gpm</code> configuration, while with <code
-class="command">xmodmap</code> every user could have his or her own <code
+<p>The <code class="command">gpm</code> approach is to feed X with the mouse
+data coming from <code class="command">gpm</code>, a cut-and-paste utility and
+mouse server for virtual consoles. The <code class="command">gpm</code> utility
+is of interest here because it can be configured to handle left-handed mouse
+devices. This approach has the drawback that all the users of the system have
+to share the same <code class="command">gpm</code> configuration, while with
+<code class="command">xmodmap</code> every user could have his or her own <code
class="filespec">.Xmodmap</code> file.</p>
<p>To use the <code class="command">gpm</code> approach, you must modify two
@@ -1449,7 +1449,8 @@
file).</p>
</li>
- <li>I don't want <code class="command">xdm</code> to manage any remote servers.
+ <li>I don't want <code class="command">xdm</code> to manage any remote
+ servers.
<p>Edit <code class="filespec">/etc/X11/xdm/Xservers</code> appropriately.
Note that as this file ships, it does not manage any remote servers, so
unless you have already edited this file (or borrowed someone else's), no
@@ -1472,8 +1473,8 @@
well for people who have changed <code class="filespec">inittab</code> to start
a getty on VC 7.</p>
-<p>If you have increased your number of virtual consoles, or otherwise require VC
-7 for some purpose, simply edit <code
+<p>If you have increased your number of virtual consoles, or otherwise require
+VC 7 for some purpose, simply edit <code
class="filespec">/etc/X11/xdm/Xservers</code> and change the "vt7" argument on
the ":0" server line to whatever VC is appropriate for your machine (vt8, vt12,
etc.). Note that while the XFree86 manual page says that if the "vt" argument
@@ -1633,7 +1634,8 @@
<p>Move the mouse cursor into the white window, then press and release the "<
>" key. (There will be no visible response to your keystrokes.) Then kill
the X server, either by using <kbd>CTRL-ALT-BACKSPACE</kbd> or by switching back
-to the virtual console from which you ran xinit, and typing <kbd>CTRL-C</kbd>.</p>
+to the virtual console from which you ran xinit, and typing
+<kbd>CTRL-C</kbd>.</p>
<p>Next, use your favorite pager program to view <code
class="command">xev</code>'s output:<br />
@@ -2225,8 +2227,8 @@
<pre> gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*");</pre>
- <p>simply picks the first font in the alphabet that matches the wildcard. With
- the ISO10646-1 fonts present, this will be</p>
+ <p>simply picks the first font in the alphabet that matches the wildcard.
+ With the ISO10646-1 fonts present, this will be</p>
<pre> -Adobe-Helvetica-Medium-R-Normal--12-120-75-75-P-67-ISO10646-1</pre>
@@ -2276,10 +2278,10 @@
XFree86 Project, Inc.</a>:</p>
<blockquote>
- <p>The X Window System is a client-server window system. The memory for pixmap
- data resides on the server side instead of the client side. If you have 8
- 1600x1200 32bpp root window images that's 61 Megabytes. It resides in the
- server instead of the client, unless they are shared memory pixmaps, in
+ <p>The X Window System is a client-server window system. The memory for
+ pixmap data resides on the server side instead of the client side. If you
+ have 8 1600x1200 32bpp root window images that's 61 Megabytes. It resides in
+ the server instead of the client, unless they are shared memory pixmaps, in
which case it will be counted on both the server and client side.</p>
<p>Obviously this data has to be stored someplace. It's not like it can just
@@ -2471,8 +2473,8 @@
<li>In some cases, we don't ship them (usually because we cannot, as the
license prevents us from doing so);</li>
<li> they're not part of XFree86, but third-party add-ons;</li>
- <li>(most importantly) we don't have the source code, so we cannot find and fix
- bugs in them — neither can (in general) the authors of XFree86
+ <li>(most importantly) we don't have the source code, so we cannot find and
+ fix bugs in them — neither can (in general) the authors of XFree86
itself.</li>
</ol>
@@ -2765,7 +2767,8 @@
<p>For <code class="filespec">/etc/X11/XF86Config-4</code>, do the following as
root:<br />
-<kbd>md5sum /etc/X11/XF86Config-4 > /var/lib/xfree86/XF86Config-4.md5sum<br />
+<kbd>md5sum /etc/X11/XF86Config-4 >
+/var/lib/xfree86/XF86Config-4.md5sum<br />
dpkg-reconfigure xserver-xfree86</kbd></p>
<p>(You may have <code class="package">xserver-xfree86-dbg</code> installed
@@ -2774,8 +2777,9 @@
<p>For <code class="filespec">/etc/X11/Xwrapper.config</code>, do the following
as root:<br />
-<kbd>md5sum /etc/X11/Xwrapper.config > /var/lib/xfree86/Xwrapper.config.md5sum<br />
-dpkg-reconfigure xserver-common</kbd></p>
+<kbd>md5sum /etc/X11/Xwrapper.config >
+/var/lib/xfree86/Xwrapper.config.md5sum<br /> dpkg-reconfigure
+xserver-common</kbd></p>
<p>Another way to accomplish the above is to purge the packages from your system
and reinstall them, but that can be considerably more disruptive.
@@ -2906,11 +2910,11 @@
<h3><a id="nodrinotfatal">The X server log says there was an error and it's
disabling DRI. Is that why the X server won't start?</a></h3>
-<p>No. If DRI (Direct Rendering Infrastructure) is disabled, then 3D-accelerated
-applications such as games may not run satisfactorily or at full speed, but
-this doesn't prevent the X server from working. A disabled DRI doesn't
-prevent your desktop from coming up, or programs like XTerm or Mozilla from
-running.</p>
+<p>No. If DRI (Direct Rendering Infrastructure) is disabled, then
+3D-accelerated applications such as games may not run satisfactorily or at full
+speed, but this doesn't prevent the X server from working. A disabled DRI
+doesn't prevent your desktop from coming up, or programs like XTerm or Mozilla
+from running.</p>
<p>If your X server is failing to start and you think this error message is the
problem, look elsewhere; the problem is something else.</p>
@@ -2998,10 +3002,11 @@
immediately. This can look a lot like a "crash" to the uninitiated, especially
when the clients themselves crash.</p>
-<p>It's easy to determine whether the X server itself works. As root, simply run
-the command <kbd>X</kbd>. If that brings up the little root window weave and the X
-cursor, then <em>you do not have a fatal X server configuration problem</em>.
-The X server is working. Use <kbd>CTRL-ALT-BACKSPACE</kbd> to kill it.</p>
+<p>It's easy to determine whether the X server itself works. As root, simply
+run the command <kbd>X</kbd>. If that brings up the little root window weave
+and the X cursor, then <em>you do not have a fatal X server configuration
+problem</em>. The X server is working. Use <kbd>CTRL-ALT-BACKSPACE</kbd> to
+kill it.</p>
<p>Alternatively, if you're using a display manager and you can see the greeter
(login screen), then the X server is running: <em>you do not have a fatal X
@@ -3067,8 +3072,8 @@
<p><em>Thanks to Denis Barbier for contributing much of this entry.</em></p>
-<p><em>Please see the glossary in <a href="#keyboard">"How does the keyboard work
-in the X Window System?"</a> above for explanantions of unfamiliar
+<p><em>Please see the glossary in <a href="#keyboard">"How does the keyboard
+work in the X Window System?"</a> above for explanantions of unfamiliar
terms.</em></p>
<p>The most significant recent change to keyboard configuration took place to
@@ -3077,7 +3082,7 @@
combining layouts. Prior to XFree86 4.3, though, this was difficult because
keyboard symbols (<em>keysyms</em>) were defined to be specific to a given
group. For example, the <code>us</code> symbols file (in <code
-class="filespec">/etc/X11/xkb/symbols/</code>) defined the its keycode to keysym
+class="filespec">/etc/X11/xkb/symbols/</code>) defined its keycode to keysym
mappings specifically for group 1 — the primary group. The
<code>us_group2</code> and <code>us_group3</code> files repeated these
definitions for group 2 and group 3, respectively. In addition to being
Reply to: