Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ basicnet/netutils/whois.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -52,6 +52,9 @@
 commands:</para>
 
-<screen><userinput><command>make &amp;&amp;
-make prefix=/usr install</command></userinput></screen>
+<screen><userinput><command>make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make prefix=/usr install</command></userinput></screen>
 
 </sect2>
@@ -62,6 +65,10 @@
 <segmentedlist>
 <segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
 <seglistitem>
 <seg>whois</seg>
+<seg>None</seg>
+<seg>None</seg>
 </seglistitem>
 </segmentedlist>
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ general/genlib/popt.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -68,6 +68,9 @@
 cp configure.in configure.ac &amp;&amp;
 touch configure.in configure.ac &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -91,5 +94,5 @@
   <segtitle>Installed Library</segtitle>
   <seglistitem>
-    <seg>libpopt</seg>
+    <seg>libpopt.[so,a]</seg>
   </seglistitem>
 </segmentedlist>
@@ -100,9 +103,9 @@
 
   <varlistentry id="libpopt">
-  <term><filename role='library'>libpopt.so</filename></term>
+  <term><filename role='library'>libpopt.[so,a]</filename></term>
   <listitem>
     <para> is used to parse command-line options.</para>
     <indexterm zone="popt libpopt">
-      <primary sortas="c-libpopt">libpopt</primary>
+      <primary sortas="c-libpopt">libpopt.[so,a]</primary>
      </indexterm>
   </listitem>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ general/prog/ruby.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -63,6 +63,9 @@
 <screen><userinput><command>./configure --prefix=/usr \
     --enable-shared --enable-pthread &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
 make install-doc</command></userinput></screen>
 
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ general/prog/tcl.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -55,7 +55,7 @@
 commands:</para>
 
-<screen><userinput><command>VERSION=&tcl-version; &amp;&amp;
-V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
-DIR=$PWD &amp;&amp;
+<screen><userinput><command>export VERSION=&tcl-version; &amp;&amp;
+export V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
+export DIR=$PWD &amp;&amp;
 cd unix &amp;&amp;
 ./configure --prefix=/usr --enable-threads &amp;&amp;
@@ -65,6 +65,9 @@
 sed -i \
   "s,^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"," \
-  tclConfig.sh &amp;&amp;
-make install &amp;&amp;
+  tclConfig.sh</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
 install -d /usr/include/tcl${V}/unix &amp;&amp;
 install -m644 *.h /usr/include/tcl${V}/unix/ &amp;&amp;
@@ -76,8 +79,17 @@
 ln -sf tclsh${V} /usr/bin/tclsh</command></userinput></screen>
 
+<para>Clean up the unprivileged user's environment using the following 
+commands:</para>
+
+<screen><userinput><command>unset VERSION &amp;&amp;
+unset V &amp;&amp;
+unset DIR</command></userinput></screen>
+
+<!--
 <caution><para>If you build the package as an ordinary user and then switch to 
 root to install the package, ensure you set the environment variables 
 <envar>V</envar> and <envar>VERSION</envar> before running the installation 
 commands.</para></caution>
+-->
 
 </sect2>
@@ -92,5 +104,5 @@
 package assumes that the source that is used to build 
 <application>Tcl</application> is always kept around for compiling packages 
-that depend on <application>Tcl</application>. These <command>sed</command>'s 
+that depend on <application>Tcl</application>. These <command>sed</command>s 
 remove the reference to the build directory and replace them by saner system 
 wide locations.</para>
@@ -108,9 +120,9 @@
 <segmentedlist>
 <segtitle>Installed Program</segtitle>
-<segtitle>Installed Library</segtitle>
+<segtitle>Installed Libraries</segtitle>
 <segtitle>Installed Directories</segtitle>
 <seglistitem>
 <seg>tclsh</seg>
-<seg>libtcl</seg>
+<seg>libtcl.so and libtclstub8.4.a</seg>
 <seg>/usr/lib/tcl8.4 and /usr/include/tcl8.4</seg></seglistitem>
 </segmentedlist>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ general/prog/tk.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -55,13 +55,16 @@
 commands:</para>
 
