Index: BOOK/boot/common/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml	(revision f698055adf6ca531790e92b9ac82b9662afb2069)
+++ BOOK/boot/common/eudev.xml	(revision 4c2f1e78f941d61d57ed3d046c4cf4b8eae80c6a)
@@ -75,11 +75,11 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="udevadm">
+      <varlistentry id="udevadm-eudev">
         <term><command>udevadm</command></term>
         <listitem>
         <para>Controls the runtime behavior of Eudev, requests kernel
         events, manages the event queue, and provides simple debugging.</para>
-          <indexterm zone="ch-boot-eudev udevadm">
-            <primary sortas="b-udevadm">udevadm</primary>
+          <indexterm zone="ch-boot-eudev udevadm-eudev">
+            <primary sortas="b-udevadm-eudev">udevadm</primary>
           </indexterm>
         </listitem>
@@ -237,10 +237,10 @@
 <!-- End of Helpers -->
 
-      <varlistentry id="libudev">
+      <varlistentry id="libudev-eudev">
         <term><filename class="libraryfile">libudev</filename></term>
         <listitem>
           <para>A library interface to eudev device information.</para>
-          <indexterm zone="ch-boot-eudev libudev">
-            <primary sortas="c-libudev">libudev</primary>
+          <indexterm zone="ch-boot-eudev libudev-eudev">
+            <primary sortas="c-libudev-eudev">libudev</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/common/systemd.xml
===================================================================
--- BOOK/final-system/common/systemd.xml	(revision f698055adf6ca531790e92b9ac82b9662afb2069)
+++ BOOK/final-system/common/systemd.xml	(revision 4c2f1e78f941d61d57ed3d046c4cf4b8eae80c6a)
@@ -204,5 +204,5 @@
         machinectl, poweroff (link to systemctl), reboot (link to systemctl),
         runlevel (link to systemctl), shutdown (link to systemctl),
-        systemctl, system-analyze, systemd-ask-password, systemd-cat,
+        systemctl, systemd, system-analyze, systemd-ask-password, systemd-cat,
         systemd-cgls, systemd-cgtop, systemd-coredumpctl, systemd-delta,
         systemd-detect-virt, systemd-inhibit, systemd-machine-id-setup,
@@ -429,8 +429,69 @@
       </varlistentry>
 
+      <varlistentry id="systemd-cgtop">
+        <term><command>systemd-cgtop</command></term>
+        <listitem>
+          <para>Shows top control groups by resource usage</para>
+          <indexterm zone="ch-system-systemd systemd-cgtop">
+            <primary sortas="b-systemd-cgtop">systemd-cgtop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-coredumpctl">
+        <term><command>systemd-coredumpctl</command></term>
+        <listitem>
+          <para>Retrieves coredumps from the journal</para>
+          <indexterm zone="ch-system-systemd systemd-coredumpctl">
+            <primary sortas="b-systemd-coredumpctl">systemd-coredumpctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-delta">
+        <term><command>systemd-delta</command></term>
+        <listitem>
+          <para>Finds overridden configuration files</para>
+          <indexterm zone="ch-system-systemd systemd-delta">
+            <primary sortas="b-systemd-delta">systemd-delta</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-detect-virt">
+        <term><command>systemd-detect-virt</command></term>
+        <listitem>
+          <para>Detects execution in a virtual environment</para>
+          <indexterm zone="ch-system-systemd systemd-detect-virt">
+            <primary sortas="b-systemd-detect-virt">systemd-detect-virt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-inhibit">
+        <term><command>systemd-inhibit</command></term>
+        <listitem>
+          <para>Executes a program with an inhibition lock taken</para>
+          <indexterm zone="ch-system-systemd systemd-inhibit">
+            <primary sortas="b-systemd-inhibit">systemd-inhibit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-machine-id-setup">
+        <term><command>systemd-machine-id-setup</command></term>
+        <listitem>
+          <para>Initializes the machine ID in
+          <filename>/etc/machine-id</filename></para>
+          <indexterm zone="ch-system-systemd systemd-machine-id-setup">
+            <primary sortas="b-systemd-machine-id-setup">systemd-machine-id-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="systemd-notify">
         <term><command>systemd-notify</command></term>
         <listitem>
-          <para>Notify init system about start-up completion and other daemon
+          <para>Notifies init system about start-up completion and other daemon
           status changes</para>
           <indexterm zone="ch-system-systemd systemd-notify">
@@ -440,4 +501,45 @@
       </varlistentry>
 
