Tags corrections.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3784 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 79 insertions, 76 deletions

diff --git a/chapter06/file.xml b/chapter06/file.xml
index 2fe5e46f2..74a2669bf 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -64,10 +64,10 @@ language tests. The first test that succeeds determines the result.</para>
 </varlistentry>
 
 <varlistentry id="libmagic">
-<term><command>libmagic</command></term>
+<term><filename class="libraryfile">libmagic</filename></term>
 <listitem>
 <indexterm zone="ch-system-file libmagic"><primary sortas="c-libmagic">libmagic</primary></indexterm>
-<para>contains routines for magic number recognition, used by the file program.</para>
+<para>contains routines for magic number recognition, used by the <command>file</command> program.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index f3d7d5395..8d9f2407c 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -37,7 +37,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
     --localstatedir=/var/lib/locate</userinput></screen>
 
 <para>The localstatedir directive above changes the location of the locate
-database to be in /var/lib/locate, which is FHS-compliant.</para>
+database to be in <filename class="directory">/var/lib/locate</filename>,
+which is FHS-compliant.</para>
 
 <para>Compile the package:</para>
 
@@ -66,7 +67,7 @@ database to be in /var/lib/locate, which is FHS-compliant.</para>
 <term><command>bigram</command></term>
 <listitem>
 <indexterm zone="ch-system-findutils bigram"><primary sortas="b-bigram">bigram</primary></indexterm>
-<para>was formerly used to produce locate databases.</para>
+<para>was formerly used to produce <command>locate</command> databases.</para>
 </listitem>
 </varlistentry>
 
@@ -74,8 +75,8 @@ database to be in /var/lib/locate, which is FHS-compliant.</para>
 <term><command>code</command></term>
 <listitem>
 <indexterm zone="ch-system-findutils code"><primary sortas="b-code">code</primary></indexterm>
-<para>was formerly used to produce locate
-databases. It is the ancestor of frcode.</para>
+<para>was formerly used to produce <command>locate</command>
+databases. It is the ancestor of <command>frcode</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -91,7 +92,7 @@ databases. It is the ancestor of frcode.</para>
 <term><command>frcode</command></term>
 <listitem>
 <indexterm zone="ch-system-findutils frcode"><primary sortas="b-frcode">frcode</primary></indexterm>
-<para>is called by updatedb to compress the list of file names. It uses 
+<para>is called by <command>updatedb</command> to compress the list of file names. It uses
 front-compression, reducing the database size by a factor of 4 to 5.</para>
 </listitem>
 </varlistentry>
@@ -109,7 +110,7 @@ and reports the names that contain a given string or match a given pattern.</par
 <term><command>updatedb</command></term>
 <listitem>
 <indexterm zone="ch-system-findutils updatedb"><primary sortas="b-updatedb">updatedb</primary></indexterm>
-<para>updates the locate database. It scans
+<para>updates the <command>locate</command> database. It scans
 the entire file system (including other file systems that are currently mounted,
 unless told not to) and puts every file name it finds in the database.</para>
 </listitem>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 5fcfbb3f8..3291807f1 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -95,8 +95,8 @@ chmod 755 /usr/bin/lex</userinput></screen>
 <indexterm zone="ch-system-flex flex"><primary sortas="b-flex">flex</primary></indexterm>
 <para>is a tool for generating programs that
 recognize patterns in text. Pattern recognition is useful in many applications.
-From a set of rules on what to look for, flex makes a program that looks for
-those patterns. The reason to use flex is that it is much easier to specify
+From a set of rules on what to look for, <command>flex</command> makes a program that looks for
+those patterns. The reason to use <command>flex</command> is that it is much easier to specify
 the rules for a pattern-finding program than to write the program.</para>
 </listitem>
 </varlistentry>
@@ -105,12 +105,12 @@ the rules for a pattern-finding program than to write the program.</para>
 <term><command>flex++</command></term>
 <listitem>
 <indexterm zone="ch-system-flex flex-"><primary sortas="b-flex++">flex++</primary></indexterm>
