Tags corrections

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3812 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
2025-06-19 03:39:20 +01:00 · 2004-06-19 13:39:28 +00:00 · 2004-06-19 13:39:28 +00:00 · 8ad79807a3
commit 8ad79807a3
parent ef57e3bcf1
16 changed files with 107 additions and 102 deletions
--- a/chapter06/net-tools.xml
+++ b/chapter06/net-tools.xml
@ -137,7 +137,7 @@ statistics..</para>
 <term><command>nisdomainname</command></term>
 <listitem>
 <indexterm zone="ch-system-net-tools nisdomainname"><primary sortas="b-nisdomainname">nisdomainname</primary></indexterm>
-<para>does the same as domainname.</para>
+<para>does the same as <command>domainname</command>.</para>
 </listitem>
 </varlistentry>

@ -178,7 +178,7 @@ terminal lines for point-to-point links to other computers.</para>
 <term><command>ypdomainname</command></term>
 <listitem>
 <indexterm zone="ch-system-net-tools ypdomainname"><primary sortas="b-ypdomainname">ypdomainname</primary></indexterm>
-<para>does the same as domainname.</para>
+<para>does the same as <command>domainname</command>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@ -29,7 +29,7 @@ GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
 <title>Installation of Patch</title>

 <para>Prepare Patch for compilation (the preprocessor flag
-<emphasis>-D_GNU_SOURCE</emphasis> is only needed on PowerPCs, on other
+<parameter>-D_GNU_SOURCE</parameter> is only needed on PowerPCs, on other
 machines you can leave it out):</para>

 <screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen>
@ -59,8 +59,8 @@ machines you can leave it out):</para>
 <listitem>
 <indexterm zone="ch-system-patch patch"><primary sortas="b-patch">patch</primary></indexterm>
 <para>modifies files according to a patch file.
-A patch file normally is a difference listing created with the diff program.
-By applying these differences to the original files, patch creates the patched
+A patch file normally is a difference listing created with the <command>diff</command> program.
+By applying these differences to the original files, <command>patch</command> creates the patched
 versions. Using patches instead of entirely new tarballs to keep your sources
 up-to-date can save you a lot of download time.</para>
 </listitem>
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@ -39,9 +39,9 @@ defaults it auto-detects, then prepare Perl for compilation with:</para>

 <variablelist>
 <varlistentry>
-<term><userinput>-Dpager="/bin/less -isR"</userinput></term>
-<listitem><para>This corrects an error in the perldoc code with the invocation 
-of the less program.</para></listitem>
+<term><parameter>-Dpager="/bin/less -isR"</parameter></term>
+<listitem><para>This corrects an error in the <command>perldoc</command> code with the invocation
+of the <command>less</command> program.</para></listitem>
 </varlistentry>
 </variablelist>

@ -85,7 +85,7 @@ to c2ph), s2p, splain and xsubpp</seg>
 <term><command>a2p</command></term>
 <listitem>
 <indexterm zone="ch-system-perl a2p"><primary sortas="b-a2p">a2p</primary></indexterm>
-<para>translates awk to perl.</para>
+<para>translates awk to Perl.</para>
 </listitem>
 </varlistentry>

@ -93,7 +93,7 @@ to c2ph), s2p, splain and xsubpp</seg>
 <term><command>c2ph</command></term>
 <listitem>
 <indexterm zone="ch-system-perl c2ph"><primary sortas="b-c2ph">c2ph</primary></indexterm>
-<para>dumps C structures as generated from "cc -g -S" stabs.</para>
+<para>dumps C structures as generated from <quote>cc -g -S</quote> stabs.</para>
 </listitem>
 </varlistentry>

@ -101,7 +101,7 @@ to c2ph), s2p, splain and xsubpp</seg>
 <term><command>dprofpp</command></term>
 <listitem>
 <indexterm zone="ch-system-perl dprofpp"><primary sortas="b-dprofpp">dprofpp</primary></indexterm>
-<para>displays perl profile data.</para>
+<para>displays Perl profile data.</para>
 </listitem>
 </varlistentry>

@ -118,7 +118,7 @@ from either Unicode Character Mappings or Tcl Encoding Files.</para>
 <term><command>find2perl</command></term>
 <listitem>
 <indexterm zone="ch-system-perl find2perl"><primary sortas="b-find2perl">find2perl</primary></indexterm>
-<para>translates find commands to perl.</para>
+<para>translates find commands to Perl.</para>
 </listitem>
 </varlistentry>

