Merged consistency update patch from systemd book.

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

31 files changed, 100 insertions, 102 deletions

diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index 703c0aa12..b87191e30 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -112,7 +112,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput><
         <term><command>chacl</command></term>
         <listitem>
           <para>Changes the access control list of a file
-          or directory.</para>
+          or directory</para>
           <indexterm zone="ch-system-acl chacl">
             <primary sortas="b-chacl">chacl</primary>
           </indexterm>
@@ -122,7 +122,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput><
       <varlistentry id="getfacl">
         <term><command>getfacl</command></term>
         <listitem>
-          <para>Gets file access control lists.</para>
+          <para>Gets file access control lists</para>
           <indexterm zone="ch-system-acl getfacl">
             <primary sortas="b-getfacl">getfacl</primary>
           </indexterm>
@@ -132,7 +132,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput><
       <varlistentry id="setacl">
         <term><command>setacl</command></term>
         <listitem>
-          <para>Sets file access control lists.</para>
+          <para>Sets file access control lists</para>
           <indexterm zone="ch-system-acl setacl">
             <primary sortas="b-setacl">setacl</primary>
           </indexterm>
@@ -142,7 +142,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput><
       <varlistentry id="libacl">
         <term><filename class="libraryfile">libacl</filename></term>
         <listitem>
-          <para>Contains the <application>Acl</application> API functions.</para>
+          <para>Contains the <application>Acl</application> API functions</para>
           <indexterm zone="ch-system-acl libacl">
             <primary sortas="c-libacl">libacl</primary>
           </indexterm>
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index 0d9c50f29..3aa9a1bbf 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -114,7 +114,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput
       <varlistentry id="getfattr">
         <term><command>getfattr</command></term>
         <listitem>
-          <para>Gets the extended attributes of filesystem objects.</para>
+          <para>Gets the extended attributes of filesystem objects</para>
           <indexterm zone="ch-system-attr getfattr">
             <primary sortas="b-getfattr">getfattr</primary>
           </indexterm>
@@ -134,7 +134,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput
       <varlistentry id="libattr">
         <term><filename class="libraryfile">libattr</filename></term>
         <listitem>
-          <para>Contains the <application>Attr</application> API functions.</para>
+          <para>Contains the <application>Attr</application> API functions</para>
           <indexterm zone="ch-system-attr libattr">
             <primary sortas="c-libattr">libattr</primary>
           </indexterm>
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 8f445f4fe..08dfe71c2 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -89,7 +89,7 @@
           <para>Produces shell scripts that automatically configure software
           source code packages to adapt to many kinds of Unix-like systems.
           The configuration scripts it produces are independent&mdash;running
-          them does not require the <command>autoconf</command> program.</para>
+          them does not require the <command>autoconf</command> program</para>
           <indexterm zone="ch-system-autoconf autoconf">
             <primary sortas="b-autoconf">autoconf</primary>
           </indexterm>
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index ae2e6f828..e3e15faa3 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -345,7 +345,7 @@ cd ../binutils-build</userinput></screen>
           <para>A library for dealing with opcodes&mdash;the <quote>readable
           text</quote> versions of instructions for the processor;
           it is used for building utilities like
-          <command>objdump</command>.</para>
+          <command>objdump</command></para>
           <indexterm zone="ch-system-binutils libopcodes">
             <primary sortas="c-libopcodes">libopcodes</primary>
           </indexterm>
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 2a57767ab..b565cf766 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -110,14 +110,14 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="liby.a">
-        <term><filename class="libraryfile">liby.a</filename></term>
+      <varlistentry id="liby">
+        <term><filename class="libraryfile">liby</filename></term>
         <listitem>
           <para>The Yacc library containing implementations of Yacc-compatible
           <function>yyerror</function> and <function>main</function> functions;
           this library is normally not very useful, but POSIX requires it</para>