-<para>invokes a version of flex that is used exclusively for C++ scanners.</para>
+<para>invokes a version of <command>flex</command> that is used exclusively for C++ scanners.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="libfl.a">
-<term><command>libfl.a</command></term>
+<term><filename class="libraryfile">libfl.a</filename></term>
 <listitem>
 <indexterm zone="ch-system-flex libfl.a"><primary sortas="c-libfl.a">libfl.a</primary></indexterm>
 <para>is the flex library.</para>
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 65ccfb0c8..4ce0d6e8a 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -61,7 +61,7 @@ pgawk, pgawk-&gawk-version; and pwcat</seg></seglistitem>
 <listitem>
 <indexterm zone="ch-system-gawk gawk"><primary sortas="b-gawk">gawk</primary></indexterm>
 <para>is a program for manipulating text files.
-It is the GNU implementation of awk.</para>
+It is the GNU implementation of <command>awk</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -77,7 +77,7 @@ It is the GNU implementation of awk.</para>
 <term><command>igawk</command></term>
 <listitem>
 <indexterm zone="ch-system-gawk igawk"><primary sortas="b-igawk">igawk</primary></indexterm>
-<para>gives gawk the ability to include files.</para>
+<para>gives <command>gawk</command> the ability to include files.</para>
 </listitem>
 </varlistentry>
 
@@ -85,7 +85,7 @@ It is the GNU implementation of awk.</para>
 <term><command>pgawk</command></term>
 <listitem>
 <indexterm zone="ch-system-gawk pgawk"><primary sortas="b-pgawk">pgawk</primary></indexterm>
-<para>is the profiling version of gawk.</para>
+<para>is the profiling version of <command>gawk</command>.</para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 662e95dfe..f1f5bbccd 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -30,7 +30,7 @@ Gawk, Gettext, Glibc, Grep, Make, Perl, Sed, Texinfo</seg></seglistitem>
 <title>Installation of GCC</title>
 
 <para>This package is known to behave badly when you have changed its
-default optimization flags (including the -march and -mcpu options).
+default optimization flags (including the <parameter>-march</parameter> and <parameter>-mcpu</parameter> options).
 Therefore, if you have defined any environment variables that override
 default optimizations, such as CFLAGS and CXXFLAGS, we recommend un-setting
 or modifying them when building GCC.</para>
@@ -47,8 +47,8 @@ the Specs patch) also used in the previous chapter:</para>
 <screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no_fixincludes-1.patch</userinput></screen>
 
 <para>Now apply a sed substitution that will suppress the installation of
-<filename>libiberty.a</filename>. We want to use the version of
-<filename>libiberty.a</filename> provided by Binutils:</para>
+<filename class="libraryfile">libiberty.a</filename>. We want to use the version of
+<filename class="libraryfile">libiberty.a</filename> provided by Binutils:</para>
 
 <screen><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
 
@@ -86,7 +86,7 @@ doubts.</para>
 <screen><userinput>make install</userinput></screen>
 
 <para>Some packages expect the C PreProcessor to be installed in the
-<filename>/lib</filename> directory.
+<filename class="directory">/lib</filename> directory.
 To support those packages, create this symlink:</para>
 
 <screen><userinput>ln -s ../usr/bin/cpp /lib</userinput></screen>
@@ -161,15 +161,15 @@ analyze programs to find out where optimizations will have the most effect.</par
 </varlistentry>
 
 <varlistentry id="libgcc">
-<term><command>libgcc*</command></term>
+<term><filename class="libraryfile">libgcc*</filename></term>
 <listitem>
 <indexterm zone="ch-system-gcc libgcc"><primary sortas="c-libgcc*">libgcc*</primary></indexterm>
-<para>contains run-time support for gcc.</para>
+<para>contains run-time support for <command>gcc</command>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="libstdc">
-<term><command>libstdc++</command></term>
+<term><filename class="libraryfile">libstdc++</filename></term>
 <listitem>
 <indexterm zone="ch-system-gcc libstdc"><primary sortas="c-libstdc++">libstdc++</primary></indexterm>
 <para>is the standard C++ library. It contains many frequently-used functions.</para>
@@ -177,7 +177,7 @@ analyze programs to find out where optimizations will have the most effect.</par
 </varlistentry>
 
 <varlistentry id="libsupc">
-<term><command>libsupc++</command></term>
+<term><filename class="libraryfile">libsupc++</filename></term>
 <listitem>
 <indexterm zone="ch-system-gcc libsupc"><primary sortas="c-libsupc++">libsupc++</primary></indexterm>
 <para>provides supporting routines for the c++ programming language.</para>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index ca3e5e8f7..0f12c91f1 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -67,7 +67,7 @@ ngettext, project-id, team-address, trigger, urlget, user-email and xgettext</se
 <term><command>autopoint</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext autopoint"><primary sortas="b-autopoint">autopoint</primary></indexterm>