@ -126,7 +126,8 @@ from either Unicode Character Mappings or Tcl Encoding Files.</para>
 <term><command>h2ph</command></term>
 <listitem>
 <indexterm zone="ch-system-perl h2ph"><primary sortas="b-h2ph">h2ph</primary></indexterm>
-<para>converts .h C header files to .ph Perl header files.</para>
+<para>converts <filename class="extension">.h</filename> C header files to
+<filename class="extension">.ph</filename> Perl header files.</para>
 </listitem>
 </varlistentry>

@ -134,7 +135,7 @@ from either Unicode Character Mappings or Tcl Encoding Files.</para>
 <term><command>h2xs</command></term>
 <listitem>
 <indexterm zone="ch-system-perl h2xs"><primary sortas="b-h2xs">h2xs</primary></indexterm>
-<para>converts .h C header files to Perl extensions.</para>
+<para>converts <filename class="extension">.h</filename> C header files to Perl extensions.</para>
 </listitem>
 </varlistentry>

@ -142,7 +143,7 @@ from either Unicode Character Mappings or Tcl Encoding Files.</para>
 <term><command>libnetcfg</command></term>
 <listitem>
 <indexterm zone="ch-system-perl libnetcfg"><primary sortas="b-libnetcfg">libnetcfg</primary></indexterm>
-<para>can be used to configure the libnet.</para>
+<para>can be used to configure the <filename class="libraryfile">libnet</filename>.</para>
 </listitem>
 </varlistentry>

@ -177,7 +178,7 @@ Perl or the modules that come with it, and mail them.</para>
 <listitem>
 <indexterm zone="ch-system-perl perldoc"><primary sortas="b-perldoc">perldoc</primary></indexterm>
 <para>displays a piece of documentation in pod
-format that is embedded in the perl installation tree or in a perl script.</para>
+format that is embedded in the Perl installation tree or in a Perl script.</para>
 </listitem>
 </varlistentry>

@ -203,7 +204,8 @@ converter <command>iconv</command>.</para>
 <term><command>pl2pm</command></term>
 <listitem>
 <indexterm zone="ch-system-perl pl2pm"><primary sortas="b-pl2pm">pl2pm</primary></indexterm>
-<para>is a rough tool for converting Perl4 .pl files to Perl5 .pm modules.</para>
+<para>is a rough tool for converting Perl4 <filename class="extension">.pl</filename>
+files to Perl5 <filename class="extension">.pm</filename> modules.</para>
 </listitem>
 </varlistentry>

@ -267,7 +269,7 @@ converter <command>iconv</command>.</para>
 <term><command>psed</command></term>
 <listitem>
 <indexterm zone="ch-system-perl psed"><primary sortas="b-psed">psed</primary></indexterm>
-<para>is a Perl version of the stream editor <userinput>sed</userinput>.</para>
+<para>is a Perl version of the stream editor <command>sed</command>.</para>
 </listitem>
 </varlistentry>

@ -275,7 +277,7 @@ converter <command>iconv</command>.</para>
 <term><command>pstruct</command></term>
 <listitem>
 <indexterm zone="ch-system-perl pstruct"><primary sortas="b-pstruct">pstruct</primary></indexterm>
-<para>dumps C structures as generated from "cc -g -S" stabs.</para>
+<para>dumps C structures as generated from <quote>cc -g -S</quote> stabs.</para>
 </listitem>
 </varlistentry>

@ -283,7 +285,7 @@ converter <command>iconv</command>.</para>
 <term><command>s2p</command></term>
 <listitem>
 <indexterm zone="ch-system-perl s2p"><primary sortas="b-s2p">s2p</primary></indexterm>
-<para>translates sed to perl.</para>
+<para>translates sed to Perl.</para>
 </listitem>
 </varlistentry>

@ -292,7 +294,7 @@ converter <command>iconv</command>.</para>
 <listitem>
 <indexterm zone="ch-system-perl splain"><primary sortas="b-splain">splain</primary></indexterm>
 <para>is used to force verbose warning
-diagnostics in perl.</para>
+diagnostics in Perl.</para>
 </listitem>
 </varlistentry>

--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@ -181,7 +181,7 @@ output. This allows you to watch the output change over time.</para>
 </varlistentry>

 <varlistentry id="libproc">
-<term><command>libproc</command></term>
+<term><filename class="libraryfile">libproc</filename></term>
 <listitem>
 <indexterm zone="ch-system-procps libproc"><primary sortas="c-libproc">libproc</primary></indexterm>
 <para>contains the functions used by most programs in this package.</para>
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@ -37,11 +37,11 @@ GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>

 <variablelist>
 <varlistentry>