-          <indexterm zone="ch-system-bison liby.a">
-            <primary sortas="c-liby.a">liby.a</primary>
+          <indexterm zone="ch-system-bison liby">
+            <primary sortas="c-liby">liby</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 32b5a2d2b..761bd7abb 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -233,12 +233,12 @@ ln -sv bzip2 /bin/bzcat</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libbz2">
-        <term><filename class="libraryfile">libbz2*</filename></term>
+        <term><filename class="libraryfile">libbz2</filename></term>
         <listitem>
           <para>The library implementing lossless, block-sorting data
           compression, using the Burrows-Wheeler algorithm</para>
           <indexterm zone="ch-system-bzip2 libbz2">
-            <primary sortas="c-libbz2*">libbz2*</primary>
+            <primary sortas="c-libbz2">libbz2</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 81853cab7..568aae7fe 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -1230,11 +1230,11 @@ sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libstdbuf">
-        <term><filename class="libraryfile">libstdbuf.so</filename></term>
+        <term><filename class="libraryfile">libstdbuf</filename></term>
         <listitem>
           <para>Library used by <command>stdbuf</command></para>
           <indexterm zone="ch-system-coreutils libstdbuf">
-            <primary sortas="c-libstdbuf">libstdbuf.so</primary>
+            <primary sortas="c-libstdbuf">libstdbuf</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 0f29b7271..7374c75c0 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -248,7 +248,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="e2freefrag">
         <term><command>e2freefrag</command></term>
         <listitem>
-          <para> Reports free space fragmentation information</para>
+          <para>Reports free space fragmentation information</para>
           <indexterm zone="ch-system-e2fsprogs e2freefrag">
             <primary sortas="b-e2freefrag">e2freefrag</primary>
           </indexterm>
@@ -295,7 +295,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <listitem>
           <para>Replays the undo log undo_log for an ext2/ext3/ext4 filesystem
           found on a device. This can be used to undo a failed operation by an
-          e2fsprogs program.</para>
+          e2fsprogs program</para>
           <indexterm zone="ch-system-e2fsprogs e2undo">
             <primary sortas="b-e2undo">e2undo</primary>
           </indexterm>
@@ -326,7 +326,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>fsck.ext2</command></term>
         <listitem>
           <para>By default checks <systemitem class="filesystem">ext2</systemitem>
-          file systems. This is a hard link to <command>e2fsck</command>.</para>
+          file systems. This is a hard link to <command>e2fsck</command></para>
           <indexterm zone="ch-system-e2fsprogs fsck.ext2">
             <primary sortas="b-fsck.ext2">fsck.ext2</primary>
           </indexterm>
@@ -337,7 +337,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>fsck.ext3</command></term>
         <listitem>
           <para>By default checks <systemitem class="filesystem">ext3</systemitem>
-          file systems. This is a hard link to <command>e2fsck</command>.</para>
+          file systems. This is a hard link to <command>e2fsck</command></para>
           <indexterm zone="ch-system-e2fsprogs fsck.ext3">
             <primary sortas="b-fsck.ext3">fsck.ext3</primary>
           </indexterm>
@@ -348,7 +348,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>fsck.ext4</command></term>
         <listitem>
           <para>By default checks <systemitem class="filesystem">ext4</systemitem>
-          file systems. This is a hard link to <command>e2fsck</command>.</para>
+          file systems. This is a hard link to <command>e2fsck</command></para>
           <indexterm zone="ch-system-e2fsprogs fsck.ext4">
             <primary sortas="b-fsck.ext4">fsck.ext4</primary>
           </indexterm>
@@ -360,7 +360,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <listitem>
           <para>By default checks <systemitem class="filesystem">ext4</systemitem>
           development file systems. This is a hard link to
-          <command>e2fsck</command>.</para>
+          <command>e2fsck</command></para>
           <indexterm zone="ch-system-e2fsprogs fsck.ext4dev">
             <primary sortas="b-fsck.ext4dev">fsck.ext4dev</primary>
           </indexterm>
@@ -416,7 +416,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>mkfs.ext2</command></term>
         <listitem>
           <para>By default creates <systemitem class="filesystem">ext2</systemitem>