-<para>copies standard gettext infrastructure files into a source package.</para>
+<para>copies standard Gettext infrastructure files into a source package.</para>
 </listitem>
 </varlistentry>
 
@@ -135,7 +135,7 @@ catalog according to their attributes and manipulates the attributes.</para>
 <term><command>msgcat</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgcat"><primary sortas="b-msgcat">msgcat</primary></indexterm>
-<para>concatenates and merges the given <filename>.po</filename> files.</para>
+<para>concatenates and merges the given <filename class="extension">.po</filename> files.</para>
 </listitem>
 </varlistentry>
 
@@ -143,7 +143,7 @@ catalog according to their attributes and manipulates the attributes.</para>
 <term><command>msgcmp</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgcmp"><primary sortas="b-msgcmp">msgcmp</primary></indexterm>
-<para>compares two <filename>.po</filename>
+<para>compares two <filename class="extension">.po</filename>
 files to check that both contain the same set of msgid strings.</para>
 </listitem>
 </varlistentry>
@@ -153,7 +153,7 @@ files to check that both contain the same set of msgid strings.</para>
 <listitem>
 <indexterm zone="ch-system-gettext msgcomm"><primary sortas="b-msgcomm">msgcomm</primary></indexterm>
 <para>finds the messages that are common to
-to the given <filename>.po</filename> files.</para>
+to the given <filename class="extension">.po</filename> files.</para>
 </listitem>
 </varlistentry>
 
@@ -210,7 +210,7 @@ catalog that match a given pattern or belong to some given source files.</para>
 <term><command>msginit</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msginit"><primary sortas="b-msginit">msginit</primary></indexterm>
-<para>creates a new <filename>.po</filename> file, initializing the meta 
+<para>creates a new <filename class="extension">.po</filename> file, initializing the meta
 information with values from the user's environment.</para>
 </listitem>
 </varlistentry>
@@ -258,7 +258,7 @@ from the given source files, to make the first translation template.</para>
 </varlistentry>
 
 <varlistentry id="libasprintf">
-<term><command>libasprintf</command></term>
+<term><filename class="libraryfile">libasprintf</filename></term>
 <listitem>
 <indexterm zone="ch-system-gettext libasprintf"><primary sortas="c-libasprintf">libasprintf</primary></indexterm>
 <para>defines the autosprintf class, which
@@ -268,29 +268,31 @@ makes C formatted output routines usable in C++ programs, for use with the
 </varlistentry>
 
 <varlistentry id="libgettextlib">
-<term><command>libgettextlib</command></term>
+<term><filename class="libraryfile">libgettextlib</filename></term>
 <listitem>
 <indexterm zone="ch-system-gettext libgettextlib"><primary sortas="c-libgettextlib">libgettextlib</primary></indexterm>
-<para>is a private library containing common routines used by the various gettext 
+<para>is a private library containing common routines used by the various Gettext
 programs. They're not meant for general use.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="libgettextpo">
-<term><command>libgettextpo</command></term>
+<term><filename class="libraryfile">libgettextpo</filename></term>
 <listitem>
 <indexterm zone="ch-system-gettext libgettextpo"><primary sortas="c-libgettextpo">libgettextpo</primary></indexterm>
-<para>is used to write specialized programs that process PO files. This library is 
-used when the standard applications shipped with gettext won't suffice (such as 
-msgcomm, msgcmp, msgattrib and msgen).</para>
+<para>is used to write specialized programs that process <filename 
+class="extension">.po</filename> files. This library is
+used when the standard applications shipped with Gettext won't suffice (such as
+<command>msgcomm</command>, <command>msgcmp</command>, 
+<command>msgattrib</command> and <command>msgen</command>).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="libgettextsrc">
-<term><command>libgettextsrc</command></term>
+<term><filename class="libraryfile">libgettextsrc</filename></term>
 <listitem>
 <indexterm zone="ch-system-gettext libgettextsrc"><primary sortas="c-libgettextsrc">libgettextsrc</primary></indexterm>