-<term><userinput>--exec-prefix=""</userinput></term>
+<term><parameter>--exec-prefix=""</parameter></term>
 <listitem><para>This causes the
-binaries to be installed in <filename>/bin</filename> instead of
-<filename>/usr/bin</filename>. As the Psmisc programs are often used in
-bootscripts, they should be available also when the <filename>/usr</filename>
+binaries to be installed in <filename class="directory">/bin</filename> instead of
+<filename class="directory">/usr/bin</filename>. As the Psmisc programs are often used in
+bootscripts, they should be available also when the <filename class="directory">/usr</filename>
 file system isn't mounted.</para></listitem>
 </varlistentry>
 </variablelist>
@ -54,12 +54,12 @@ file system isn't mounted.</para></listitem>

 <screen><userinput>make install</userinput></screen>

-<para>There is no reason for the <filename>pstree</filename> and
-<filename>pstree.x11</filename> programs to reside in
+<para>There is no reason for the <command>pstree</command> and
+<command>pstree.x11</command> programs to reside in
 <filename class="directory">/bin</filename>. We therefore move them to
 <filename class="directory">/usr/bin</filename>. Also, there is no need
-for <filename>pstree.x11</filename> to exist as a separate program. We
-therefore make it a symbolic link to <filename>pstree</filename>:</para>
+for <command>pstree.x11</command> to exist as a separate program. We
+therefore make it a symbolic link to <command>pstree</command>:</para>

 <screen><userinput>mv /bin/pstree* /usr/bin
 ln -sf pstree /usr/bin/pstree.x11</userinput></screen>
--- a/chapter06/pwdgroup.xml
+++ b/chapter06/pwdgroup.xml
@ -22,9 +22,9 @@ the <filename>/etc/passwd</filename> and <filename>/etc/group</filename> files.
 <para>Create the <filename>/etc/passwd</filename> file by running the following
 command:</para>

-<screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
 root:x:0:0:root:/root:/bin/bash
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>

 <para>The actual password for <emphasis>root</emphasis> (the <quote>x</quote>
 here is just a placeholder) will be set later.</para>
@ -32,7 +32,7 @@ here is just a placeholder) will be set later.</para>
 <para>Create the <filename>/etc/group</filename> file by running the following 
 command:</para>

-<screen><userinput>cat &gt; /etc/group &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/group &lt;&lt; "EOF"
 root:x:0:
 bin:x:1:
 sys:x:2:
@ -48,7 +48,7 @@ audio:x:11:
 video:x:12:
 utmp:x:13:
 usb:x:14:
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>

 <para>The created groups aren't part of any standard -- they are some of the
 groups that the Udev configuration we will be using in the next section
@ -67,7 +67,7 @@ user name and group name resolution will now work.</para>

 <screen><userinput>exec /tools/bin/bash --login +h</userinput></screen>

-<para>Note the use of the <emphasis>+h</emphasis> directive. This tells
+<para>Note the use of the <parameter>+h</parameter> directive. This tells
 <command>bash</command> not to use its internal path hashing. Without this
 directive, <command>bash</command> would remember the paths to binaries it
 has executed. Since we want to use our newly compiled binaries as soon as
--- a/chapter06/readjusting.xml
+++ b/chapter06/readjusting.xml
@ -35,11 +35,11 @@ however, our testing has shown that the resulting Binutils program binaries
 should be identical.</para></note>

 <para>From now on every compiled program will link <emphasis>only</emphasis>
-against the libraries in <filename>/usr/lib</filename> and
-<filename>/lib</filename>. The extra
-<emphasis>INSTALL=/tools/bin/install</emphasis> is needed because the Makefile
+against the libraries in <filename class="directory">/usr/lib</filename> and
+<filename class="directory">/lib</filename>. The extra
+<parameter>INSTALL=/tools/bin/install</parameter> is needed because the Makefile
 created during the second pass still contains the reference to
-<filename>/usr/bin/install</filename>, which we obviously haven't installed yet.
+<command>/usr/bin/install</command>, which we obviously haven't installed yet.
 Some host distributions contain a <filename class="symlink">ginstall</filename>
 symbolic link which takes precedence in the Makefile and thus can cause a
 problem here. The above command takes care of this also.</para>
@ -78,7 +78,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 output of the last command will be (allowing for platform specific differences
 in dynamic linker name):</para>

