r6035 - in trunk/BOOK: multimedia/libdriv x/installing

randy at linuxfromscratch.org randy at linuxfromscratch.org
Tue May 9 16:00:02 PDT 2006


Author: randy
Date: 2006-05-09 16:59:59 -0600 (Tue, 09 May 2006)
New Revision: 6035

Modified:
   trunk/BOOK/multimedia/libdriv/alsa-lib.xml
   trunk/BOOK/x/installing/luit.xml
   trunk/BOOK/x/installing/x-config.xml
   trunk/BOOK/x/installing/x-setup.xml
   trunk/BOOK/x/installing/x7app.xml
   trunk/BOOK/x/installing/x7data.xml
   trunk/BOOK/x/installing/x7font.xml
   trunk/BOOK/x/installing/x7lib.xml
   trunk/BOOK/x/installing/x7proto.xml
   trunk/BOOK/x/installing/x7server.xml
   trunk/BOOK/x/installing/x7util.xml
   trunk/BOOK/x/installing/xbitmaps.xml
   trunk/BOOK/x/installing/xorg.xml
   trunk/BOOK/x/installing/xorg7.xml
Log:
Typo, spelling and tag fixes in various package instructions

Modified: trunk/BOOK/multimedia/libdriv/alsa-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-lib.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/multimedia/libdriv/alsa-lib.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -73,7 +73,7 @@
     <title>Kernel Configuration</title>
 
     <para>In the Device Drivers ⇒ Sound ⇒ Advanced Linux Sound
-    Architecture section of the kernel configuration, select the settingis and
+    Architecture section of the kernel configuration, select the settings and
     drivers appropriate for your hardware.  Ensure that the deprecated Device
     Drivers ⇒ Sound ⇒ Open Sound System is <emphasis>not</emphasis>
     selected.  If necessary, recompile and install your new kernel.</para>

Modified: trunk/BOOK/x/installing/luit.xml
===================================================================
--- trunk/BOOK/x/installing/luit.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/luit.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -88,4 +88,3 @@
   </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/x/installing/x-config.xml
===================================================================
--- trunk/BOOK/x/installing/x-config.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x-config.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -146,7 +146,7 @@
       in the <filename
       class='directory'>/usr/X11R6/lib/modules/drivers/</filename> directory.
       These were either built with the <application>X</application> server or
-      installed via external (e.g. proprietary) programs.</para>
+      installed via external (i.e., proprietary) programs.</para>
 
       <para>There are many options for device drivers and most are specific to
       the driver being used.  Documentation for many drivers can be found at

Modified: trunk/BOOK/x/installing/x-setup.xml
===================================================================
--- trunk/BOOK/x/installing/x-setup.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x-setup.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -24,7 +24,7 @@
     <filename class="directory">
     <replaceable></usr/X11R6></replaceable>/lib</filename> to 
     the <filename>/etc/ld.so.conf</filename> file and run 
-    <command>ldconfig</command>.  Additionally, While still the 
+    <command>ldconfig</command>.  Additionally, while still the 
     <systemitem class="username">root</systemitem> user, ensure 
     <filename class="directory">
     <replaceable></usr/X11R6></replaceable>/bin</filename>
@@ -61,7 +61,8 @@
     for <application>XFree86</application>.</para>
 
     <para>Edit the newly created configuration file to suit your system. The
-    details of the files are located in the xorg.conf and XF86Config man 
+    details of the files are located in the <filename>xorg.conf.5x</filename>
+    and <filename>XF86Config.5x</filename> man 
     pages. Some things you may want to do are:</para>
 
     <itemizedlist>
@@ -183,7 +184,6 @@
 
   </sect2>
 
-
   <sect2 id='dri'>
     <title>Checking Direct Rendering Infrastructure (DRI) Installation</title>
 
@@ -255,7 +255,7 @@
 
       <para>The core X font protocol finds fonts from the server configuration
       file (<filename>xorg.conf</filename> or <filename>XF86Config</filename>). 
-      If no font paths exist in the configurations file, the server will fall
+      If no font paths exist in the configuration file, the server will fall
       back to an internal hard-coded path.  Assuming the prefix for your
       <application>X</application> installation is
       <filename class="directory">/usr/X11R6</filename>, the core fonts will