-<para>is a private library containing common routines used by the various gettext 
+<para>is a private library containing common routines used by the various Gettext 
 programs. They're not meant for general use.</para>
 </listitem>
 </varlistentry>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 854931cd8..b29676594 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -33,7 +33,7 @@ Gawk, GCC, Gettext, Grep, Make, Perl, Sed, Texinfo</seg></seglistitem>
 
 <para>The Glibc build system is very well self-contained and will install
 perfectly, even though our compiler specs file and linker are still pointing
-at <filename>/tools</filename>. We cannot adjust the specs and linker before
+at <filename class="directory">/tools</filename>. We cannot adjust the specs and linker before
 the Glibc install, because the Glibc autoconf tests would then give bogus
 results and thus defeat our goal of achieving a clean build.</para>
 
@@ -57,9 +57,9 @@ cd ../glibc-build</userinput></screen>
 
 <variablelist>
 <varlistentry>
-<term><userinput>--libexecdir=/tmp/pt_chown</userinput></term>
+<term><parameter>--libexecdir=/tmp/pt_chown</parameter></term>
 <listitem><para>This changes
-the location of the <filename>pt_chown</filename> program from its default of
+the location of the <command>pt_chown</command> program from its default of
 <filename class="directory">/usr/libexec</filename> to
 <filename class="directory">/tmp/pt_chown</filename>. This program isn't required
 on modern systems, so we install it in a place from which we will delete it
@@ -134,7 +134,7 @@ Numerous unofficial and unstable patches are required to fix these problems,
 and it has been decided not to support such complex locales.
 This applies to the ja_JP and fa_IR locales as well:
 they have been installed only
-for gcc and gettext tests to pass, and e.g.
+for GCC and Gettext tests to pass, and e.g.
 the <command>watch</command> program (part of Procps)
 compiled according to this book doesn't work properly in them.
 Various attempts to circumvent these
@@ -164,7 +164,7 @@ to be set up.</para>
 <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running the
 following:</para>
 
-<screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
 # Begin /etc/nsswitch.conf
 
 passwd: files
@@ -180,7 +180,7 @@ ethers: files
 rpc: files
 
 # End /etc/nsswitch.conf
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
 <para>To find out what time zone you're in, run the following script:</para>
 
@@ -197,10 +197,10 @@ or <emphasis>Canada/Eastern</emphasis>. Then create the
 
 <variablelist>
 <varlistentry>
-<term><userinput>--remove-destination</userinput></term>
+<term><parameter>--remove-destination</parameter></term>
 <listitem><para>This is needed to force removal of the already existing symbolic 
 link. The reason why we copy instead of symlink is to cover the situation where 
-<filename>/usr</filename> is on a separate partition. This could matter, for 
+<filename class="directory">/usr</filename> is on a separate partition. This could matter, for
 example, when booted into single user mode.</para></listitem>
 </varlistentry>
 </variablelist>
@@ -217,7 +217,7 @@ gave you.</para>
 <indexterm zone="conf-ld"><primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary></indexterm>
 
 <para>By default, the dynamic loader
-(<filename>/lib/ld-linux.so.2</filename>) searches through <filename 
+(<filename class="libraryfile">/lib/ld-linux.so.2</filename>) searches through <filename
 class="directory">/lib</filename> and <filename class="directory">/usr/lib</filename> 
 for dynamic libraries that are needed
 by programs when you run them. However, if there are libraries in
@@ -232,14 +232,14 @@ dynamic loader's search path.</para>
 <para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
 following:</para>
 
-<screen><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
 # Begin /etc/ld.so.conf
 
 /usr/local/lib
 /opt/lib
 
 # End /etc/ld.so.conf
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
 </sect2>
 
@@ -317,7 +317,7 @@ when a program terminates with a segmentation fault.</para>
 <term><command>iconvconfig</command></term>
 <listitem>
 <indexterm zone="ch-system-glibc iconvconfig"><primary sortas="b-iconvconfig">iconvconfig</primary></indexterm>
-<para>creates fastloading iconv module configuration file.</para>
+<para>creates fastloading <command>iconv</command> module configuration file.</para>
 </listitem>
 </varlistentry>
 
@@ -342,7 +342,7 @@ by each given program or shared library.</para>
 <term><command>lddlibc4</command></term>
 <listitem>
 <indexterm zone="ch-system-glibc lddlibc4"><primary sortas="b-lddlibc4">lddlibc4</primary></indexterm>
