Index: chapter06/acl.xml
===================================================================
--- chapter06/acl.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/acl.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -113,5 +113,5 @@
         <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>
@@ -123,5 +123,5 @@
         <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>
@@ -133,5 +133,5 @@
         <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>
@@ -143,5 +143,5 @@
         <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>
Index: chapter06/attr.xml
===================================================================
--- chapter06/attr.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/attr.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -115,5 +115,5 @@
         <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>
@@ -135,5 +135,5 @@
         <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>
Index: chapter06/autoconf.xml
===================================================================
--- chapter06/autoconf.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/autoconf.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -90,5 +90,5 @@
           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>
Index: chapter06/binutils.xml
===================================================================
--- chapter06/binutils.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/binutils.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -346,5 +346,5 @@
           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>
Index: chapter06/bison.xml
===================================================================
--- chapter06/bison.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/bison.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -111,12 +111,12 @@
       </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>
Index: chapter06/bzip2.xml
===================================================================
--- chapter06/bzip2.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/bzip2.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -234,10 +234,10 @@
 
       <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>
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/coreutils.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -1231,9 +1231,9 @@
 
       <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>
Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/e2fsprogs.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -249,5 +249,5 @@
         <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>
@@ -296,5 +296,5 @@
           <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>
@@ -327,5 +327,5 @@
         <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>
@@ -338,5 +338,5 @@
         <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>
@@ -349,5 +349,5 @@
         <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>
@@ -361,5 +361,5 @@
           <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>
@@ -417,5 +417,5 @@
         <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>
@@ -428,5 +428,5 @@
         <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>
@@ -439,5 +439,5 @@
         <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>
@@ -450,5 +450,5 @@
         <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>
Index: chapter06/expat.xml
===================================================================
--- chapter06/expat.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/expat.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -89,5 +89,5 @@
         <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>
@@ -99,5 +99,5 @@
         <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>
Index: chapter06/file.xml
===================================================================
--- chapter06/file.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/file.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -92,5 +92,5 @@
 
       <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
Index: chapter06/findutils.xml
===================================================================
--- chapter06/findutils.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/findutils.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -116,5 +116,5 @@
         <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>
@@ -139,5 +139,5 @@
           <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>
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/gcc.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -382,7 +382,7 @@
         <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>
@@ -395,7 +395,7 @@
         <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>
@@ -408,7 +408,7 @@
         <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>
@@ -443,5 +443,5 @@
           <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>
@@ -487,7 +487,7 @@
         <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>
@@ -510,5 +510,5 @@
           <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>
@@ -521,5 +521,5 @@
           functionality</para>
           <indexterm zone="ch-system-gcc libssp">
-            <primary sortas="c-libssp*">libssp*</primary>
+            <primary sortas="c-libssp">libssp</primary>
           </indexterm>
         </listitem>
Index: chapter06/gdbm.xml
===================================================================
--- chapter06/gdbm.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/gdbm.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -97,5 +97,5 @@
         <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>
@@ -107,5 +107,5 @@
         <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>
Index: chapter06/gettext.xml
===================================================================
--- chapter06/gettext.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/gettext.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -408,12 +408,12 @@
       </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>
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/glibc.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -418,5 +418,5 @@
         /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>
Index: chapter06/gmp.xml
===================================================================
--- chapter06/gmp.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/gmp.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -124,5 +124,5 @@
         <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>
@@ -134,5 +134,5 @@
         <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>
Index: chapter06/intltool.xml
===================================================================
--- chapter06/intltool.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/intltool.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -84,5 +84,5 @@
         <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>
@@ -94,5 +94,5 @@
         <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>
@@ -104,5 +104,5 @@
         <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>
@@ -114,5 +114,5 @@
         <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>
@@ -124,5 +124,5 @@
         <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>
Index: chapter06/iproute2.xml
===================================================================
--- chapter06/iproute2.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/iproute2.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -135,5 +135,5 @@
           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>