@@ -447,7 +447,7 @@
 
       <para>Earlier it was mentioned that <filename>/etc/fonts/fonts.conf</filename>
       could be modified to use DejaVu using the default family names.  Since
-      DejaVu is a replacement for Bitstream Vera fonts, we can substitute it
+      DejaVu is a replacement for Bitstream Vera fonts, it can be substituted
       for that family.  Visually inspect the <filename>fonts.conf</filename> to
       see how fonts are grouped together under the generic family names and a
       preference list is created.  To replace Bitstream Vera with DejaVu, as the
@@ -522,7 +522,7 @@
       <primary sortas="e-etc-pam.d/xdm">/etc/pam.d/xdm</primary>
     </indexterm>
 
-<screen role="root"><userinput>cp /etc/pam.d/login /etc/pam.d/xdm</userinput></screen>
+<screen role="root"><userinput>cp -v /etc/pam.d/login /etc/pam.d/xdm</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/x/installing/x7app.xml
===================================================================
--- trunk/BOOK/x/installing/x7app.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x7app.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -99,5 +99,3 @@
   </sect2>
 
 </sect1>
-
-

Modified: trunk/BOOK/x/installing/x7data.xml
===================================================================
--- trunk/BOOK/x/installing/x7data.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x7data.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -96,4 +96,3 @@
   </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/x/installing/x7font.xml
===================================================================
--- trunk/BOOK/x/installing/x7font.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x7font.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -102,11 +102,10 @@
     running the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role="root">install -d -m755 /usr/share/fonts &&
+<screen><userinput role="root">install -v -d -m755 /usr/share/fonts &&
 ln -svn $XORG_PREFIX/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &&
 ln -svn $XORG_PREFIX/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
 
   </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x7lib.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -144,4 +144,3 @@
   </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/x/installing/x7proto.xml
===================================================================
--- trunk/BOOK/x/installing/x7proto.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x7proto.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -95,4 +95,3 @@
   </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/x/installing/x7server.xml
===================================================================
--- trunk/BOOK/x/installing/x7server.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x7server.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -112,9 +112,8 @@
 
     <para><parameter>--enable-install-setuid</parameter>: The Xorg binary must
     run as the root user.  This switch ensures that the binary is installed 
-    setuid when the build is done by an un-privelaged user.</para>
+    setuid when the build is done by an unprivileged user.</para>
 
   </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/x/installing/x7util.xml
===================================================================
--- trunk/BOOK/x/installing/x7util.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/x7util.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -121,4 +121,3 @@
   </sect2>
 
 </sect1>
-

Modified: trunk/BOOK/x/installing/xbitmaps.xml
===================================================================
--- trunk/BOOK/x/installing/xbitmaps.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/xbitmaps.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -36,7 +36,7 @@
     <primary sortas="a-xbitmaps">Luit</primary>
   </indexterm>
 
-  <para>Xbitmaps provides static graphics needed by xorg applications to 
+  <para>Xbitmaps provides static graphics needed by Xorg applications to 
   draw screen elements.</para>
 
   <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -69,7 +69,7 @@
   <sect2 role="installation">
     <title>Installation of Xbitmaps</title>
 
-    <para>First, configure the xbitmaps package by running the following
+    <para>First, configure the Xbitmaps package by running the following
     command:</para>
 
 <screen><userinput>./configure $XORG_CONFIG</userinput></screen>
@@ -82,5 +82,3 @@
   </sect2>
 
 </sect1>
-
-

Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/xorg.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -4,18 +4,6 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
   <!ENTITY xorg-download-http "http://xorg.freedesktop.org/releases/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2 ">
   <!ENTITY xorg-download-ftp  "ftp://expo.x.org/pub/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2">
   <!ENTITY xorg-md5sum        "52ad69832db5c36c7041f90625ed4598">
@@ -122,7 +110,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'>
@@ -156,12 +144,13 @@
     the sixth is normal documentation, and the seventh is hardcopy
     documentation.</para>
 
-    <para>To check your file for integrity, download the
+    <para>To check the files for integrity, download the
     <filename>md5sums</filename> file. Then:</para>
 
 <screen><userinput>md5sum -c md5sums</userinput></screen>
 