-          file systems.  This is a hard link to <command>mke2fs</command>.</para>
+          file systems. This is a hard link to <command>mke2fs</command></para>
           <indexterm zone="ch-system-e2fsprogs mkfs.ext2">
             <primary sortas="b-mkfs.ext2">mkfs.ext2</primary>
           </indexterm>
@@ -427,7 +427,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>mkfs.ext3</command></term>
         <listitem>
           <para>By default creates <systemitem class="filesystem">ext3</systemitem>
-          file systems.  This is a hard link to <command>mke2fs</command>.</para>
+          file systems. This is a hard link to <command>mke2fs</command></para>
           <indexterm zone="ch-system-e2fsprogs mkfs.ext3">
             <primary sortas="b-mkfs.ext3">mkfs.ext3</primary>
           </indexterm>
@@ -438,7 +438,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>mkfs.ext4</command></term>
         <listitem>
           <para>By default creates <systemitem class="filesystem">ext4</systemitem>
-          file systems.  This is a hard link to <command>mke2fs</command>.</para>
+          file systems. This is a hard link to <command>mke2fs</command></para>
           <indexterm zone="ch-system-e2fsprogs mkfs.ext4">
             <primary sortas="b-mkfs.ext4">mkfs.ext4</primary>
           </indexterm>
@@ -449,7 +449,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>mkfs.ext4dev</command></term>
         <listitem>
           <para>By default creates <systemitem class="filesystem">ext4</systemitem>
-          development file systems.  This is a hard link to <command>mke2fs</command>.</para>
+          development file systems. This is a hard link to <command>mke2fs</command></para>
           <indexterm zone="ch-system-e2fsprogs mkfs.ext4dev">
             <primary sortas="b-mkfs.ext4dev">mkfs.ext4dev</primary>
           </indexterm>
diff --git a/chapter06/expat.xml b/chapter06/expat.xml
index 6e3fefa60..5a3bbea81 100644
--- a/chapter06/expat.xml
+++ b/chapter06/expat.xml
@@ -88,7 +88,7 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
         <term><command>xmlwf </command></term>
         <listitem>
           <para>is a non-validating utility to check whether or not
-          XML documents are well formed.</para>
+          XML documents are well formed</para>
           <indexterm zone="ch-system-expat xmlwf">
             <primary sortas="b-xmlwf">xmlwf</primary>
           </indexterm>
@@ -98,7 +98,7 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
       <varlistentry id="libexpat">
         <term><filename class="libraryfile">libexpat</filename></term>
         <listitem>
-          <para> contains API functions for parsing XML.</para>
+          <para> contains API functions for parsing XML</para>
           <indexterm zone="ch-system-expat libexpat">
             <primary sortas="c-libexpat">libexpat</primary>
           </indexterm>
diff --git a/chapter06/file.xml b/chapter06/file.xml
index 004a885b9..b5e28f244 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -91,7 +91,7 @@
       </varlistentry>
 
       <varlistentry id="libmagic">
-        <term><filename class="libraryfile">libmagic.so</filename></term>
+        <term><filename class="libraryfile">libmagic</filename></term>
         <listitem>
           <para>Contains routines for magic number recognition, used by the
           <command>file</command> program</para>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 5f0f88e08..792300d1d 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -115,7 +115,7 @@ sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
         <term><command>code</command></term>
         <listitem>
           <para>Was formerly used to produce <command>locate</command>
-          databases; it is the ancestor of <command>frcode</command>.</para>
+          databases; it is the ancestor of <command>frcode</command></para>
           <indexterm zone="ch-system-findutils code">
             <primary sortas="b-code">code</primary>
           </indexterm>
@@ -138,7 +138,7 @@ sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
         <listitem>
           <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 four to five.</para>
+          by a factor of four to five</para>
           <indexterm zone="ch-system-findutils frcode">
             <primary sortas="b-frcode">frcode</primary>
           </indexterm>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 53f8354ad..c9063842a 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -381,9 +381,9 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <term><command>gcc-ar</command></term>
         <listitem>
           <para>A wrapper around <command>ar</command> that adds a