Index: chapter06/kbd.xml
===================================================================
--- chapter06/kbd.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/kbd.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -388,5 +388,5 @@
           <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>
Index: chapter06/m4.xml
===================================================================
--- chapter06/m4.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/m4.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -87,5 +87,5 @@
           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>
Index: chapter06/mpfr.xml
===================================================================
--- chapter06/mpfr.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/mpfr.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -96,5 +96,5 @@
         <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>
Index: chapter06/ncurses.xml
===================================================================
--- chapter06/ncurses.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/ncurses.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -301,16 +301,16 @@
       </varlistentry>
 
-      <varlistentry id="libcurses">
-        <term><filename class="libraryfile">libcurses</filename></term>
-        <listitem>
-          <para>A link to <filename>libncurses</filename></para>
-          <indexterm zone="ch-system-ncurses libcurses">
-            <primary sortas="c-libcurses">libcurses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libncurses">
-        <term><filename class="libraryfile">libncurses</filename></term>
+      <varlistentry id="libcursesw">
+        <term><filename class="libraryfile">libcursesw</filename></term>
+        <listitem>
+          <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="libncursesw">
+        <term><filename class="libraryfile">libncursesw</filename></term>
         <listitem>
           <para>Contains functions to display text in many complex ways on a
@@ -318,36 +318,36 @@
           menu displayed during the kernel's <command>make
           menuconfig</command></para>
-          <indexterm zone="ch-system-ncurses libncurses">
-            <primary sortas="c-libncurses">libncurses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libform">
-        <term><filename class="libraryfile">libform</filename></term>
+          <indexterm zone="ch-system-ncurses libncursesw">
+            <primary sortas="c-libncursesw">libncursesw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <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>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmenu">
-        <term><filename class="libraryfile">libmenu</filename></term>
+          <indexterm zone="ch-system-ncurses libformw">
+            <primary sortas="c-libformw">libformw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <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>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpanel">
-        <term><filename class="libraryfile">libpanel</filename></term>
+          <indexterm zone="ch-system-ncurses libmenuw">
+            <primary sortas="c-libmenuw">libmenuw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <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>
Index: chapter06/patch.xml
===================================================================
--- chapter06/patch.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/patch.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -83,5 +83,5 @@
           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>
Index: chapter06/pcre.xml
===================================================================
--- chapter06/pcre.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/pcre.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -131,5 +131,5 @@
         <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>
@@ -142,5 +142,5 @@
         <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>
@@ -153,7 +153,7 @@
         <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>
@@ -163,7 +163,7 @@
         <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>
@@ -174,7 +174,7 @@
         <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>
Index: chapter06/perl.xml
===================================================================
--- chapter06/perl.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/perl.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -475,5 +475,5 @@
         <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>
Index: chapter06/pkgconfig.xml
===================================================================
--- chapter06/pkgconfig.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/pkgconfig.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -109,5 +109,5 @@
         <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">
Index: chapter06/popt.xml
===================================================================
--- chapter06/popt.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/popt.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -81,5 +81,5 @@
         <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>
Index: chapter06/texinfo.xml
===================================================================
--- chapter06/texinfo.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/texinfo.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -119,5 +119,5 @@
           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>
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/util-linux.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -129,7 +129,5 @@
         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>
@@ -623,5 +621,5 @@
         <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>
@@ -1081,5 +1079,5 @@
         <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>
Index: chapter06/xml-parser.xml
===================================================================
--- chapter06/xml-parser.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/xml-parser.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -77,7 +77,7 @@
 
       <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>
Index: chapter06/xz.xml
===================================================================
--- chapter06/xz.xml	(revision 9e6d13e9fe9b8731424175f4a1f3fed55151ab91)
+++ chapter06/xz.xml	(revision afba93bef35d287c961b62cbfd8370652aaab826)
@@ -324,10 +324,10 @@
 
       <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>