-<screen><userinput><command>VERSION=&tk-version; &amp;&amp;
-V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
-DIR=$PWD &amp;&amp;
+<screen><userinput><command>export VERSION=&tk-version; &amp;&amp;
+export V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
+export DIR=$PWD &amp;&amp;
 cd unix &amp;&amp;
 ./configure --prefix=/usr --enable-threads &amp;&amp;
 make &amp;&amp;
 sed -i "s:${DIR}/unix:/usr/lib:" tkConfig.sh &amp;&amp;
-sed -i "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh &amp;&amp;
-make install &amp;&amp;
+sed -i "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
 install -d /usr/include/tk${V}/unix &amp;&amp;
 install -m644 *.h /usr/include/tk${V}/unix/ &amp;&amp;
@@ -73,8 +76,17 @@
 ln -sf wish${V} /usr/bin/wish</command></userinput></screen>
 
+<para>Clean up the unprivileged user's environment using the following
+commands:</para>
+
+<screen><userinput><command>unset VERSION &amp;&amp;
+unset V &amp;&amp;
+unset DIR</command></userinput></screen>
+
+<!--
 <caution><para>If you build the package as an ordinary user and then switch to 
 root to install the package, ensure you set the environment variables
 <envar>V</envar> and <envar>VERSION</envar> before running the installation
 commands.</para></caution>
+-->
 
 </sect2>
@@ -106,9 +118,9 @@
 <segmentedlist>
 <segtitle>Installed Program</segtitle>
-<segtitle>Installed Library</segtitle>
+<segtitle>Installed Libraries</segtitle>
 <segtitle>Installed Directories</segtitle>
 <seglistitem>
 <seg>wish</seg>
-<seg>libtk</seg>
+<seg>libtk.so and libtkstub8.4.a</seg>
 <seg>/usr/lib/tk8.4 and /usr/include/tk8.4</seg></seglistitem>
 </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ introduction/welcome/changelog.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -23,5 +23,5 @@
 <itemizedlist>
 
-<listitem><para>January 30th, 2005 [dj]: Fixed craclib_dict_path check
+<listitem><para>January 30th, 2005 [dj]: Fixed cracklib_dict_path check
 in Linux_PAM configure.  Added change to 
 Linux-PAM-linkage-2.patch.</para></listitem>
Index: multimedia/cdwriteutils/udftools.xml
===================================================================
--- multimedia/cdwriteutils/udftools.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ multimedia/cdwriteutils/udftools.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -62,6 +62,9 @@
 </sect2>
 
-<sect2>
+<sect2 id="udftools-kernel">
 <title>Installation of the kernel patch</title>
+<indexterm zone="udftools udftools-kernel">
+<primary sortas="d-UDF-File-System">UDF File System</primary>
+</indexterm>
 
 <warning>
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ postlfs/shells/tcsh.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -55,6 +55,9 @@
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
 make install.man &amp;&amp;
 ln -sf /usr/bin/tcsh /bin/csh</command></userinput></screen>
@@ -115,6 +118,10 @@
 <segmentedlist>
 <segtitle>Installed Program</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
 <seglistitem>
 <seg>tcsh</seg>
+<seg>None</seg>
+<seg>None</seg>
 </seglistitem>
 </segmentedlist>
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ postlfs/shells/zsh.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -61,6 +61,9 @@
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -98,6 +101,10 @@
 <segmentedlist>
 <segtitle>Installed Program</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
 <seglistitem>
 <seg>zsh</seg>
+<seg>None</seg>
+<seg>None</seg>
 </seglistitem>
 </segmentedlist>
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision c2688a0ceed9daca2a0b58ae322d459154846f2a)
+++ server/mail/sendmail.xml	(revision d86145218fb097a9819d9cc767da4bd56c672405)
@@ -66,7 +66,7 @@
 <para>Before building <application>Sendmail</application>, create the users, 
 groups and directories that <application>Sendmail</application> requires 