-          plugin to the command line.  This program is only used
+          plugin to the command line. This program is only used
           to add "link time optization" and is not useful with the
-          default build options.</para>
+          default build options</para>
           <indexterm zone="ch-system-gcc gcc-ar">
             <primary sortas="b-gcc-ar">gc-ar</primary>
           </indexterm>
@@ -394,9 +394,9 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <term><command>gcc-nm</command></term>
         <listitem>
           <para>A wrapper around <command>nm</command> that adds a
-          plugin to the command line.  This program is only used
+          plugin to the command line. This program is only used
           to add "link time optization" and is not useful with the
-          default build options.</para>
+          default build options</para>
           <indexterm zone="ch-system-gcc gcc-nm">
             <primary sortas="b-gcc-nm">gc-nm</primary>
           </indexterm>
@@ -407,9 +407,9 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <term><command>gcc-ranlib</command></term>
         <listitem>
           <para>A wrapper around <command>ranlib</command> that adds a
-          plugin to the command line.  This program is only used
+          plugin to the command line. This program is only used
           to add "link time optization" and is not useful with the
-          default build options.</para>
+          default build options</para>
           <indexterm zone="ch-system-gcc gcc-ranlib">
             <primary sortas="b-gcc-ranlib">gc-ranlib</primary>
           </indexterm>
@@ -442,7 +442,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <listitem>
           <para>Contains run-time support for <command>gcc</command></para>
           <indexterm zone="ch-system-gcc libgcc">
-            <primary sortas="c-libgcc*">libgcc*</primary>
+            <primary sortas="c-libgcc">libgcc</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -486,9 +486,9 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <term><filename class="libraryfile">liblto_plugin</filename></term>
         <listitem>
           <para>GCC's Link Time Optimization (LTO) plugin allows GCC to perform
-          optimizations across compilation units.</para>
+          optimizations across compilation units</para>
           <indexterm zone="ch-system-gcc liblto_plugin">
-            <primary sortas="c-liblto_plugin*">liblto_plugin*</primary>
+            <primary sortas="c-liblto_plugin">liblto_plugin</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -509,7 +509,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <listitem>
           <para>GCC Quad Precision Math Library API</para>
           <indexterm zone="ch-system-gcc libquadmath">
-            <primary sortas="c-libquadmath*">libquadmath*</primary>
+            <primary sortas="c-libquadmath">libquadmath</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -520,7 +520,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
           <para>Contains routines supporting GCC's stack-smashing protection
           functionality</para>
           <indexterm zone="ch-system-gcc libssp">
-            <primary sortas="c-libssp*">libssp*</primary>
+            <primary sortas="c-libssp">libssp</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/gdbm.xml b/chapter06/gdbm.xml
index a4b36f18f..6457f1c83 100644
--- a/chapter06/gdbm.xml
+++ b/chapter06/gdbm.xml
@@ -96,7 +96,7 @@
       <varlistentry id="gdbm_dump">
         <term><command>gdbm_dump</command></term>
         <listitem>
-          <para>Dumps a GDBM database to a file.</para>
+          <para>Dumps a GDBM database to a file</para>
           <indexterm zone="ch-system-gdbm gdbm_dump">
             <primary sortas="b-gdbm_dump">gdbm_dump</primary>
           </indexterm>
@@ -106,7 +106,7 @@
       <varlistentry id="gdbm_load">
         <term><command>gdbm_load</command></term>
         <listitem>
-          <para>Recreates a GDBM database from a dump file.</para>
+          <para>Recreates a GDBM database from a dump file</para>
           <indexterm zone="ch-system-gdbm gdbm_load">
             <primary sortas="b-gdbm_load">gdbm_load</primary>
           </indexterm>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index 8c64a5059..cdbcdc392 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -407,14 +407,14 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="preloadable_libintl.so">
+      <varlistentry id="preloadable_libintl">
         <term><filename class="libraryfile">preloadable_libintl</filename></term>
         <listitem>
           <para>A library, intended to be used by LD_PRELOAD that assists
           <filename class="libraryfile">libintl</filename> in logging