-<blockquote><screen>[Requesting program interpreter: /lib/ld-linux.so.2]</screen></blockquote>
+<screen><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>

 <para>Note especially that <filename class="directory">/lib</filename> is now
 the prefix of our dynamic linker.</para>
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@ -28,7 +28,7 @@ remove the temporary copies of Tcl, Expect and DejaGNU, which were used for
 running the toolchain tests. If you want to use these programs later on, you
 will need to recompile and re-install them. The installation instructions are
 the same as in <xref linkend="chapter-temporary-tools"/>, apart from changing
-the prefix from <emphasis>/tools</emphasis> to <emphasis>/usr</emphasis>. The
+the prefix from <filename class="directory">/tools</filename> to <filename class="directory">/usr</filename>. The
 BLFS book discusses a slightly different approach to installing Tcl, see 
 <ulink url="&blfs-root;"/>.</para></note>

--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@ -29,11 +29,10 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo</seg></seglistitem>
 <title>Installation of Sed</title>

 <para>A bug in this version of sed changes permissions on files modified using
-the in-place function (<userinput>-i</userinput> flag).  Apply a patch to ensure
+the in-place function (<parameter>-i</parameter> flag).  Apply a patch to ensure
 that the original file permissions are preserved.</para>

-<screen><userinput>patch -Np1 -i ../sed-&sed-version;-permissions-1.patch
-</userinput></screen>
+<screen><userinput>patch -Np1 -i ../sed-&sed-version;-permissions-1.patch</userinput></screen>

 <para>Prepare Sed for compilation:</para>

--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@ -81,12 +81,12 @@ mv /usr/bin/passwd /bin</userinput></screen>
 <screen><userinput>mv /usr/lib/lib{shadow,misc}.so.0* /lib</userinput></screen>

 <para>As some packages expect to find the just-moved libraries in
-<filename>/usr/lib</filename>, create the following symlinks:</para>
+<filename class="directory">/usr/lib</filename>, create the following symlinks:</para>

 <screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
 ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</userinput></screen>

-<para>The -D option of the <filename>useradd</filename> program requires this
+<para>The <parameter>-D</parameter> option of the <command>useradd</command> program requires this
 directory for it to work properly:</para>

 <screen><userinput>mkdir /etc/default</userinput></screen>
@ -415,7 +415,7 @@ shell, initial group, home directory, and the like.</para>
 </varlistentry>

 <varlistentry id="libmisc">
-<term><command>libmisc</command></term>
+<term><filename class="libraryfile">libmisc</filename></term>
 <listitem>
 <indexterm zone="ch-system-shadow libmisc"><primary sortas="c-libmisc">libmisc</primary></indexterm>
 <para>...</para>
@ -423,7 +423,7 @@ shell, initial group, home directory, and the like.</para>
 </varlistentry>

 <varlistentry id="libshadow">
-<term><command>libshadow</command></term>
+<term><filename class="libraryfile">libshadow</filename></term>
 <listitem>
 <indexterm zone="ch-system-shadow libshadow"><primary sortas="c-libshadow">libshadow</primary></indexterm>
 <para>contains functions used by most programs in this package.</para>
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@ -60,7 +60,7 @@ Fix this bug by applying another patch:</para>
 <para>Create a new <filename>/etc/syslog.conf</filename> file by running the
 following:</para>

-<screen><userinput>cat &gt; /etc/syslog.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/syslog.conf &lt;&lt; "EOF"
 # Begin /etc/syslog.conf

 auth,authpriv.* -/var/log/auth.log
@ -72,7 +72,7 @@ user.* -/var/log/user.log
 *.emerg *

 # End /etc/syslog.conf
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>

 </sect2>

--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@ -28,10 +28,12 @@ running, and shutdown of your system.</para>
 <sect2 role="installation">
 <title>Installation of Sysvinit</title>

-<para>Sysvinit &sysvinit-version; contains a "buffer overflow" bug.
+<para>Sysvinit &sysvinit-version; contains a <quote>buffer overflow</quote> bug.
 Under some conditions, it clobbers the
 values of environment variables. Fix that:</para>
+
 <screen><userinput>patch -Np1 -i ../sysvinit-&sysvinit-version;-proclen-1.patch</userinput></screen>
+
 <para>When run-levels are changed (for example, when halting the system),
 <command>init</command> sends termination signals to those processes that
 <command>init</command> itself started and that shouldn't be running in the new
@ -64,7 +66,7 @@ misinterpretation, you can modify the source so that these messages read like
 <para>Create a new <filename>/etc/inittab</filename> file by running the
 following:</para>

-<screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"
 # Begin /etc/inittab

 id:3:initdefault:
@ -91,9 +93,9 @@ su:S016:once:/sbin/sulogin
 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600

 # End /etc/inittab
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>