-    <para>The package (or all seven packages) should give an OK status.</para>
+    <para>For each file you downloaded, an
+    <computeroutput>OK</computeroutput> status should be displayed.</para>
 
   </sect2>
 
@@ -195,7 +184,7 @@
     Banshee), 3Dlabs, ATI (Rage Pro, Rage 128, Radeon 7X00, Radeon 2), Intel
     (i810, i815), and Matrox (G200, G400, G450).</para>
 
-    <para>Additionally NVidia provides their own closed source binary drivers,
+    <para>Additionally, NVidia provides their own closed source binary drivers,
     which do not make use of DRI. If you intend to use these drivers, do not
     enable DRI.</para>
 
@@ -221,15 +210,15 @@
 sed -i 's/geteuid /geteuid() /' \
     programs/Xserver/hw/xfree86/common/xf86Init.c</userinput></screen>
 
-
 <!-- To be removed if/when proposed glibc patch is added to LFS SVN
      Leave in in for a couple of weeks with 'you may need' and a testcase
      around it to save the support list silly questions.  Should remove in
      a couple of weeks -->
-      <para>Recent glibc may have a problem with it's installed sys/kd.h file.
-      This has recently been fixed in LFS svn.  Execute the
-      following commands to work around a broken kd.h file.  The commands will
-      only make the modification if needed:</para>
+      <para>Recent <application>Glibc</application> may have a problem with its
+      installed <filename>sys/kd.h</filename> file.
+      This has recently been fixed in LFS SVN.  Execute the
+      following commands to work around a broken <filename>kd.h</filename>
+      file.  The commands will only make the modification if needed:</para>
 
 <screen><userinput>grep "__undef_LINUX" \
     /usr/include/sys/kd.h 2>&1 > /dev/null || \
@@ -241,7 +230,8 @@
 
       <para>Additionally, if you choose to install
       <application>Xorg</application> to any prefix other than
-      <filename class="directory">/usr/X11R6</filename>, the luit package
+      <filename class="directory">/usr/X11R6</filename>, the
+      <application>luit</application> package
       needs another correction to fix a hard coded path.  Execute the
       following command:</para>
 
@@ -391,7 +381,9 @@
     `grep -lr linux/config.h *` &&
 ( make World 2>&1 | tee xorg-compile.log && exit $PIPESTATUS )</userinput></screen>
 
-      <para>Again as the <systemitem class="username">root</systemitem>
+      <para>This package does not come with a test suite.</para>
+
+      <para>Now, as the <systemitem class="username">root</systemitem>
       user:</para>
 
 <screen role="root"><userinput>make install &&
@@ -414,7 +406,7 @@
       following commands as the <systemitem class="username">root</systemitem>
       user:</para>
 
-<screen role="root"><userinput>install -d -m755 /usr/share/fonts &&
+<screen role="root"><userinput>install -v -d -m755 /usr/share/fonts &&
 ln -svn /usr/X11R6/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &&
 ln -svn /usr/X11R6/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
 

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml	2006-05-09 21:12:38 UTC (rev 6034)
+++ trunk/BOOK/x/installing/xorg7.xml	2006-05-09 22:59:59 UTC (rev 6035)
@@ -98,7 +98,7 @@
 done 2>&1 | tee -a ../xorg-compile.log #log the entire loop</screen>
 
   <para>The above shell will exit immediately on error.  If it runs to
-  completion, you should manually exit the shell before continuing onto
+  completion, you should manually exit the shell before continuing on to
   the next set of instructions.</para>
 
   <sect2>
@@ -140,7 +140,7 @@
     <replaceable><PREFIX></replaceable>/bin</filename> to your
     <envar>PATH</envar> environment variable and  <filename class="directory">
     <replaceable><PREFIX></replaceable>/lib/pkgconfig</filename>
-    to your <envar>PKG_CONFIG_PATH</envar> variable.  For detailed instrucitons,
+    to your <envar>PKG_CONFIG_PATH</envar> variable.  For detailed instructions,
     see <xref linkend="postlfs-config-profile"/>.  You should also add
     <filename class="directory">
     <replaceable><PREFIX></replaceable>/lib</filename> to the 




More information about the blfs-book mailing list