-          untranslated messages.</para>
-          <indexterm zone="ch-system-gettext preloadable_libintl.so">
-            <primary sortas="c-preloadable_libintl.so">preloadable_libintl</primary>
+          untranslated messages</para>
+          <indexterm zone="ch-system-gettext preloadable_libintl">
+            <primary sortas="c-preloadable_libintl">preloadable_libintl</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 7ca51fd90..ed69cd7b9 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -417,7 +417,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
         /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
         /usr/include/sys, /usr/lib/audit, /usr/lib/gconv, /usr/lib/locale,
         /usr/libexec/getconf, /usr/share/i18n, /usr/share/zoneinfo,
-        /var/cache/nscd, and /var/lib/nss_db</seg>
+        /var/cache/nscd, /var/lib/nss_db</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml
index e8d781f07..6f4c2c7c9 100644
--- a/chapter06/gmp.xml
+++ b/chapter06/gmp.xml
@@ -123,7 +123,7 @@ make install-html</userinput></screen>
       <varlistentry id="libgmp">
         <term><filename class="libraryfile">libgmp</filename></term>
         <listitem>
-          <para>Contains precision math functions.</para>
+          <para>Contains precision math functions</para>
           <indexterm zone="ch-system-gmp libgmp">
             <primary sortas="c-libgmp">libgmp</primary>
           </indexterm>
@@ -133,7 +133,7 @@ make install-html</userinput></screen>
       <varlistentry id="libgmpxx">
         <term><filename class="libraryfile">libgmpxx</filename></term>
         <listitem>
-          <para>Contains C++ precision math functions.</para>
+          <para>Contains C++ precision math functions</para>
           <indexterm zone="ch-system-gmp libgmpxx">
             <primary sortas="c-libgmpxx">libgmpxx</primary>
           </indexterm>
diff --git a/chapter06/intltool.xml b/chapter06/intltool.xml
index fb170ea8e..ac157a2cd 100644
--- a/chapter06/intltool.xml
+++ b/chapter06/intltool.xml
@@ -83,7 +83,7 @@ install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N
       <varlistentry id="intltoolize">
         <term><command>intltoolize</command></term>
         <listitem>
-          <para>Prepares a package to use intltool.</para>
+          <para>Prepares a package to use intltool</para>
           <indexterm zone="ch-system-intltool intltoolize">
             <primary sortas="b-intltoolize">intltoolize</primary>
           </indexterm>
@@ -93,7 +93,7 @@ install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N
       <varlistentry id="intltool-extract">
         <term><command>intltool-extract</command></term>
         <listitem>
-          <para>Generates header files that can be read by <command>gettext</command>.</para>
+          <para>Generates header files that can be read by <command>gettext</command></para>
           <indexterm zone="ch-system-intltool intltool-extract">
             <primary sortas="b-intltool-extract">intltool-extract</primary>
           </indexterm>
@@ -103,7 +103,7 @@ install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N
       <varlistentry id="intltool-merge">
         <term><command>intltool-merge</command></term>
         <listitem>
-          <para>Merges translated strings into various file types.</para>
+          <para>Merges translated strings into various file types</para>
           <indexterm zone="ch-system-intltool intltool-merge">
             <primary sortas="b-intltool-merge">intltool-merge</primary>
           </indexterm>
@@ -113,7 +113,7 @@ install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N
       <varlistentry id="intltool-prepare">
         <term><command>intltool-prepare</command></term>
         <listitem>
-          <para>Updates pot files and merges them with translation files.</para>
+          <para>Updates pot files and merges them with translation files</para>
           <indexterm zone="ch-system-intltool intltool-prepare">
             <primary sortas="b-intltool-prepare">intltool-prepare</primary>
           </indexterm>
@@ -123,7 +123,7 @@ install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N
       <varlistentry id="intltool-update">
         <term><command>intltool-update</command></term>
         <listitem>
