Index: general/sysutils/cpio/cpio-exp.xml
===================================================================
--- general/sysutils/cpio/cpio-exp.xml	(revision 12b1ef07bed3dcbe287a5be7d2fb9be9b06aafce)
+++ general/sysutils/cpio/cpio-exp.xml	(revision 77b3389d9742513e1bdb04c4d0180d496d463880)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><parameter>--libexec=/tmp/cpio</parameter>: This command installs the
+<para><parameter>--libexec=/tmp/cpio</parameter>: This command installs 
 <command>rmt</command> to <filename class="directory">/tmp/cpio</filename> so
 that it can be removed. The <command>rmt</command> executable is already
-installed by <application>tar</application> package in
+installed by the <application>tar</application> package in
 <acronym>LFS</acronym>.</para>
 
Index: x/installing/xfree86-setup.xml
===================================================================
--- x/installing/xfree86-setup.xml	(revision 12b1ef07bed3dcbe287a5be7d2fb9be9b06aafce)
+++ x/installing/xfree86-setup.xml	(revision 77b3389d9742513e1bdb04c4d0180d496d463880)
@@ -20,10 +20,10 @@
 This program brings up a window with three gears turning.  The
 <command>xterm</command> will display how many frames were drawn every
-five seconds so this is a reasonable benchmark.  The window is scalable, and
+five seconds, so this is a reasonable benchmark.  The window is scalable, and
 the frames drawn per second is highly dependent on the size of
 the window.</para>
  
 <para>For troubleshooting problems, check the <acronym>DRI</acronym> Users Guide at
-<userinput><ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/></userinput>.
+<ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/>.
 </para>
 </sect2>
@@ -74,5 +74,5 @@
 
 <para>Now change to the directory where you have your
-<application>TrueType</application> fonts and run
+<application>TrueType</application> fonts and run:
 <screen><userinput><command>mkfontscale &amp;&amp;
 mkfontdir</command></userinput></screen></para></sect3>
@@ -90,5 +90,5 @@
 <filename>XF86Config</filename> points to the
 <application>TrueType</application> font directory</title>
-<para>The "Files" section should look like
+<para>The "Files" section should look like:
 <screen>Section "Files"
         ...
@@ -109,5 +109,5 @@
 program.</para>
 
-<note><para>You should re-run <command>mkfontscale</command> and  
+<note><para>You should rerun <command>mkfontscale</command> and  
 <command>mkfontdir</command> any time you add or delete
 <application>TrueType</application> fonts.
@@ -151,4 +151,11 @@
 <para><screen><userinput># Run xdm as a separate service
 x:5:respawn:/usr/X11R6/bin/xdm -nodaemon</userinput></screen></para>
+
+<para>If Linux-PAM is installed on your system, you should 
+create a PAM entry for xdm by duplicating the login entry
+using the following command:</para>
+
+<para><screen><userinput>cp /etc/pam.d/login /etc/pam.d/xdm</userinput></screen></para>
+
 </sect2>
 
@@ -162,5 +169,5 @@
 
 <para>The layout of the <filename>~/.Xresources</filename> file consists
-if a list of specifications in the form of</para>
+of a list of specifications in the form of</para>
 
 <screen>object.subobject[.subobject...].attribute: value</screen>
@@ -194,5 +201,5 @@
 <screen><userinput><command>xrdb -load &lt;filename&gt;</command></userinput></screen>
 
-<para>To add resources to <application>X</application>'s database in memory use:</para>
+<para>To add resources to <application>X</application>'s database in memory, use:</para>
 <screen><userinput><command>xrdb -merge &lt;filename&gt;</command></userinput></screen>
 
Index: x/installing/xfree86/xfree86-inst.xml
===================================================================
--- x/installing/xfree86/xfree86-inst.xml	(revision 12b1ef07bed3dcbe287a5be7d2fb9be9b06aafce)
+++ x/installing/xfree86/xfree86-inst.xml	(revision 77b3389d9742513e1bdb04c4d0180d496d463880)
@@ -4,8 +4,8 @@
 <sect3>
 <title>Kernel Compilation Settings</title>
-<para>If you have an Intel P6 (Pentium Pro, Pentium II and later) it is recommended 
+<para>If you have an Intel P6 (Pentium Pro, Pentium II and later), it is recommended 
 that you compile <acronym>MTRR</acronym> (Memory Type Range Registers) support into the kernel.
 The kernel can map Cyrix and AMD <acronym>CPU</acronym>s to the
-<acronym>MTRR</acronym> interface so selecting this
+<acronym>MTRR</acronym> interface, so selecting this
 option is useful for those processors also.
 This option is found in the 