-with the following commands:</para>
-
-<screen><userinput><command>groupadd smmsp &amp;&amp;
+with the following commands issued as the root user:</para>
+
+<screen><userinput role='root'><command>groupadd smmsp &amp;&amp;
 groupadd mail &amp;&amp;
 useradd -c "Sendmail Daemon" -g smmsp -G mail smmsp &amp;&amp;
@@ -88,19 +88,22 @@
 cd ../cf/cf &amp;&amp;
 cp generic-linux.mc sendmail.mc &amp;&amp;
-sh Build sendmail.cf &amp;&amp;
-mkdir /etc/mail &amp;&amp;
+sh Build sendmail.cf</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>install -v -d -m755 /etc/mail &amp;&amp;
 sh Build install-cf &amp;&amp;
 cd ../../ &amp;&amp;
 sh Build install &amp;&amp;
-cp -R cf/* /etc/mail &amp;&amp;
-cp cf/cf/{submit,sendmail}.mc /etc/mail &amp;&amp;
+cp -v -R cf/* /etc/mail &amp;&amp;
+cp -v cf/cf/{submit,sendmail}.mc /etc/mail &amp;&amp;
 for manpage in sendmail editmap mailstats makemap praliases smrsh 
 do
-    install -m444 $manpage/$manpage.8   /usr/share/man/man8
+    install -v -m444 $manpage/$manpage.8 /usr/share/man/man8
 done &amp;&amp;
-install -m444 sendmail/aliases.5    /usr/share/man/man5 &amp;&amp;
-install -m444 sendmail/mailq.1      /usr/share/man/man1 &amp;&amp;
-install -m444 sendmail/newaliases.1 /usr/share/man/man1 &amp;&amp;
-install -m444 vacation/vacation.1   /usr/share/man/man1</command></userinput></screen>
+install -v -m444 sendmail/aliases.5    /usr/share/man/man5 &amp;&amp;
+install -v -m444 sendmail/mailq.1      /usr/share/man/man1 &amp;&amp;
+install -v -m444 sendmail/newaliases.1 /usr/share/man/man1 &amp;&amp;
+install -v -m444 vacation/vacation.1   /usr/share/man/man1</command></userinput></screen>
 
 <para><emphasis>Note:</emphasis> See the source tree 
@@ -122,7 +125,11 @@
 <screen><userinput><command>cd doc/op &amp;&amp;
 sed -i -e 's/groff/GROFF_NO_SGR=1 groff/' Makefile &amp;&amp;
-make op.txt op.pdf &amp;&amp;
-install -d -m 755 /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-install -m 644 op.ps op.txt op.pdf /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
+make op.txt op.pdf</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>install -v -d -m755 /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
+install -v -m644 op.ps op.txt op.pdf \
+    /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
 cd ../../</command></userinput></screen>
 
@@ -165,7 +172,7 @@
 <para>Create the <filename>/etc/mail/local-host-names</filename> and 
 <filename>/etc/mail/aliases</filename> files using the following 
-commands:</para>
-
-<screen><userinput><command>echo $(hostname) > /etc/mail/local-host-names
+commands as the root user:</para>
+
+<screen><userinput role='root'><command>echo $(hostname) > /etc/mail/local-host-names
 cat &gt; /etc/mail/aliases &lt;&lt; "EOF"</command>
 postmaster: root
@@ -195,5 +202,5 @@
 <primary sortas="f-sendmail-init">sendmail</primary></indexterm>
 
-<screen><userinput><command>make install-sendmail</command></userinput></screen>
+<screen><userinput role='root'><command>make install-sendmail</command></userinput></screen>
 
 <note><para>The -qNm option to <command>sendmail</command>, where N is number 
@@ -211,8 +218,10 @@
 <segmentedlist>
 <segtitle>Installed Programs</segtitle>
-<segtitle>Installed Directory</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
 <seglistitem>
 <seg>editmap, hoststat, mailstats, mailq, makemap, newaliases, praliases, 
 purgestat, sendmail, smrsh and vacation</seg>
+<seg>None</seg>
 <seg>/etc/mail and /usr/share/doc/sendmail-&sendmail-version;</seg>
 </seglistitem>