-          <para>Updates the po template files and merges them with the translations.</para>
+          <para>Updates the po template files and merges them with the translations</para>
           <indexterm zone="ch-system-intltool intltool-update">
             <primary sortas="b-intltool-update">intltool-update</primary>
           </indexterm>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 3dd8d1e31..14d3a2cb0 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -134,7 +134,7 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
           <para>A shell script wrapper for the <command>ip</command> command.
           Note that it requires the <command>arping</command> and
           <command>rdisk</command> programs from the
-          iputils package found at <ulink url="http://www.skbuff.net/iputils/"/>.</para>
+          iputils package found at <ulink url="http://www.skbuff.net/iputils/"/></para>
           <indexterm zone="ch-system-iproute2 ifcfg">
             <primary sortas="b-ifcfg">ifcfg</primary>
           </indexterm>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index fa415fdb8..3a347be9b 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -387,7 +387,7 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
         <listitem>
           <para>Puts the keyboard and console in UNICODE mode. Don't use this
           program unless your keymap file is in the ISO-8859-1 encoding. For
-          other encodings, this utility produces incorrect results.</para>
+          other encodings, this utility produces incorrect results</para>
           <indexterm zone="ch-system-kbd unicode_start">
             <primary sortas="b-unicode_start">unicode_start</primary>
           </indexterm>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index c22282c1d..783aca41d 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -86,7 +86,7 @@
           files, running Unix commands, performing integer arithmetic,
           manipulating text, recursion, etc. The <command>m4</command> program
           can be used either as a front-end to a compiler or as a macro processor
-          in its own right.</para>
+          in its own right</para>
           <indexterm zone="ch-system-m4 m4">
             <primary sortas="b-m4">m4</primary>
           </indexterm>
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 2205a9df8..e4febcc9f 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -95,7 +95,7 @@ make install-html</userinput></screen>
       <varlistentry id="libmpfr">
         <term><filename class="libraryfile">libmpfr</filename></term>
         <listitem>
-          <para>Contains multiple-precision math functions.</para>
+          <para>Contains multiple-precision math functions</para>
           <indexterm zone="ch-system-mpfr libmpfr">
             <primary sortas="c-libmpfr">libmpfr</primary>
           </indexterm>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 35be33550..571ac00b9 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -300,55 +300,55 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libcurses">
-        <term><filename class="libraryfile">libcurses</filename></term>
+      <varlistentry id="libcursesw">
+        <term><filename class="libraryfile">libcursesw</filename></term>
         <listitem>
-          <para>A link to <filename>libncurses</filename></para>
-          <indexterm zone="ch-system-ncurses libcurses">
-            <primary sortas="c-libcurses">libcurses</primary>
+          <para>A link to <filename>libncursesw</filename></para>
+          <indexterm zone="ch-system-ncurses libcursesw">
+            <primary sortas="c-libcursesw">libcursesw</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libncurses">
-        <term><filename class="libraryfile">libncurses</filename></term>
+      <varlistentry id="libncursesw">
+        <term><filename class="libraryfile">libncursesw</filename></term>
         <listitem>
           <para>Contains functions to display text in many complex ways on a
           terminal screen; a good example of the use of these functions is the
           menu displayed during the kernel's <command>make
           menuconfig</command></para>
-          <indexterm zone="ch-system-ncurses libncurses">
-            <primary sortas="c-libncurses">libncurses</primary>
+          <indexterm zone="ch-system-ncurses libncursesw">
+            <primary sortas="c-libncursesw">libncursesw</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libform">
-        <term><filename class="libraryfile">libform</filename></term>
+      <varlistentry id="libformw">
+        <term><filename class="libraryfile">libformw</filename></term>
         <listitem>
           <para>Contains functions to implement forms</para>
-          <indexterm zone="ch-system-ncurses libform">
-            <primary sortas="c-libform">libform</primary>
+          <indexterm zone="ch-system-ncurses libformw">
+            <primary sortas="c-libformw">libformw</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libmenu">
-        <term><filename class="libraryfile">libmenu</filename></term>
+      <varlistentry id="libmenuw">
+        <term><filename class="libraryfile">libmenuw</filename></term>
         <listitem>
           <para>Contains functions to implement menus</para>