@@ -227,5 +227,5 @@
 <warning><para>If you recompile or upgrade your kernel, you will need to re-copy the 
 appropriate driver module(s)
-to the kernel module library and rerun <command>depmod</command>.</para></warning>
+to the kernel module library and rerun <command>depmod -a</command>.</para></warning>
 
 <note><para>If you created <acronym>AGP</acronym> support as a module when compiling the kernel, you may
Index: x/installing/xfree86/xfree86-intro.xml
===================================================================
--- x/installing/xfree86/xfree86-intro.xml	(revision 12b1ef07bed3dcbe287a5be7d2fb9be9b06aafce)
+++ x/installing/xfree86/xfree86-intro.xml	(revision 77b3389d9742513e1bdb04c4d0180d496d463880)
@@ -6,5 +6,5 @@
 <application>X</application> Window System. <application>XFree86</application> provides a client/server 
 interface between display 
-hardware (the mouse, keyboard, and video displays) and the desktop environment 
+hardware (the mouse, keyboard, and video displays) and the desktop environment, 
 while also providing both the windowing infrastructure and a standardized 
 application interface (<acronym>API</acronym>).</para>
@@ -30,7 +30,9 @@
 however they
 are updated more often than the <application>XFree86</application> package and are highly recommended:
-<xref linkend="expat"/>, <xref linkend="freetype2"/> and <xref linkend="fontconfig"/></para>
+<xref linkend="expat"/>, <xref linkend="freetype2"/>, <xref linkend="fontconfig"/>, and 
+<xref linkend="Linux_PAM"/>.</para>
 
-<note><para>If you choose not to install these separate packages, the
+<note><para>If you choose not to install <application>expat</application>, 
+<application>freetype2</application>, and <application>fontconfig</application>, the
 <filename>host.def</filename> file below will have to be modified to
 instruct <application>XFree86</application> to build them.</para></note>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 12b1ef07bed3dcbe287a5be7d2fb9be9b06aafce)
+++ x/lib/lib.xml	(revision 77b3389d9742513e1bdb04c4d0180d496d463880)
@@ -5,11 +5,10 @@
 <para>This chapter does not contain libraries that are required to run
 <application>X</application>.  It does contain libraries that enhance
-<application>X</application>.  The enhancement is as simple as font
-support or as complex as libraries that sit between
+<application>X</application>.  In some cases the enhancement is as simple as
+font support. In others it is  as complex as libraries that sit between
 <application>X</application> and applications that run on
-<application>X</application> whose purpose is to standardize the look
-and feel and inter-process communications so that applications written by
-different programmers end up looking and acting similarly. They also
-assist programmers by supplying common elements.</para> 
+<application>X</application> whose purpose is to standardize the look and feel
+and inter-process communications for different applications.  They also assist
+programmers by supplying common elements.</para> 
 
 &qt;
Index: x/xorg/xorg.xml
===================================================================
--- x/xorg/xorg.xml	(revision 12b1ef07bed3dcbe287a5be7d2fb9be9b06aafce)
+++ x/xorg/xorg.xml	(revision 77b3389d9742513e1bdb04c4d0180d496d463880)
@@ -9,5 +9,5 @@
 <note><para>There are two packages in BLFS that implement the <application>X</application> 
 Window System: <application>Xorg</application> and <application>XFree86</application>.  
-These packages are quite similar.  In fact the base system of <application>Xorg</application>
+These packages are quite similar.  In fact, the base system of <application>Xorg</application>
 is <application>XFree86</application>-RC2.  The primary difference as of this writing is 
 the license provisions of the packages.  For someone building a package for their own use,
@@ -21,5 +21,5 @@
 improvements to the internals of the system and more frequent releases.</para>
 
-<para><application>XFree86</application> continues to be a solid, conservitive 
+<para><application>XFree86</application> continues to be a solid, conservative 
 application with excellent driver support.</para>
 
@@ -33,5 +33,5 @@
 implementation of the <application>X</application> Window System. 
 This application  provides a client/server interface between display
-hardware (the mouse, keyboard, and video displays) and the desktop environment
+hardware (the mouse, keyboard, and video displays) and the desktop environment,
 while also providing both the windowing infrastructure and a standardized
 application interface (<acronym>API</acronym>).</para>
@@ -50,6 +50,10 @@
  
 <sect4><title>Required</title>
-<para><xref linkend="libpng"/>, <xref linkend="expat"/>, <xref linkend="freetype2"/> 
-and <xref linkend="fontconfig"/>.</para>
+<para><xref linkend="libpng"/>, <xref linkend="expat"/>, <xref linkend="freetype2"/> and
+<xref linkend="fontconfig"/>.</para>
+</sect4>
+
+<sect4><title>Optional</title> 
+<para><xref linkend="Linux_PAM"/>.</para>
 </sect4>
 