-<para> The -I '\033(K' switch tells agetty to send this escape sequence to
+<para> The <parameter>-I '\033(K'</parameter> switch tells <command>agetty</command> to send this escape sequence to
 the terminal before doing anything else. This escape sequence switches the
 console character set to a user-defined one, which can be modified by
 running the <command>setfont</command> program.
@ -121,7 +123,7 @@ killall5), poweroff (link to halt), reboot (link to halt), runlevel, shutdown, s
 <term><command>halt</command></term>
 <listitem>
 <indexterm zone="ch-system-sysvinit halt"><primary sortas="b-halt">halt</primary></indexterm>
-<para>normally invokes shutdown with the -h flag,
+<para>normally invokes <command>shutdown</command> with the <parameter>-h</parameter> flag,
 except when already in run-level 0, then it tells the kernel to halt the system.
 But first it notes in the file <filename>/var/log/wtmp</filename> that the
 system is being brought down.</para>
@ -188,7 +190,7 @@ messages to the current user's terminal.</para>
 <listitem>
 <indexterm zone="ch-system-sysvinit poweroff"><primary sortas="b-poweroff">poweroff</primary></indexterm>
 <para>tells the kernel to halt the system and
-switch off the computer. But see halt.</para>
+switch off the computer. But see <command>halt</command>.</para>
 </listitem>
 </varlistentry>

@ -196,7 +198,7 @@ switch off the computer. But see halt.</para>
 <term><command>reboot</command></term>
 <listitem>
 <indexterm zone="ch-system-sysvinit reboot"><primary sortas="b-reboot">reboot</primary></indexterm>
-<para>tells the kernel to reboot the system. But see halt.</para>
+<para>tells the kernel to reboot the system. But see <command>halt</command>.</para>
 </listitem>
 </varlistentry>

@ -223,7 +225,7 @@ signaling all processes and notifying all logged-in users.</para>
 <listitem>
 <indexterm zone="ch-system-sysvinit sulogin"><primary sortas="b-sulogin">sulogin</primary></indexterm>
 <para>allows the superuser to log in. It is
-normally invoked by init when the system goes into single user mode.</para>
+normally invoked by <command>init</command> when the system goes into single user mode.</para>
 </listitem>
 </varlistentry>

@ -231,7 +233,7 @@ normally invoked by init when the system goes into single user mode.</para>
 <term><command>telinit</command></term>
 <listitem>
 <indexterm zone="ch-system-sysvinit telinit"><primary sortas="b-telinit">telinit</primary></indexterm>
-<para>tells init which run-level to enter.</para>
+<para>tells <command>init</command> which run-level to enter.</para>
 </listitem>
 </varlistentry>

--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@ -52,7 +52,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>

 <variablelist>
 <varlistentry>
-<term><userinput>TEXMF=/usr/share/texmf</userinput></term>
+<term><parameter>TEXMF=/usr/share/texmf</parameter></term>
 <listitem><para>The TEXMF
 makefile variable holds the location of the root of your TeX tree if, for
 example, you plan to install a TeX package later on.</para></listitem>
@ -92,7 +92,8 @@ makeinfo, texi2dvi and texindex</seg></seglistitem>
 <indexterm zone="ch-system-texinfo info"><primary sortas="b-info">info</primary></indexterm>
 <para>is used to read Info documents. Info
 documents are a bit like man pages, but often go much deeper than just
-explaining all the flags. Compare for example man tar and info tar.</para>
+explaining all the flags. Compare for example <command>man tar</command>
+and <command>info tar</command>.</para>
 </listitem>
 </varlistentry>

--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@ -30,8 +30,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, Zlib</seg></seglistite
 <sect2 role="installation">
 <title>FHS compliance notes</title>

-<para>The FHS recommends that we use <filename>/var/lib/hwclock</filename>,
-instead of the usual <filename>/etc</filename>, as the location for the
+<para>The FHS recommends that we use <filename class="directory">/var/lib/hwclock</filename>,
+instead of the usual <filename class="directory">/etc</filename>, as the location for the
 <filename>adjtime</filename> file. To make the <command>hwclock</command>
 program FHS-compliant, run the following:</para>

@ -60,14 +60,14 @@ by applying the following patch:</para>

 <variablelist>
 <varlistentry>
-<term><userinput>HAVE_KILL=yes</userinput></term>
+<term><parameter>HAVE_KILL=yes</parameter></term>
 <listitem><para>This prevents the
 <command>kill</command> program (already installed by Procps) from being
 built and installed again.</para></listitem>
 </varlistentry>

 <varlistentry>
