Author: randy
Date: 2006-03-15 08:04:26 -0700 (Wed, 15 Mar 2006)
New Revision: 5727
Modified:
trunk/BOOK/x/installing/x-setup.xml
trunk/BOOK/x/installing/xorg.xml
trunk/BOOK/x/lib/cairo.xml
trunk/BOOK/x/lib/libdrm.xml
trunk/BOOK/x/lib/mesalib.xml
trunk/BOOK/x/lib/qt.xml
trunk/BOOK/x/wm/fluxbox.xml
trunk/BOOK/x/wm/other-wms.xml
Log:
Removed excess EOL whitespace from all package instructions in the 'x' chapters
Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml 2006-03-15 15:00:51 UTC (rev 5726)
+++ trunk/BOOK/x/installing/x-setup.xml 2006-03-15 15:04:26 UTC (rev 5727)
@@ -282,7 +282,7 @@
<filename>xorg.conf</filename>. This directory already contains the needed
bitmap
fonts and their aliases:</para>
-<screen><literal>FontPath "/usr/share/fonts/cyrillic/"</literal></screen>
+<screen><literal>FontPath "/usr/share/fonts/cyrillic/"</literal></screen>
</sect2>
Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml 2006-03-15 15:00:51 UTC (rev 5726)
+++ trunk/BOOK/x/installing/xorg.xml 2006-03-15 15:04:26 UTC (rev 5727)
@@ -35,14 +35,14 @@
<note>
<para>There are three packages in BLFS that implement the <application>X
- Window System</application>: <application>Xorg</application>
- (X11R6 and X11R7) and <application>XFree86</application>. These
- packages are all quite similar. In fact, the base system of
- <application>Xorg</application> is
+ Window System</application>: <application>Xorg</application>
+ (X11R6 and X11R7) and <application>XFree86</application>. These
+ packages are all quite similar. In fact, the base system of
+ <application>Xorg</application> is
<application>XFree86</application>-4.4.0RC2. Licensing was the original
reason for the split. <application>Xorg-&xorg7-version;</application>
introduces a completely autotooled build system, but is otherwise the
- same codebase as <application>Xorg-&xorg-version;</application>.
+ same codebase as <application>Xorg-&xorg-version;</application>.
Most large commercial distributions have decided to use the
<application>Xorg</application> package, but several still provide
<application>XFree86</application>.</para>
@@ -51,7 +51,7 @@
packages is the stated goals of the developers. Some developers were
unhappy with the administration and progress of
<application>XFree86</application>. X.org's future plans include
- significant improvements to the internals of the system and more
+ significant improvements to the internals of the system and more
frequent releases.</para>
<para><application>XFree86</application> continues to be a solid,
@@ -108,7 +108,7 @@
<bridgehead renderas="sect3">Download Instructions</bridgehead>
<para>As an alternative to downloading the entire source tree in a single
- file, there are several, smaller files that can be fetched from the
+ file, there are several, smaller files that can be fetched from the
download location (directory /pub/X11R&xorg-version;/src/):</para>
<itemizedlist spacing='compact'>
@@ -199,18 +199,18 @@
<para>The <application>Xorg</application> sources must be patched in
order to avoid a race condition with the <application>luit</application>
program. Additionally, recent <application>glibc</application> requires
- <filename>linux/types.h</filename> to be included prior to
- <filename>asm/types.h</filename>. Fix both issues with the following
+ <filename>linux/types.h</filename> to be included prior to
+ <filename>asm/types.h</filename>. Fix both issues with the following
commands:</para>
<screen><userinput>patch -Np1 -i ../X11R&xorg-version;-luit_race-1.patch
&&
sed -i "[EMAIL PROTECTED]/@*/\n#include <linux/types.h>\n@" \
programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
- <para>Additionally, if you choose to install
- <application>Xorg</application> to any prefix other than
+ <para>Additionally, if you choose to install
+ <application>Xorg</application> to any prefix other than
<filename class="directory">/usr/X11R6</filename>, the luit package
- needs another correction to fix a hard coded path. Execute the
+ needs another correction to fix a hard coded path. Execute the
following command:</para>
<screen><userinput>sed -i 's@/usr/X11R6@<replaceable>[/usr]</replaceable>@'
programs/luit/parser.h</userinput></screen>
@@ -366,7 +366,7 @@
make install.man</userinput></screen>
<para>If you've installed <application>Xorg</application> in the default
- prefix listed above, run the following commands as the
+ prefix listed above, run the following commands as the
<systemitem class="username">root</systemitem> user:</para>
<screen role="root"><userinput>ln -v -s ../X11R6/bin /usr/bin/X11 &&
Modified: trunk/BOOK/x/lib/cairo.xml
===================================================================
--- trunk/BOOK/x/lib/cairo.xml 2006-03-15 15:00:51 UTC (rev 5726)
+++ trunk/BOOK/x/lib/cairo.xml 2006-03-15 15:04:26 UTC (rev 5727)
@@ -72,7 +72,7 @@
<bridgehead renderas="sect3">cairo Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required">X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>,
+ <para role="required">X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>,
or <xref linkend="xfree86"/>)
and <xref linkend="pkgconfig"/></para>
Modified: trunk/BOOK/x/lib/libdrm.xml
===================================================================
--- trunk/BOOK/x/lib/libdrm.xml 2006-03-15 15:00:51 UTC (rev 5726)
+++ trunk/BOOK/x/lib/libdrm.xml 2006-03-15 15:04:26 UTC (rev 5727)
@@ -33,8 +33,8 @@
<sect2 role="package">
<title>Introduction to libdrm</title>
- <para><application>libdrm</application> provides core library routines
- for the X Window System to directly interface with video hardware using
+ <para><application>libdrm</application> provides core library routines
+ for the X Window System to directly interface with video hardware using
the Linux kernel's Direct Rendering Modules.</para>
<bridgehead renderas="sect3">Package Information</bridgehead>
Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml 2006-03-15 15:00:51 UTC (rev 5726)
+++ trunk/BOOK/x/lib/mesalib.xml 2006-03-15 15:04:26 UTC (rev 5727)
@@ -48,15 +48,15 @@
<para>Download MD5 sum: &mesalib-md5sum;</para>
</listitem>
<listitem>
- <para>Download size (including Recommended downloads):
+ <para>Download size (including Recommended downloads):
&mesalib-size;</para>
</listitem>
<listitem>
- <para>Estimated disk space required (including Recommended downloads):
+ <para>Estimated disk space required (including Recommended downloads):
&mesalib-buildsize;</para>
</listitem>
<listitem>
- <para>Estimated build time (including Recommended downloads):
+ <para>Estimated build time (including Recommended downloads):
&mesalib-time;</para>
</listitem>
</itemizedlist>
@@ -76,12 +76,12 @@
<para><ulink
url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2"/>
- provides a demo and a diagnostic program to verify that GL is working
+ provides a demo and a diagnostic program to verify that GL is working
properly.</para>
<note>
<para>You should extract all three tarballs from the same toplevel
- directory. All three files will extract to the
+ directory. All three files will extract to the
<filename class="directory">Mesa-&mesalib-version;</filename>
directory.</para>
</note>
@@ -93,13 +93,13 @@
<para>If you've installed the X Window System into any prefix other than
<filename class="directory">/usr</filename>, then you'll need to adjust the
- commands below for your system. Correct several hard coded directories
+ commands below for your system. Correct several hard coded directories
in the source files with the following commands:</para>
<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@/[EMAIL
PROTECTED]' {} \; &&
sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@'
src/glx/x11/dri_glx.c</userinput></screen>
- <para>Install <application>MesaLib</application>
+ <para>Install <application>MesaLib</application>
by running the following command:</para>
<screen><userinput>make linux-dri</userinput></screen>
@@ -112,7 +112,7 @@
mkdir -v -p /usr/lib/X11/modules/dri &&
install -v -m755 lib/*dri* /usr/lib/X11/modules/dri</userinput></screen>
- <para>If you've extracted the GLUT and Demos packages as well, then
+ <para>If you've extracted the GLUT and Demos packages as well, then
build the test programs with the following commands:</para>
<screen><userinput>cd progs/xdemos &&
@@ -124,12 +124,12 @@
<screen role="root"><userinput>install -v -m755 glxinfo glxgears
/usr/bin</userinput></screen>
<note>
- <para>If building <xref linkend="xorg7"/>, do not
- remove the Mesa source tree yet, it will be required to build the
+ <para>If building <xref linkend="xorg7"/>, do not
+ remove the Mesa source tree yet, it will be required to build the
X server.</para>
</note>
- <para>Finally, if installing to any prefix other than
+ <para>Finally, if installing to any prefix other than
<filename class="directory">/usr</filename>, you should create symlinks
to the GL headers in <filename class="directory">/usr/include</filename>.
Execute the following command as the
@@ -142,25 +142,25 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><command>find...sed -i 's@/usr/X11R6@/usr@'...</command>: This
+ <para><command>find...sed -i 's@/usr/X11R6@/usr@'...</command>: This
command corrects several hard coded references to the X11R6 default
installation path.</para>
- <para><command>sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@'
+ <para><command>sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@'
src/glx/x11/dri_glx.c</command>: This command corrects a hard coded
reference to the module directory.</para>
<para><command>bin/installmesa</command>: Mesa uses a custom installation
- script as opposed to the normal <parameter>install</parameter> make
+ script as opposed to the normal <parameter>install</parameter> make
target.</para>
- <para><command>install -v -m755 lib/*dri*
+ <para><command>install -v -m755 lib/*dri*
/usr/lib/X11/modules/dri</command>: installs the DRI modules.</para>
<para><command>make PROGS='glxinfo glxgears'</command>: build only
the glxinfo and glxgears programs.</para>
- <para><command>install -v -m755 glxinfo glxgears /usr/bin</command>:
+ <para><command>install -v -m755 glxinfo glxgears /usr/bin</command>:
Installs only the glxinfo and glxgears programs.</para>
</sect2>
@@ -199,7 +199,7 @@
<varlistentry id="glxinfo">
<term><filename>glxinfo</filename></term>
<listitem>
- <para>a diagnostic program that displays information about the
+ <para>a diagnostic program that displays information about the
graphics hardware and installed GL libraries.</para>
<indexterm zone="MesaLib glxinfo">
<primary sortas="b-glxinfo">glxinfo</primary>
Modified: trunk/BOOK/x/lib/qt.xml
===================================================================
--- trunk/BOOK/x/lib/qt.xml 2006-03-15 15:00:51 UTC (rev 5726)
+++ trunk/BOOK/x/lib/qt.xml 2006-03-15 15:04:26 UTC (rev 5727)
@@ -80,7 +80,7 @@
<parameter>-plugin-imgfmt-<replaceable>[library]</replaceable></parameter>
parameters from the <command>configure</command> commands shown in the
instructions below.</para>
-
+
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="nas"/>,
<xref linkend="cups"/>,
Modified: trunk/BOOK/x/wm/fluxbox.xml
===================================================================
--- trunk/BOOK/x/wm/fluxbox.xml 2006-03-15 15:00:51 UTC (rev 5726)
+++ trunk/BOOK/x/wm/fluxbox.xml 2006-03-15 15:04:26 UTC (rev 5727)
@@ -253,7 +253,7 @@
<varlistentry id="fbsetroot">
<term><command>fbsetroot</command></term>
<listitem>
- <para>is a utility to change root window appearance based on the
+ <para>is a utility to change root window appearance based on the
<application>Blackbox</application> application bsetroot.</para>
<indexterm zone="fluxbox fbsetroot">
<primary sortas="b-fbsetroot">fbsetroot</primary>
Modified: trunk/BOOK/x/wm/other-wms.xml
===================================================================
--- trunk/BOOK/x/wm/other-wms.xml 2006-03-15 15:00:51 UTC (rev 5726)
+++ trunk/BOOK/x/wm/other-wms.xml 2006-03-15 15:04:26 UTC (rev 5727)
@@ -16,8 +16,8 @@
<title>Other Window Managers</title>
<para><command>twm</command> is the Tab Window Manager. This is the default
- window manager installed by the <xref linkend="xorg"/>,
- <xref linkend="xorg7"/>, and <xref linkend="xfree86"/> <application>X
+ window manager installed by the <xref linkend="xorg"/>,
+ <xref linkend="xorg7"/>, and <xref linkend="xfree86"/> <application>X
Window Systems</application>.</para>
<para><command>mwm</command> is the Motif� Window Manager. It is an
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