-          <indexterm zone="ch-system-ncurses libmenu">
-            <primary sortas="c-libmenu">libmenu</primary>
+          <indexterm zone="ch-system-ncurses libmenuw">
+            <primary sortas="c-libmenuw">libmenuw</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libpanel">
-        <term><filename class="libraryfile">libpanel</filename></term>
+      <varlistentry id="libpanelw">
+        <term><filename class="libraryfile">libpanelw</filename></term>
         <listitem>
           <para>Contains functions to implement panels</para>
-          <indexterm zone="ch-system-ncurses libpanel">
-            <primary sortas="c-libpanel">libpanel</primary>
+          <indexterm zone="ch-system-ncurses libpanelw">
+            <primary sortas="c-libpanelw">libpanelw</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index da7fcb3f7..e75881820 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -82,7 +82,7 @@
           <para>Modifies files according to a patch file. A patch file is
           normally 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.</para>
+          <command>patch</command> creates the patched versions</para>
           <indexterm zone="ch-system-patch patch">
             <primary sortas="b-patch">patch</primary>
           </indexterm>
diff --git a/chapter06/pcre.xml b/chapter06/pcre.xml
index f44e5003d..cc7955ab6 100644
--- a/chapter06/pcre.xml
+++ b/chapter06/pcre.xml
@@ -130,7 +130,7 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
       <varlistentry id="pcretest">
         <term><command>pcretest</command></term>
         <listitem>
-          <para>Tests a Perl compatible regular expression.</para>
+          <para>Tests a Perl compatible regular expression</para>
           <indexterm zone="ch-system-pcre pcretest">
             <primary sortas="b-pcretest">pcretest</primary>
           </indexterm>
@@ -141,7 +141,7 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
         <term><command>pcre-config</command></term>
         <listitem>
           <para>Used during the compilation process of programs linking to the
-          PCRE libraries.</para>
+          PCRE libraries</para>
           <indexterm zone="ch-system-pcre pcre-config">
             <primary sortas="b-pcre-config">pcre-config</primary>
           </indexterm>
@@ -152,9 +152,9 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
         <term><filename class="libraryfile">libpcre</filename></term>
         <listitem>
           <para>Provides functions useful for working with regular
-          expressions.</para>
+          expressions</para>
           <indexterm zone="ch-system-pcre libpcre">
-            <primary sortas="c-libpcre*">libpcre*</primary>
+            <primary sortas="c-libpcre">libpcre</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -162,9 +162,9 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
       <varlistentry id="libpcrecpp">
         <term><filename class="libraryfile">libpcrecpp</filename></term>
         <listitem>
-          <para>Provides C++ wrapper functions for the libpcre library.</para>
+          <para>Provides C++ wrapper functions for the libpcre library</para>
           <indexterm zone="ch-system-pcre libpcrecpp">
-            <primary sortas="c-libpcrecpp*">libpcrecpp*</primary>
+            <primary sortas="c-libpcrecpp">libpcrecpp</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -173,9 +173,9 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
         <term><filename class="libraryfile">libpcreposix</filename></term>
         <listitem>
           <para>Provides wrapper functions based on the POSIX regular expression
-          API.</para>
+          API</para>
           <indexterm zone="ch-system-pcre libpcreposix">
-            <primary sortas="c-libpcre*">libpcreposix*</primary>
+            <primary sortas="c-libpcreposix">libpcreposix</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index c7bc8963e..2a32b78f0 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -474,7 +474,7 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
         <term><command>prove</command></term>
         <listitem>
           <para>Command line tool for running tests against the Test::Harness
-          module.</para>
+          module</para>
           <indexterm zone="ch-system-perl prove">
             <primary sortas="b-prove">prove</primary>
           </indexterm>
diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml
index 77ca840bd..ee2214c37 100644
--- a/chapter06/pkgconfig.xml
+++ b/chapter06/pkgconfig.xml
@@ -108,7 +108,7 @@
          <!-- Don't remove the extra space, it prevents a FOP warning. -->
         <term><command>pkg-config </command></term>
         <listitem>
-          <para>returns meta information for the specified library or package.
+          <para>returns meta information for the specified library or package
           </para>
           <indexterm zone="ch-system-pkgconfig pkgconfig">
             <primary sortas="b-pkgconfig">pkg-config</primary>
diff --git a/chapter06/popt.xml b/chapter06/popt.xml
index e1f950808..cc7c6bdc2 100644
--- a/chapter06/popt.xml
+++ b/chapter06/popt.xml
@@ -80,7 +80,7 @@
          <!-- Don't remove the extra space, it prevet a FOP warning. -->
         <term><filename class="libraryfile">libpopt</filename></term>
         <listitem>
-          <para>is used to parse command-line options.</para>
+          <para>is used to parse command-line options</para>
           <indexterm zone="ch-system-popt libpopt">
             <primary sortas="b-libpopt">libpopt</primary>
           </indexterm>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index c24b2e59f..b4a5639b6 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -118,7 +118,7 @@ popd</userinput></screen>
           <para>Used to read info pages which are similar to man pages, but
           often go much deeper than just explaining all the available command
           line options. For example, compare <command>man bison</command> and
-          <command>info bison</command>.</para>
+          <command>info bison</command></para>
           <indexterm zone="ch-system-texinfo info">
             <primary sortas="b-info">info</primary>
           </indexterm>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 223197be2..2f3f9dd73 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -128,9 +128,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul,
         umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
         wipefs, and x86_64</seg>
-
         <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
-
         <seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, 
         /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, /var/lib/hwclock</seg>
       </seglistitem>
@@ -622,7 +620,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         <term><command>lsblk</command></term>
         <listitem>
           <para>Lists information about all or selected block devices in
-           a tree-like format.</para>
+           a tree-like format</para>
           <indexterm zone="ch-system-util-linux lsblk">
             <primary sortas="b-lsblk">lsblk</primary>
           </indexterm>
@@ -1080,7 +1078,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         <term><command>uuidd</command></term>
         <listitem>
           <para>A daemon used by the UUID library to generate time-based
-          UUIDs in a secure and guranteed-unique fashion.</para>
+          UUIDs in a secure and guranteed-unique fashion</para>
           <indexterm zone="ch-system-util-linux uuidd">
             <primary sortas="b-uuidd">uuidd</primary>
           </indexterm>
diff --git a/chapter06/xml-parser.xml b/chapter06/xml-parser.xml
index 8a5e5b917..54d5bcb35 100644
--- a/chapter06/xml-parser.xml
+++ b/chapter06/xml-parser.xml
@@ -76,9 +76,9 @@
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="Expat">
-        <term><filename class="libraryfile">Expat.so</filename></term>
+        <term><filename class="libraryfile">Expat</filename></term>
         <listitem>
-          <para>provides the Perl Expat interface.</para>
+          <para>provides the Perl Expat interface</para>
           <indexterm zone="ch-system-xml-parser Expat">
             <primary sortas="c-Expat">Expat</primary>
           </indexterm>
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index 67594d2d4..60402cd18 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -323,12 +323,12 @@ ln -svf ../../lib/$(readlink /usr/lib/liblzma.so) /usr/lib/liblzma.so</userinput
       </varlistentry>
 
       <varlistentry id="liblzma">
-        <term><filename class="libraryfile">liblzma*</filename></term>
+        <term><filename class="libraryfile">liblzma</filename></term>
         <listitem>
           <para>The library implementing lossless, block-sorting data
           compression, using the Lempel-Ziv-Markov chain algorithm</para>
           <indexterm zone="ch-system-xz liblzma">
-            <primary sortas="c-liblzma*">liblzma*</primary>
+            <primary sortas="c-liblzma">liblzma</primary>
           </indexterm>
         </listitem>
       </varlistentry>