-<term><userinput>HAVE_SLN=yes</userinput></term>
+<term><parameter>HAVE_SLN=yes</parameter></term>
 <listitem><para>This prevents the
 <command>sln</command> program (a statically linked
 <command>ln</command> already installed by Glibc) from being built and
@ -103,7 +103,7 @@ whereis and write</seg></seglistitem>
 <listitem>
 <indexterm zone="ch-system-util-linux agetty"><primary sortas="b-agetty">agetty</primary></indexterm>
 <para>opens a tty port, prompts for a login name,
-and then invokes the login program.</para>
+and then invokes the <command>login</command> program.</para>
 </listitem>
 </varlistentry>

@ -344,7 +344,7 @@ Minix file system on the given device.</para>
 <listitem>
 <indexterm zone="ch-system-util-linux mcookie"><primary sortas="b-mcookie">mcookie</primary></indexterm>
 <para>generates magic cookies, 128-bit random hexadecimal numbers, 
-for xauth.</para>
+for <command>xauth</command>.</para>
 </listitem>
 </varlistentry>

@ -394,7 +394,7 @@ for xauth.</para>
 <listitem>
 <indexterm zone="ch-system-util-linux more"><primary sortas="b-more">more</primary></indexterm>
 <para>is a filter for paging through text one
-screen full at a time. But less is much better.</para>
+screen full at a time. But <command>less</command> is much better.</para>
 </listitem>
 </varlistentry>

--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@ -49,7 +49,7 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput><
 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>

 <para>The optional but highly recommended
-<userinput>--enable-multibyte</userinput> switch
+<parameter>--enable-multibyte</parameter> switch
 includes support for editing files in multibyte character encodings into
 <command>vim</command>.
 It is needed for those people who ignore our recommendation not to
@ -92,49 +92,49 @@ installed. For more information read the Vim documentation.</para>
 <para>By default, <command>vim</command> runs in vi-incompatible mode. Some
 people might not like this, but we prefer to run <command>vim</command> in its
 own mode (else we wouldn't have included it in this book, but the original
-<command>vi</command>). We've included the setting of "nocompatible"
+<command>vi</command>). We've included the setting of <quote>nocompatible</quote>
 below to high-light the fact that the new behavior is being used. It
-also reminds those who would change to "compatible" mode that it should
+also reminds those who would change to <quote>compatible</quote> mode that it should
 appear first because it changes other settings and overrides must come
 after this setting. Create a default vim configuration file by running
 the following:</para>

-<screen><userinput>cat &gt; /etc/vimrc &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/vimrc &lt;&lt; "EOF"
 " Begin /etc/vimrc

 set nocompatible
 set backspace=2
 syntax on
-<!-- set fileencodings=ucs-bom,utf-8,<replaceable>your-8-bit-charset</replaceable> -->
+<!-- set fileencodings=ucs-bom,utf-8,<replaceable>[your-8-bit-charset]</replaceable> -->
 if (&amp;term == "iterm") || (&amp;term == "putty")
  set background=dark
 endif

 " End /etc/vimrc
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>

-<para>The <emphasis>set nocompatible</emphasis> makes
+<para>The <parameter>set nocompatible</parameter> makes
 <command>vim</command> behave in a more useful way (the default) than the
-vi-compatible manner. Remove the "no" if you want the old <command>vi</command>
-behavior. The <emphasis>set backspace=2</emphasis> allows
+vi-compatible manner. Remove the <quote>no</quote> if you want the old <command>vi</command>
+behavior. The <parameter>set backspace=2</parameter> allows
 backspacing over line breaks, autoindents and the start of insert. The
-<emphasis>syntax on</emphasis> enables <command>vim</command>'s
+<parameter>syntax on</parameter> enables <command>vim</command>'s
 syntax highliting.
 <!-- XXX: the ascii-only files are considered to be in utf-8 - that's not what
 one expects . That's why fileencodings stuff is commented out for now

-The <emphasis>set fileencodings=...</emphasis> makes
+The <parameter>set fileencodings=...</parameter> makes
 <command>vim</command> capable of automatically detecting the character
 set of the file being edited (replace
-"<replaceable>your-8-bit-charset</replaceable>"
+"<replaceable>[your-8-bit-charset]</replaceable>"
 with the value appropriate for your country, e.g. iso-8859-15 in Italy).
 This line is useful because bleeding-edge distributions
 like Fedora Core use UTF-8, and conservative ones like Debian
 use traditional 8-bit encodings for text files. If you have not