-<para>assists ldd with object files.</para>
+<para>assists <command>ldd</command> with object files.</para>
 </listitem>
 </varlistentry>
 
@@ -474,7 +474,7 @@ printing the currently executed function.</para>
 </varlistentry>
 
 <varlistentry id="ld.so">
-<term><command>ld.so</command></term>
+<term><filename class="libraryfile">ld.so</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc ld.so"><primary sortas="c-ld.so">ld.so</primary></indexterm>
 <para>is the helper program for shared library executables.</para>
@@ -482,7 +482,7 @@ printing the currently executed function.</para>
 </varlistentry>
 
 <varlistentry id="libBrokenLocale">
-<term><command>libBrokenLocale</command></term>
+<term><filename class="libraryfile">libBrokenLocale</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libBrokenLocale"><primary sortas="c-libBrokenLocale">libBrokenLocale</primary></indexterm>
 <para>is used by programs, such as Mozilla, to solve broken locales.</para>
@@ -490,7 +490,7 @@ printing the currently executed function.</para>
 </varlistentry>
 
 <varlistentry id="libSegFault">
-<term><command>libSegFault</command></term>
+<term><filename class="libraryfile">libSegFault</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libSegFault"><primary sortas="c-libSegFault">libSegFault</primary></indexterm>
 <para>is a segmentation fault signal handler. It tries to catch segfaults.</para>
@@ -498,7 +498,7 @@ printing the currently executed function.</para>
 </varlistentry>
 
 <varlistentry id="libanl">
-<term><command>libanl</command></term>
+<term><filename class="libraryfile">libanl</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libanl"><primary sortas="c-libanl">libanl</primary></indexterm>
 <para>is an asynchronous name lookup library.</para>
@@ -506,7 +506,7 @@ printing the currently executed function.</para>
 </varlistentry>
 
 <varlistentry id="libbsd-compat">
-<term><command>libbsd-compat</command></term>
+<term><filename class="libraryfile">libbsd-compat</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libbsd-compat"><primary sortas="c-libbsd-compat">libbsd-compat</primary></indexterm>
 <para>provides the portability needed
@@ -515,7 +515,7 @@ in order to run certain BSD programs under Linux.</para>
 </varlistentry>
 
 <varlistentry id="libc">
-<term><command>libc</command></term>
+<term><filename class="libraryfile">libc</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libc"><primary sortas="c-libc">libc</primary></indexterm>
 <para>is the main C library -- a collection of commonly used functions.</para>
@@ -523,7 +523,7 @@ in order to run certain BSD programs under Linux.</para>
 </varlistentry>
 
 <varlistentry id="libcrypt">
-<term><command>libcrypt</command></term>
+<term><filename class="libraryfile">libcrypt</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libcrypt"><primary sortas="c-libcrypt">libcrypt</primary></indexterm>
 <para>is the cryptography library.</para>
@@ -531,7 +531,7 @@ in order to run certain BSD programs under Linux.</para>
 </varlistentry>
 
 <varlistentry id="libdl">
-<term><command>libdl</command></term>
+<term><filename class="libraryfile">libdl</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libdl"><primary sortas="c-libdl">libdl</primary></indexterm>
 <para>is the dynamic linking interface library.</para>
@@ -539,15 +539,15 @@ in order to run certain BSD programs under Linux.</para>
 </varlistentry>
 
 <varlistentry id="libg">
-<term><command>libg</command></term>
+<term><filename class="libraryfile">libg</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libg"><primary sortas="c-libg">libg</primary></indexterm>
-<para>is a runtime library for g++.</para>
+<para>is a runtime library for <command>g++</command>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="libieee">
-<term><command>libieee</command></term>
+<term><filename class="libraryfile">libieee</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libieee"><primary sortas="c-libieee">libieee</primary></indexterm>
 <para>is the IEEE floating point library.</para>
@@ -555,7 +555,7 @@ in order to run certain BSD programs under Linux.</para>
 </varlistentry>
 
 <varlistentry id="libm">
-<term><command>libm</command></term>
+<term><filename class="libraryfile">libm</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libm"><primary sortas="c-libm">libm</primary></indexterm>
 <para>is the mathematical library.</para>