+      <varlistentry id="systemd-nspawn">
+        <term><command>systemd-nspawn</command></term>
+        <listitem>
+          <para>Spawns a namespace container for debugging, testing, and
+          building</para>
+          <indexterm zone="ch-system-systemd systemd-nspawn">
+            <primary sortas="b-systemd-nspawn">systemd-nspawn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-run">
+        <term><command>systemd-run</command></term>
+        <listitem>
+          <para>Runs programs in transient scope or service units</para>
+          <indexterm zone="ch-system-systemd systemd-run">
+            <primary sortas="b-systemd-run">systemd-run</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-stdio-bridge">
+        <term><command>systemd-stdio-bridge</command></term>
+        <listitem>
+          <para>Connects stdio or a socket to a given bus address</para>
+          <indexterm zone="ch-system-systemd systemd-stdio-bridge">
+            <primary sortas="b-systemd-stdio-bridge">systemd-stdio-bridge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-tmpfiles">
+        <term><command>systemd-tmpfiles</command></term>
+        <listitem>
+          <para>Creates, deletes, and cleans up volatile and temporary files</para>
+          <indexterm zone="ch-system-systemd systemd-tmpfiles">
+            <primary sortas="b-systemd-tmpfiles">systemd-tmpfiles</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="systemd-tty-ask-password-agent">
         <term><command>systemd-tty-ask-password-agent</command></term>
@@ -460,52 +562,52 @@
       </varlistentry>
 
-      <varlistentry id="pam_systemd">
-        <term><filename class="libraryfile">pam_systemd</filename></term>
-        <listitem>
-          <para>Register user sessions in the systemd control group
-          hierarchy</para>
-          <indexterm zone="ch-system-systemd pam_systemd">
-            <primary sortas="c-pam_systemd">pam_systemd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lib-systemd">
-        <term><filename class="directory">/lib/systemd</filename></term>
-        <listitem>
-          <para>Location of system units and configurations</para>
-          <indexterm zone="ch-system-systemd lib-systemd">
-            <primary sortas="e-/lib/systemd">/lib/systemd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="etc-systemd">
-        <term><filename class="directory">/etc/systemd</filename></term>
-        <listitem>
-          <para>Location of user units and configurations</para>
-          <indexterm zone="ch-system-systemd etc-systemd">
-            <primary sortas="e-/etc/systemd">/etc/systemd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="etc-tmpfilesd">
-        <term><filename class="directory">/etc/tmpfiles.d</filename></term>
-        <listitem>
-          <para>Configuration for creation, deletion and cleaning of temporary
-          and volatile files</para>
-          <indexterm zone="ch-system-systemd etc-tmpfilesd">
-            <primary sortas="e-/etc/tmpfiles.d">/etc/tmpfiles.d</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usr-share-systemd">
-        <term><filename class="directory">/usr/share/systemd</filename></term>
-        <listitem>
-          <para>Location of session unit files</para>
-          <indexterm zone="ch-system-systemd usr-share-systemd">
-            <primary sortas="e-/usr/share/systemd">/usr/share/systemd</primary>
+      <varlistentry id="timedatectl">
+        <term><command>timedatectl</command></term>
+        <listitem>
+          <para>Controls the system time and date</para>
+          <indexterm zone="ch-system-systemd timedatectl">
+            <primary sortas="b-timedatectl">timedatectl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevadm">
+        <term><command>udevadm</command></term>
+        <listitem>
+          <para>Udev management tool</para>
+          <indexterm zone="ch-system-systemd udevadm">
+            <primary sortas="b-udevadm">udevadm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libnss_myhostname">
+        <term><filename class="libraryfile">libnss_myhostname</filename></term>
+        <listitem>
+          <para>Plugin for the GNU Name Service Switch (NSS) functionality
+          of Glibc, provding hostname resolution for the locally configured
+          system hostname</para>
+          <indexterm zone="ch-system-systemd libnss_myhostname">
+            <primary sortas="c-libnss_myhostname">libnss_myhostname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libsystemd">
+        <term><filename class="libraryfile">libsystemd</filename></term>
+        <listitem>
+          <para>Support library for systemd</para>
+          <indexterm zone="ch-system-systemd libsystemd">
+            <primary sortas="c-libsystemd">libsystemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libudev">
+        <term><filename class="libraryfile">libudev</filename></term>
+        <listitem>
+          <para>A library interface to Udev device information.</para>
+          <indexterm zone="ch-system-systemd libudev">
+            <primary sortas="c-libudev">libudev</primary>
           </indexterm>
         </listitem>