-passed the <option>- -enable-multibyte</option> switch to the
+passed the <parameter>- -enable-multibyte</parameter> switch to the
 <command>./configure</command> command above, this line will not work. -->
 Finally, the <emphasis>if</emphasis> statement with the
-<emphasis>set background=dark</emphasis> corrects <command>vim</command>'s
+<parameter>set background=dark</parameter> corrects <command>vim</command>'s
 guess about the background color of some terminal emulators. This gives the
 highliting a better color scheme for use on the black background of
 these programs.
@ -164,7 +164,7 @@ vimtutor and xxd</seg></seglistitem>
 <term><command>efm_filter.pl</command></term>
 <listitem>
 <indexterm zone="ch-system-vim efm_filter.pl"><primary sortas="b-efm_filter.pl">efm_filter.pl</primary></indexterm>
-<para>is a filter for creating an error file that can be read by vim.</para>
+<para>is a filter for creating an error file that can be read by <command>vim</command>.</para>
 </listitem>
 </varlistentry>

@ -173,7 +173,7 @@ vimtutor and xxd</seg></seglistitem>
 <listitem>
 <indexterm zone="ch-system-vim efm_perl.pl"><primary sortas="b-efm_perl.pl">efm_perl.pl</primary></indexterm>
 <para>reformats the error messages of the
-Perl interpreter for use with the <quote>quickfix</quote> mode of vim.</para>
+Perl interpreter for use with the <quote>quickfix</quote> mode of <command>vim</command>.</para>
 </listitem>
 </varlistentry>

@ -181,7 +181,7 @@ Perl interpreter for use with the <quote>quickfix</quote> mode of vim.</para>
 <term><command>ex</command></term>
 <listitem>
 <indexterm zone="ch-system-vim ex"><primary sortas="b-ex">ex</primary></indexterm>
-<para>starts vim in ex mode.</para>
+<para>starts <command>vim</command> in ex mode.</para>
 </listitem>
 </varlistentry>

@ -189,7 +189,7 @@ Perl interpreter for use with the <quote>quickfix</quote> mode of vim.</para>
 <term><command>less.sh</command></term>
 <listitem>
 <indexterm zone="ch-system-vim less.sh"><primary sortas="b-less.sh">less.sh</primary></indexterm>
-<para>is a script that starts vim with less.vim.</para>
+<para>is a script that starts <command>vim</command> with less.vim.</para>
 </listitem>
 </varlistentry>

@ -197,7 +197,7 @@ Perl interpreter for use with the <quote>quickfix</quote> mode of vim.</para>
 <term><command>mve.awk</command></term>
 <listitem>
 <indexterm zone="ch-system-vim mve.awk"><primary sortas="b-mve.awk">mve.awk</primary></indexterm>
-<para>processes vim errors.</para>
+<para>processes <command>vim</command> errors.</para>
 </listitem>
 </varlistentry>

@ -205,7 +205,7 @@ Perl interpreter for use with the <quote>quickfix</quote> mode of vim.</para>
 <term><command>pltags.pl</command></term>
 <listitem>
 <indexterm zone="ch-system-vim pltags.pl"><primary sortas="b-pltags.pl">pltags.pl</primary></indexterm>
-<para>creates a tags file for perl code, for use by vim.</para>
+<para>creates a tags file for Perl code, for use by <command>vim</command>.</para>
 </listitem>
 </varlistentry>

@ -221,8 +221,8 @@ Perl interpreter for use with the <quote>quickfix</quote> mode of vim.</para>
 <term><command>rview</command></term>
 <listitem>
 <indexterm zone="ch-system-vim rview"><primary sortas="b-rview">rview</primary></indexterm>
-<para>is a restricted version of view: no shell
-commands can be started and view can't be suspended.</para>
+<para>is a restricted version of <command>view</command>: no shell
+commands can be started and <command>view</command> can't be suspended.</para>
 </listitem>
 </varlistentry>

@ -230,8 +230,8 @@ commands can be started and view can't be suspended.</para>
 <term><command>rvim</command></term>
 <listitem>
 <indexterm zone="ch-system-vim rvim"><primary sortas="b-rvim">rvim</primary></indexterm>
-<para>is a restricted version of vim: no shell
-commands can be started and vim can't be suspended.</para>
+<para>is a restricted version of <command>vim</command>: no shell
+commands can be started and <command>vim</command> can't be suspended.</para>
 </listitem>
 </varlistentry>

@ -239,7 +239,7 @@ commands can be started and vim can't be suspended.</para>
 <term><command>shtags.pl</command></term>
 <listitem>
 <indexterm zone="ch-system-vim shtags.pl"><primary sortas="b-shtags.pl">shtags.pl</primary></indexterm>