@@ -90,8 +94,8 @@
 <sect3>
 <title>Kernel Compilation Settings</title>
-<para>If you have an Intel P6 (Pentium Pro, Pentium II and later) it is recommended
+<para>If you have an Intel P6 (Pentium Pro, Pentium II and later), it is recommended
 that you compile <acronym>MTRR</acronym> (Memory Type Range Registers) support into the kernel.
 The kernel can map Cyrix and AMD <acronym>CPU</acronym>s to the
-<acronym>MTRR</acronym> interface so selecting this
+<acronym>MTRR</acronym> interface, so selecting this
 option is useful for those processors also. This option is found in the
 "Processor type and features" menu.  It can increase performance of
@@ -136,5 +140,5 @@
 
 <sect3><title>Setting Up a Shadow Directory</title>  
-<para>When building <application>Xorg</application> you should create
+<para>When building, <application>Xorg</application> you should create
 a shadow directory of symbolic links for the compiled code.  To do that, we first
 make the <application>lndir</application>.  Starting from the 
@@ -158,9 +162,10 @@
 application will build without a <filename>host.def</filename> file, but
 the included libraries for <application>fontconfig</application> and 
-<application>freetype2</application> do not build properly on a base LFS system so 
-we must specify that we have those and some other libraries too.</para>
+<application>freetype2</application> do not build properly on a base LFS system. 
+Therefore, you must specify that these libraries, as well as others, should be
+imported from the system.</para>
 
 <note><para><filename>config/cf/host.def</filename> is a C file, not a shell 
-script.  Be sure to make sure the comments delimited by /* ... */ are
+script.  Ensure the comments delimited by /* ... */ are
 balanced when modifying the file. </para></note>
 
@@ -270,7 +275,7 @@
 This command runs multiple makefiles to completely rebuild the system.
 <parameter>2&gt;&amp;1</parameter> redirects error messages
-to the same location as normal output. The <command>tee</command> command
+to the same location as standard output. The <command>tee</command> command
 allows viewing of the output while logging the results to a file. The parentheses
-around the command run the entire comand in a subshell and finally the
+around the command runs the entire comand in a subshell and finally the
 <command>exit $PIPESTATUS</command> ensures the result of the <command>make</command>
 is returned as the result and not the result of the <command>tee</command> command.</para>
@@ -286,5 +291,5 @@
 ln -sf ../X11R6/include/X11 /usr/include/X11</command></screen>
 These commands are present to enable other (broken) packages to build
-against <application>Xorg</application>.  We do this even though the i
+against <application>Xorg</application>.  We do this even though the 
 Filesystem Hierarchy Standard says:
 "In general, software must not be installed or managed via the above
@@ -310,21 +315,14 @@
 <para>Edit <filename>/etc/ld.so.conf</filename> and add
 <filename class="directory">/usr/X11R6/lib</filename>.
-Run</para> <screen><userinput><command>ldconfig</command></userinput></screen>
- 
-<para>Add <filename class='directory'>/usr/X11R6/bin</filename> to your
-<envar>PATH</envar> environment
-variable in <filename>.bash_profile</filename> or <filename>/etc/profile</filename>.  
-The statement should look something like <parameter>PATH=$PATH:/usr/X11R6/bin</parameter>
-and be placed before the <command>export PATH</command>
-statement.</para>
+Run:</para> <screen><userinput><command>ldconfig</command></userinput></screen>
+ 
+<para>Ensure <filename class='directory'>/usr/X11R6/bin</filename> is added to your
+<envar>PATH</envar> environment variable. Instructions for doing this are described
+in the section "<xref linkend='postlfs-config-profile'/>."</para>
  
 <para>Expand the <envar>PKG_CONFIG_PATH</envar> so that other packages
-can find <application>Xorg</application> libraries. Add the following line to
-<filename>.bash_profile</filename> for root user:</para>
-<screen><userinput><command>export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig</command></userinput></screen>
- 
-<para>Run</para>
-<screen><userinput><command>source ~/.bash_profile</command></userinput></screen>
- 
+can find <application>Xorg</application> libraries. Procedures for this are also
+described in the section "<xref linkend='postlfs-config-profile'/>."</para>
+
 <para>Set up your mouse:
 <screen><userinput><command>ln -s psaux /dev/mouse</command></userinput></screen>
@@ -411,7 +409,7 @@
 </note>
  
-<para>Start <application>X</application> with
+<para>Start <application>X</application> with:
 <screen><userinput><command>startx</command></userinput></screen>
-to get basic functional <application>X</application> Window System.</para>
+to get a basic functional <application>X</application> Window System.</para>
 
 <para>At this point, you should check out the X Window Components at 
