Index: BOOK/final-system/common/acl.xml
===================================================================
--- BOOK/final-system/common/acl.xml	(revision 2805028cb5673041a1397beaf8747bccbd7468b5)
+++ BOOK/final-system/common/acl.xml	(revision d1f79abbea94b741ae4266d9bed3114f749bc714)
@@ -75,5 +75,5 @@
         <seg>chacl, getfacl, setfacl</seg>
         <seg>libattr.[a,so]</seg>
-        <seg>/usr/include/acl, /usr/share/doc/acl</seg>
+        <seg>/usr/include/acl, /usr/share/doc/acl-&acl-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/attr.xml
===================================================================
--- BOOK/final-system/common/attr.xml	(revision 2805028cb5673041a1397beaf8747bccbd7468b5)
+++ BOOK/final-system/common/attr.xml	(revision d1f79abbea94b741ae4266d9bed3114f749bc714)
@@ -72,5 +72,5 @@
         <seg>attr, getfattr, setfattr</seg>
         <seg>libattr.[a,so]</seg>
-        <seg>/usr/include/attr</seg>
+        <seg>/usr/include/attr /usr/share/doc/attr-&attr-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 2805028cb5673041a1397beaf8747bccbd7468b5)
+++ BOOK/final-system/common/gcc.xml	(revision d1f79abbea94b741ae4266d9bed3114f749bc714)
@@ -206,4 +206,15 @@
       </varlistentry>
 
+      <varlistentry id="libatomic">
+        <term><filename class="libraryfile">libatomic</filename></term>
+        <listitem>
+          <para>A GCC support runtime library for atomic operations not
+          supported by hardware</para>
+          <indexterm zone="ch-system-gcc libatomic">
+            <primary sortas="c-libatomic*">libatomic*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libgcc">
         <term><filename class="libraryfile">libgcc</filename></term>
@@ -251,4 +262,25 @@
       </varlistentry>
 
+      <varlistentry id="libitm">
+        <term><filename class="libraryfile">libitm</filename></term>
+        <listitem>
+          <para>The GNU Transactional Memory Library, which provides
+          transaction support for accesses to a process's memory</para>
+          <indexterm zone="ch-system-gcc libitm">
+            <primary sortas="c-libitm*">libitm*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="liblto_plugin">
+        <term><filename class="libraryfile">liblto_plugin</filename></term>
+        <listitem>
+          <para>Runtime library for GCC's link-time optimization plugin</para>
+          <indexterm zone="ch-system-gcc liblto_plugin">
+            <primary sortas="c-liblto_plugin">liblto_plugin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libmudflap">
         <term><filename class="libraryfile">libmudflap</filename></term>
@@ -262,4 +294,14 @@
       </varlistentry>
 
+      <varlistentry id="libquadmath">
+        <term><filename class="libraryfile">libquadmath</filename></term>
+        <listitem>
+          <para>The GCC Quad-Precision Math Libarary API</para>
+          <indexterm zone="ch-system-gcc libquadmath">
+            <primary sortas="c-libquadmath*">libquadmath*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libssp">
         <term><filename class="libraryfile">libssp</filename></term>
Index: BOOK/final-system/common/libcap.xml
===================================================================
--- BOOK/final-system/common/libcap.xml	(revision 2805028cb5673041a1397beaf8747bccbd7468b5)
+++ BOOK/final-system/common/libcap.xml	(revision d1f79abbea94b741ae4266d9bed3114f749bc714)
@@ -71,10 +71,10 @@
       </varlistentry>
 
-      <varlistentry id="setcap">
-        <term><command>setcap</command></term>
+      <varlistentry id="getcap">
+        <term><command>getcap</command></term>
         <listitem>
-          <para>Sets file capabilities</para>
-          <indexterm zone="ch-system-libcap setcap">
-            <primary sortas="b-setcap">setcap</primary>
+          <para>Examines file capabilities</para>
+          <indexterm zone="ch-system-libcap getcap">
+            <primary sortas="b-getcap">getcap</primary>
           </indexterm>
         </listitem>
@@ -91,10 +91,10 @@
       </varlistentry>
 
-      <varlistentry id="getcap">
-        <term><command>getcap</command></term>
+      <varlistentry id="setcap">
+        <term><command>setcap</command></term>
         <listitem>
-          <para>Wxamines file capabilities</para>
-          <indexterm zone="ch-system-libcap getcap">
-            <primary sortas="b-getcap">getcap</primary>
+          <para>Sets file capabilities</para>
+          <indexterm zone="ch-system-libcap setcap">
+            <primary sortas="b-setcap">setcap</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision 2805028cb5673041a1397beaf8747bccbd7468b5)
+++ BOOK/final-system/common/shadow.xml	(revision d1f79abbea94b741ae4266d9bed3114f749bc714)
@@ -154,5 +154,5 @@
 
       <seglistitem>
-        <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
+        <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
         lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 2805028cb5673041a1397beaf8747bccbd7468b5)
+++ BOOK/final-system/common/util-linux.xml	(revision d1f79abbea94b741ae4266d9bed3114f749bc714)
@@ -271,15 +271,4 @@
       </varlistentry>
 
-      <varlistentry id="ddate">
-        <term><command>ddate</command></term>
-        <listitem>
-          <para>Gives the Discordian date or converts the given Gregorian date
-          to a Discordian one</para>
-          <indexterm zone="ch-system-util-linux ddate">
-            <primary sortas="b-ddate">ddate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="delpart">
         <term><command>delpart</command></term>