@@ -563,7 +563,7 @@ in order to run certain BSD programs under Linux.</para>
 </varlistentry>
 
 <varlistentry id="libmcheck">
-<term><command>libmcheck</command></term>
+<term><filename class="libraryfile">libmcheck</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libmcheck"><primary sortas="c-libmcheck">libmcheck</primary></indexterm>
 <para>contains code run at boot.</para>
@@ -571,16 +571,16 @@ in order to run certain BSD programs under Linux.</para>
 </varlistentry>
 
 <varlistentry id="libmemusage">
-<term><command>libmemusage</command></term>
+<term><filename class="libraryfile">libmemusage</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libmemusage"><primary sortas="c-libmemusage">libmemusage</primary></indexterm>
-<para>is used by memusage to help collect
+<para>is used by <command>memusage</command> to help collect
 information about the memory usage of a program.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="libnsl">
-<term><command>libnsl</command></term>
+<term><filename class="libraryfile">libnsl</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libnsl"><primary sortas="c-libnsl">libnsl</primary></indexterm>
 <para>is the network services library.</para>
@@ -588,17 +588,17 @@ information about the memory usage of a program.</para>
 </varlistentry>
 
 <varlistentry id="libnss">
-<term><command>libnss*</command></term>
+<term><filename class="libraryfile">libnss*</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libnss"><primary sortas="c-libnss*">libnss*</primary></indexterm>
 <para>are the Name Service Switch libraries,
 containing functions for resolving host names, user names, group names,
-aliases, services, protocols,and the like.</para>
+aliases, services, protocols, and the like.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="libpcprofile">
-<term><command>libpcprofile</command></term>
+<term><filename class="libraryfile">libpcprofile</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libpcprofile"><primary sortas="c-libpcprofile">libpcprofile</primary></indexterm>
 <para>contains profiling functions used
@@ -607,7 +607,7 @@ to track the amount of CPU time spent in which source code lines.</para>
 </varlistentry>
 
 <varlistentry id="libpthread">
-<term><command>libpthread</command></term>
+<term><filename class="libraryfile">libpthread</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libpthread"><primary sortas="c-libpthread">libpthread</primary></indexterm>
 <para>is the POSIX threads library.</para>
@@ -615,7 +615,7 @@ to track the amount of CPU time spent in which source code lines.</para>
 </varlistentry>
 
 <varlistentry id="libresolv">
-<term><command>libresolv</command></term>
+<term><filename class="libraryfile">libresolv</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libresolv"><primary sortas="c-libresolv">libresolv</primary></indexterm>
 <para>contains functions for creating,
@@ -624,7 +624,7 @@ sending, and interpreting packets to the Internet domain name servers.</para>
 </varlistentry>
 
 <varlistentry id="librpcsvc">
-<term><command>librpcsvc</command></term>
+<term><filename class="libraryfile">librpcsvc</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc librpcsvc"><primary sortas="c-librpcsvc">librpcsvc</primary></indexterm>
 <para>contains functions providing miscellaneous RPC services.</para>
@@ -632,7 +632,7 @@ sending, and interpreting packets to the Internet domain name servers.</para>
 </varlistentry>
 
 <varlistentry id="librt">
-<term><command>librt</command></term>
+<term><filename class="libraryfile">librt</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc librt"><primary sortas="c-librt">librt</primary></indexterm>
 <para>contains functions providing most of the
@@ -641,7 +641,7 @@ interfaces specified by the POSIX.1b Realtime Extension.</para>
 </varlistentry>
 
 <varlistentry id="libthread_db">
-<term><command>libthread_db</command></term>
+<term><filename class="libraryfile">libthread_db</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libthread_db"><primary sortas="c-libthread_db">libthread_db</primary></indexterm>
 <para>contains functions useful for
@@ -650,10 +650,10 @@ building debuggers for multi-threaded programs.</para>
 </varlistentry>
 
 <varlistentry id="libutil">
-<term><command>libutil</command></term>
+<term><filename class="libraryfile">libutil</filename></term>
 <listitem>
 <indexterm zone="ch-system-glibc libutil"><primary sortas="c-libutil">libutil</primary></indexterm>
-<para>contains code for "standard" functions used in many different Unix utilities.</para>
+<para>contains code for <quote>standard</quote> functions used in many different Unix utilities.</para>
 </listitem>
 </varlistentry>
 </variablelist>