-<para>generates a tag file for perl scripts.</para>
+<para>generates a tag file for Perl scripts.</para>
 </listitem>
 </varlistentry>

@ -255,7 +255,7 @@ commands can be started and vim can't be suspended.</para>
 <term><command>view</command></term>
 <listitem>
 <indexterm zone="ch-system-vim view"><primary sortas="b-view">view</primary></indexterm>
-<para>starts vim in read-only mode.</para>
+<para>starts <command>vim</command> in read-only mode.</para>
 </listitem>
 </varlistentry>

@ -271,7 +271,7 @@ commands can be started and vim can't be suspended.</para>
 <term><command>vim132</command></term>
 <listitem>
 <indexterm zone="ch-system-vim vim132"><primary sortas="b-vim132">vim132</primary></indexterm>
-<para>starts vim with the terminal in 132-column mode.</para>
+<para>starts <command>vim</command> with the terminal in 132-column mode.</para>
 </listitem>
 </varlistentry>

@ -279,7 +279,7 @@ commands can be started and vim can't be suspended.</para>
 <term><command>vim2html.pl</command></term>
 <listitem>
 <indexterm zone="ch-system-vim vim2html.pl"><primary sortas="b-vim2html.pl">vim2html.pl</primary></indexterm>
-<para>converts vim documentation to HTML.</para>
+<para>converts Vim documentation to HTML.</para>
 </listitem>
 </varlistentry>

@ -287,7 +287,7 @@ commands can be started and vim can't be suspended.</para>
 <term><command>vimdiff</command></term>
 <listitem>
 <indexterm zone="ch-system-vim vimdiff"><primary sortas="b-vimdiff">vimdiff</primary></indexterm>
-<para>edits two or three versions of a file with vim and show differences.</para>
+<para>edits two or three versions of a file with <command>vim</command> and show differences.</para>
 </listitem>
 </varlistentry>

@ -304,7 +304,7 @@ commands can be started and vim can't be suspended.</para>
 <listitem>
 <indexterm zone="ch-system-vim vimspell.sh"><primary sortas="b-vimspell.sh">vimspell.sh</primary></indexterm>
 <para>is a script which spells a file and generates the syntax statements necessary 
-to highlight in vim. This script requires the old Unix <command>spell</command> 
+to highlight in <command>vim</command>. This script requires the old Unix <command>spell</command>
 command, which is provided neither in LFS nor in BLFS.</para>
 </listitem>
 </varlistentry>
@ -313,7 +313,7 @@ command, which is provided neither in LFS nor in BLFS.</para>
 <term><command>vimtutor</command></term>
 <listitem>
 <indexterm zone="ch-system-vim vimtutor"><primary sortas="b-vimtutor">vimtutor</primary></indexterm>
-<para>teaches you the basic keys and commands of vim.</para>
+<para>teaches you the basic keys and commands of <command>vim</command>.</para>
 </listitem>
 </varlistentry>

--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@ -30,7 +30,7 @@ some programs.</para>

 <note><para>Zlib is known to build its shared library incorrectly if CFLAGS is
 specified in the environment. If you are using your own CFLAGS variable, be
-sure to add the <emphasis>-fPIC</emphasis> directive to your CFLAGS for the
+sure to add the <parameter>-fPIC</parameter> directive to your CFLAGS for the
 duration of the below <command>configure</command> command, then remove it
 afterwards.</para></note>

@ -50,6 +50,7 @@ afterwards.</para></note>
 <screen><userinput>make install</userinput></screen>

 <para>Now also build the non-shared (static) library:</para>
+
 <screen><userinput>make clean
 ./configure --prefix=/usr
 make</userinput></screen>
@ -80,7 +81,7 @@ into <filename class="directory">/lib</filename>:</para>

 <screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen>

-<para>Now we need to fix the <filename>/usr/lib/libz.so</filename> symlink
+<para>Now we need to fix the <filename class="symlink">/usr/lib/libz.so</filename> symlink
 because we just moved the file it points to:</para>

 <screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
@ -98,7 +99,7 @@ because we just moved the file it points to:</para>
 <variablelist><title>Short description</title>

 <varlistentry id="libz">
-<term><command>libz*</command></term>
+<term><filename class="libraryfile">libz*</filename></term>
 <listitem>
 <indexterm zone="ch-system-zlib libz"><primary sortas="c-libz*">libz*</primary></indexterm>
 <para>contains compression and un-compression