Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/appendices/dependencies/common.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,60 +31,4 @@
   </para>
 
-<!-- Begin ACL dependency info -->
-  <bridgehead renderas="sect2" id="acl-dep">ACL</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
-         Libtool, Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Coreutils, Gettext, Libcap, Sed, and Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Attr dependency info -->
-  <bridgehead renderas="sect2" id="attr-dep">Attr</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
-         Libtool, Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>ACL, Coretutils, Gettext, Libcap, Sed, and Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Autoconf dependency info -->
   <bridgehead renderas="sect2" id="autoconf-dep">Autoconf</bridgehead>
@@ -180,5 +124,5 @@
         <seglistitem>
           <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC, Grep, Make,
-          and Readline</seg>
+          Readline</seg>
         </seglistitem>
       </segmentedlist>
@@ -208,13 +152,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, File, Gawk, GCC,
-         Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU and Expect</seg>
+         Grep, Make, Perl, Sed, Texinfo, Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>DejaGNU, Expect</seg>
         </seglistitem>
       </segmentedlist>
@@ -283,6 +227,6 @@
       </segmentedlist>
 
-<!-- Begin CLFS-Boot-scripts dependency info -->
-  <bridgehead renderas="sect2" id="boot-scripts-dep">CLFS-Boot-scripts</bridgehead>
+<!-- Begin CLFS-Bootscripts dependency info -->
+  <bridgehead renderas="sect2" id="bootscripts-dep">CLFS-Bootscripts</bridgehead>
 
       <segmentedlist>
@@ -317,5 +261,5 @@
 
         <seglistitem>
-         <seg>GCC, Grep, Make, Sed and Texinfo</seg>
+         <seg>GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -345,5 +289,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         GMP, ISL, Make, MPC, MPFR, Sed and Texinfo</seg>
+         GMP, ISL, Make, MPC, MPFR, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -372,6 +316,6 @@
 
         <seglistitem>
-         <seg>ACL, Attr, Bash, Binutils, Coreutils, Glibc, Gawk, GCC, GMP,
-         Grep, Libcap, Make, Patch, Perl, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, GMP, Grep, Make,
+         Patch, Perl, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -389,33 +333,5 @@
 
         <seglistitem>
-          <seg>Bash, Diffutils, Findutils, Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin D-Bus dependency info -->
-  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
-         Gettext, Grep, Make, Man, Pkg-config, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Systemd</seg>
+          <seg>Bash, Diffutils, Eudev, Findutils, Man</seg>
         </seglistitem>
       </segmentedlist>
@@ -428,5 +344,5 @@
 
         <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -483,21 +399,300 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Patch, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
+         Make, Patch, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Eudev dependency info -->
+  <bridgehead renderas="sect2" id="eudev-dep">Eudev</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
+         Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Expect dependency info -->
+  <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep, Make,
+         Patch, Sed, Tcl</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin E2fsprogs dependency info -->
+  <bridgehead renderas="sect2" id="e2fsprogs-dep">E2fsprogs</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Gettext, Grep, Gzip,
+         Make, Pkg-config-lite, Sed, Texinfo, Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Bzip2, Diffutils</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin File dependency info -->
+  <bridgehead renderas="sect2" id="file-dep">File</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
+         Make, Sed, Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Findutils dependency info -->
+  <bridgehead renderas="sect2" id="findutils-dep">Findutils</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
+         Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>DejaGNU, Diffutils, Expect</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Flex dependency info -->
+  <bridgehead renderas="sect2" id="flex-dep">Flex</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, M4, Make,
+         Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Bison, Diffutils, Gawk</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>IPRoute2, Kbd, Man</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Gawk dependency info -->
+  <bridgehead renderas="sect2" id="gawk-dep">Gawk</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Gcc dependency info -->
+  <bridgehead renderas="sect2" id="gcc-dep">Gcc</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, CLooG, Coreutils, Diffutils, Glibc,
+         Findutils, Gawk, GCC, GMP, Grep, ISL, Make, MPFR, Patch, Perl, Sed,
+         Tar, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Check, DejaGNU, Expect</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin GDBM dependency info -->
+  <bridgehead renderas="sect2" id="gdbm">GDBM</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Gettext dependency info -->
+  <bridgehead renderas="sect2" id="gettext-dep">Gettext</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
+         GCC, Grep, Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Tar, Tcl</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Automake</seg>
         </seglistitem>
       </segmentedlist>
@@ -511,328 +706,21 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
-         Grep, Gzip, Make, Perl, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Eudev dependency info -->
-  <bridgehead renderas="sect2" id="eudev-dep">Eudev</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Systemd</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Expat dependency info -->
-  <bridgehead renderas="sect2" id="expat-dep">Expat</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>D-Bus and XML::Parser</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Expect dependency info -->
-  <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep, Make,
-         Patch, Sed and Tcl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin E2fsprogs dependency info -->
-  <bridgehead renderas="sect2" id="e2fsprogs-dep">E2fsprogs</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Gettext, Grep, Gzip,
-         Make, Pkg-config-lite, Sed, Texinfo and Util-linux</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bzip2 and Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin File dependency info -->
-  <bridgehead renderas="sect2" id="file-dep">File</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make, Sed and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Findutils dependency info -->
-  <bridgehead renderas="sect2" id="findutils-dep">Findutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU, Diffutils and Expect</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Flex dependency info -->
-  <bridgehead renderas="sect2" id="flex-dep">Flex</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, M4, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bison, Diffutils and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>IPRoute2, Kbd and Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gawk dependency info -->
-  <bridgehead renderas="sect2" id="gawk-dep">Gawk</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gcc dependency info -->
-  <bridgehead renderas="sect2" id="gcc-dep">Gcc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, CLooG, Coreutils, Diffutils, Glibc,
-         Findutils, Gawk, GCC, GMP, Grep, ISL, Make, MPFR, Patch, Perl, Sed,
-         Tar and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Check, DejaGNU, and Expect</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin GDBM dependency info -->
-  <bridgehead renderas="sect2" id="gdbm">GDBM</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Grep, Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gettext dependency info -->
-  <bridgehead renderas="sect2" id="gettext-dep">Gettext</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
-         GCC, Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Tar and Tcl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Automake</seg>
+         Grep, Gzip, Make, Perl, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -873,5 +761,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, M4, Make,
-         Sed and Texinfo</seg>
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -890,32 +778,4 @@
         <seglistitem>
           <seg>MPFR, GCC</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gperf dependency info -->
-  <bridgehead renderas="sect2" id="gperf-dep">Gperf</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Intltool</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Systemd</seg>
         </seglistitem>
       </segmentedlist>
@@ -929,13 +789,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Patch, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Gawk</seg>
+         Make, Patch, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Gawk</seg>
         </seglistitem>
       </segmentedlist>
@@ -957,21 +817,21 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Perl
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man and Perl</seg>
+         Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Man, Perl</seg>
         </seglistitem>
       </segmentedlist>
@@ -985,5 +845,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed and Texinfo</seg>
+         Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1012,5 +872,5 @@
 
         <seglistitem>
-         <seg>Coreutils, Gawk and Make</seg>
+         <seg>Coreutils, Gawk, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1029,31 +889,4 @@
         <seglistitem>
           <seg>Perl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Intltool dependency info -->
-  <bridgehead renderas="sect2" id="intltool-dep">Intltool</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Glibc, GCC, Make, Perl Sed and XML::Parser</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -1067,5 +900,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, Glibc, Findutils, Flex, GCC,
-         Make, Linux-Headers and Sed</seg>
+         Make, Linux-Headers, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1094,5 +927,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Libcap and Make</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1122,5 +955,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         GMP, Make, MPC, MPFR, Sed and Texinfo</seg>
+         GMP, Make, MPC, MPFR, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1195,5 +1028,5 @@
 
         <seglistitem>
-          <seg>Systemd</seg>
+          <seg>Eudev</seg>
         </seglistitem>
       </segmentedlist>
@@ -1207,48 +1040,77 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Ncurses and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Libcap dependency info -->
-  <bridgehead renderas="sect2" id="libcap-dep">Libcap</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Coreutils, IPutils, Systemd</seg>
+         Ncurses, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin libee dependency info -->
+  <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
+         GCC, Grep, Libestr, Make, Pkg-config-lite, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Rsyslog</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin libestr dependency info -->
+  <bridgehead renderas="sect2" id="libestr-dep">Libestr</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
+         GCC, Grep, Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Libee, Rsyslog</seg>
         </seglistitem>
       </segmentedlist>
@@ -1262,5 +1124,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Make, Sed, and Texinfo</seg>
+         Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1290,5 +1152,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
-         GCC, Grep, Make, Sed and Texinfo</seg>
+         GCC, Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1317,5 +1179,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make, Perl and Sed</seg>
+         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1345,5 +1207,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, GCC, Grep,
-         Gzip, Make, KMOD, Ncurses, Perl and Sed</seg>
+         Gzip, Make, KMOD, Ncurses, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1372,6 +1234,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Sed
-         and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Sed,
+         Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1389,5 +1251,5 @@
 
         <seglistitem>
-          <seg>Autoconf and Bison</seg>
+          <seg>Autoconf, Bison</seg>
         </seglistitem>
       </segmentedlist>
@@ -1401,13 +1263,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Perl and Procps-ng</seg>
+         Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Perl, Procps</seg>
         </seglistitem>
       </segmentedlist>
@@ -1429,21 +1291,21 @@
         <seglistitem>
          <seg>Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC,
-         Grep, Groff, Gzip, Less, XZ Utils, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>D-Bus</seg>
+         Grep, Groff, Gzip, Less, XZ Utils, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -1456,5 +1318,5 @@
 
         <seglistitem>
-         <seg>Bash, Coreutils, and Make</seg>
+         <seg>Bash, Coreutils, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1484,5 +1346,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
-         Make, MPFR, Sed and Texinfo</seg>
+         Make, MPFR, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1512,5 +1374,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
-         Make, Sed and Texinfo</seg>
+         Make, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1529,4 +1391,32 @@
         <seglistitem>
           <seg>GCC</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin KMOD dependency info -->
+  <bridgehead renderas="sect2" id="module-init-tools-dep">KMOD</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, Findutils, GCC, Grep, Make,
+         Sed, Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, File, Gawk, Gzip</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -1540,22 +1430,22 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, GRUB, Inetutils, Less, Procps-ng, Psmisc, Readline, Texinfo,
-          Util-linux and Vim</seg>
+         Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
+          Util-linux, Vim</seg>
         </seglistitem>
       </segmentedlist>
@@ -1568,5 +1458,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1596,13 +1486,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Gzip, Iana-Etc and Procps-ng, Tar</seg>
+         Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Gzip, Iana-Etc, Procps, Tar</seg>
         </seglistitem>
       </segmentedlist>
@@ -1624,32 +1514,32 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs, Systemd, Util-linux</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Procps-ng dependency info -->
-  <bridgehead renderas="sect2" id="procps-ng-dep">Procps-ng</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make and Ncurses</seg>
+         Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Util-linux, E2fsprogs</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Procps dependency info -->
+  <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make, Ncurses</seg>
         </seglistitem>
       </segmentedlist>
@@ -1678,6 +1568,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses
-         and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses,
+         Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1707,5 +1597,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses,
-         Patch, Sed and Texinfo</seg>
+         Patch, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1724,4 +1614,32 @@
         <seglistitem>
           <seg>Bash</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Rsyslog dependency info -->
+  <bridgehead renderas="sect2" id="rsyslog-dep">Rsyslog</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, libee,
+         Libestr, Make, Sed, Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -1734,22 +1652,22 @@
 
         <seglistitem>
-         <seg>ACL, Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs, File, Libtool and Shadow</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
+         Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Gawk</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>E2fsprogs, File, Libtool, Shadow</seg>
         </seglistitem>
       </segmentedlist>
@@ -1762,35 +1680,33 @@
 
         <seglistitem>
-         <seg>ACL, Attr, Bash, Binutils, Coreutils, Diffutils, Glibc,
-         Findutils, Gawk, GCC, Gettext, Grep, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin systemd dependency info -->
-  <bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>ACL, Attr, Bash, Binutils, Coreutils, D-Bus, E2fsprogs, Glibc,
-         Findutils, Gawk, GCC, GPerf, Grep, Intltool, Libcap, Make, Perl,
-         Pkg-config, Sed, Util-linux and XML::Parser</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
+         Gettext, Grep, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Sysvinit dependency info -->
+  <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Binutils, Coreutils, Glibc, GCC, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1820,13 +1736,13 @@
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC,
-         Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Findutils, Gawk and Gzip</seg>
+         Grep, Make, Sed, Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Findutils, Gawk, Gzip</seg>
         </seglistitem>
       </segmentedlist>
@@ -1848,5 +1764,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
-         Make and Sed</seg>
+         Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1876,13 +1792,41 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make,
-         Ncurses and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Gzip</seg>
+         Ncurses, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Gzip</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Eudev dependency info -->
+  <bridgehead renderas="sect2" id="udev-dep">Eudev</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
+         Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
@@ -1904,21 +1848,21 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
-         Make, Ncurses, Pkg-config-lite, Sed, Texinfo and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs, Systemd</seg>
+         Make, Ncurses, Pkg-config-lite, Sed, Texinfo, Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>E2fsprogs</seg>
         </seglistitem>
       </segmentedlist>
@@ -1932,5 +1876,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
-         Gettext, Grep, Make, Ncurses, Perl and Sed</seg>
+         Gettext, Grep, Make, Ncurses, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1949,31 +1893,4 @@
         <seglistitem>
           <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin XML::Parser dependency info -->
-  <bridgehead renderas="sect2" id="xml-parser-dep">XML::Parser</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Coreutils, Expat, Make and Perl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Intltool</seg>
         </seglistitem>
       </segmentedlist>
@@ -1987,5 +1904,5 @@
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
-         Grep, Make and Sed</seg>
+         Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -2014,21 +1931,21 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>File, KMOD and Util-linux</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>File, KMOD, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/rationale/common.xml
===================================================================
--- BOOK/appendices/rationale/common.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/appendices/rationale/common.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -79,5 +79,5 @@
 
     <listitem>
-      <para>CLFS-Boot-scripts</para>
+      <para>CLFS-Bootscripts</para>
       <para>This package contains a number of scripts that run at boottime,
       performing essential tasks such as mounting/checking filesystems and
Index: OK/boot/common/boot-scripts.xml
===================================================================
--- BOOK/boot/common/boot-scripts.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,229 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-boot-scripts" role="wrap">
-  <?dbhtml filename="boot-scripts.html"?>
-
-  <title>Boot-scripts for CLFS &boot-scripts-clfs-version;</title>
-
-  <indexterm zone="ch-scripts-boot-scripts">
-    <primary sortas="a-Boot-scripts">Boot-scripts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Boot-scripts package contains a set of scripts to
-    start/stop the CLFS system at bootup/shutdown.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Boot-scripts</title>
-
-    <para os="a">Install the package:</para>
-
-<screen os="b"><userinput>make DESTDIR=/tools install-boot-scripts</userinput></screen>
-
-  <para os="c">The <command>setclock</command> script reads the time from the
-  hardware clock, also known as the BIOS or the Complementary Metal Oxide
-  Semiconductor (CMOS) clock. If the hardware clock is set to UTC, this
-  script will convert the hardware clock's time to the local time using
-  the <filename>/tools/etc/sysconfig/clock</filename> file (which tells the
-  <command>hwclock</command> program which timezone the user is in). There
-  is no way to detect whether or not the hardware clock is set to UTC, so
-  this needs to be configured manually.</para>
-
-
-
-  <para os="d">If you do not know whether or not the hardware clock is set to UTC,
-  you can find out after you have booted the new machine by running the
-  <userinput>hwclock --localtime  --show</userinput> command, and if
-  necessary editing the <filename>/tools/etc/sysconfig/clock</filename> file.
-  The worst that will happen if you make a wrong guess here is that the
-  time displayed will be wrong.</para>
-
-  <para os="e">Change the value of the <envar>UTC</envar> variable below
-  to a value of <option>0</option> (zero) if the hardware clock
-  is <emphasis>not</emphasis> set to UTC time.</para>
-
-<screen os="f"><userinput>cat &gt; /tools/etc/sysconfig/clock &lt;&lt; "EOF"
-<literal># Begin /tools/etc/sysconfig/clock
-
-UTC=1
-
-# End /tools/etc/sysconfig/clock</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-boot-scripts" role="content">
-    <title>Contents of Boot-scripts</title>
-
-    <segmentedlist>
-      <segtitle>Installed scripts</segtitle>
-
-      <seglistitem>
-        <seg>checkfs, cleanfs, functions, halt, localnet, mountfs, mountkernfs,
-        rc, reboot, sendsignals, setclock, swap, and udev.</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="checkfs-boot-scripts">
-        <term><command>checkfs</command></term>
-        <listitem>
-          <para>Checks the integrity of the file systems before they are
-          mounted (with the exception of journal and network based file
-          systems)</para>
-          <indexterm zone="ch-scripts-boot-scripts checkfs-boot-scripts">
-            <primary sortas="d-checkfs">checkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cleanfs-boot-scripts">
-        <term><command>cleanfs</command></term>
-        <listitem>
-          <para>Removes files that should not be preserved between reboots,
-          such as those in <filename class="directory">/var/run/</filename>
-          and <filename class="directory">/var/lock/</filename>; it re-creates
-          <filename>/var/run/utmp</filename> and removes the possibly present
-          <filename>/etc/nologin</filename>, <filename>/fastboot</filename>,
-          and <filename>/forcefsck</filename> files</para>
-          <indexterm zone="ch-scripts-boot-scripts cleanfs-boot-scripts">
-            <primary sortas="d-cleanfs">cleanfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="functions-boot-scripts">
-        <term><command>functions</command></term>
-        <listitem>
-          <para>Contains common functions, such as error and status checking,
-          that are used by several boot-scripts</para>
-          <indexterm zone="ch-scripts-boot-scripts functions-boot-scripts">
-            <primary sortas="d-functions">functions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt-boot-scripts">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Halts the system</para>
-          <indexterm zone="ch-scripts-boot-scripts halt-boot-scripts">
-            <primary sortas="d-halt">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localnet-boot-scripts">
-        <term><command>localnet</command></term>
-        <listitem>
-          <para>Sets up the system's hostname and local loopback device</para>
-          <indexterm zone="ch-scripts-boot-scripts localnet-boot-scripts">
-            <primary sortas="d-localnet">localnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountfs-boot-scripts">
-        <term><command>mountfs</command></term>
-        <listitem>
-          <para>Mounts all file systems, except ones that are marked
-          <emphasis>noauto</emphasis> or are network based</para>
-          <indexterm zone="ch-scripts-boot-scripts mountfs-boot-scripts">
-            <primary sortas="d-mountfs">mountfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountkernfs-boot-scripts">
-        <term><command>mountkernfs</command></term>
-        <listitem>
-          <para>Mounts virtual kernel file systems, such as
-          <systemitem class="filesystem">proc</systemitem></para>
-          <indexterm zone="ch-scripts-boot-scripts mountkernfs-boot-scripts">
-            <primary sortas="d-mountkernfs">mountkernfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rc-boot-scripts">
-        <term><command>rc</command></term>
-        <listitem>
-          <para>The master run-level control script; it is responsible for
-          running all the other boot-scripts one-by-one, in a sequence
-          determined by the name of the symbolic links being processed</para>
-          <indexterm zone="ch-scripts-boot-scripts rc-boot-scripts">
-            <primary sortas="d-rc">rc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot-boot-scripts">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Reboots the system</para>
-          <indexterm zone="ch-scripts-boot-scripts reboot-boot-scripts">
-            <primary sortas="d-reboot">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendsignals-boot-scripts">
-        <term><command>sendsignals</command></term>
-        <listitem>
-          <para>Makes sure every process is terminated before the system reboots
-          or halts</para>
-          <indexterm zone="ch-scripts-boot-scripts sendsignals-boot-scripts">
-            <primary sortas="d-sendsignals">sendsignals</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setclock-boot-scripts">
-        <term><command>setclock</command></term>
-        <listitem>
-          <para>Resets the kernel clock to local time in case the hardware clock
-          is not set to UTC time</para>
-          <indexterm zone="ch-scripts-boot-scripts setclock-boot-scripts">
-            <primary sortas="d-setclock">setclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swap-boot-scripts">
-        <term><command>swap</command></term>
-        <listitem>
-          <para>Enables and disables swap files and partitions</para>
-          <indexterm zone="ch-scripts-boot-scripts swap-boot-scripts">
-            <primary sortas="d-swap">swap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eudev-boot-scripts">
-        <term><command>udev</command></term>
-        <listitem>
-          <para>Starts and stops the Eudev daemon</para>
-          <indexterm zone="ch-scripts-boot-scripts eudev-boot-scripts">
-            <primary sortas="d-eudev">udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/common/bootscripts.xml
===================================================================
--- BOOK/boot/common/bootscripts.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/boot/common/bootscripts.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-boot-bootscripts" role="wrap">
+  <?dbhtml filename="bootscripts.html"?>
+
+  <title>Bootscripts for CLFS &bootscripts-clfs-version;</title>
+
+  <indexterm zone="ch-boot-bootscripts">
+    <primary sortas="a-Bootscripts">Bootscripts</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Bootscripts package contains a set of scripts to
+    start/stop the CLFS system at bootup/shutdown.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Bootscripts</title>
+
+    <para os="a">Install the package:</para>
+
+<screen os="b"><userinput>make DESTDIR=/tools install-bootscripts</userinput></screen>
+
+  <para os="c">The <command>setclock</command> script reads the time from the
+  hardware clock, also known as the BIOS or the Complementary Metal Oxide
+  Semiconductor (CMOS) clock. If the hardware clock is set to UTC, this
+  script will convert the hardware clock's time to the local time using
+  the <filename>/tools/etc/sysconfig/clock</filename> file (which tells the
+  <command>hwclock</command> program which timezone the user is in). There
+  is no way to detect whether or not the hardware clock is set to UTC, so
+  this needs to be configured manually.</para>
+
+
+
+  <para os="d">If you do not know whether or not the hardware clock is set to UTC,
+  you can find out after you have booted the new machine by running the
+  <userinput>hwclock --localtime  --show</userinput> command, and if
+  necessary editing the <filename>/tools/etc/sysconfig/clock</filename> file.
+  The worst that will happen if you make a wrong guess here is that the
+  time displayed will be wrong.</para>
+
+  <para os="e">Change the value of the <envar>UTC</envar> variable below
+  to a value of <option>0</option> (zero) if the hardware clock
+  is <emphasis>not</emphasis> set to UTC time.</para>
+
+<screen os="f"><userinput>cat &gt; /tools/etc/sysconfig/clock &lt;&lt; "EOF"
+<literal># Begin /tools/etc/sysconfig/clock
+
+UTC=1
+
+# End /tools/etc/sysconfig/clock</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-bootscripts" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/boot/common/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/common/eudev.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -55,220 +55,9 @@
  </sect2>
 
-  <sect2 id="contents-eudev" role="content">
-    <title>Contents of Eudev</title>
+  <sect2 role="content">
+    <title/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
-        firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, usb_id,
-        v4l_id, write_cd_rules, write_net_rules</seg>
-        <seg>libudev</seg>
-        <seg>/tools/etc/udev, /tools/lib/firmware, /tools/lib/udev</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udevadm">
-        <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>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevd">
-        <term><command>udevd</command></term>
-        <listitem>
-          <para>A daemon that reorders hotplug events before submitting them to
-          <command>udev</command>,
-          thus avoiding various race conditions</para>
-          <indexterm zone="ch-boot-eudev udevd">
-            <primary sortas="b-udevd">udevd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
- <!-- Start of Helpers -->
-      <varlistentry id="ata_id">
-        <term><command>ata_id</command></term>
-        <listitem>
-          <para>Provides Eudev with a unique string and additional
-          information (uuid, label) for an ATA drive</para>
-          <indexterm zone="ch-boot-eudev ata_id">
-            <primary sortas="b-ata_id">ata_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cdrom_id">
-        <term><command>cdrom_id</command></term>
-        <listitem>
-          <para>Prints the capabilities of a CDROM or DVDROM drive.</para>
-          <indexterm zone="ch-boot-eudev cdrom_id">
-            <primary sortas="b-cdrom_id">cdrom_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="collect">
-        <term><command>collect</command></term>
-        <listitem>
-          <para>Given an ID for the current uevent and a list of IDs
-(for all target uevents), registers the current ID and indicates whether
-all target IDs have been registered.</para>
-          <indexterm zone="ch-boot-eudev collect">
-            <primary sortas="b-collect">collect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="create_floppy_devices">
-        <term><command>create_floppy_devices</command></term>
-        <listitem>
-          <para>Creates all possible floppy devices based on the CMOS type</para>
-          <indexterm zone="ch-boot-eudev create_floppy_devices">
-            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="edd_id">
-        <term><command>edd_id</command></term>
-        <listitem>
-          <para>Identifies x86 disk drives from Enhanced Disk Drive calls</para>
-          <indexterm zone="ch-boot-eudev edd_id">
-            <primary sortas="b-edd_id">edd_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="firmware.sh">
-        <term><command>firmware.sh</command></term>
-        <listitem>
-          <para>Script to load firmware for a device</para>
-          <indexterm zone="ch-boot-eudev firmware.sh">
-            <primary sortas="b-firmware.sh">firmware.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fstab_import">
-        <term><command>fstab_import</command></term>
-        <listitem>
-          <para>Finds an entry in <filename>/etc/fstab</filename> that matches
-the current device, and provides its information to Udev.</para>
-          <indexterm zone="ch-boot-eudev fstab_import">
-            <primary sortas="b-fstab_import">fstab_import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="path_id">
-        <term><command>path_id</command></term>
-        <listitem>
-          <para>Provides the shortest possible unique hardware path to a
-          device</para>
-          <indexterm zone="ch-boot-eudev path_id">
-            <primary sortas="b-path_id">path_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_id">
-        <term><command>scsi_id</command></term>
-        <listitem>
-          <para>Retrieves or generates a unique SCSI identifier.</para>
-          <indexterm zone="ch-boot-eudev scsi_id">
-            <primary sortas="b-scsi_id">scsi_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usb_id">
-        <term><command>usb_id</command></term>
-        <listitem>
-          <para>Identifies a USB block device.</para>
-          <indexterm zone="ch-boot-eudev usb_id">
-            <primary sortas="b-usb_id">usb_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l_id">
-        <term><command>v4l_id</command></term>
-        <listitem>
-          <para>Determines V4L capabilities for a given device.</para>
-          <indexterm zone="ch-boot-eudev v4l_id">
-            <primary sortas="b-v4l_id">v4l_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write_cd_rules">
-        <term><command>write_cd_rules</command></term>
-        <listitem>
-          <para>A script which generates Eudev rules to provide stable names
-for network interfaces.</para>
-          <indexterm zone="ch-boot-eudev write_cd_rules">
-            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write_net_rules">
-        <term><command>write_net_rules</command></term>
-        <listitem>
-          <para>A script which generates Eudev rules to provide stable names
-for network interfaces.</para>
-          <indexterm zone="ch-boot-eudev write_net_rules">
-            <primary sortas="b-write_net_rules">write_net_rules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!-- End of Helpers -->
-
-      <varlistentry id="libudev">
-        <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>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="etc-eudev">
-        <term><filename class="directory">/etc/udev</filename></term>
-        <listitem>
-          <para>Contains <command>udev</command> configuration files,
-          device permissions, and rules for device naming</para>
-          <indexterm zone="ch-boot-eudev etc-eudev">
-            <primary sortas="e-/etc/udev">/etc/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lib-eudev">
-        <term><filename class="directory">/lib/udev</filename></term>
-        <listitem>
-          <para>Contains <command>udev</command> helper programs
-          and static devices which get copied to /dev when booted.</para>
-          <indexterm zone="ch-boot-eudev lib-eudev">
-            <primary sortas="e-/lib/udev">/lib/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
 
   </sect2>
Index: BOOK/boot/common/pwdgroup.xml
===================================================================
--- BOOK/boot/common/pwdgroup.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/common/pwdgroup.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -33,5 +33,4 @@
 <literal>bin:x:&uid-bin;:&gid-bin;:/bin:/bin/false</literal>
 <literal>daemon:x:&uid-daemon;:&gid-daemon;:/sbin:/bin/false</literal>
-<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
 <literal>nobody:x:&uid-nobody;:&gid-nogroup;:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
@@ -61,4 +60,10 @@
       <listitem>
         <para>Often used by email programs</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal></term>
+      <listitem>
+        <para>User for D-Bus</para>
       </listitem>
     </varlistentry>
@@ -104,6 +109,4 @@
 cdrom:x:&gid-cdrom;:
 adm:x:&gid-adm;:
-messagebus:x:&gid-messagebus;:
-systemd-journal:x:&gid-systemd-journal;:
 mail:x:&gid-mail;:
 wheel:x:&gid-wheel;:
@@ -125,4 +128,10 @@
       <listitem>
         <para>This group is allowed to use the CDRW drive</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>messagebus:x:&gid-messagebus;:</literal></term>
+      <listitem>
+        <para>User for D-Bus</para>
       </listitem>
     </varlistentry>
Index: BOOK/boot/common/sysvinit.xml
===================================================================
--- BOOK/boot/common/sysvinit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/common/sysvinit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -117,135 +117,9 @@
   </sect2>
 
-  <sect2 id="contents-sysvinit" role="content">
-    <title>Contents of Sysvinit</title>
+  <sect2 role="content">
+    <title/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bootlogd, fstab-decode, halt, init, killall5,
-        poweroff (link to halt), reboot (link to halt), runlevel,
-        shutdown, and telinit (link to init)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bootlogd">
-        <term><command>bootlogd</command></term>
-        <listitem>
-          <para>Logs boot messages to a log file</para>
-          <indexterm zone="ch-boot-sysvinit bootlogd">
-            <primary sortas="b-bootlogd">bootlogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fstab-decode">
-        <term><command>fstab-decode</command></term>
-        <listitem>
-          <para>Runs a command with fstab-encoded arguments</para>
-          <indexterm zone="ch-boot-sysvinit fstab-decode">
-            <primary sortas="b-fstab-decode">fstab-decode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Normally invokes <command>shutdown</command> with the
-          <parameter>-h</parameter> option, except when already in run-level 0,
-          then it tells the kernel to halt the system; it notes in the
-          file <filename>/var/log/wtmp</filename> that the system is being
-          brought down</para>
-          <indexterm zone="ch-boot-sysvinit halt">
-            <primary sortas="b-halt">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="init">
-        <term><command>init</command></term>
-        <listitem>
-          <para>The first process to be started when the kernel has initialized
-          the hardware which takes over the boot process and starts all the
-          proceses it is instructed to</para>
-          <indexterm zone="ch-boot-sysvinit init">
-            <primary sortas="b-init">init</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="killall5">
-        <term><command>killall5</command></term>
-        <listitem>
-          <para>Sends a signal to all processes, except the processes in its own
-          session so it will not kill the shell running the script that called
-          it</para>
-          <indexterm zone="ch-boot-sysvinit killall5">
-            <primary sortas="b-killall5">killall5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="poweroff">
-        <term><command>poweroff</command></term>
-        <listitem>
-          <para>Tells the kernel to halt the system and switch off the computer
-          (see <command>halt</command>)</para>
-          <indexterm zone="ch-boot-sysvinit poweroff">
-            <primary sortas="b-poweroff">poweroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Tells the kernel to reboot the system (see
-          <command>halt</command>)</para>
-          <indexterm zone="ch-boot-sysvinit reboot">
-            <primary sortas="b-reboot">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runlevel">
-        <term><command>runlevel</command></term>
-        <listitem>
-          <para>Reports the previous and the current run-level, as noted in
-          the last run-level record in <filename>/var/run/utmp</filename></para>
-          <indexterm zone="ch-boot-sysvinit runlevel">
-            <primary sortas="b-runlevel">runlevel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shutdown">
-        <term><command>shutdown</command></term>
-        <listitem>
-          <para>Brings the system down in a secure way, signaling all processes
-          and notifying all logged-in users</para>
-          <indexterm zone="ch-boot-sysvinit shutdown">
-            <primary sortas="b-shutdown">shutdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telinit">
-        <term><command>telinit</command></term>
-        <listitem>
-          <para>Tells <command>init</command> which run-level to change to</para>
-          <indexterm zone="ch-boot-sysvinit telinit">
-            <primary sortas="b-telinit">telinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <para>Details on this package are located in <xref
+    linkend="contents-sysvinit" role="."/></para>
 
   </sect2>
Index: BOOK/boot/mips-chapter.xml
===================================================================
--- BOOK/boot/mips-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/mips-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/mips64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
Index: BOOK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/mips64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
Index: BOOK/boot/ppc-chapter.xml
===================================================================
--- BOOK/boot/ppc-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/ppc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
Index: BOOK/boot/ppc64-64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/ppc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
Index: BOOK/boot/ppc64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/ppc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
Index: BOOK/boot/sparc-chapter.xml
===================================================================
--- BOOK/boot/sparc-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/sparc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
Index: BOOK/boot/sparc/silo.xml
===================================================================
--- BOOK/boot/sparc/silo.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/sparc/silo.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -17,5 +17,5 @@
 
   <para os="a">This is for the configuration of <command>silo</command>, similar
-  to what is in boot-scripts.</para>
+  to what is in bootscripts.</para>
 
 <screen><userinput>cat &gt; ${CLFS}/etc/silo.conf &lt;&lt; "EOF"
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/sparc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
Index: BOOK/boot/x86-chapter.xml
===================================================================
--- BOOK/boot/x86-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/x86-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
Index: BOOK/boot/x86_64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/boot/x86_64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -13,5 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/bootable/x86/kernel.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -42,6 +42,6 @@
 
     <para>Be sure to enable or disable following features or the system might
-    not work correctly or boot at all. Refer to
-    <filename>/usr/share/doc/systemd-&systemd-version;/README</filename>:</para>
+    not work correctly or boot at all.<!-- Refer to
+    <filename>/usr/share/doc/systemd-&systemd-version;/README</filename> -->:</para>
 
     <screen role="nodump">General setup  ---&gt;
Index: BOOK/bootscripts/common/bootscripts.xml
===================================================================
--- BOOK/bootscripts/common/bootscripts.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/bootscripts.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-bootscripts" role="wrap">
+  <?dbhtml filename="bootscripts.html"?>
+
+  <title>Bootscripts for CLFS &bootscripts-clfs-version;</title>
+
+  <indexterm zone="ch-scripts-bootscripts">
+    <primary sortas="a-Bootscripts">Bootscripts</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Bootscripts package contains a set of scripts to
+    start/stop the CLFS system at bootup/shutdown.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Bootscripts</title>
+
+    <para os="a">Install the package:</para>
+
+<screen os="b"><userinput>make install-bootscripts</userinput></screen>
+
+    <para os="c">You can will need to run the following command to install support for Networking:</para>
+
+<screen os="d"><userinput>make install-network</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-bootscripts" role="content">
+    <title>Contents of Bootscripts</title>
+
+    <segmentedlist>
+      <segtitle>Installed scripts</segtitle>
+
+      <seglistitem>
+        <seg>checkfs, cleanfs, console, functions, halt, ifdown,
+        ifup, localnet, mountfs, mountkernfs, network, rc, reboot, sendsignals,
+        setclock, static, swap, sysklogd, template, and udev.</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="checkfs-bootscripts">
+        <term><command>checkfs</command></term>
+        <listitem>
+          <para>Checks the integrity of the file systems before they are
+          mounted (with the exception of journal and network based file
+          systems)</para>
+          <indexterm zone="ch-scripts-bootscripts checkfs-bootscripts">
+            <primary sortas="d-checkfs">checkfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cleanfs-bootscripts">
+        <term><command>cleanfs</command></term>
+        <listitem>
+          <para>Removes files that should not be preserved between reboots,
+          such as those in <filename class="directory">/var/run/</filename>
+          and <filename class="directory">/var/lock/</filename>; it re-creates
+          <filename>/var/run/utmp</filename> and removes the possibly present
+          <filename>/etc/nologin</filename>, <filename>/fastboot</filename>,
+          and <filename>/forcefsck</filename> files</para>
+          <indexterm zone="ch-scripts-bootscripts cleanfs-bootscripts">
+            <primary sortas="d-cleanfs">cleanfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="console-bootscripts">
+        <term><command>console</command></term>
+        <listitem>
+          <para>Loads the correct keymap table for the desired keyboard
+          layout; it also sets the screen font</para>
+          <indexterm zone="ch-scripts-bootscripts console-bootscripts">
+            <primary sortas="d-console">console</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="functions-bootscripts">
+        <term><command>functions</command></term>
+        <listitem>
+          <para>Contains common functions, such as error and status checking,
+          that are used by several bootscripts</para>
+          <indexterm zone="ch-scripts-bootscripts functions-bootscripts">
+            <primary sortas="d-functions">functions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="halt-bootscripts">
+        <term><command>halt</command></term>
+        <listitem>
+          <para>Halts the system</para>
+          <indexterm zone="ch-scripts-bootscripts halt-bootscripts">
+            <primary sortas="d-halt">halt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ifdown-bootscripts">
+        <term><command>ifdown</command></term>
+        <listitem>
+          <para>Assists the network script with stopping network devices</para>
+          <indexterm zone="ch-scripts-bootscripts ifdown-bootscripts">
+            <primary sortas="d-ifdown">ifdown</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ifup-bootscripts">
+        <term><command>ifup</command></term>
+        <listitem>
+          <para>Assists the network script with starting network devices</para>
+          <indexterm zone="ch-scripts-bootscripts ifup-bootscripts">
+            <primary sortas="d-ifup">ifup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="localnet-bootscripts">
+        <term><command>localnet</command></term>
+        <listitem>
+          <para>Sets up the system's hostname and local loopback device</para>
+          <indexterm zone="ch-scripts-bootscripts localnet-bootscripts">
+            <primary sortas="d-localnet">localnet</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mountfs-bootscripts">
+        <term><command>mountfs</command></term>
+        <listitem>
+          <para>Mounts all file systems, except ones that are marked
+          <emphasis>noauto</emphasis> or are network based</para>
+          <indexterm zone="ch-scripts-bootscripts mountfs-bootscripts">
+            <primary sortas="d-mountfs">mountfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mountkernfs-bootscripts">
+        <term><command>mountkernfs</command></term>
+        <listitem>
+          <para>Mounts virtual kernel file systems, such as
+          <systemitem class="filesystem">proc</systemitem></para>
+          <indexterm zone="ch-scripts-bootscripts mountkernfs-bootscripts">
+            <primary sortas="d-mountkernfs">mountkernfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="network-bootscripts">
+        <term><command>network</command></term>
+        <listitem>
+          <para>Sets up network interfaces, such as network cards, and sets up
+          the default gateway (where applicable)</para>
+          <indexterm zone="ch-scripts-bootscripts network-bootscripts">
+            <primary sortas="d-network">network</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rc-bootscripts">
+        <term><command>rc</command></term>
+        <listitem>
+          <para>The master run-level control script; it is responsible for
+          running all the other bootscripts one-by-one, in a sequence
+          determined by the name of the symbolic links being processed</para>
+          <indexterm zone="ch-scripts-bootscripts rc-bootscripts">
+            <primary sortas="d-rc">rc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="reboot-bootscripts">
+        <term><command>reboot</command></term>
+        <listitem>
+          <para>Reboots the system</para>
+          <indexterm zone="ch-scripts-bootscripts reboot-bootscripts">
+            <primary sortas="d-reboot">reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sendsignals-bootscripts">
+        <term><command>sendsignals</command></term>
+        <listitem>
+          <para>Makes sure every process is terminated before the system reboots
+          or halts</para>
+          <indexterm zone="ch-scripts-bootscripts sendsignals-bootscripts">
+            <primary sortas="d-sendsignals">sendsignals</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setclock-bootscripts">
+        <term><command>setclock</command></term>
+        <listitem>
+          <para>Resets the kernel clock to local time in case the hardware clock
+          is not set to UTC time</para>
+          <indexterm zone="ch-scripts-bootscripts setclock-bootscripts">
+            <primary sortas="d-setclock">setclock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="static-bootscripts">
+        <term><command>static</command></term>
+        <listitem>
+          <para>Provides the functionality needed to assign a static Internet
+          Protocol (IP) address to a network interface</para>
+          <indexterm zone="ch-scripts-bootscripts static-bootscripts">
+            <primary sortas="d-static">static</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swap-bootscripts">
+        <term><command>swap</command></term>
+        <listitem>
+          <para>Enables and disables swap files and partitions</para>
+          <indexterm zone="ch-scripts-bootscripts swap-bootscripts">
+            <primary sortas="d-swap">swap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sysklogd-bootscripts">
+        <term><command>sysklogd</command></term>
+        <listitem>
+          <para>Starts and stops the system and kernel log daemons</para>
+          <indexterm zone="ch-scripts-bootscripts sysklogd-bootscripts">
+            <primary sortas="d-sysklogd">sysklogd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="template-bootscripts">
+        <term><command>template</command></term>
+        <listitem>
+          <para>A template to create custom bootscripts for other
+          daemons</para>
+          <indexterm zone="ch-scripts-bootscripts template-bootscripts">
+            <primary sortas="d-template">template</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="eudev-bootscripts">
+        <term><command>udev</command></term>
+        <listitem>
+          <para>Starts and stops the Eudev daemon</para>
+          <indexterm zone="ch-scripts-bootscripts eudev-bootscripts">
+            <primary sortas="d-eudev">udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/bootscripts/common/console.xml
===================================================================
--- BOOK/bootscripts/common/console.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/console.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-console">
+  <?dbhtml filename="console.html"?>
+  <title>Configuring the Linux Console</title>
+
+  <indexterm zone="ch-scripts-console">
+    <primary sortas="d-console">console</primary>
+  <secondary>configuring</secondary></indexterm>
+
+  <para>This section discusses how to configure the <command>i18n</command>
+  bootscript that sets up the keyboard map and the console font. If non-ASCII
+  characters (e.g., the British pound sign and Euro character) will not be
+  used and the keyboard is a U.S. one, skip this section. Without the
+  configuration file, the <command>console</command> bootscript will do
+  nothing.</para>
+
+  <para>The <command>i18n</command> script reads the
+  <filename>/etc/sysconfig/i18n</filename> file for configuration
+  information. Decide which keymap and screen font will be used. Various
+  language-specific HOWTO's can also help with this (see <ulink
+  url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. A pre-made
+  <filename>/etc/sysconfig/i18n</filename> file with known settings for
+  several countries was installed with the CLFS-Bootscripts package, so the
+  relevant section can be uncommented if the country is supported. If still
+  in doubt, look in the <filename class="directory">/usr/share/consolefonts</filename>
+  for valid screen fonts and <filename class="directory">/usr/share/keymaps</filename>
+  for valid keymaps.</para>
+
+  <para>The default <filename>/etc/sysconfig/i18n</filename> is set up for UTF-8
+  using the us keymap. You will need to edit the file to your specific needs.
+  The <filename>/etc/sysconfig/i18n</filename> file has additional information
+  in it to help you to assist in configuring.</para>
+
+</sect1>
Index: BOOK/bootscripts/common/eudev.xml
===================================================================
--- BOOK/bootscripts/common/eudev.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/eudev.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-eudev">
+  <?dbhtml filename="eudev.html"?>
+
+  <title>Device and Module Handling on a CLFS System</title>
+
+  <indexterm zone="ch-scripts-eudev">
+    <primary sortas="a-Eudev">Eudev</primary>
+    <secondary>usage</secondary>
+  </indexterm>
+
+  <para>In <xref linkend="chapter-building-system"/>, we installed the Eudev
+  package. Before we go into the details regarding how this works,
+  a brief history of previous methods of handling devices is in
+  order.</para>
+
+  <para>Linux systems in general traditionally use a static device creation
+  method, whereby a great many device nodes are created under <filename
+  class="directory">/dev</filename> (sometimes literally thousands of nodes),
+  regardless of whether the corresponding hardware devices actually exist. This
+  is typically done via a <command>MAKEDEV</command> script, which contains a
+  number of calls to the <command>mknod</command> program with the relevant
+  major and minor device numbers for every possible device that might exist in
+  the world.</para>
+
+  <para>Using the Eudev method, only those devices which are detected by the
+  kernel get device nodes created for them. Because these device nodes will be
+  created each time the system boots, they will be stored on a <systemitem
+  class="filesystem">tmpfs</systemitem> file system (a virtual file system that
+  resides entirely in system memory). Device nodes do not require much space, so
+  the memory that is used is negligible.</para>
+
+  <sect2>
+    <title>History</title>
+
+    <para>In February 2000, a new filesystem called <systemitem
+    class="filesystem">devfs</systemitem> was merged into the 2.3.46 kernel
+    and was made available during the 2.4 series of stable kernels. Although
+    it was present in the kernel source itself, this method of creating devices
+    dynamically never received overwhelming support from the core kernel
+    developers.</para>
+
+    <para>The main problem with the approach adopted by <systemitem
+    class="filesystem">devfs</systemitem> was the way it handled device
+    detection, creation, and naming. The latter issue, that of device node
+    naming, was perhaps the most critical. It is generally accepted that if
+    device names are allowed to be configurable, then the device naming policy
+    should be up to a system administrator, not imposed on them by any
+    particular developer(s). The <systemitem
+    class="filesystem">devfs</systemitem> file system also suffers from race
+    conditions that are inherent in its design and cannot be fixed without a
+    substantial revision to the kernel. It has also been marked as deprecated
+    due to a lack of recent maintenance.</para>
+
+    <para>With the development of the unstable 2.5 kernel tree, later released
+    as the 2.6 series of stable kernels, a new virtual filesystem called
+    <systemitem class="filesystem">sysfs</systemitem> came to be. The job of
+    <systemitem class="filesystem">sysfs</systemitem> is to export a view of
+    the system's hardware configuration to userspace processes. With this
+    userspace-visible representation, the possibility of seeing a userspace
+    replacement for <systemitem class="filesystem">devfs</systemitem> became
+    much more realistic.</para>
+
+  </sect2>
+
+  <sect2>
+    <title>Eudev Implementation</title>
+
+    <sect3>
+      <title>Sysfs</title>
+
+      <para>The <systemitem class="filesystem">sysfs</systemitem> filesystem was
+      mentioned briefly above. One may wonder how <systemitem
+      class="filesystem">sysfs</systemitem> knows about the devices present on
+      a system and what device numbers should be used for them. Drivers that
+      have been compiled into the kernel directly register their objects with
+      <systemitem class="filesystem">sysfs</systemitem> as they are detected by
+      the kernel. For drivers compiled as modules, this registration will happen
+      when the module is loaded. Once the <systemitem
+      class="filesystem">sysfs</systemitem> filesystem is mounted (on <filename
+      class="directory">/sys</filename>), data which the built-in drivers
+      registered with <systemitem class="filesystem">sysfs</systemitem> are
+      available to userspace processes and to <command>udevd</command> for device
+      node creation.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Eudev Bootscript</title>
+
+      <para>The <command>S10udev</command> initscript takes care of creating
+      device nodes when Linux is booted. The script unsets the uevent handler
+      from the default of <command>/sbin/hotplug</command>.  This is done
+      because the kernel no longer needs to call out to an external binary.
+      Instead <command>udevd</command> will listen on a netlink socket for
+      uevents that the kernel raises. Next, the bootscript copies any static
+      device nodes that exist in <filename
+      class="directory">/lib/udev/devices</filename> to <filename
+      class="directory">/dev</filename>. This is necessary because some devices,
+      directories, and symlinks are needed before the dynamic device handling
+      processes are available during the early stages of booting a system.
+      Creating static device nodes in <filename
+      class="directory">/lib/udev/devices</filename> also provides an easy
+      workaround for devices that are not supported by the dynamic device
+      handling infrastructure. The bootscript then starts the Eudev daemon,
+      <command>udevd</command>, which will act on any uevents it receives.
+      Finally, the bootscript forces the kernel to replay uevents for any
+      devices that have already been registered and then waits for
+      <command>udevd</command> to handle them.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Device Node Creation</title>
+
+      <para>To obtain the right major and minor number for a device, Eudev relies
+      on the information provided by <systemitem
+      class="filesystem">sysfs</systemitem> in <filename
+      class="directory">/sys</filename>.  For example,
+      <filename>/sys/class/tty/vcs/dev</filename> contains the string
+      <quote>7:0</quote>. This string is used by <command>udevd</command>
+      to create a device node with major number <emphasis>7</emphasis> and minor
+      <emphasis>0</emphasis>. The names and permissions of the nodes created
+      under the <filename class="directory">/dev</filename> directory are
+      determined by rules specified in the files within the <filename
+      class="directory">/etc/udev/rules.d/</filename> directory. These are
+      numbered in a similar fashion to the CLFS-Bootscripts package. If
+      <command>udevd</command> can't find a rule for the device it is creating,
+      it will default permissions to <emphasis>660</emphasis> and ownership to
+      <emphasis>root:root</emphasis>. Documentation on the syntax of the Eudev
+      rules configuration files is available in
+      <filename>/usr/share/doc/udev/writing_udev_rules/index.html</filename></para>
+
+    </sect3>
+
+    <sect3>
+      <title>Module Loading</title>
+
+      <para>Device drivers compiled as modules may have aliases built into them.
+      Aliases are visible in the output of the <command>modinfo</command>
+      program and are usually related to the bus-specific identifiers of devices
+      supported by a module. For example, the <emphasis>snd-fm801</emphasis>
+      driver supports PCI devices with vendor ID 0x1319 and device ID 0x0801,
+      and has an alias of <quote>pci:v00001319d00000801sv*sd*bc04sc01i*</quote>.
+      For most devices, the bus driver exports the alias of the driver that
+      would handle the device via <systemitem
+      class="filesystem">sysfs</systemitem>. E.g., the
+      <filename>/sys/bus/pci/devices/0000:00:0d.0/modalias</filename> file
+      might contain the string
+      <quote>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</quote>.
+      The default rules provided by Eudev will cause <command>udevd</command>
+      to call out to <command>/sbin/modprobe</command> with the contents of the
+      <envar>MODALIAS</envar> uevent environment variable (that should be the
+      same as the contents of the <filename>modalias</filename> file in sysfs),
+      thus loading all modules whose aliases match this string after wildcard
+      expansion.</para>
+
+      <para>In this example, this means that, in addition to
+      <emphasis>snd-fm801</emphasis>, the obsolete (and unwanted)
+      <emphasis>forte</emphasis> driver will be loaded if it is
+      available. See below for ways in which the loading of unwanted drivers can
+      be prevented.</para>
+
+      <para>The kernel itself is also able to load modules for network
+      protocols, filesystems and NLS support on demand.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Handling Hotpluggable/Dynamic Devices</title>
+
+      <para>When you plug in a device, such as a Universal Serial Bus (USB) MP3
+      player, the kernel recognizes that the device is now connected and
+      generates a uevent. This uevent is then handled by
+      <command>udevd</command> as described above.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2>
+    <title>Problems with Loading Modules and Creating Devices</title>
+
+    <para>There are a few possible problems when it comes to automatically
+    creating device nodes.</para>
+
+    <sect3>
+      <title>A kernel module is not loaded automatically</title>
+
+      <para>Eudev will only load a module if it has a bus-specific alias and the
+      bus driver properly exports the necessary aliases to <systemitem
+      class="filesystem">sysfs</systemitem>. In other cases, one should
+      arrange module loading by other means. With Linux-&linux-version;, Eudev is
+      known to load properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
+      SERIO and FireWire devices.</para>
+
+      <para>To determine if the device driver you require has the necessary
+      support for Eudev, run <command>modinfo</command> with the module name as
+      the argument.  Now try locating the device directory under
+      <filename class="directory">/sys/bus</filename> and check whether there is
+      a <filename>modalias</filename> file there.</para>
+
+      <para>If the <filename>modalias</filename> file exists in <systemitem
+      class="filesystem">sysfs</systemitem>, the driver supports the device and
+      can talk to it directly, but doesn't have the alias, it is a bug in the
+      driver. Load the driver without the help from Eudev and expect the issue
+      to be fixed later.</para>
+
+      <para>If there is no <filename>modalias</filename> file in the relevant
+      directory under <filename class="directory">/sys/bus</filename>, this
+      means that the kernel developers have not yet added modalias support to
+      this bus type. With Linux-&linux-version;, this is the case with ISA
+      busses. Expect this issue to be fixed in later kernel versions.</para>
+
+      <para>Eudev is not intended to load <quote>wrapper</quote> drivers such as
+      <emphasis>snd-pcm-oss</emphasis> and non-hardware drivers such as
+      <emphasis>loop</emphasis> at all.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>A kernel module is not loaded automatically, and Eudev is not
+      intended to load it</title>
+
+      <para>If the <quote>wrapper</quote> module only enhances the functionality
+      provided by some other module (e.g., <emphasis>snd-pcm-oss</emphasis>
+      enhances the functionality of <emphasis>snd-pcm</emphasis> by making the
+      sound cards available to OSS applications), configure
+      <command>modprobe</command> to load the wrapper after Eudev loads the
+      wrapped module. To do this, add an <quote>install</quote> line in
+      <filename>/etc/modprobe.conf</filename>. For example:</para>
+
+<screen role="nodump"><literal>install snd-pcm /sbin/modprobe -i snd-pcm ; \
+    /sbin/modprobe snd-pcm-oss ; true</literal></screen>
+
+      <para>If the module in question is not a wrapper and is useful by itself,
+      configure the <command>S05modules</command> bootscript to load this
+      module on system boot. To do this, add the module name to the
+      <filename>/etc/sysconfig/modules</filename> file on a separate line.
+      This works for wrapper modules too, but is suboptimal in that case.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Eudev loads some unwanted module</title>
+
+      <para>Either don't build the module, or blacklist it in
+      <filename>/etc/modprobe.conf</filename> file as done with the
+      <emphasis>forte</emphasis> module in the example below:</para>
+
+<screen role="nodump"><literal>blacklist forte</literal></screen>
+
+      <para>Blacklisted modules can still be loaded manually with the
+      explicit <command>modprobe</command> command.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Eudev creates a device incorrectly, or makes a wrong symlink</title>
+
+      <para>This usually happens if a rule unexpectedly matches a device. For
+      example, a poorly-writen rule can match both a SCSI disk (as desired)
+      and the corresponding SCSI generic device (incorrectly) by vendor.
+      Find the offending rule and make it more specific, with the help of
+      <command>udevadm info</command>.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Eudev rule works unreliably</title>
+
+      <para>This may be another manifestation of the previous problem. If not,
+      and your rule uses <systemitem class="filesystem">sysfs</systemitem>
+      attributes, it may be a kernel timing issue, to be fixed in later kernels.
+      For now, you can work around it by creating a rule that waits for the used
+      <systemitem class="filesystem">sysfs</systemitem> attribute and appending
+      it to the <filename>/etc/udev/rules.d/10-wait_for_sysfs.rules</filename>
+      file. Please notify the CLFS Development list if you do so and it
+      helps.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Eudev does not create a device</title>
+
+      <para>Further text assumes that the driver is built statically into the
+      kernel or already loaded as a module, and that you have already checked
+      that Eudev doesn't create a misnamed device.</para>
+
+      <para>Eudev has no information needed to create a device node if a kernel
+      driver does not export its data to <systemitem
+      class="filesystem">sysfs</systemitem>.
+      This is most common with third party drivers from outside the kernel
+      tree. Create a static device node in
+      <filename>/lib/udev/devices</filename> with the appropriate major/minor
+      numbers (see the file <filename>devices.txt</filename> inside the kernel
+      documentation or the documentation provided by the third party driver
+      vendor). The static device node will be copied to
+      <filename class="directory">/dev</filename> by the
+      <command>S10udev</command> bootscript.</para>
+
+    </sect3>
+
+    <sect3>
+      <title>Device naming order changes randomly after rebooting</title>
+
+      <para>This is due to the fact that Eudev, by design, handles uevents and
+      loads modules in parallel, and thus in an unpredictable order. This will
+      never be <quote>fixed</quote>. You should not rely upon the kernel device
+      names being stable. Instead, create your own rules that make symlinks with
+      stable names based on some stable attributes of the device, such as a
+      serial number or the output of various *_id utilities installed by Eudev.
+      See <xref linkend="ch-scripts-symlinks"/> and
+      <xref linkend="chapter-network"/> for examples.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2>
+    <title>Useful Reading</title>
+
+    <para>Additional helpful documentation is available at the following
+    sites:</para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para remap="verbatim">A Userspace Implementation of <systemitem class="filesystem">devfs</systemitem>
+        <ulink url="http://www.kroah.com/linux/talks/ols_2003_udev_paper/Reprint-Kroah-Hartman-OLS2003.pdf"/></para>
+      </listitem>
+
+      <listitem>
+        <para remap="verbatim">The <systemitem class="filesystem">sysfs</systemitem> Filesystem
+        <ulink url="http://www.kernel.org/pub/linux/kernel/people/mochel/doc/papers/ols-2005/mochel.pdf"/></para>
+      </listitem>
+
+    </itemizedlist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/bootscripts/common/inputrc.xml
===================================================================
--- BOOK/bootscripts/common/inputrc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/inputrc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-inputrc">
+  <?dbhtml filename="inputrc.html"?>
+
+  <title>Creating the /etc/inputrc File</title>
+
+  <indexterm zone="ch-scripts-inputrc">
+    <primary sortas="e-/etc/inputrc">/etc/inputrc</primary>
+  </indexterm>
+
+  <para>The <filename>/etc/inputrc</filename> file deals with mapping
+  the keyboard for specific situations. This file is the start-up file
+  used by Readline &mdash; the input-related library &mdash; used by Bash
+  and most other shells.</para>
+
+  <para>Most people do not need user-specific keyboard mappings so
+  the command below creates a global <filename>/etc/inputrc</filename>
+  used by everyone who logs in. If you later decide you need to override
+  the defaults on a per-user basis, you can create a
+  <filename>.inputrc</filename> file in the user's home directory with
+  the modified mappings.</para>
+
+  <para>For more information on how to edit the <filename>inputrc</filename>
+  file, see <command>info bash</command> under the <emphasis>Readline Init
+  File</emphasis> section. <command>info readline</command> is also a good
+  source of information.</para>
+
+  <para>Below is a generic global <filename>inputrc</filename> along
+  with comments to explain what the various options do. Note that
+  comments cannot be on the same line as commands. Create the file
+  using the following command:</para>
+
+<screen><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF"
+<literal># Begin /etc/inputrc
+# Modified by Chris Lynn &lt;roryo@roryo.dynup.net&gt;
+
+# Allow the command prompt to wrap to the next line
+set horizontal-scroll-mode Off
+
+# Enable 8bit input
+set meta-flag On
+set input-meta On
+
+# Turns off 8th bit stripping
+set convert-meta Off
+
+# Keep the 8th bit for display
+set output-meta On
+
+# none, visible or audible
+set bell-style none
+
+# All of the following map the escape sequence of the
+# value contained inside the 1st argument to the
+# readline specific functions
+
+"\eOd": backward-word
+"\eOc": forward-word
+
+# for linux console
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+"\e[5~": beginning-of-history
+"\e[6~": end-of-history
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+
+# for xterm
+"\eOH": beginning-of-line
+"\eOF": end-of-line
+
+# for Konsole
+"\e[H": beginning-of-line
+"\e[F": end-of-line
+
+# End /etc/inputrc</literal>
+EOF</userinput></screen>
+
+</sect1>
Index: BOOK/bootscripts/common/introduction.xml
===================================================================
--- BOOK/bootscripts/common/introduction.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/introduction.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-introduction">
+  <?dbhtml filename="introduction.html"?>
+
+  <title>Introduction</title>
+
+  <para>This chapter details how to install and configure the CLFS-Bootscripts
+  package. Most of these scripts will work without modification, but a few
+  require additional configuration files because they deal with
+  hardware-dependent information.</para>
+
+  <para>System-V style init scripts are employed in this book because they
+  are widely used. For additional options, a hint detailing the BSD style
+  init setup is available at <ulink
+  url="&hints-root;BSD-Init"/>.
+  Searching the LFS mailing lists for <quote>depinit</quote> will also offer
+  additional choices.</para>
+
+  <para>If using an alternative style of init scripts, skip this chapter and
+  move on to <xref linkend="chapter-bootable"/>.</para>
+
+</sect1>
Index: BOOK/bootscripts/common/locale.xml
===================================================================
--- BOOK/bootscripts/common/locale.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/locale.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-locale">
+  <title>Setting Up Locale Information</title>
+  <?dbhtml filename="locale.html"?>
+
+  <indexterm zone="ch-scripts-locale">
+    <primary sortas="e-/etc/profile">/etc/profile</primary>
+  </indexterm>
+
+  <para>The base <filename>/etc/profile</filename> below sets some
+  environment variables necessary for native language support. Setting
+  them properly results in:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>The output of programs translated into the native language</para>
+    </listitem>
+    <listitem>
+      <para>Correct classification of characters into letters, digits and
+      other classes. This is necessary for <command>bash</command> to
+      properly accept non-ASCII characters in command lines in non-English
+      locales</para>
+    </listitem>
+    <listitem>
+      <para>The correct alphabetical sorting order for the country</para>
+    </listitem>
+    <listitem>
+      <para>Appropriate default paper size</para>
+    </listitem>
+    <listitem>
+      <para>Correct formatting of monetary, time, and date values</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>This script also sets the <envar>INPUTRC</envar> environment variable
+  that makes Bash and Readline use the <filename>/etc/inputrc</filename> file
+  created earlier.</para>
+
+  <para>Replace <replaceable>[ll]</replaceable> below with the
+  two-letter code for the desired language (e.g., <quote>en</quote>) and
+  <replaceable>[CC]</replaceable> with the two-letter code for the
+  appropriate country (e.g., <quote>GB</quote>).
+  <replaceable>[charmap]</replaceable> should be replaced with the
+  canonical charmap for your chosen locale.</para>
+
+  <para>The list of all locales supported by Glibc can be obtained by running
+  the following command:</para>
+
+<screen role="nodump"><userinput>locale -a</userinput></screen>
+
+  <para>Locales can have a number of synonyms, e.g. <quote>ISO-8859-1</quote>
+  is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
+  Some applications cannot handle the various synonyms correctly, so it is
+  safest to choose the canonical name for a particular locale. To determine
+  the canonical name, run the following command, where <replaceable>[locale
+  name]</replaceable> is the output given by <command>locale -a</command> for
+  your preferred locale (<quote>en_US.utf8</quote> in our example).</para>
+
+<screen role="nodump"><userinput>LC_ALL=<replaceable>[locale name]</replaceable> locale charmap</userinput></screen>
+
+  <para>For the <quote>en_US.utf8</quote> locale, the above command
+  will print:</para>
+
+<screen><computeroutput>UTF-8</computeroutput></screen>
+
+  <para>This results in a final locale setting of <quote>en_US.UTF-8</quote>.
+  It is important that the locale found using the heuristic above is tested prior
+  to it being added to the Bash startup files:</para>
+
+<screen role="nodump"><userinput>LC_ALL=[locale name] locale territory 
+LC_ALL=[locale name] locale language
+LC_ALL=[locale name] locale charmap
+LC_ALL=[locale name] locale int_curr_symbol
+LC_ALL=[locale name] locale int_prefix</userinput></screen>
+
+  <para>The above commands should print the language name, the character
+  encoding used by the locale, the local currency, and the prefix to dial
+  before the telephone number in order to get into the country. If any of the
+  commands above fail with a message similar to the one shown below, this means
+  that your locale was either not installed in Chapter 10 or is not supported by
+  the default installation of Glibc.</para>
+
+<screen><computeroutput>locale: Cannot set LC_* to default locale: No such file or directory</computeroutput></screen>
+
+  <para>If this happens, you should either install the desired locale using
+  the <command>localedef</command> command, or consider choosing a different
+  locale. Further instructions assume that there are no such error messages
+  from Glibc.</para>
+
+  <para>Some packages beyond CLFS may also lack support for your chosen locale.
+  One example is the X library (part of the X Window System), which outputs
+  the following error message:</para>
+
+<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
+
+  <para>Sometimes it is possible to fix this by removing the charmap part of
+  the locale specification, as long as that does not change the character map
+  that Glibc associates with the locale (this can be checked by running the
+  <command>locale charmap</command> command in both locales). For example,
+  one would have to change &quot;de_DE.ISO-8859-15@euro&quot; to
+  &quot;de_DE@euro&quot; in order to get this locale recognized by Xlib.</para>
+
+  <para>Other packages can also function incorrectly (but may not necessarily
+  display any error messages) if the locale name does not meet their expectations.
+  In those cases, investigating how other Linux distributions support your locale
+  might provide some useful information.</para>
+
+  <para>Once the proper locale settings have been determined, create the
+  <filename>/etc/profile</filename> file:</para>
+
+<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
+<literal># Begin /etc/profile
+
+export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
+export INPUTRC=/etc/inputrc
+
+# End /etc/profile</literal>
+EOF</userinput></screen>
+
+  <para>Setting the keyboard layout, screen font, and locale-related
+  environment variables are the only internationalization steps needed to
+  support locales that use ordinary single-byte encodings and left-to-right
+  writing direction. UTF-8 has been tested on the English, French, German,
+  Italian, and Spanish locales. All other locales are untested. If you discover
+  issues with any other locale please open a ticket in our Trac system.</para>
+
+  <para>Some locales need additional programs and support. CLFS will not be
+  supporting these locales in the book. We welcome the support for these other
+  locales via <ulink url="&cblfs-root;"/>.</para>
+
+</sect1>
Index: BOOK/bootscripts/common/profile.xml
===================================================================
--- BOOK/bootscripts/common/profile.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/profile.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-profile">
+  <title>The Bash Shell Startup Files</title>
+  <?dbhtml filename="profile.html"?>
+
+  <indexterm zone="ch-scripts-profile">
+    <primary sortas="e-/etc/profile">/etc/profile</primary>
+  </indexterm>
+
+  <para>The shell program <command>/bin/bash</command> (hereafter
+  referred to as <quote>the shell</quote>) uses a collection of startup
+  files to help create an environment to run in. Each file has a
+  specific use and may affect login and interactive environments
+  differently. The files in the <filename class="directory">/etc</filename>
+  directory provide global settings. If an equivalent file exists in the
+  home directory, it may override the global settings.</para>
+
+  <para>An interactive login shell is started after a successful login,
+  using <command>/bin/login</command>, by reading the
+  <filename>/etc/passwd</filename> file. An interactive non-login shell
+  is started at the command-line (e.g.,
+  <prompt>[prompt]$</prompt><command>/bin/bash</command>). A
+  non-interactive shell is usually present when a shell script is
+  running. It is non-interactive because it is processing a script and
+  not waiting for user input between commands.</para>
+
+  <para>For more information, see <command>info bash</command> under the
+  <emphasis>Bash Startup Files and Interactive Shells</emphasis> section,
+  and <ulink url="&cblfs-root;index.php/Bash_Startup_Files">Bash Startup
+  Files</ulink> in CBLFS.</para>
+
+  <para>The files <filename>/etc/profile</filename> and
+  <filename>~/.bash_profile</filename> are read when the shell is
+  invoked as an interactive login shell. In the next section, a base
+  <filename>/etc/profile</filename> will be created to set up locale
+  information.</para>
+
+</sect1>
Index: BOOK/bootscripts/common/setclock.xml
===================================================================
--- BOOK/bootscripts/common/setclock.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/setclock.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-setclock">
+  <?dbhtml filename="setclock.html"?>
+
+  <title>Configuring the setclock Script</title>
+
+  <indexterm zone="ch-scripts-setclock">
+    <primary sortas="d-setclock">setclock</primary>
+  <secondary>configuring</secondary></indexterm>
+
+  <para os="a">The <command>setclock</command> script reads the time from the
+  hardware clock, also known as the BIOS or the Complementary Metal Oxide
+  Semiconductor (CMOS) clock. If the hardware clock is set to UTC, this
+  script will convert the hardware clock's time to the local time using
+  the <filename>/etc/localtime</filename> file (which tells the
+  <command>hwclock</command> program which timezone the user is in). There
+  is no way to detect whether or not the hardware clock is set to UTC, so
+  this needs to be configured manually.</para>
+
+  <para os="b">If you cannot remember whether or not the hardware clock is set
+  to UTC, find out by running the <userinput>hwclock --localtime
+  --show</userinput> command. This will display what the current time is
+  according to the hardware clock. If this time matches whatever your
+  watch says, then the hardware clock is set to local time. If the output
+  from <command>hwclock</command> is not local time, chances are it is set
+  to UTC time. Verify this by adding or subtracting the proper amount of
+  hours for the timezone to the time shown by <command>hwclock</command>.
+  For example, if you are currently in the MST timezone, which is also
+  known as GMT -0700, add seven hours to the local time.</para>
+
+  <para os="c">Change the value of the <envar>UTC</envar> variable below
+  to a value of <option>0</option> (zero) if the hardware clock
+  is <emphasis>not</emphasis> set to UTC time.</para>
+
+  <para os="d">Create a new file <filename>/etc/sysconfig/clock</filename> by running
+  the following:</para>
+
+<screen><userinput>cat &gt; /etc/sysconfig/clock &lt;&lt; "EOF"
+<literal># Begin /etc/sysconfig/clock
+
+UTC=1
+
+# End /etc/sysconfig/clock</literal>
+EOF</userinput></screen>
+
+  <para os="e">A good hint explaining how to deal with time on CLFS is available
+  at <ulink url="&hints-root;time.txt"/>. It explains issues such as
+  time zones, UTC, and the <envar>TZ</envar> environment variable.</para>
+
+</sect1>
Index: BOOK/bootscripts/common/symlinks.xml
===================================================================
--- BOOK/bootscripts/common/symlinks.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/symlinks.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-symlinks">
+  <?dbhtml filename="symlinks.html"?>
+
+  <title>Creating custom symlinks to devices</title>
+
+  <sect2>
+
+    <title>CD-ROM symlinks</title>
+
+    <para>Some software that you may want to install later (e.g., various
+    media players) expect the /dev/cdrom and /dev/dvd symlinks to exist.
+    Also, it may be convenient to put references to those symlinks into
+    <filename>/etc/fstab</filename>. For each of your CD-ROM devices,
+    find the corresponding directory under
+    <filename class="directory">/sys</filename> (e.g., this can be
+    <filename class="directory">/sys/block/hdd</filename>) and
+    run a command similar to the following:</para>
+
+<screen role="nodump"><userinput>udevadm test /sys/block/hdd</userinput></screen>
+
+    <para>Look at the lines containing the output of various *_id programs.</para>
+
+    <para>There are two approaches to creating symlinks. The first one is to
+    use the model name and the serial number, the second one is based on the
+    location of the device on the bus. If you are going to use the first
+    approach, create a file similar to the following:</para>
+
+<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
+<literal>
+# Custom CD-ROM symlinks
+SUBSYSTEM=="block", ENV{ID_MODEL}=="SAMSUNG_CD-ROM_SC-148F", \
+    ENV{ID_REVISION}=="PS05", SYMLINK+="cdrom"
+SUBSYSTEM=="block", ENV{ID_MODEL}=="PHILIPS_CDD5301", \
+    ENV{ID_SERIAL}=="5VO1306DM00190", SYMLINK+="cdrom1 dvd"
+</literal>
+EOF</userinput></screen>
+
+    <note>
+      <para>Although the examples in this book work properly, be aware
+      that Eudev does not recognize the backslash for line continuation.
+      If modifying Eudev rules with an editor, be sure to leave each rule
+      on one physical line.</para>
+    </note>
+
+    <para>This way, the symlinks will stay correct even if you move the drives
+    to different positions on the IDE bus, but the
+    <filename>/dev/cdrom</filename> symlink won't be created if you replace
+    the old SAMSUNG CD-ROM with a new drive.</para>
+<!-- The symlinks in the first approach survive even the transition
+     to libata for IDE drives, but that is not for the book. -->
+
+    <para>The SUBSYSTEM==&quot;block&quot; key is needed in order to avoid
+    matching SCSI generic devices. Without it, in the case with SCSI
+    CD-ROMs, the symlinks will sometimes point to the correct
+    <filename>/dev/srX</filename> devices, and sometimes to
+    <filename>/dev/sgX</filename>, which is wrong.</para>
+
+    <para>The second approach yields:</para>
+
+<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
+<literal>
+# Custom CD-ROM symlinks
+SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
+    ENV{ID_PATH}=="pci-0000:00:07.1-ide-0:1", SYMLINK+="cdrom"
+SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
+    ENV{ID_PATH}=="pci-0000:00:07.1-ide-1:1", SYMLINK+="cdrom1 dvd"
+</literal>
+EOF</userinput></screen>
+
+    <para>This way, the symlinks will stay correct even if you replace drives
+    with different models, but place them to the old positions on the IDE
+    bus. The ENV{ID_TYPE}==&quot;cd&quot; key makes sure that the symlink
+    disappears if you put something other than a CD-ROM in that position on
+    the bus.</para>
+
+    <para>Of course, it is possible to mix the two approaches.</para>
+
+  </sect2>
+
+  <sect2>
+
+    <title>Dealing with duplicate devices</title>
+
+    <para>As explained in <xref linkend="ch-scripts-eudev"/>, the order in
+    which devices with the same function appear in
+    <filename class="directory">/dev</filename> is essentially random.
+    E.g., if you have a USB web camera and a TV tuner, sometimes
+    <filename>/dev/video0</filename> refers to the camera and
+    <filename>/dev/video1</filename> refers to the tuner, and sometimes
+    after a reboot the order changes to the opposite one.
+    For all classes of hardware except sound cards and network cards, this is
+    fixable by creating udev rules for custom persistent symlinks.
+    The case of network cards is covered separately in
+    <xref linkend="chapter-network"/>, and sound card configuration can
+    be found in <ulink url="&cblfs-root;">CBLFS</ulink>.</para>
+
+    <para>For each of your devices that is likely to have this problem
+    (even if the problem doesn't exist in your current Linux distribution),
+    find the corresponding directory under
+    <filename class="directory">/sys/class</filename> or
+    <filename class="directory">/sys/block</filename>.
+    For video devices, this may be
+    <filename
+    class="directory">/sys/class/video4linux/video<replaceable>X</replaceable></filename>.
+    Figure out the attributes that identify the device uniquely (usually,
+    vendor and product IDs and/or serial numbers work):</para>
+
+<screen role="nodump"><userinput>udevadm info -a -p /sys/class/video4linux/video0</userinput></screen>
+
+    <para>Then write rules that create the symlinks, e.g.:</para>
+
+<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/83-duplicate_devs.rules &lt;&lt; EOF
+<literal>
+# Persistent symlinks for webcam and tuner
+KERNEL=="video*", SYSFS{idProduct}=="1910", SYSFS{idVendor}=="0d81", \
+    SYMLINK+="webcam"
+KERNEL=="video*", SYSFS{device}=="0x036f", SYSFS{vendor}=="0x109e", \
+    SYMLINK+="tvtuner"
+</literal>
+EOF</userinput></screen>
+
+    <para>The result is that <filename>/dev/video0</filename> and
+    <filename>/dev/video1</filename> devices still refer randomly to the tuner
+    and the web camera (and thus should never be used directly), but there are
+    symlinks <filename>/dev/tvtuner</filename> and
+    <filename>/dev/webcam</filename> that always point to the correct
+    device.</para>
+
+    <para>More information on writing Eudev rules can be found in
+    <filename>/usr/share/doc/udev/writing_udev_rules/index.html</filename>.</para>
+
+ </sect2>
+
+</sect1>
Index: BOOK/bootscripts/common/usage.xml
===================================================================
--- BOOK/bootscripts/common/usage.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/common/usage.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-scripts-usage">
+  <?dbhtml filename="usage.html"?>
+
+  <title>How Do These Bootscripts Work?</title>
+
+  <indexterm zone="ch-scripts-usage">
+    <primary sortas="a-Bootscripts">Bootscripts</primary>
+  <secondary>usage</secondary></indexterm>
+
+  <para>Linux uses a special booting facility named SysVinit that is
+  based on a concept of <emphasis>run-levels</emphasis>. It can be quite
+  different from one system to another, so it cannot be assumed that
+  because things worked in one particular Linux distribution, they should work
+  the same in CLFS too. CLFS has its own way of doing things, but it
+  respects generally accepted standards.</para>
+
+  <para>SysVinit (which will be referred to as <quote>init</quote> from
+  now on) works using a run-levels scheme. There are seven (numbered 0 to 6)
+  run-levels (actually, there are more run-levels, but they are for
+  special cases and are generally not used. See <filename>init(8)</filename>
+  for more details), and each one of those corresponds to the actions the
+  computer is supposed to perform when it starts up. The default
+  run-level is 3. Here are the descriptions of the different run-levels
+  as they are implemented:</para>
+
+<literallayout>0: halt the computer
+1: single-user mode
+2: multi-user mode without networking
+3: multi-user mode with networking
+4: reserved for customization, otherwise does the same as 3
+5: same as 4, it is usually used for GUI login (like X's <command>xdm</command> or KDE's <command>kdm</command>)
+6: reboot the computer</literallayout>
+
+  <para>The command used to change run-levels is <command>init
+  <replaceable>[runlevel]</replaceable></command>, where
+  <replaceable>[runlevel]</replaceable> is the target run-level. For example,
+  to reboot the computer, a user could issue the <command>init 6</command>
+  command, which is an alias for the <command>reboot</command> command.
+  Likewise, <command>init 0</command> is an alias for the
+  <command>halt</command> command.</para>
+
+  <para>There are a number of directories under <filename
+  class="directory">/etc/rc.d</filename> that look like <filename
+  class="directory">rc?.d</filename> (where ? is the number of the
+  run-level) and <filename class="directory">rcsysinit.d</filename>, all
+  containing a number of symbolic links. Some begin with a
+  <emphasis>K</emphasis>, the others begin with an
+  <emphasis>S</emphasis>, and all of them have two numbers following the
+  initial letter. The K means to stop (kill) a service and the S means
+  to start a service. The numbers determine the order in which the
+  scripts are run, from 00 to 99&mdash;the lower the number the earlier it
+  gets executed. When <command>init</command> switches to another run-level,
+  the appropriate services are either started or stopped, depending on the
+  runlevel chosen.</para>
+
+  <para>The real scripts are in <filename
+  class="directory">/etc/rc.d/init.d</filename>. They do the actual work,
+  and the symlinks all point to them. Killing links and starting links point
+  to the same script in <filename class="directory">/etc/rc.d/init.d</filename>.
+  This is because the scripts can be called with different parameters like
+  <option>start</option>, <option>stop</option>, <option>restart</option>,
+  <option>reload</option>, and <option>status</option>. When a K link is
+  encountered, the appropriate script is run with the <option>stop</option>
+  argument. When an S link is encountered, the appropriate script is run
+  with the <option>start</option> argument.</para>
+
+  <para>There is one exception to this explanation. Links that start
+  with an <emphasis>S</emphasis> in the <filename
+  class="directory">rc0.d</filename> and <filename
+  class="directory">rc6.d</filename> directories will not cause anything
+  to be started. They will be called with the parameter
+  <option>stop</option> to stop something. The logic behind this
+  is that when a user is going to reboot or halt the system, nothing
+  needs to be started. The system only needs to be stopped.</para>
+
+  <para>These are descriptions of what the arguments make the scripts
+  do:</para>
+
+  <variablelist>
+    <varlistentry>
+      <term><option>start</option></term>
+      <listitem>
+        <para>The service is started.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>stop</option></term>
+      <listitem>
+        <para>The service is stopped.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>restart</option></term>
+      <listitem>
+        <para>The service is stopped and then started again.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>reload</option></term>
+      <listitem>
+        <para>The configuration of the service is updated. This is used
+        after the configuration file of a service was modified, when the
+        service does not need to be restarted.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>status</option></term>
+      <listitem>
+        <para>Tells if the service is running and with which PIDs.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+
+  <para>Feel free to modify the way the boot process works (after all,
+  it is your own CLFS system). The files given here are an example of how
+  it can be done.</para>
+
+</sect1>
Index: BOOK/bootscripts/mips-chapter.xml
===================================================================
--- BOOK/bootscripts/mips-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/mips-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/mips64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/mips64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/mips64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/mips64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/ppc-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/ppc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/ppc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/ppc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/ppc64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/ppc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/sparc-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/sparc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/sparc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/sparc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/sparc64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/sparc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/x86-chapter.xml
===================================================================
--- BOOK/bootscripts/x86-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/x86-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/x86_64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/bootscripts/x86_64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/bootscripts/x86_64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+  <?dbhtml dir="bootscripts"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Setting Up System Bootscripts</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
+
+</chapter>
Index: BOOK/chroot/common/pwdgroup.xml
===================================================================
--- BOOK/chroot/common/pwdgroup.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/chroot/common/pwdgroup.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -66,5 +66,4 @@
 adm:x:&gid-adm;:
 messagebus:x:&gid-messagebus;:
-systemd-journal:x:&gid-systemd-journal;:
 mail:x:&gid-mail;:
 wheel:x:&gid-wheel;:
Index: OK/final-system/common/acl.xml
===================================================================
--- BOOK/final-system/common/acl.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-acl" role="wrap">
-  <?dbhtml filename="acl.html"?>
-
-  <title>ACL-&acl-version;</title>
-
-  <indexterm zone="ch-system-acl">
-    <primary sortas="a-ACL">ACL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>ACL is a library for getting and setting POSIX Access Control Lists.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ACL</title>
-
-    <para os="a">Apply a sed to install the documentation with a versioned
-    directory:</para>
-
-<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para os="c">Apply a sed to fix a few tests:</para>
-
-<screen os="d"><userinput>sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
-
-    <para os="e">Prepare ACL for compilation:</para>
-
-<screen os="f"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
-
-    <para os="g">Compile the package:</para>
-
-<screen os="h"><userinput>make</userinput></screen>
-
-    <para os="i">The Acl tests need a filesystem which supports access controls
-    after Coreutils has been built with the Acl libraries. Return to this
-    section after Coreutils has been installed. Test the results:</para>
-
-<screen os="j"><userinput remap="test">make tests</userinput></screen>
-
-    <para os="k">Install the package:</para>
-
-<screen os="l"><userinput>make install install-dev install-lib</userinput></screen>
-
-    <para os="m">Move the shared library to <filename class="directory">/lib</filename>
-    and recreate the symlink in <filename class="directory">/usr/lib</filename>:</para>
-
-<screen os="n"><userinput>mv -v /usr/lib/libacl.so.* /lib
-ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
-
-    <para os="o">Set the proper permissions on the shared library:</para>
-
-<screen os="p"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-acl" role="content">
-    <title>Contents of ACL</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>chacl, getfacl, setfacl</seg>
-        <seg>libattr.[a,so]</seg>
-        <seg>/usr/include/acl, /usr/share/doc/acl-&acl-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chacl">
-        <term><command>chacl</command></term>
-        <listitem>
-          <para>Changes the access control list of a file or directory</para>
-          <indexterm zone="ch-system-acl chacl">
-            <primary sortas="b-chacl">chacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getfacl">
-        <term><command>getfacl</command></term>
-        <listitem>
-          <para>Get file access control lists</para>
-          <indexterm zone="ch-system-acl getfacl">
-            <primary sortas="b-getfacl">getfacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfacl">
-        <term><command>setfacl</command></term>
-        <listitem>
-          <para>Set file access control lists</para>
-          <indexterm zone="ch-system-acl setfacl">
-            <primary sortas="b-setfacl">setfacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libacl">
-        <term><filename class="libraryfile">libacl</filename></term>
-        <listitem>
-          <para>Library to manage access control lists</para>
-          <indexterm zone="ch-system-acl libacl">
-            <primary sortas="c-libacl">libacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/attr.xml
===================================================================
--- BOOK/final-system/common/attr.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-attr" role="wrap">
-  <?dbhtml filename="attr.html"?>
-
-  <title>Attr-&attr-version;</title>
-
-  <indexterm zone="ch-system-attr">
-    <primary sortas="a-Attr">Attr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Attr is a library for getting and setting POSIX.1e
-    (formerly POSIX 6) draft 15 capabilities.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Attr</title>
-
-    <para os="a">Apply a sed to install the documentation with a versioned
-    directory:</para>
-
-<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
-
-    <para os="c">Prepare Attr for compilation:</para>
-
-<screen os="d"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="e">Compile the package:</para>
-
-<screen os="f"><userinput>make</userinput></screen>
-
-    <para os="g">The tests need to run with a filesystem which supports extended
-    attributes. Test the results:</para>
-
-<screen os="h"><userinput remap="test">make -j1 tests root-tests</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make install install-dev install-lib</userinput></screen>
-
-    <para os="k">Move the shared library to <filename class="directory">/lib
-    </filename> and recreate the symlink in <filename class="directory">/usr/lib
-    </filename>:</para>
-
-<screen os="l"><userinput>mv -v /usr/lib/libattr.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput></screen>
-
-    <para os="m">Set the proper permissions on the shared library:</para>
-
-<screen os="n"><userinput>chmod 755 -v /lib/libattr.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-attr" role="content">
-    <title>Contents of Attr</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>attr, getfattr, setfattr</seg>
-        <seg>libattr.[a,so]</seg>
-        <seg>/usr/include/attr /usr/share/doc/attr-&attr-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="attr">
-        <term><command>attr</command></term>
-        <listitem>
-          <para>Manage extended attributes on filesystem objects</para>
-          <indexterm zone="ch-system-attr attr">
-            <primary sortas="b-attr">attr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getfattr">
-        <term><command>getfattr</command></term>
-        <listitem>
-          <para>Get extended attributes of filesystem objects</para>
-          <indexterm zone="ch-system-attr getfattr">
-            <primary sortas="b-getfattr">getfattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfattr">
-        <term><command>setfattr</command></term>
-        <listitem>
-          <para>Set extended attributes of filesystem objects</para>
-          <indexterm zone="ch-system-attr setfattr">
-            <primary sortas="b-setfattr">setfattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libattr">
-        <term><filename class="libraryfile">libattr</filename></term>
-        <listitem>
-          <para>Library to manage extended attributes on filesystem objects</para>
-          <indexterm zone="ch-system-attr libattr">
-            <primary sortas="c-libattr">libattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/dbus.xml
===================================================================
--- BOOK/final-system/common/dbus.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dbus" role="wrap">
-  <?dbhtml filename="dbus.html"?>
-
-  <title>D-Bus-&dbus-version;</title>
-
-  <indexterm zone="ch-system-dbus">
-    <primary sortas="a-D-Bus">D-Bus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>D-Bus is a message bus system, a simple way for applications
-    to talk to one another.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-
-    <para os="a">Prepare D-Bus for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/dbus-1.0 --localstatedir=/var \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does come with a testsuite, but it requires
-    several packages that are not included in CLFS. Instructions for running
-    the testsuite can be found in the CBLFS wiki at
-    <ulink url="&cblfs-root;index.php/D-BUS_Core"/>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Move the shared library to <filename class="directory">/lib
-    </filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
-
-    <para os="j">Create a symlink so that D-Bus and systemd can use the same
-    <filename>machine-id</filename> file:</para>
-
-<screen os="k"><userinput>ln -sv /etc/machine-id /var/lib/dbus</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-dbus" role="content">
-    <title>Contents of D-Bus</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor, dbus-send, dbus-uuidgen</seg>
-        <seg>libdbus-1.[a,so]</seg>
-        <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
-        /usr/share/doc/dbus-&dbus-version;, /var/lib/dbus</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dbus-cleanup-sockets">
-        <term><command>dbus-cleanup-sockets</command></term>
-        <listitem>
-          <para>Cleans up leftover sockets in a directory</para>
-          <indexterm zone="ch-system-dbus dbus-cleanup-sockets">
-            <primary sortas="b-dbus-cleanup-sockets">dbus-cleanup-sockets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-daemon">
-        <term><command>dbus-daemon</command></term>
-        <listitem>
-          <para>The message bus daemon</para>
-          <indexterm zone="ch-system-dbus dbus-daemon">
-            <primary sortas="b-dbus-daemon">dbus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-uuidgen">
-        <term><command>dbus-uuidgen</command></term>
-        <listitem>
-          <para>Utility to generate UUIDs</para>
-          <indexterm zone="ch-system-dbus dbus-uuidgen">
-            <primary sortas="b-dbus-uuidgen">dbus-uuidgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-monitor">
-        <term><command>dbus-monitor</command></term>
-        <listitem>
-          <para>A debug probe that prints message bus messages</para>
-          <indexterm zone="ch-system-dbus dbus-monitor">
-            <primary sortas="b-dbus-monitor">dbus-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-launch">
-        <term><command>dbus-launch</command></term>
-        <listitem>
-          <para>Utility to start a message bus from a shell script</para>
-          <indexterm zone="ch-system-dbus dbus-launch">
-            <primary sortas="b-dbus-launch">dbus-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-send">
-        <term><command>dbus-send</command></term>
-        <listitem>
-          <para>Send a message to a message bus</para>
-          <indexterm zone="ch-system-dbus dbus-send">
-            <primary sortas="b-dbus-send">dbus-send</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdbus-1">
-        <term><filename class="libraryfile">libdbus-1</filename></term>
-        <listitem>
-          <para>Library containing the API for using the message bus</para>
-          <indexterm zone="ch-system-dbus libdbus-1">
-            <primary sortas="c-libdbus-1">libdbus-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/eudev.xml
===================================================================
--- BOOK/final-system/common/eudev.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/common/eudev.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-eudev" role="wrap">
+  <?dbhtml filename="eudev.html"?>
+
+  <title>Eudev-&eudev-version;</title>
+
+  <indexterm zone="ch-system-eudev">
+    <primary sortas="a-Eudev">Eudev</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Eudev package contains programs for dynamic creation of device
+    nodes.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Eudev</title>
+
+    <para os="a">Prepare Eudev for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
+    --with-rootprefix="" --libexecdir=/lib --enable-split-usr \
+    --libdir=/usr/lib --with-rootlibdir=/lib --sbindir=/sbin --bindir=/sbin \
+    --enable-rule_generator --disable-introspection --disable-keymap \
+    --disable-gudev --disable-gtk-doc-html --with-firmware-path=/lib/firmware \
+    --enable-libkmod</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
+
+    <para os="g">Install the package:</para>
+
+<screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">Create a directory for storing firmware that can be
+    loaded by <command>udev</command>:</para>
+
+<screen os="j"><userinput>install -dv /lib/firmware</userinput></screen>
+
+    <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
+
+<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \
+> /etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-eudev" role="content">
+    <title>Contents of Eudev</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
+        firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, usb_id,
+        v4l_id, write_cd_rules, write_net_rules</seg>
+        <seg>libudev</seg>
+        <seg>/etc/udev, /lib/firmware, /lib/udev, /usr/share/doc/udev</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="udevadm">
+        <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-system-eudev udevadm">
+            <primary sortas="b-udevadm">udevadm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevd">
+        <term><command>udevd</command></term>
+        <listitem>
+          <para>A daemon that reorders hotplug events before submitting them to
+          <command>udev</command>,
+          thus avoiding various race conditions</para>
+          <indexterm zone="ch-system-eudev udevd">
+            <primary sortas="b-udevd">udevd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+ <!-- Start of Helpers -->
+      <varlistentry id="ata_id">
+        <term><command>ata_id</command></term>
+        <listitem>
+          <para>Provides Eudev with a unique string and additional
+          information (uuid, label) for an ATA drive</para>
+          <indexterm zone="ch-system-eudev ata_id">
+            <primary sortas="b-ata_id">ata_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cdrom_id">
+        <term><command>cdrom_id</command></term>
+        <listitem>
+          <para>Prints the capabilities of a CDROM or DVDROM drive.</para>
+          <indexterm zone="ch-system-eudev cdrom_id">
+            <primary sortas="b-cdrom_id">cdrom_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="collect">
+        <term><command>collect</command></term>
+        <listitem>
+          <para>Given an ID for the current uevent and a list of IDs
+(for all target uevents), registers the current ID and indicates whether
+all target IDs have been registered.</para>
+          <indexterm zone="ch-system-eudev collect">
+            <primary sortas="b-collect">collect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="create_floppy_devices">
+        <term><command>create_floppy_devices</command></term>
+        <listitem>
+          <para>Creates all possible floppy devices based on the CMOS type</para>
+          <indexterm zone="ch-system-eudev create_floppy_devices">
+            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="edd_id">
+        <term><command>edd_id</command></term>
+        <listitem>
+          <para>Identifies x86 disk drives from Enhanced Disk Drive calls</para>
+          <indexterm zone="ch-system-eudev edd_id">
+            <primary sortas="b-edd_id">edd_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="firmware.sh">
+        <term><command>firmware.sh</command></term>
+        <listitem>
+          <para>Script to load firmware for a device</para>
+          <indexterm zone="ch-system-eudev firmware.sh">
+            <primary sortas="b-firmware.sh">firmware.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fstab_import">
+        <term><command>fstab_import</command></term>
+        <listitem>
+          <para>Finds an entry in <filename>/etc/fstab</filename> that matches
+the current device, and provides its information to Udev.</para>
+          <indexterm zone="ch-system-eudev fstab_import">
+            <primary sortas="b-fstab_import">fstab_import</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="path_id">
+        <term><command>path_id</command></term>
+        <listitem>
+          <para>Provides the shortest possible unique hardware path to a
+          device</para>
+          <indexterm zone="ch-system-eudev path_id">
+            <primary sortas="b-path_id">path_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="scsi_id">
+        <term><command>scsi_id</command></term>
+        <listitem>
+          <para>Retrieves or generates a unique SCSI identifier.</para>
+          <indexterm zone="ch-system-eudev scsi_id">
+            <primary sortas="b-scsi_id">scsi_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="usb_id">
+        <term><command>usb_id</command></term>
+        <listitem>
+          <para>Identifies a USB block device.</para>
+          <indexterm zone="ch-system-eudev usb_id">
+            <primary sortas="b-usb_id">usb_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="v4l_id">
+        <term><command>v4l_id</command></term>
+        <listitem>
+          <para>Determines V4L capabilities for a given device.</para>
+          <indexterm zone="ch-system-eudev v4l_id">
+            <primary sortas="b-v4l_id">v4l_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write_cd_rules">
+        <term><command>write_cd_rules</command></term>
+        <listitem>
+          <para>A script which generates Eudev rules to provide stable names
+for network interfaces.</para>
+          <indexterm zone="ch-system-eudev write_cd_rules">
+            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write_net_rules">
+        <term><command>write_net_rules</command></term>
+        <listitem>
+          <para>A script which generates Eudev rules to provide stable names
+for network interfaces.</para>
+          <indexterm zone="ch-system-eudev write_net_rules">
+            <primary sortas="b-write_net_rules">write_net_rules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+<!-- End of Helpers -->
+
+      <varlistentry id="libudev">
+        <term><filename class="libraryfile">libudev</filename></term>
+        <listitem>
+          <para>A library interface to eudev device information.</para>
+          <indexterm zone="ch-system-eudev libudev">
+            <primary sortas="c-libudev">libudev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="etc-eudev">
+        <term><filename class="directory">/etc/udev</filename></term>
+        <listitem>
+          <para>Contains <command>udev</command> configuration files,
+          device permissions, and rules for device naming</para>
+          <indexterm zone="ch-system-eudev etc-eudev">
+            <primary sortas="e-/etc/udev">/etc/udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lib-eudev">
+        <term><filename class="directory">/lib/udev</filename></term>
+        <listitem>
+          <para>Contains <command>udev</command> helper programs
+          and static devices which get copied to /dev when booted.</para>
+          <indexterm zone="ch-system-eudev lib-eudev">
+            <primary sortas="e-/lib/udev">/lib/udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/glibc.xml
===================================================================
--- BOOK/final-system/common/glibc.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/common/glibc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -175,9 +175,4 @@
 mkdir -pv /var/cache/nscd</userinput></screen>
 
-    <para os="w">Install the systemd support files for <command>nscd</command>:</para>
-
-<screen os="x"><userinput>install -v -Dm644 ../glibc-2.19/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
-install -v -Dm644 ../glibc-2.19/nscd/nscd.service /lib/systemd/system/nscd.service</userinput></screen>
-
   </sect2>
 
Index: OK/final-system/common/gperf.xml
===================================================================
--- BOOK/final-system/common/gperf.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gperf" role="wrap">
-  <?dbhtml filename="gperf.html"?>
-
-  <title>Gperf-&gperf-version;</title>
-
-  <indexterm zone="ch-system-gperf">
-    <primary sortas="a-Gperf">Gperf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Gperf generates a perfect hash function from a key set.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gperf</title>
-
-    <para os="a">Prepare Gperf for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gperf" role="content">
-    <title>Contents of Gperf</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>gperf</seg>
-        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gperf">
-        <term><command>gperf</command></term>
-        <listitem>
-          <para>Generates a perfect hash function from a key set</para>
-          <indexterm zone="ch-system-gperf gperf">
-            <primary sortas="b-gperf">gperf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/intltool.xml
===================================================================
--- BOOK/final-system/common/intltool.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-intltool" role="wrap">
-  <?dbhtml filename="intltool.html"?>
-
-  <title>Intltool-&intltool-version;</title>
-
-  <indexterm zone="ch-system-intltool">
-    <primary sortas="a-Intltool">Intltool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Intltool package contains internationalization tools.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Intltool</title>
-
-    <para os="a">Prepare Intltool for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-intltool" role="content">
-    <title>Contents of Intltool</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>intltool-extract, intltool-merge, intltool-prepare, intltool-update, intltoolize</seg>
-        <seg>/usr/share/intltool</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="intltool-extract">
-        <term><command>intltool-extract</command></term>
-        <listitem>
-          <para>Generates header files which can be read by gettext</para>
-          <indexterm zone="ch-system-intltool intltool-extract">
-            <primary sortas="b-intltool-extract">intltool-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-merge">
-        <term><command>intltool-merge</command></term>
-        <listitem>
-          <para>Merges translated strings into various types of files</para>
-          <indexterm zone="ch-system-intltool intltool-merge">
-            <primary sortas="b-intltool-merge">intltool-merge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-prepare">
-        <term><command>intltool-prepare</command></term>
-        <listitem>
-          <para>Prepares software to make use of intltool</para>
-          <indexterm zone="ch-system-intltool intltool-prepare">
-            <primary sortas="b-intltool-prepare">intltool-prepare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-update">
-        <term><command>intltool-update</command></term>
-        <listitem>
-          <para>Updates PO template files and merges translations with them</para>
-          <indexterm zone="ch-system-intltool intltool-update">
-            <primary sortas="b-intltool-update">intltool-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltoolize">
-        <term><command>intltoolize</command></term>
-        <listitem>
-          <para>Copies intltool related files to software packages</para>
-          <indexterm zone="ch-system-intltool intltoolize">
-            <primary sortas="b-intltoolize">intltoolize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/libcap.xml
===================================================================
--- BOOK/final-system/common/libcap.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libcap" role="wrap">
-  <?dbhtml filename="libcap.html"?>
-
-  <title>Libcap-&libcap-version;</title>
-
-  <indexterm zone="ch-system-libcap">
-    <primary sortas="a-Libcap">Libcap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Libcap is a library for getting and setting POSIX.1e
-    (formerly POSIX 6) draft 15 capabilities.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libcap</title>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make RAISE_SETFCAP=no install
-chmod -v 755 /lib/libcap.so.&libcap-version;
-ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
-rm -v /lib/libcap.so
-mv -v /lib/libcap.a /usr/lib</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-libcap" role="content">
-    <title>Contents of Libcap</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>capsh, getcap, getpcaps, setcap</seg>
-        <seg>libcap.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="capsh">
-        <term><command>capsh</command></term>
-        <listitem>
-          <para>Capability support and use can be explored and constrained
-          with this tool</para>
-          <indexterm zone="ch-system-libcap capsh">
-            <primary sortas="b-capsh">capsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getcap">
-        <term><command>getcap</command></term>
-        <listitem>
-          <para>Examines file capabilities</para>
-          <indexterm zone="ch-system-libcap getcap">
-            <primary sortas="b-getcap">getcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getpcaps">
-        <term><command>getpcaps</command></term>
-        <listitem>
-          <para>Displays the capabilities on the queried process(es)</para>
-          <indexterm zone="ch-system-libcap getpcaps">
-            <primary sortas="b-getpcaps">getpcaps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setcap">
-        <term><command>setcap</command></term>
-        <listitem>
-          <para>Sets file capabilities</para>
-          <indexterm zone="ch-system-libcap setcap">
-            <primary sortas="b-setcap">setcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcap">
-        <term><filename class="libraryfile">libcap</filename></term>
-        <listitem>
-          <para>Library for setting and clearing POSIX.1e capabilities</para>
-          <indexterm zone="ch-system-libcap libcap">
-            <primary sortas="c-libcap">libcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/libee.xml
===================================================================
--- BOOK/final-system/common/libee.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/common/libee.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libee" role="wrap">
+  <?dbhtml filename="libee.html"?>
+
+  <title>Libee-&libee-version;</title>
+
+  <indexterm zone="ch-system-libee">
+    <primary sortas="a-Libee">Libee</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Libee is an event expression library.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libee</title>
+
+    <para os="a">Prepare Libee for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<note os="n1">
+    <para>Libee will fail to compile if using multiple jobs with make. Append "<command>-j 1</command>" to the following make command:</para>
+</note>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">This package does not come with a test suite.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-libee" role="content">
+    <title>Contents of Libee</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>libee-convert</seg>
+        <seg>libee.[a,so]</seg>
+        <seg>/usr/include/libee</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libee-convert">
+        <term><command>libee-convert</command></term>
+        <listitem>
+          <para>todo</para>
+          <indexterm zone="ch-system-libee libee-convert">
+            <primary sortas="b-libee-convert">libee-convert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libee">
+        <term><filename class="libraryfile">libee</filename></term>
+        <listitem>
+          <para>is the event expression library</para>
+          <indexterm zone="ch-system-libee libee">
+            <primary sortas="c-libee">libee</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/libestr.xml
===================================================================
--- BOOK/final-system/common/libestr.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/common/libestr.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libestr" role="wrap">
+  <?dbhtml filename="libestr.html"?>
+
+  <title>Libestr-&libestr-version;</title>
+
+  <indexterm zone="ch-system-libestr">
+    <primary sortas="a-Libestr">Libestr</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Libestr package is a library for some string essentials.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libestr</title>
+
+    <para os="a">Prepare Libestr for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">This package does not come with a test suite.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-libestr" role="content">
+    <title>Contents of Libestr</title>
+
+    <segmentedlist>
+      <segtitle>Installed libraries</segtitle>
+
+      <seglistitem>
+        <seg>libestr.[a,so]</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libestr">
+        <term><filename class="libraryfile">libestr</filename></term>
+        <listitem>
+          <para>contains functions for aiding in string functions</para>
+          <indexterm zone="ch-system-libestr libestr">
+            <primary sortas="c-libestr">libestr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/procps-ng.xml
===================================================================
--- BOOK/final-system/common/procps-ng.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/common/procps-ng.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -114,5 +114,5 @@
       </varlistentry>
 
-      <varlistentry id="pidof">
+<!--      <varlistentry id="pidof">
         <term><command>pidof</command></term>
         <listitem>
@@ -122,5 +122,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
       <varlistentry id="pkill">
Index: BOOK/final-system/common/rsyslog.xml
===================================================================
--- BOOK/final-system/common/rsyslog.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/common/rsyslog.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-rsyslog" xreflabel="rsyslog" role="wrap">
+  <?dbhtml filename="rsyslog.html"?>
+
+  <title>Rsyslog-&rsyslog-version;</title>
+
+  <indexterm zone="ch-system-rsyslog">
+    <primary sortas="a-rsyslog">rsyslog</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The rsyslog package contains programs for logging system messages,
+    such as those given by the kernel when unusual things happen.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Rsyslog</title>
+
+    <para os="a">Prepare Rsyslog for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+    <para os="h">Create a directory for expansion snippets:</para>
+
+<screen os="i"><userinput>install -dv /etc/rsyslog.d</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="conf-rsyslog" role="configuration">
+    <title>Configuring rsyslog</title>
+
+    <indexterm zone="conf-rsyslog">
+      <primary sortas="a-rsyslog">rsyslog</primary>
+    <secondary>configuring</secondary></indexterm>
+
+    <indexterm zone="conf-rsyslog">
+      <primary sortas="e-/etc/rsyslog.conf">/etc/rsyslog.conf</primary>
+    </indexterm>
+
+    <para>Create a new <filename>/etc/rsyslog.conf</filename> file by running
+    the following:</para>
+
+<screen><userinput>cat &gt; /etc/rsyslog.conf &lt;&lt; "EOF"
+<literal># Begin /etc/rsyslog.conf
+
+# CLFS configuration of rsyslog. For more info use man rsyslog.conf
+
+#######################################################################
+# Rsyslog Modules
+
+# Support for Local System Logging
+$ModLoad imuxsock.so
+
+# Support for Kernel Logging
+$ModLoad imklog.so
+
+#######################################################################
+# Global Options
+
+# Use traditional timestamp format.
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# Set the default permissions for all log files.
+$FileOwner root
+$FileGroup root
+$FileCreateMode 0640
+$DirCreateMode 0755
+
+# Provides UDP reception
+$ModLoad imudp
+$UDPServerRun 514
+
+# Disable Repeating of Entries
+$RepeatedMsgReduction on
+
+#######################################################################
+# Include Rsyslog Config Snippets
+
+$IncludeConfig /etc/rsyslog.d/*.conf
+
+#######################################################################
+# Standard Log Files
+
+auth,authpriv.*			/var/log/auth.log
+*.*;auth,authpriv.none		-/var/log/syslog
+daemon.*			-/var/log/daemon.log
+kern.*				-/var/log/kern.log
+lpr.*				-/var/log/lpr.log
+mail.*				-/var/log/mail.log
+user.*				-/var/log/user.log
+
+# Catch All Logs
+*.=debug;\
+	auth,authpriv.none;\
+	news.none;mail.none	-/var/log/debug
+*.=info;*.=notice;*.=warn;\
+	auth,authpriv.none;\
+	cron,daemon.none;\
+	mail,news.none		-/var/log/messages
+
+# Emergencies are shown to everyone
+*.emerg				*
+
+# End /etc/rsyslog.conf</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-rsyslog" role="content">
+    <title>Contents of rsyslog</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>rsyslogd</seg>
+        <seg>/usr/lib/rsyslog</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rsyslogd">
+        <term><command>rsyslogd</command></term>
+        <listitem>
+          <para>Logs the messages that system programs offer for logging.
+          Every logged message contains at least a date stamp and a hostname,
+          and normally the program's name too, but that depends on how
+          trusting the logging daemon is told to be.</para>
+          <indexterm zone="ch-system-rsyslog rsyslogd">
+            <primary sortas="b-rsyslogd">rsyslogd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: OK/final-system/common/systemd.xml
===================================================================
--- BOOK/final-system/common/systemd.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,320 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-systemd" role="wrap">
-  <?dbhtml filename="systemd.html"?>
-
-  <title>Systemd-&systemd-version;</title>
-
-  <indexterm zone="ch-system-systemd">
-    <primary sortas="a-systemd">Systemd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The systemd package is a system and service manager for Linux
-    operating systems.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Systemd</title>
-
-    <para os="p1">Apply a patch so that compat <command>pkg-config</command>
-    files get installed without installing compat libraries:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
-
-    <para os="a">Prepare systemd for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" --with-rootlibdir=/lib \
-    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
-    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
-    --with-dbussessionservicedir=/usr/share/dbus-1/services \
-    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-root*</parameter></term>
-        <listitem>
-          <para>These switches ensure that core programs and
-          shared libraries are installed in the subdirectories
-          of the root partition.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-split-usr</parameter></term>
-        <listitem>
-          <para>This switch ensures that systemd will work on
-          systems where /bin, /lib and /sbin directories are not
-          symlinks to their /usr counterparts.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-gudev</parameter></term>
-        <listitem>
-          <para>This switch prevents systemd from building
-          <filename class="libraryfile">libgudev</filename> as it requires
-          Glib, which is not installed in CLFS.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-dbus*</parameter></term>
-        <listitem>
-          <para>These switches ensure that D-Bus configuration files get
-          installed to the correct locations.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">Prevent a broken test case from running:</para>
-
-<screen os="g"><userinput remap="test">sed -e "s:test/udev-test.pl::g" \
-    -e "s:test-bus-cleanup\$(EXEEXT) ::g" \
-    -e "s:test-bus-gvariant\$(EXEEXT) ::g" \
-    -i Makefile</userinput></screen>
-
-    <para os="h">Test the results, issue:</para>
-
-<screen os="i"><userinput remap="test">make check</userinput></screen>
-
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make install</userinput></screen>
-
-    <para os="l">Install documentation files that are not installed by default:</para>
-
-<screen os="m"><userinput>install -v -m644 man/*.html /usr/share/doc/systemd-&systemd-version;</userinput></screen>
-
-    <para os="n">Move NSS myhostname library to <filename class="directory">/lib
-</filename>:</para>
-
-<screen os="o"><userinput>mv -v /usr/lib/libnss_myhostname.so.2 /lib</userinput></screen>
-
-    <para os="p">Remove an unnecessary directory:</para>
-
-<screen os="q"><userinput>rm -rfv /usr/lib/rpm</userinput></screen>
-
-    <para os="r">Create symlinks for backwards-compatibility with Sysvinit:</para>
-
-<screen os="s"><userinput>for tool in runlevel reboot shutdown poweroff halt telinit; do
-  ln -sfv ../bin/systemctl /sbin/$tool
-done
-ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
-
-    <para os="t">Modify a configuration file which references a group that
-    doesn't exist:</para>
-
-<screen os="u"><userinput>sed -i "s@root lock@root root@g" /usr/lib/tmpfiles.d/legacy.conf</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-systemd" role="configuration">
-    <title>Configuring Systemd</title>
-
-    <indexterm zone="conf-systemd">
-      <primary sortas="a-systemd">systemd</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-systemd">
-      <primary sortas="e-/etc/os-release">/etc/os-release</primary>
-    </indexterm>
-
-    <para>Create <filename>/etc/machine-id</filename> which is needed
-    by Journald:</para>
-
-<screen><userinput>systemd-machine-id-setup</userinput></screen>
-
-    <para>Create a file to identify the operating system.
-    <command>systemd</command> will use this file on boot to put information
-    on the screen.</para>
-
-<screen><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
-# Begin /etc/os-release
-
-NAME=Cross-LFS
-ID=clfs
-
-PRETTY_NAME=Cross Linux From Scratch
-ANSI_COLOR=0;33
-
-VERSION=&version;
-VERSION_ID=&versionid;
-
-# End /etc/os-release
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-systemd" role="content">
-    <title>Contents of Systemd</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>bootctl, busctl, halt (link to systemctl), hostnamectl,
-        init (link to systemd), journalctl, kernel-install, localectl, loginctl,
-        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,
-        systemd-cgls, systemd-cgtop, systemd-coredumpctl, systemd-delta,
-        systemd-detect-virt, systemd-inhibit, systemd-machine-id-setup,
-        systemd-notify, systemd-nspawn, systemd-run, systemd-stdio-bridge
-        (link to systemd-bus-proxyd), systemd-tmpfiles,
-        systemd-tty-ask-password-agent, telinit (link to systemctl),
-        timedatectl, udevadm</seg>
-        <seg>libnss_myhostname.so, libsystemd.so, libudev.so</seg>
-        <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
-        /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
-        /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
-        /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d,
-        /usr/lib/sysctl.d, /usr/lib/systemd,
-        /usr/share/doc-systemd-&systemd-version;, /usr/share/systemd,
-        /var/lib/systemd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="systemctl">
-        <term><command>systemctl</command></term>
-        <listitem>
-          <para>Control the systemd system and service manager</para>
-          <indexterm zone="ch-system-systemd systemctl">
-            <primary sortas="b-systemctl">systemctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd">
-        <term><command>systemd</command></term>
-        <listitem>
-          <para>System and service manager for Linux</para>
-          <indexterm zone="ch-system-systemd systemd">
-            <primary sortas="b-systemd">systemd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-ask-password">
-        <term><command>systemd-ask-password</command></term>
-        <listitem>
-          <para>Queries the user for a system passphrase, via the
-          TTY or an UI agent.</para>
-          <indexterm zone="ch-system-systemd systemd-ask-password">
-            <primary sortas="b-systemd-ask-password">systemd-ask-password</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-cgls">
-        <term><command>systemd-cgls</command></term>
-        <listitem>
-          <para>Recursively shows control group contents</para>
-          <indexterm zone="ch-system-systemd systemd-cgls">
-            <primary sortas="b-systemd-cgls">systemd-cgls</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
-          status changes</para>
-          <indexterm zone="ch-system-systemd systemd-notify">
-            <primary sortas="b-systemd-notify">systemd-notify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-tty-ask-password-agent">
-        <term><command>systemd-tty-ask-password-agent</command></term>
-        <listitem>
-          <para>Process system password requests</para>
-          <indexterm zone="ch-system-systemd systemd-tty-ask-password-agent">
-            <primary sortas="b-systemd-tty-ask-password-agent">systemd-tty-ask-password-agent</primary>
-          </indexterm>
-        </listitem>
-      </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>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/sysvinit.xml
===================================================================
--- BOOK/final-system/common/sysvinit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/common/sysvinit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-sysvinit" role="wrap">
+  <?dbhtml filename="sysvinit.html"?>
+
+  <title>Sysvinit-&sysvinit-version;</title>
+
+  <indexterm zone="ch-system-sysvinit">
+    <primary sortas="a-Sysvinit">Sysvinit</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Sysvinit package contains programs for controlling the startup,
+    running, and shutdown of the system.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Sysvinit</title>
+
+<para os ="a">Apply a sed which disables last, mesg, mountpoint, sulogin,
+utmpdump, and wall from being built and installed as they are provided by
+Util-linux:</para>
+
+<screen os="b"><userinput>sed -i -e 's/\ sulogin[^ ]*//' \
+    -e '/utmpdump/d' -e '/mountpoint/d' -e '/mesg/d' src/Makefile</userinput></screen>
+
+<para os ="c">Compile the package:</para>
+
+<screen os="d"><userinput>make -C src clobber
+make -C src</userinput></screen>
+
+    <para os="e">Install the package:</para>
+
+<screen os="f"><userinput>make -C src install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="conf-sysvinit" role="configuration">
+    <title>Configuring Sysvinit</title>
+
+    <indexterm zone="conf-sysvinit">
+      <primary sortas="a-Sysvinit">Sysvinit</primary>
+    <secondary>configuring</secondary></indexterm>
+
+    <indexterm zone="conf-sysvinit">
+      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
+    </indexterm>
+
+    <para>Create a new file <filename>/etc/inittab</filename> by running the
+    following:</para>
+
+<screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"
+<literal># Begin /etc/inittab
+
+id:3:initdefault:
+
+si::sysinit:/etc/rc.d/init.d/rc sysinit
+
+l0:0:wait:/etc/rc.d/init.d/rc 0
+l1:S1:wait:/etc/rc.d/init.d/rc 1
+l2:2:wait:/etc/rc.d/init.d/rc 2
+l3:3:wait:/etc/rc.d/init.d/rc 3
+l4:4:wait:/etc/rc.d/init.d/rc 4
+l5:5:wait:/etc/rc.d/init.d/rc 5
+l6:6:wait:/etc/rc.d/init.d/rc 6
+
+ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
+
+su:S016:once:/sbin/sulogin
+</literal>
+EOF</userinput></screen>
+
+    <para>The following command adds the standard virtual terminals to
+    <filename>/etc/inittab</filename>. If your system only has a serial
+    console skip the following command:</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal>1:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty1 9600
+2:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty2 9600
+3:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty3 9600
+4:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty4 9600
+5:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty5 9600
+6:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty6 9600
+</literal>
+EOF</userinput></screen>
+
+    <para>If your system has a serial console run the following command to add
+    the entry to <filename>/etc/inittab</filename>:</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal>c0:12345:respawn:/sbin/agetty --noclear 115200 ttyS0 vt100
+</literal>
+EOF</userinput></screen>
+
+   <para>Finally, add the end line to <filename>/etc/inittab</filename>:</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal># End /etc/inittab</literal>
+EOF</userinput></screen>
+
+    <para>The <parameter>-I '\033(K'</parameter> option tells
+    <command>agetty</command> to send this escape sequence to the terminal
+    before doing anything else. This escape sequence switches the console
+    character set to a user-defined one, which can be modified by running
+    the <command>setfont</command> program. The <command>console</command>
+    initscript from the CLFS-Bootscripts package calls the
+    <command>setfont</command> program during system startup. Sending this
+    escape sequence is necessary for people who use non-ISO 8859-1 screen
+    fonts, but it does not affect native English speakers.</para>
+
+  </sect2>
+
+  <sect2 id="contents-sysvinit" role="content">
+    <title>Contents of Sysvinit</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>bootlogd, fstab-decode, halt, init, killall5, pidof (link to
+        killall5), poweroff (link to halt), reboot (link to halt), runlevel,
+        shutdown, and telinit (link to init)</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="bootlogd">
+        <term><command>bootlogd</command></term>
+        <listitem>
+          <para>Logs boot messages to a log file</para>
+          <indexterm zone="ch-system-sysvinit bootlogd">
+            <primary sortas="b-bootlogd">bootlogd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fstab-decode">
+        <term><command>fstab-decode</command></term>
+        <listitem>
+          <para>Runs a command with fstab-encoded arguments</para>
+          <indexterm zone="ch-system-sysvinit fstab-decode">
+            <primary sortas="b-fstab-decode">fstab-decode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="halt">
+        <term><command>halt</command></term>
+        <listitem>
+          <para>Normally invokes <command>shutdown</command> with the
+          <parameter>-h</parameter> option, except when already in run-level 0,
+          then it tells the kernel to halt the system; it notes in the
+          file <filename>/var/log/wtmp</filename> that the system is being
+          brought down</para>
+          <indexterm zone="ch-system-sysvinit halt">
+            <primary sortas="b-halt">halt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="init">
+        <term><command>init</command></term>
+        <listitem>
+          <para>The first process to be started when the kernel has initialized
+          the hardware which takes over the boot process and starts all the
+          proceses it is instructed to</para>
+          <indexterm zone="ch-system-sysvinit init">
+            <primary sortas="b-init">init</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="killall5">
+        <term><command>killall5</command></term>
+        <listitem>
+          <para>Sends a signal to all processes, except the processes in its own
+          session so it will not kill the shell running the script that called
+          it</para>
+          <indexterm zone="ch-system-sysvinit killall5">
+            <primary sortas="b-killall5">killall5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pidof">
+        <term><command>pidof</command></term>
+        <listitem>
+          <para>Reports the PIDs of the given programs</para>
+          <indexterm zone="ch-system-sysvinit pidof">
+            <primary sortas="b-pidof">pidof</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="poweroff">
+        <term><command>poweroff</command></term>
+        <listitem>
+          <para>Tells the kernel to halt the system and switch off the computer
+          (see <command>halt</command>)</para>
+          <indexterm zone="ch-system-sysvinit poweroff">
+            <primary sortas="b-poweroff">poweroff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="reboot">
+        <term><command>reboot</command></term>
+        <listitem>
+          <para>Tells the kernel to reboot the system (see
+          <command>halt</command>)</para>
+          <indexterm zone="ch-system-sysvinit reboot">
+            <primary sortas="b-reboot">reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="runlevel">
+        <term><command>runlevel</command></term>
+        <listitem>
+          <para>Reports the previous and the current run-level, as noted in
+          the last run-level record in <filename>/var/run/utmp</filename></para>
+          <indexterm zone="ch-system-sysvinit runlevel">
+            <primary sortas="b-runlevel">runlevel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="shutdown">
+        <term><command>shutdown</command></term>
+        <listitem>
+          <para>Brings the system down in a secure way, signaling all processes
+          and notifying all logged-in users</para>
+          <indexterm zone="ch-system-sysvinit shutdown">
+            <primary sortas="b-shutdown">shutdown</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="telinit">
+        <term><command>telinit</command></term>
+        <listitem>
+          <para>Tells <command>init</command> which run-level to change to</para>
+          <indexterm zone="ch-system-sysvinit telinit">
+            <primary sortas="b-telinit">telinit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/common/util-linux.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -46,5 +46,5 @@
       utilize <filename class="libraryfile">libudev</filename> for WWN and serial
       number information. If this is desired, rebuild Util-linux after
-      <xref linkend="ch-system-systemd"/></para>
+      <xref linkend="ch-system-eudev"/></para>
     </note>
 
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/mips-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,6 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
@@ -40,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -58,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -68,14 +64,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,6 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
@@ -40,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -58,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -68,14 +64,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
Index: BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/mips64-64/glibc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -140,12 +140,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/mips64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -49,10 +49,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
@@ -71,7 +65,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -105,5 +96,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
@@ -119,11 +109,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-n32.xml"/>
@@ -131,12 +114,17 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
Index: BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/glibc-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/mips64/glibc-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -122,12 +122,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: OK/final-system/multilib/acl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/acl-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-acl" role="wrap">
-  <?dbhtml filename="acl-64bit.html"?>
-
-  <title>Acl-&acl-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-acl">
-    <primary sortas="a-Acl">Acl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Acl</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr --libdir=/lib64 \
-    --libexecdir=/usr/lib64</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib64
-    </filename> and remove the shared link from <filename class="directory">
-    /lib64</filename>:</para>
-
-<screen os="n"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libacl.so) /usr/lib64/libacl.so
-rm -v /lib64/libacl.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-<screen os="p"><userinput>chmod 755 -v /lib64/libacl.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(id('contents-acl'))"/>
-
-</sect1>
Index: OK/final-system/multilib/acl-n32.xml
===================================================================
--- BOOK/final-system/multilib/acl-n32.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,96 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-acl-n32" role="wrap">
-  <?dbhtml filename="acl-n32.html"?>
-
-  <title>Acl-&acl-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-acl-n32">
-    <primary sortas="a-Acl">Acl</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Acl</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure \
-    --prefix=/usr --libdir=/lib32 \
-    --libexecdir=/usr/lib32</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib32
-    </filename> and remove the shared link from <filename class="directory">
-    /lib32</filename>:</para>
-
-<screen os="n"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libacl.so) /usr/lib32/libacl.so
-rm -v /lib32/libacl.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-<screen os="p"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-acl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/acl.xml
===================================================================
--- BOOK/final-system/multilib/acl.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-acl-32" role="wrap">
-  <?dbhtml filename="acl.html"?>
-
-  <title>Acl-&acl-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-acl-32">
-    <primary sortas="a-Acl">Acl</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Acl</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILD32}" ./configure \
-    --prefix=/usr --libdir=/lib \
-    --libexecdir=/usr/lib</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib
-    </filename> and remove the shared link from <filename class="directory">
-    /lib</filename>:</para>
-
-<screen os="n"><userinput>ln -sfv ../../lib/$(readlink /lib/libacl.so) /usr/lib/libacl.so
-rm -v /lib/libacl.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/acl.xml"
-  xpointer="xpointer(//*[@os='p'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-acl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/attr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/attr-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-attr" role="wrap">
-  <?dbhtml filename="attr-64bit.html"?>
-
-  <title>Attr-&attr-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-attr">
-    <primary sortas="a-Attr">Attr</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Attr</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure \
-    --prefix=/usr --libdir=/lib64 \
-    --libexecdir=/usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib64
-    </filename> and remove the shared link from <filename class="directory">
-    /lib64</filename>:</para>
-
-<screen os="l"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libattr.so) /usr/lib64/libattr.so
-rm -v /lib64/libattr.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n"><userinput>chmod 755 -v /lib64/libattr.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(id('contents-attr'))"/>
-
-</sect1>
Index: OK/final-system/multilib/attr-n32.xml
===================================================================
--- BOOK/final-system/multilib/attr-n32.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-attr-n32" role="wrap">
-  <?dbhtml filename="attr-n32.html"?>
-
-  <title>Attr-&attr-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-attr-n32">
-    <primary sortas="a-Attr">Attr</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Attr</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" ./configure \
-    --prefix=/usr --libdir=/lib32 \
-    --libexecdir=/usr/lib32</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib32
-    </filename> and remove the shared link from <filename class="directory">
-    /lib32</filename>:</para>
-
-<screen os="l"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libattr.so) /usr/lib32/libattr.so
-rm -v /lib32/libattr.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n"><userinput>chmod 755 -v /lib32/libattr.so.1.1.0</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-attr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/attr.xml
===================================================================
--- BOOK/final-system/multilib/attr.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-attr-32" role="wrap">
-  <?dbhtml filename="attr.html"?>
-
-  <title>Attr-&attr-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-attr-32">
-    <primary sortas="a-Attr">Attr</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Attr</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD32}" ./configure \
-    --prefix=/usr --libdir=/lib \
-    --libexecdir=/usr/lib</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib
-    </filename> and remove the shared link from <filename class="directory">
-    /lib</filename>:</para>
-
-<screen os="l"><userinput>ln -sfv ../../lib/$(readlink /lib/libattr.so) /usr/lib/libattr.so
-rm -v /lib/libattr.so</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='n'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-attr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/dbus-64bit.xml
===================================================================
--- BOOK/final-system/multilib/dbus-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dbus" role="wrap">
-  <?dbhtml filename="dbus-64bit.html"?>
-
-  <title>D-Bus-&dbus-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-dbus">
-    <primary sortas="a-D-Bus">D-Bus</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dbus.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" USE_ARCH=64 PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} \
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib64 --libexecdir=/usr/lib64/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
-    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">Move the shared library to <filename class="directory">/lib64
-    </filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib64/libdbus-1.so.* /lib64
-ln -sfv ../../lib64/$(readlink /usr/lib64/libdbus-1.so) /usr/lib64/libdbus-1.so
-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dbus.xml"
-  xpointer="xpointer(id('contents-dbus'))"/>
-
-</sect1>
Index: OK/final-system/multilib/dbus-n32.xml
===================================================================
--- BOOK/final-system/multilib/dbus-n32.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dbus-n32" role="wrap">
-  <?dbhtml filename="dbus-n32.html"?>
-
-  <title>D-Bus-&dbus-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-dbus-n32">
-    <primary sortas="a-D-Bus">D-Bus</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dbus.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" USE_ARCH=n32 PKG_CONFIG_PATH=${PKG_CONFIG_PATHN32} \
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib32 --libexecdir=/usr/lib32/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
-    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">Move the shared library to <filename class="directory">/lib32
-    </filename> and recreate the symbolic link.</para>
-
-<screen os="i"><userinput>mv -v /usr/lib32/libdbus-1.so.* /lib32
-ln -sfv ../../lib32/$(readlink /usr/lib32/libdbus-1.so) /usr/lib32/libdbus-1.so
-</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-dbus" role="."/></para>
-
-  </sect2>
-</sect1>
-
-
-
Index: OK/final-system/multilib/dbus.xml
===================================================================
--- BOOK/final-system/multilib/dbus.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dbus-32" role="wrap">
-  <?dbhtml filename="dbus.html"?>
-
-  <title>D-Bus-&dbus-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-dbus-32">
-    <primary sortas="a-D-Bus">D-Bus 32 Bit Libraries</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/dbus.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" USE_ARCH=32 PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
-    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
-    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/dbus.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-dbus" role="."/></para>
-
-  </sect2>
-</sect1>
-
Index: BOOK/final-system/multilib/eudev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eudev-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/eudev-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-eudev" role="wrap">
+  <?dbhtml filename="eudev-64bit.html"?>
+
+  <title>Eudev-&eudev-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-eudev">
+    <primary sortas="a-Eudev">Eudev</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Eudev</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} \
+CC="gcc ${BUILD64}" ./configure --prefix=/usr --sysconfdir=/etc \
+    --with-rootprefix="" --libexecdir=/lib64 --libdir=/usr/lib64 \
+    --with-rootlibdir=/lib64 --sbindir=/sbin --bindir=/sbin \
+    --enable-split-usr --enable-rule_generator --disable-introspection \
+    --disable-keymap --disable-gudev --disable-gtk-doc-html \
+    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='r1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='r2'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(id('contents-eudev'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/eudev-n32.xml
===================================================================
--- BOOK/final-system/multilib/eudev-n32.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/eudev-n32.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-eudev-n32" role="wrap">
+  <?dbhtml filename="udev-n32.html"?>
+
+  <title>Eudev-&eudev-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-eudev-n32">
+    <primary sortas="a-Eudev">Eudev</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Eudev</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>
+PKG_CONFIG_PATH=${PKG_CONFIG_PATHN32} \
+CC="gcc ${BUILDN32}" ./configure --prefix=/usr --sysconfdir=/etc \
+    --with-rootprefix="" --libexecdir=/lib32 --enable-split-usr \
+    --libdir=/usr/lib32 --with-rootlibdir=/lib32 --sbindir=/sbin \
+    --bindir=/sbin --enable-rule_generator --disable-introspection \
+    --disable-keymap --disable-gudev --disable-gtk-doc-html --enable-libkmod</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
+
+  </sect2>
+</sect1>
+
+
+
Index: BOOK/final-system/multilib/eudev.xml
===================================================================
--- BOOK/final-system/multilib/eudev.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/eudev.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-eudev-32" role="wrap">
+  <?dbhtml filename="eudev.html"?>
+
+  <title>Eudev-&eudev-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-eudev-32">
+    <primary sortas="a-Eudev">Eudev 32 Bit Libraries</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Eudev</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
+CC="gcc ${BUILD32}" ./configure --prefix=/usr --sysconfdir=/etc \
+    --with-rootprefix="" --libexecdir=/lib --enable-split-usr \
+    --libdir=/usr/lib --with-rootlibdir=/lib --sbindir=/sbin --bindir=/sbin \
+    --enable-rule_generator --disable-introspection --disable-keymap \
+    --disable-gudev --disable-gtk-doc-html --enable-libkmod</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
+
+  </sect2>
+</sect1>
+
Index: BOOK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/multilib/glibc-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -132,12 +132,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: OK/final-system/multilib/gperf.xml
===================================================================
--- BOOK/final-system/multilib/gperf.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gperf" role="wrap">
-  <?dbhtml filename="gperf.html"?>
-
-  <title>Gperf-&gperf-version;</title>
-
-  <indexterm zone="ch-system-gperf">
-    <primary sortas="a-Gperf">Gperf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Gperf generates a perfect hash function from a key set.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gperf</title>
-
-    <para os="a">Prepare Gperf for compilation:</para>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gperf" role="content">
-    <title>Contents of Gperf</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>gperf</seg>
-        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gperf">
-        <term><command>gperf</command></term>
-        <listitem>
-          <para>Generates a perfect hash function from a key set</para>
-          <indexterm zone="ch-system-gperf gperf">
-            <primary sortas="b-gperf">gperf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libcap-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libcap-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libcap" role="wrap">
-  <?dbhtml filename="libcap-64bit.html"?>
-
-  <title>Libcap-&libcap-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-libcap">
-    <primary sortas="a-Libcap">Libcap</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libcap.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libcap</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make lib=lib64 install
-chmod -v 755 /lib64/libcap.so.&libcap-version;
-ln -sfv ../../lib64/$(readlink /lib64/libcap.so) /usr/lib64/libcap.so
-rm -v /lib64/libcap.so
-mv -v /lib64/libcap.a /usr/lib64</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libcap.xml"
-  xpointer="xpointer(id('contents-libcap'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libcap-n32.xml
===================================================================
--- BOOK/final-system/multilib/libcap-n32.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libcap-n32" role="wrap">
-  <?dbhtml filename="libcap-n32.html"?>
-
-  <title>Libcap-&libcap-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libcap-n32">
-    <primary sortas="a-Libcap">Libcap</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libcap.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libcap</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make lib=lib32 install
-chmod -v 755 /lib32/libcap.so.&libcap-version;
-ln -sfv ../../lib32/$(readlink /lib32/libcap.so) /usr/lib32/libcap.so
-rm -v /lib32/libcap.so
-mv -v /lib32/libcap.a /usr/lib32</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libcap" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libcap.xml
===================================================================
--- BOOK/final-system/multilib/libcap.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libcap-32" role="wrap">
-  <?dbhtml filename="libcap.html"?>
-
-  <title>Libcap-&libcap-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libcap-32">
-    <primary sortas="a-Libcap">Libcap</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libcap.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libcap</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make RAISE_SETFCAP=no lib=lib install
-chmod -v 755 /lib/libcap.so.&libcap-version;
-ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
-rm -v /lib/libcap.so
-mv -v /lib/libcap.a /usr/lib</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libcap" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/multilib/libee-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libee-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/libee-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libee" role="wrap">
+  <?dbhtml filename="libee-64bit.html"?>
+
+  <title>Libee-&libee-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-libee">
+    <primary sortas="a-Libee">Libee</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/libee.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libee</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/libee.xml"
+  xpointer="xpointer(id('contents-libee'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/libee-n32.xml
===================================================================
--- BOOK/final-system/multilib/libee-n32.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/libee-n32.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libee-n32" role="wrap">
+  <?dbhtml filename="libee-n32.html"?>
+
+  <title>Libee-&libee-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-libee-n32">
+    <primary sortas="a-Libee">Libee</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/libee.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libee</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-libee" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/libee.xml
===================================================================
--- BOOK/final-system/multilib/libee.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/libee.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libee-32" role="wrap">
+  <?dbhtml filename="libee.html"?>
+
+  <title>Libee-&libee-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-libee-32">
+    <primary sortas="a-Libee">Libee</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/libee.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libee</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+  ./configure --prefix=/usr</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-libee" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/libestr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libestr-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/libestr-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libestr" role="wrap">
+  <?dbhtml filename="libestr-64bit.html"?>
+
+  <title>Libestr-&libestr-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-libestr">
+    <primary sortas="a-Libestr">Libestr</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/libestr.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libestr</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/libestr.xml"
+  xpointer="xpointer(id('contents-libestr'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/libestr-n32.xml
===================================================================
--- BOOK/final-system/multilib/libestr-n32.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/libestr-n32.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libestr-n32" role="wrap">
+  <?dbhtml filename="libestr-n32.html"?>
+
+  <title>Libestr-&libestr-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-libestr-n32">
+    <primary sortas="a-Libestr">Libestr</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/libestr.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libestr</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-libestr" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/libestr.xml
===================================================================
--- BOOK/final-system/multilib/libestr.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/libestr.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libestr-32" role="wrap">
+  <?dbhtml filename="libestr.html"?>
+
+  <title>Libestr-&libestr-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-libestr-32">
+    <primary sortas="a-Libestr">Libestr</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/libestr.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libestr</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libestr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-libestr" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/rsyslog.xml
===================================================================
--- BOOK/final-system/multilib/rsyslog.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/rsyslog.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-rsyslog" xreflabel="rsyslog" role="wrap">
+  <?dbhtml filename="rsyslog.html"?>
+
+  <title>Rsyslog-&rsyslog-version;</title>
+
+  <indexterm zone="ch-system-rsyslog">
+    <primary sortas="a-rsyslog">rsyslog</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/rsyslog.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Rsyslog</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/rsyslog.xml"
+  xpointer="xpointer(id('conf-rsyslog'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/rsyslog.xml"
+  xpointer="xpointer(id('contents-rsyslog'))"/>
+
+</sect1>
Index: OK/final-system/multilib/systemd-64bit.xml
===================================================================
--- BOOK/final-system/multilib/systemd-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-systemd" role="wrap">
-  <?dbhtml filename="systemd-64bit.html"?>
-
-  <title>Systemd-&systemd-version;</title>
-
-  <indexterm zone="ch-system-systemd">
-    <primary sortas="a-systemd">Systemd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Systemd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" -with-rootlibdir=/lib64 \
-    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
-    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
-    --with-dbussessionservicedir=/usr/share/dbus-1/services \
-    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-<screen><userinput>mv -v /usr/lib64/libnss_myhostname.so.2 /lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(id('conf-systemd'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(id('contents-systemd'))"/>
-
-</sect1>
Index: OK/final-system/multilib/systemd-n32.xml
===================================================================
--- BOOK/final-system/multilib/systemd-n32.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-systemd-n32" role="wrap">
-  <?dbhtml filename="systemd-n32.html"?>
-
-  <title>Systemd-&systemd-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-systemd-n32">
-    <primary sortas="a-systemd">Systemd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of systemd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
-    xpointer="xpointer(//*[@os='mlw1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \
-    --libexecdir=/usr/lib32 --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" -with-rootlibdir=/lib32 \
-    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
-    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
-    --with-dbussessionservicedir=/usr/share/dbus-1/services \
-    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-<screen><userinput>mv -v /usr/lib32/libnss_myhostname.so.2 /lib32</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-systemd" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/systemd.xml
===================================================================
--- BOOK/final-system/multilib/systemd.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-systemd-32" role="wrap">
-  <?dbhtml filename="systemd.html"?>
-
-  <title>Systemd-&systemd-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-systemd-32">
-    <primary sortas="a-systemd">Systemd</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/systemd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Systemd</title>
-
-    <note os="mlw1">
-      <para>If you do not have Linux-PAM installed in your system you can safely
-      skip this page. If you do have Linux-PAM installed and you wish to use
-      <filename class="libraryfile">pam_systemd.so</filename>
-      to register and control user sessions within the systemd control group
-      hierarchy, follow the instructions to install the module.</para>
-    </note>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" --with-rootlibdir=/lib \
-    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
-    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
-    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
-    --with-dbussessionservicedir=/usr/share/dbus-1/services \
-    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make src/shared/{af,errno}-{from,to}-name.h src/libsystemd/libsystemd.sym
-make libsystemd.la libudev.la libnss_myhostname.la</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>make install-libLTLIBRARIES
-make install-pkgconfiglibDATA</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-systemd" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/multilib/sysvinit.xml
===================================================================
--- BOOK/final-system/multilib/sysvinit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/final-system/multilib/sysvinit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-sysvinit" role="wrap">
+  <?dbhtml filename="sysvinit.html"?>
+
+  <title>Sysvinit-&sysvinit-version;</title>
+
+  <indexterm zone="ch-system-sysvinit">
+    <primary sortas="a-Sysvinit">Sysvinit</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Sysvinit</title>
+  
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>make -C src clobber
+make -C src CC="gcc ${BUILD64}"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(id('conf-sysvinit'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(id('contents-sysvinit'))"/>
+
+</sect1>
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/ppc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,6 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
@@ -40,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -58,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -68,14 +64,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
Index: BOOK/final-system/ppc/glibc.xml
===================================================================
--- BOOK/final-system/ppc/glibc.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/ppc/glibc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -126,12 +126,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: BOOK/final-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/ppc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,6 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
@@ -40,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -58,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -68,14 +64,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
Index: BOOK/final-system/ppc64-64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64-64/glibc.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/ppc64-64/glibc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -156,12 +156,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/ppc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -41,8 +41,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
@@ -56,6 +52,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -82,5 +76,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
@@ -94,19 +87,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
Index: BOOK/final-system/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/glibc-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/ppc64/glibc-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -131,12 +131,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/sparc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,6 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
@@ -40,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -58,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -68,14 +64,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,6 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
@@ -40,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -58,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -68,14 +64,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
Index: BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/glibc.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/sparc64-64/glibc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -143,12 +143,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -41,8 +41,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
@@ -56,6 +52,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -82,5 +76,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
@@ -94,19 +87,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -129,12 +129,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/x86-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,6 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
@@ -40,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -58,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -68,15 +64,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-<!--   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
Index: BOOK/final-system/x86/glibc.xml
===================================================================
--- BOOK/final-system/x86/glibc.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/x86/glibc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -162,12 +162,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -31,6 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
@@ -40,5 +38,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -58,5 +55,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -68,14 +64,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
Index: BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/glibc.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/x86_64-64/glibc.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -162,12 +162,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
 
   </sect2>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/x86_64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -41,8 +41,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
@@ -56,6 +52,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
@@ -82,5 +76,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
@@ -94,19 +87,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xml-parser-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
Index: BOOK/final-system/x86_64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/glibc-64bit.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/final-system/x86_64/glibc-64bit.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -124,12 +124,4 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
   </sect2>
 
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/general.ent	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -3,5 +3,5 @@
 <!ENTITY month "05"> <!-- Use two digits -->
 <!ENTITY month_name "May">
-<!ENTITY day "13"> <!-- Use two digits -->
+<!ENTITY day "14"> <!-- Use two digits -->
 <!ENTITY year "2014"> <!-- Use four digits -->
 
@@ -11,8 +11,8 @@
 <!ENTITY minor-version "0">
 <!ENTITY extra-version "0">
-<!ENTITY generic-version "systemd"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
+<!ENTITY generic-version "sysvinit"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
 
 <!ENTITY versionid "&year;&month;&day;"> <!-- /etc/os-release from systemd -->
-<!ENTITY version "SYSTEMD-&year;&month;&day;">
+<!ENTITY version "SYSVINIT-&year;&month;&day;">
 
 <!ENTITY version-x86 "&version;-x86">
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/introduction/common/changelog.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -37,4 +37,15 @@
 -->
     <listitem>
+      <para>14 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Created Sysvinit branch - removed Attr, ACL, D-Bus,
+          Expat, Gperf, Intltool, Libcap, Systemd, XML::Parser, and added
+          Libee, Libestr, Rsyslog.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>11 May 2014</para>
       <itemizedlist>
Index: BOOK/introduction/common/how.xml
===================================================================
--- BOOK/introduction/common/how.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/introduction/common/how.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -76,9 +76,9 @@
   support the target machine. Booting involves installing a few
   additional packages that are needed for bootup, installing
-  boot-scripts, and building a miminal kernel.<!-- We also describe some
+  bootscripts, and building a miminal kernel.<!-- We also describe some
   alternative booting methods in <xref linkend="ch-boot-whatnext"/> --></para>
 
-  <para>To finish the installation, several configuration files are created in
-  <xref linkend="chapter-system-config"/>, and the kernel and boot loader are set
+  <para> To finish the installation, the CLFS-Bootscripts are set up in
+  <xref linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
   up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
   contains information on furthering the CLFS experience beyond this book.
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/materials/common/packages.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,22 +16,4 @@
 
     <varlistentry>
-      <term>ACL (&acl-version;) - <token>&acl-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&acl-home;"/></para>
-        <para>Download: <ulink url="&acl-url;"/></para>
-        <para>MD5 sum: <literal>&acl-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Attr (&attr-version;) - <token>&attr-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&attr-home;"/></para>
-        <para>Download: <ulink url="&attr-url;"/></para>
-        <para>MD5 sum: <literal>&attr-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
       <listitem>
@@ -88,9 +70,9 @@
 
     <varlistentry>
-      <term>Boot-scripts for CLFS (&boot-scripts-clfs-version;) - <token>&boot-scripts-clfs-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&boot-scripts-clfs-home;"/></para>
-        <para>Download: <ulink url="&boot-scripts-clfs-url;"/></para>
-        <para>MD5 sum: <literal>&boot-scripts-clfs-md5;</literal></para>
+      <term>Bootscripts for CLFS (&bootscripts-clfs-version;) - <token>&bootscripts-clfs-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&bootscripts-clfs-home;"/></para>
+        <para>Download: <ulink url="&bootscripts-clfs-url;"/></para>
+        <para>MD5 sum: <literal>&bootscripts-clfs-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -115,13 +97,4 @@
 
     <varlistentry>
-      <term>CLFS Network Scripts (&clfs-network-scripts-version;) - <token>&clfs-network-scripts-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&clfs-network-scripts-home;"/></para>
-        <para>Download: <ulink url="&clfs-network-scripts-url;"/></para>
-        <para>MD5 sum: <literal>&clfs-network-scripts-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>ClooG (&cloog-version;) - <token>&cloog-size;</token>:</term>
       <listitem>
@@ -138,13 +111,4 @@
         <para>Download: <ulink url="&coreutils-url;"/></para>
         <para>MD5 sum: <literal>&coreutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>D-Bus (&dbus-version;) - <token>&dbus-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&dbus-home;"/></para>
-        <para>Download: <ulink url="&dbus-url;"/></para>
-        <para>MD5 sum: <literal>&dbus-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -304,13 +268,4 @@
 
     <varlistentry>
-      <term>Gperf (&gperf-version;) - <token>&gperf-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gperf-home;"/></para>
-        <para>Download: <ulink url="&gperf-url;"/></para>
-        <para>MD5 sum: <literal>&gperf-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Grep (&grep-version;) - <token>&grep-size;</token>:</term>
       <listitem>
@@ -349,13 +304,4 @@
 
     <varlistentry>
-      <term>Intltool (&intltool-version;) - <token>&intltool-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&intltool-home;"/></para>
-        <para>Download: <ulink url="&intltool-url;"/></para>
-        <para>MD5 sum: <literal>&intltool-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
       <listitem>
@@ -412,13 +358,4 @@
 
     <varlistentry>
-      <term>Libcap (&libcap-version;) - <token>&libcap-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libcap-home;"/></para>
-        <para>Download: <ulink url="&libcap-url;"/></para>
-        <para>MD5 sum: <literal>&libcap-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Libpipeline (&libpipeline-version;) - <token>&libpipeline-size;</token>:</term>
       <listitem>
@@ -591,13 +528,4 @@
 
     <varlistentry>
-      <term>Systemd (&systemd-version;) - <token>&systemd-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&systemd-home;"/></para>
-        <para>Download: <ulink url="&systemd-url;"/></para>
-        <para>MD5 sum: <literal>&systemd-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Tar (&tar-version;) - <token>&tar-size;</token>:</term>
       <listitem>
@@ -649,13 +577,4 @@
         <para>Download: <ulink url="&vim-url;"/></para>
         <para>MD5 sum: <literal>&vim-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>XML::Parser  (&xml-parser-version;) - <token>&xml-parser-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&xml-parser-home;"/></para>
-        <para>Download: <ulink url="&xml-parser-url;"/></para>
-        <para>MD5 sum: <literal>&xml-parser-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/materials/common/patches.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -130,13 +130,4 @@
 
     <varlistentry>
-      <term>Systemd Compat Patch - <token>&systemd-compat-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&systemd-compat-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-compat-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Sysvinit Tools Updates Patch - <token>&sysvinit-tools_updates-patch-size;</token>:</term>
       <listitem>
Index: BOOK/mips-index.xml
===================================================================
--- BOOK/mips-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/mips-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -59,5 +59,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/mips-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/mips-chapter.xml"/>
Index: BOOK/mips64-64-index.xml
===================================================================
--- BOOK/mips64-64-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/mips64-64-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -59,5 +59,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/mips64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/mips64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/mips64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/mips64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/mips64-64-chapter.xml"/>
Index: BOOK/mips64-index.xml
===================================================================
--- BOOK/mips64-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/mips64-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -59,5 +59,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/mips64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/mips64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/mips64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/mips64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/mips64-chapter.xml"/>
Index: BOOK/network/common/choose.xml
===================================================================
--- BOOK/network/common/choose.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/common/choose.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -9,5 +9,5 @@
   <?dbhtml filename="choose.html"?>
 
-  <title>Systemd Networking?</title>
+  <title>DHCP or Static Networking?</title>
 
   <indexterm zone="ch-network-choose">
@@ -20,10 +20,11 @@
 
   <para> There are two different ways you can proceed from this point
-  to configure your network. You can use systemd, or install the
-  CLFS-Network-Scripts.</para>
+  to configure your network. Dynamic will allow you to take advantage of
+  a DHCP server to get all your configuration information. Static you become
+  responsible for setting up your options.</para>
 
-  <para>To use systemd to configure a Network Interface, Follow <xref linkend="ch-systemd-network"/>.</para>
+  <para>To configure a Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
 
-  <para>To use CLFS-network-scripts to configure a Network Interface, Follow <xref linkend="ch-scripts-network-scripts"/>.</para>
+  <para>To configure a DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
 
 </sect1>
Index: BOOK/network/common/dhcpcd.xml
===================================================================
--- BOOK/network/common/dhcpcd.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/common/dhcpcd.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -47,52 +47,44 @@
 
   <sect2 id="conf-dhcpcd" role="configuration">
-    <title>Creating the DHCP Network Interface Configuration File</title>
+    <title>Creating the DHCP Network Interface Configuration Files</title>
 
-    <para>The following is an example for the eth0 interface. Refer to the
-    dhcpcd.conf man page for more information. This step may be skipped if
-    default behavior of dhcpcd is required.</para>
+    <para>First install the service from the CLFS Bootscripts package:</para>
 
-    <para>Create the <filename>/etc/dhcpcd.conf</filename> configuration file
-    using the following commands. Adjust appropriately for additional options:</para>
+<screen><userinput>tar -xvf bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.xz
+cd bootscripts-cross-lfs-&bootscripts-clfs-version;
+make install-service-dhcpcd</userinput></screen>
 
-<screen><userinput>cd /etc &amp;&amp;
-cat &gt; dhcpcd.conf &lt;&lt; "EOF"
-<literal># dhcpcd configuration eth0 interface
-# See dhcpcd.conf(5) for details.
+    <para>Finally, create the
+    <filename>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</filename>
+    configuration file using the following commands. Adjust appropriately for
+    additional interfaces:</para>
 
-interface eth0
-# dhcpcd-run-hooks uses these options.
-option subnet_mask, routers, domain_name_servers
+<screen><userinput>cd /etc/sysconfig/network-devices &amp;&amp;
+mkdir -v ifconfig.eth0 &amp;&amp;
+cat &gt; ifconfig.eth0/dhcpcd &lt;&lt; "EOF"
+<literal>ONBOOT="yes"
+SERVICE="dhcpcd"
 
-# The default timeout for waiting for a DHCP response is 30 seconds
-# which may be too long or too short and can be changed here.
-timeout 16</literal>
+# Start Command for DHCPCD
+DHCP_START="-q"
+
+# Stop Command for DHCPCD
+DHCP_STOP="-k"</literal>
 EOF</userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="static.xml"
+    xpointer="xpointer(//*[@os='var-ob'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="static.xml"
+    xpointer="xpointer(//*[@os='var-s'])"/>
+
+    <para>The <envar>DHCP_START</envar> and <envar>DHCP_STOP</envar> variables
+    arguments that are passed onto <filename>dhcpcd</filename> when starting
+    and stoppping the service. More information about what can be passed can
+    be found in the <filename>dhcpcd(8)</filename> man page.</para>
+
     <para>To configure another Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Configuring the Network Interface at boot</title>
-
-    <para>Enabling of the Network Interface configuration is
-    done per interface. To enable Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl enable dhcpcd@eth0</userinput></screen>
-
-    <para>To disable previously enabled Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl disable dhcpcd@eth0</userinput></screen>
-
-    <para>To manually start the Network Interface configuration,
-    run:</para>
-
-<screen role="nodump"><userinput>systemctl start dhcpcd@eth0</userinput></screen>
-
-    <para>Replace eth0 with the correct Network Interface
-    name as described on the beginning of this page.</para>
 
   </sect2>
Index: BOOK/network/common/hostname.xml
===================================================================
--- BOOK/network/common/hostname.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/common/hostname.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -9,17 +9,18 @@
   <?dbhtml filename="hostname.html"?>
 
-  <title>Configuring the system hostname</title>
+  <title>Configuring the localnet Script</title>
 
   <indexterm zone="ch-network-hostname">
-    <primary sortas="d-hostname">hostname</primary>
+    <primary sortas="d-localnet">localnet</primary>
   <secondary>configuring</secondary></indexterm>
 
-  <para>Systemd reads <filename>/etc/hostname</filename> to determine which
-  hostname should be set.</para>
+  <para>Part of the job of the <command>localnet</command> script is
+  setting the system's hostname. This needs to be configured in the
+  <filename>/etc/sysconfig/network</filename> file.</para>
 
-  <para>Create the <filename>/etc/hostname</filename> file and enter a hostname
-  by running:</para>
+  <para>Create the <filename>/etc/sysconfig/network</filename> file
+  and enter a hostname by running:</para>
 
-  <screen><userinput>echo "<replaceable>[clfs]</replaceable>" &gt; /etc/hostname</userinput></screen>
+  <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
 
   <para><replaceable>[clfs]</replaceable> needs to be replaced with the
Index: OK/network/common/network-scripts.xml
===================================================================
--- BOOK/network/common/network-scripts.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-network-scripts" role="wrap">
-  <?dbhtml filename="network-scripts.html"?>
-
-  <sect1info condition="script">
-    <productname>clfs-network-scripts</productname>
-    <productnumber>&clfs-network-scripts-version;</productnumber>
-    <address>&clfs-network-scripts-url;</address>
-  </sect1info>
-
-  <title>CLFS-Network-Scripts-&clfs-network-scripts-version;</title>
-
-  <indexterm zone="ch-scripts-network-scripts">
-    <primary sortas="a-Network-Scripts">Network-Scripts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The CLFS-Network-Scripts package contains a set of scripts to
-    configure the network at bootup and deconfigure it at shutdown.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CLFS-Network-Scripts</title>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-network-scripts" role="content">
-    <title>Contents of CLFS-Network-Scripts</title>
-    <segmentedlist>
-      <segtitle>Installed scripts</segtitle>
-      <segtitle>Installed systemd units</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>ifdown, ifup, ipv4-static</seg>
-        <seg>ifupdown@.service, dhcpcd@.service, nscd.service</seg>
-        <seg>/etc/sysconfig, /lib/services, /lib/lsb (symbolic link)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ifdown-network-scripts">
-        <term><command>ifdown</command></term>
-        <listitem>
-          <para>Stops a network device.</para>
-          <indexterm zone="ch-scripts-network-scripts ifdown-network-scripts">
-            <primary sortas="d-ifdown">ifdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifup-network-scripts">
-        <term><command>ifup</command></term>
-        <listitem>
-          <para>Initializes a network device.</para>
-          <indexterm zone="ch-scripts-network-scripts ifup-network-scripts">
-            <primary sortas="d-ifup">ifup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipv4-static-network-scripts">
-        <term><command>ipv4-static</command></term>
-        <listitem>
-          <para>Provides the functionality needed to assign a static Internet
-          Protocol (IP) address to a network interface.</para>
-          <indexterm zone="ch-scripts-network-scripts ipv4-static-network-scripts">
-            <primary sortas="d-ipv4-static">ipv4-static</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/network/common/static.xml
===================================================================
--- BOOK/network/common/static.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
+++ BOOK/network/common/static.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-network-static">
+  <?dbhtml filename="network-static.html"?>
+
+  <title>Static Networking Configuration</title>
+
+  <sect2>
+    <title>Creating the Static Network Interface Configuration Files</title>
+
+    <para>Which interfaces are brought up and down by the network script
+    depends on the files and directories in the <filename
+    class="directory">/etc/sysconfig/network-devices</filename> hierarchy.
+    This directory should contain a sub-directory for each interface to be
+    configured, such as <filename>ifconfig.xyz</filename>, where
+    <quote>xyz</quote> is a network interface name. Inside this directory
+    would be files defining the attributes to this interface, such as its IP
+    address(es), subnet masks, and so forth.</para>
+
+    <para>The following command creates a sample <filename>ipv4</filename>
+    file for the <emphasis>eth0</emphasis> device:</para>
+
+<screen><userinput>cd /etc/sysconfig/network-devices &amp;&amp;
+mkdir -v ifconfig.eth0 &amp;&amp;
+cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF"
+<literal>ONBOOT="yes"
+SERVICE="ipv4-static"
+IP="192.168.1.1"
+GATEWAY="192.168.1.2"
+PREFIX="24"
+BROADCAST="192.168.1.255"</literal>
+EOF</userinput></screen>
+
+    <para os="var-ob">The values of these variables must be changed in every file to match
+    the proper setup. If the <envar>ONBOOT</envar> variable is set to
+    <quote>yes</quote> the network script will bring up the Network Interface
+    Card (NIC) during booting of the system. If set to anything but
+    <quote>yes</quote> the NIC will be ignored by the network script and not
+    be brought up.</para>
+
+    <para os="var-s">The <envar>SERVICE</envar> variable defines the method used for
+    obtaining the IP address. The CLFS-Bootscripts package has a modular IP
+    assignment format, and creating additional files in the <filename
+    class="directory">/etc/sysconfig/network-devices/services</filename>
+    directory allows other IP assignment methods.</para>
+
+    <para>The <envar>GATEWAY</envar> variable should contain the default
+    gateway IP address, if one is present. If not, then comment out the
+    variable entirely.</para>
+
+    <para>The <envar>PREFIX</envar> variable needs to contain the number of
+    bits used in the subnet. Each octet in an IP address is 8 bits. If the
+    subnet's netmask is 255.255.255.0, then it is using the first three octets
+    (24 bits) to specify the network number. If the netmask is 255.255.255.240,
+    it would be using the first 28 bits.  Prefixes longer than 24 bits are
+    commonly used by DSL and cable-based Internet Service Providers (ISPs).
+    In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the
+    <envar>PREFIX</envar> variable according to your specific subnet.</para>
+
+    <para>To configure another DHCP Interface, Follow <xref linkend="conf-dhcpcd"/>.</para>
+
+  </sect2>
+
+</sect1>
Index: OK/network/common/sysconfig-network.xml
===================================================================
--- BOOK/network/common/sysconfig-network.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,105 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-network-static">
-  <?dbhtml filename="network-static.html"?>
-
-  <title>Static Networking Configuration</title>
-
-  <sect2>
-    <title>Creating the Static Network Interface Configuration Files</title>
-
-    <para>Which interfaces are brought up and down by the network script
-    depends on the files and directories in the <filename
-    class="directory">/etc/sysconfig</filename> hierarchy.
-    This directory should contain a sub-directory for each interface to be
-    configured, such as <filename>ifconfig.xyz</filename>, where
-    <quote>xyz</quote> is a network interface name. Inside this directory
-    would be files defining the attributes to this interface, such as its IP
-    address(es), subnet masks, and so forth.</para>
-
-    <note><para>Udev may assign random Network Card Interface names
-    for some network cards such as enp2s1. If you are not sure what
-    your Network Card Interface name is, you can always run
-    <command>ip l</command> after you have booted your system. Again,
-    it is important that <filename>ifconfig.xyz</filename> is named
-    after correct Network Card Interface name (e.g.
-    <filename>ifconfig.enp2s1</filename> or
-    <filename>ifconfig.eth0</filename>) or systemd will fail to bring
-    up your network interface.</para></note>
-
-    <para>The following command creates a sample <filename>ipv4</filename>
-    file for the <emphasis>eth0</emphasis> device:</para>
-
-<screen><userinput>mkdir -pv /etc/sysconfig &amp;&amp;
-cd /etc/sysconfig &amp;&amp;
-cat &gt; ifconfig.eth0 &lt;&lt; "EOF"
-<literal>IFACE="eth0"
-SERVICE="ipv4-static"
-IP="192.168.1.1"
-GATEWAY="192.168.1.2"
-PREFIX="24"
-BROADCAST="192.168.1.255"</literal>
-EOF</userinput></screen>
-
-    <para os="var-ob">The values of these variables must be changed in every
-    file to match the proper setup.</para>
-
-    <para os="var-i">The <envar>IFACE</envar> variable defines the interface
-    name, for example, eth0. It is required for all network device configuration
-    files.</para>
-
-    <para os="var-s">The <envar>SERVICE</envar> variable defines the method used
-    for obtaining the IP address. The CLFS-Network-Scripts package has a modular
-    IP assignment format, and creating additional files in the <filename
-    class="directory">/lib/services</filename>
-    directory allows other IP assignment methods.</para>
-
-    <para>The <envar>GATEWAY</envar> variable should contain the default
-    gateway IP address, if one is present. If not, then comment out the
-    variable entirely.</para>
-
-    <para>The <envar>PREFIX</envar> variable needs to contain the number of
-    bits used in the subnet. Each octet in an IP address is 8 bits. If the
-    subnet's netmask is 255.255.255.0, then it is using the first three octets
-    (24 bits) to specify the network number. If the netmask is 255.255.255.240,
-    it would be using the first 28 bits.  Prefixes longer than 24 bits are
-    commonly used by DSL and cable-based Internet Service Providers (ISPs).
-    In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the
-    <envar>PREFIX</envar> variable according to your specific subnet.</para>
-
-    <para>For more information see the <command>ifup</command> man page.</para>
-
-    <para>To configure another DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Configuring the Network Interface at boot</title>
-
-    <para>Enabling of the Network Interface configuration is
-    done per interface. To enable Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl enable ifupdown@eth0</userinput></screen>
-
-    <para>To disable previously enabled Network Interface
-    configuration at boot, run:</para>
-
-<screen role="nodump"><userinput>systemctl disable ifupdown@eth0</userinput></screen>
-
-    <para>To manually start the Network Interface configuration,
-    run:</para>
-
-<screen role="nodump"><userinput>systemctl start ifupdown@eth0</userinput></screen>
-
-    <para>Replace eth0 with the correct Network Interface
-    name as described on the beginning of this page.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/network/common/systemd-network.xml
===================================================================
--- BOOK/network/common/systemd-network.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-systemd-network">
-  <?dbhtml filename="systemd-network.html"?>
-
-  <title>Networking Configuration with Systemd-networkd</title>
-
-  <sect2 role="static">
-    <title>Creating the Static Network Interface Configuration Files</title>
-
-    <note><para>Udev may assign random Network Card Interface names
-    for some network cards such as enp2s1. If you are not sure what
-    your Network Card Interface name is, you can always run
-    <command>ip l</command> after you have booted your system. It is important that the <envar>Name</envar> variable in  <filename>/etc/systemd/network</filename> contain the correct Network Card Interface name (e.g.
-    <envar>Name=enp2s1</envar> or
-    <envar>Name=eth0</envar>) or systemd will fail to bring
-    up your network interface.</para></note>
-
-    <para><command>systemd-networkd</command> uses <filename>/etc/system/network</filename> for configuration files. Refer to systemd.network(5) and systemd.netdev(5). Configure a network interface with a config file. Adjust Name= as required:</para>
-
-<screen><userinput>cd /etc/systemd/network &amp;&amp;
-cat &gt; static.network &lt;&lt; "EOF"
-[Match]
-Name=enp2s0
-
-[Network]
-Address=192.168.1.1/24
-Gateway=192.168.1.2
-EOF</userinput></screen>
-
-    <para os="var-ob">The values of these variables must be changed in every
-    file to match the proper setup.</para>
-
-    <para os="var-i">The <envar>Name</envar> variable defines the interface
-    name, for example, eth0. It is required for all network device configuration
-    files.</para>
-
-    <para>The <envar>Gateway</envar> variable should contain the default
-    gateway IP address, if one is present. If not, then comment out the
-    variable entirely.</para>
-
-    <para>For more information see the <command>systemd.netdev</command> man page.</para>
-
-  </sect2>
-
-  <sect2 role="dhcp">
-    <title>Connecting to a network with DHCP</title>
-
-  <para><command>systemd-networkd</command> uses <filename>/etc/systemd/network</filename> for configuration files. Refer to <filename>systemd.network(5)</filename> and <filename>systemd.netdev(5)</filename>. Configure a network interface with a config file. Adjust Name= as required:</para>
-
-<screen><userinput>cd /etc/systemd/network &amp;&amp;
-cat &gt; dhcp.network &lt;&lt; "EOF"
-[Match]
-Name=enp2s0
-
-[Network]
-DHCP=yes
-EOF</userinput></screen>
-
-  <para><command>systemd-networkd</command> will automatically configure <filename>/run/systemd/network/resolv.conf</filename> when using DHCP. If you did not manually create <filename>/etc/resolv.conf</filename>, create a symlink:</para>
-
-<screen><userinput>ln -sv /run/systemd/network/resolv.conf /etc</userinput></screen>
-
-  <para>Continue to <xref linkend="chapter-bootable"/>.</para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/network/mips-chapter.xml
===================================================================
--- BOOK/network/mips-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/mips-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
 
Index: BOOK/network/mips64-64-chapter.xml
===================================================================
--- BOOK/network/mips64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/mips64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
 
Index: BOOK/network/mips64-chapter.xml
===================================================================
--- BOOK/network/mips64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/mips64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
 
Index: BOOK/network/ppc-chapter.xml
===================================================================
--- BOOK/network/ppc-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/ppc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
 
Index: BOOK/network/ppc64-64-chapter.xml
===================================================================
--- BOOK/network/ppc64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/ppc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
 
Index: BOOK/network/ppc64-chapter.xml
===================================================================
--- BOOK/network/ppc64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/ppc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
 
Index: BOOK/network/sparc-chapter.xml
===================================================================
--- BOOK/network/sparc-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/sparc-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
 
Index: BOOK/network/sparc64-64-chapter.xml
===================================================================
--- BOOK/network/sparc64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/sparc64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
 
Index: BOOK/network/sparc64-chapter.xml
===================================================================
--- BOOK/network/sparc64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/sparc64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
 
Index: BOOK/network/x86-chapter.xml
===================================================================
--- BOOK/network/x86-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/x86-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
 
Index: BOOK/network/x86_64-64-chapter.xml
===================================================================
--- BOOK/network/x86_64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/x86_64-64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dhcpcd.xml"/>
 
Index: BOOK/network/x86_64-chapter.xml
===================================================================
--- BOOK/network/x86_64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/network/x86_64-chapter.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -16,7 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/resolv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd-network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/network-scripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysconfig-network.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dhcpcd.xml"/>
 
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/packages.ent	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -5,16 +5,4 @@
 
 <!-- Note: For empty *-home entities use " " not "" -->
-
-<!ENTITY acl-version "2.2.52">
-<!ENTITY acl-size "384 KB">
-<!ENTITY acl-url "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
-<!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
-<!ENTITY acl-home "http://acl.bestbits.at/">
-
-<!ENTITY attr-version "2.4.47">
-<!ENTITY attr-size "340 KB">
-<!ENTITY attr-url "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
-<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
-<!ENTITY attr-home "http://acl.bestbits.at/">
 
 <!ENTITY arcload-version "0.5">
@@ -62,9 +50,9 @@
 <!ENTITY bison-home "&gnu-software;bison">
 
-<!ENTITY boot-scripts-clfs-version "3.0-pre1">
-<!ENTITY boot-scripts-clfs-size "24 KB">
-<!ENTITY boot-scripts-clfs-url "&packages-root;boot-scripts-cross-lfs-&boot-scripts-clfs-version;.tar.bz2">
-<!ENTITY boot-scripts-clfs-md5 "a1e4752a9c9bb92cd14249e0bee97cb4">
-<!ENTITY boot-scripts-clfs-home " ">
+<!ENTITY bootscripts-clfs-version "3.0-pre1">
+<!ENTITY bootscripts-clfs-size "24 KB">
+<!ENTITY bootscripts-clfs-url "&packages-root;bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.bz2">
+<!ENTITY bootscripts-clfs-md5 "a1e4752a9c9bb92cd14249e0bee97cb4">
+<!ENTITY bootscripts-clfs-home " ">
 
 <!ENTITY bzip2-version "1.0.6">
@@ -80,10 +68,4 @@
 <!ENTITY check-home "http://check.sourceforge.net/">
 
-<!ENTITY clfs-network-scripts-version "20140224">
-<!ENTITY clfs-network-scripts-size "22 KB">
-<!ENTITY clfs-network-scripts-url "http://cross-lfs.org/files/clfs-network-scripts-&clfs-network-scripts-version;.tar.xz">
-<!ENTITY clfs-network-scripts-md5 "831308d5e80bdaa3f494dc218ee43f78">
-<!ENTITY clfs-network-scripts-home " ">
-
 <!ENTITY cloog-version "0.18.2">
 <!ENTITY cloog-size "2,377 KB">
@@ -103,10 +85,4 @@
 <!ENTITY coreutils-md5 "8fb0ae2267aa6e728958adc38f8163a2">
 <!ENTITY coreutils-home "&gnu-software;coreutils">
-
-<!ENTITY dbus-version "1.8.2">
-<!ENTITY dbus-size "1,860 KB">
-<!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "d6f709bbec0a022a1847c7caec9d6068">
-<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
 
 <!ENTITY dejagnu-version "1.5.1">
@@ -215,10 +191,4 @@
 <!ENTITY gmp-home "http://gmplib.org/">
 
-<!ENTITY gperf-version "3.0.4">
-<!ENTITY gperf-size "968 KB">
-<!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
-<!ENTITY gperf-md5 "c1f1db32fb6598d6a93e6e88796a8632">
-<!ENTITY gperf-home "&gnu-software;gperf">
-
 <!ENTITY grep-version "2.18">
 <!ENTITY grep-size "1,213 KB">
@@ -258,11 +228,4 @@
 <!-- <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc"> -->
 
-
-<!ENTITY intltool-version "0.50.2">
-<!ENTITY intltool-size "192 KB">
-<!ENTITY intltool-url "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
-<!ENTITY intltool-md5 "23fbd879118253cb99aeac067da5f591">
-<!ENTITY intltool-home "http://freedesktop.org/wiki/Software/intltool">
-
 <!ENTITY iproute2-version "3.14.0">
 <!ENTITY iproute2-size "436 KB">
@@ -301,9 +264,15 @@
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less">
 
-<!ENTITY libcap-version "2.24">
-<!ENTITY libcap-size "68 KB">
-<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "d43ab9f680435a7fff35b4ace8d45b80">
-<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
+<!ENTITY libee-version "0.4.1">
+<!ENTITY libee-size "352 KB">
+<!ENTITY libee-url "http://www.libee.org/download/files/download/libee-&libee-version;.tar.gz">
+<!ENTITY libee-md5 "7bbf4160876c12db6193c06e2badedb2">
+<!ENTITY libee-home "http://www.libee.org/">
+
+<!ENTITY libestr-version "0.1.5">
+<!ENTITY libestr-size "326 KB">
+<!ENTITY libestr-url "http://libestr.adiscon.com/files/download/libestr-&libestr-version;.tar.gz">
+<!ENTITY libestr-md5 "f180c0cdc82883d161eba3f2e8a34eb4">
+<!ENTITY libestr-home "http://libestr.adiscon.com/">
 
 <!ENTITY libpipeline-version "1.3.0">
@@ -415,4 +384,9 @@
 <!ENTITY readline-md5 "33c8fb279e981274f485fd91da77e94a">
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
+<!ENTITY rsyslog-version "6.4.2">
+<!ENTITY rsyslog-size "2,519 KB">
+<!ENTITY rsyslog-url "http://www.rsyslog.com/files/download/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
+<!ENTITY rsyslog-md5 "7de0124ec7d67ce2bfda0009ab1263ee">
+<!ENTITY rsyslog-home "http://www.rsyslog.com/">
 
 <!ENTITY sed-version "4.2.2">
@@ -439,10 +413,4 @@
 <!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
 <!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
-
-<!ENTITY systemd-version "212">
-<!ENTITY systemd-size "2,723 KB">
-<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5 "257a75fff826ff91cb1ce567091cf270">
-<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
 
 <!ENTITY tar-version "1.27.1">
@@ -498,10 +466,4 @@
 <!ENTITY vim-home "http://www.vim.org">
 
-<!ENTITY xml-parser-version "2.42_01">
-<!ENTITY xml-parser-size "240 KB">
-<!ENTITY xml-parser-url "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
-<!ENTITY xml-parser-md5 "a4650aebcc464bb91113c2c356da8210">
-<!ENTITY xml-parser-home "https://github.com/chorny/XML-Parser">
-
 <!ENTITY xz-version "5.0.5">
 <!ENTITY xz-size "908 KB">
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/patches.ent	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -60,8 +60,4 @@
 <!ENTITY readline-branch_update-patch-md5 "72a60fac6699ee42f99ec78a5d74e4e1">
 <!ENTITY readline-branch_update-patch-size "3.015 KB">
-
-<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
-<!ENTITY systemd-compat-patch-md5 "09bfa3f4b09620555aa107e48a4f850b">
-<!ENTITY systemd-compat-patch-size "9.244 KB">
 
 <!ENTITY sysvinit-tools_updates-patch "sysvinit-&sysvinit-version;-tools_updates-1.patch">
Index: BOOK/ppc-index.xml
===================================================================
--- BOOK/ppc-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/ppc-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/ppc-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/ppc-chapter.xml"/>
Index: BOOK/ppc64-64-index.xml
===================================================================
--- BOOK/ppc64-64-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/ppc64-64-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/ppc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/ppc64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/ppc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/ppc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/ppc64-64-chapter.xml"/>
Index: BOOK/ppc64-index.xml
===================================================================
--- BOOK/ppc64-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/ppc64-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/ppc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/ppc64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/ppc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/ppc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/ppc64-chapter.xml"/>
Index: BOOK/sparc-index.xml
===================================================================
--- BOOK/sparc-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/sparc-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/sparc-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/sparc-chapter.xml"/>
Index: BOOK/sparc64-64-index.xml
===================================================================
--- BOOK/sparc64-64-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/sparc64-64-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/sparc64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/sparc64-64-chapter.xml"/>
Index: BOOK/sparc64-index.xml
===================================================================
--- BOOK/sparc64-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/sparc64-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/sparc64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/sparc64-chapter.xml"/>
Index: OK/system-config/common/clock.xml
===================================================================
--- BOOK/system-config/common/clock.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-clock">
-  <?dbhtml filename="clock.html"?>
-
-  <title>Configuring the system clock</title>
-
-  <indexterm zone="ch-scripts-clock">
-    <primary sortas="d-clock">clock</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>This section discusses how to configure the
-  <command>systemd-timedated</command> system service, which configures
-  system clock and timezone.</para>
-
-  <para>Systemd provides a <command>timedatectl</command> utility which is
-  used to communicate with <command>systemd-timedated</command>. It can be used
-  to set the system clock in local time or UTC time, depending on the hardware
-  clock setting. By default, <command>systemd-timedated</command> will assume
-  that clock is set to UTC time.</para>
-
-  <para>If you cannot remember whether or not the hardware clock is set to UTC,
-  find out by running the <userinput>hwclock --localtime --show</userinput>
-  command. This will display what the current time is according to the hardware
-  clock. If this time matches whatever your watch says, then the hardware clock is
-  set to local time. If the output from <command>hwclock</command> is not local
-  time, chances are it is set to UTC time. Verify this by adding or subtracting
-  the proper amount of hours for the timezone to the time shown by
-  <command>hwclock</command>. For example, if you are currently in the MST
-  timezone, which is also known as GMT -0700, add seven hours to the local
-  time.</para>
-
-  <para><command>systemd-timedated</command> reads
-  <filename>/etc/adjtime</filename>, and depending on the contents of the file,
-  it sets the clock to either UTC or local time.</para>
-
- <para>Create the <filename>/etc/adjtime</filename> file with the following
- contents if your hardware clock is set to local time:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/adjtime &lt;&lt; "EOF"
-<literal>0.0 0 0.0
-0
-LOCAL</literal>
-EOF</userinput></screen>
-
- <para>If <filename>/etc/adjtime</filename> isn't present at first boot,
- <command>systemd-timedated</command> will assume that hardware clock is
- set to UTC and adjust the file according to that.</para>
-
-  <para>If your clock is set to local time, tell
-  <command>systemd-timedated</command> about it by running the following
-  command:</para>
-
-<screen role="nodump"><userinput>timedatectl set-local-rtc 1</userinput></screen>
-
-  <para><command>timedatectl</command> can also be used to change system time and
-  time zone.</para>
-
-  <para>To change your current system time, issue:</para>
-
-<screen role="nodump"><userinput>timedatectl set-time YYYY:MM:DD HH:MM:SS</userinput></screen>
-
-  <para>Hardware clock will also be updated accordingly.</para>
-
-  <para>To change your current time zone, issue:</para>
-
-<screen role="nodump"><userinput>timedatectl set-timezone TIMEZONE</userinput></screen>
-
-  <para>You can get list of available time zones by running:</para>
-
-<screen role="nodump"><userinput>timedatectl list-timezones</userinput></screen>
-
-  <note><para>Please note that <command>timedatectl</command> command can
-  be used only on a system booted with systemd.</para></note>
-
-</sect1>
Index: OK/system-config/common/console.xml
===================================================================
--- BOOK/system-config/common/console.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-console">
-  <?dbhtml filename="console.html"?>
-  <title>Configuring the Linux Console</title>
-
-  <indexterm zone="ch-scripts-console">
-    <primary sortas="d-console">console</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>This section discusses how to configure the
-  <command>systemd-vconsole-setup</command> system service which configures
-  the virtual console font and console keymap.
-
-  The <command>systemd-vconsole-setup</command> service reads <filename>
-  /etc/vconsole.conf</filename> for configuration information. Decide which
-  keymap and screen font will be used. Various language-specific HOWTO's can
-  help. with this (see
-  <ulink url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. Examine
-  <command>localectl list-keymaps</command> output for a list of valid console
-  keymaps. Look in
-  <filename class="directory">/usr/share/consolefonts</filename> for valid
-  screen fonts.</para>
-
-  <para>The <filename>/etc/vconsole.conf</filename> file should contain lines
-  of the form: VARIABLE="value". The following variables are recognized:</para>
-
-  <variablelist>
-
-    <varlistentry>
-      <term>KEYMAP</term>
-      <listitem>
-        <para>This variable specifies the key mapping table for the keyboard. If
-        unset, it defaults to <literal>us</literal>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>KEYMAP_TOGGLE</term>
-      <listitem>
-        <para>This variable can be used to configure a second toggle keymap and
-        is unset by default.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FONT</term>
-      <listitem>
-        <para>This variable specifies the font used by the virtual
-        console.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FONT_MAP</term>
-      <listitem>
-        <para>This variable specifies the console map to be used.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>FONT_UNIMAP</term>
-      <listitem>
-        <para>This variable specifies the unicode font map.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para>An example for a German keyboard and console is given below:</para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/vconsole.conf &lt;&lt; "EOF"
-<literal>KEYMAP=de-latin1
-FONT=Lat2-Terminus16</literal>
-EOF</userinput></screen>
-
-  <para>You can change KEYMAP value at runtime by using the
-  <command>localectl</command> utility:</para>
-
-<screen role="nodump"><userinput>localectl set-keymap MAP</userinput></screen>
-
-  <note><para>Please note that <command>localectl</command> command can
-  be used  only on a system booted with systemd.</para></note>
-
-  <para>You can also use <command>localectl</command> utility with the
-  corresponding parameters to change X11 keyboard layout, model, variant
-  and options:</para>
-
-<screen role="nodump"><userinput>localectl set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]</userinput></screen>
-
-  <para>To list possible values for <command>localectl set-x11-keymap</command>
-  parameters, run <command>localectl</command> with parameters listed below:
-  </para>
-
-  <variablelist>
-
-    <varlistentry>
-      <term>list-x11-keymap-models</term>
-      <listitem>
-        <para>Show known X11 keyboard mapping models.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>list-x11-keymap-layouts</term>
-      <listitem>
-        <para>Show known X11 keyboard mapping layouts.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>list-x11-keymap-variants</term>
-      <listitem>
-        <para>Show known X11 keyboard mapping variants.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>list-x11-keymap-options</term>
-      <listitem>
-        <para>Show known X11 keyboard mapping options.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <note><para>Using any of the parameters listed above requires
-  <ulink url="http://cblfs.cross-lfs.org/index.php/Xorg7/Data">
-  XKeyboard Client</ulink> package from CBLFS.</para></note>
-
-</sect1>
Index: OK/system-config/common/inputrc.xml
===================================================================
--- BOOK/system-config/common/inputrc.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-   <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-inputrc">
-  <?dbhtml filename="inputrc.html"?>
-
-  <title>Creating the /etc/inputrc File</title>
-
-  <indexterm zone="ch-scripts-inputrc">
-    <primary sortas="e-/etc/inputrc">/etc/inputrc</primary>
-  </indexterm>
-
-  <para>The <filename>/etc/inputrc</filename> file deals with mapping
-  the keyboard for specific situations. This file is the start-up file
-  used by Readline &mdash; the input-related library &mdash; used by Bash
-  and most other shells.</para>
-
-  <para>Most people do not need user-specific keyboard mappings so
-  the command below creates a global <filename>/etc/inputrc</filename>
-  used by everyone who logs in. If you later decide you need to override
-  the defaults on a per-user basis, you can create a
-  <filename>.inputrc</filename> file in the user's home directory with
-  the modified mappings.</para>
-
-  <para>For more information on how to edit the <filename>inputrc</filename>
-  file, see <command>info bash</command> under the <emphasis>Readline Init
-  File</emphasis> section. <command>info readline</command> is also a good
-  source of information.</para>
-
-  <para>Below is a generic global <filename>inputrc</filename> along
-  with comments to explain what the various options do. Note that
-  comments cannot be on the same line as commands. Create the file
-  using the following command:</para>
-
-<screen><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF"
-<literal># Begin /etc/inputrc
-# Modified by Chris Lynn &lt;roryo@roryo.dynup.net&gt;
-
-# Allow the command prompt to wrap to the next line
-set horizontal-scroll-mode Off
-
-# Enable 8bit input
-set meta-flag On
-set input-meta On
-
-# Turns off 8th bit stripping
-set convert-meta Off
-
-# Keep the 8th bit for display
-set output-meta On
-
-# none, visible or audible
-set bell-style none
-
-# All of the following map the escape sequence of the
-# value contained inside the 1st argument to the
-# readline specific functions
-
-"\eOd": backward-word
-"\eOc": forward-word
-
-# for linux console
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-
-# for xterm
-"\eOH": beginning-of-line
-"\eOF": end-of-line
-
-# for Konsole
-"\e[H": beginning-of-line
-"\e[F": end-of-line
-
-# End /etc/inputrc</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: OK/system-config/common/introduction.xml
===================================================================
--- BOOK/system-config/common/introduction.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter details how to finish configuring the base system.
-  This includes some final configuration for systemd as well as locales and
-  a simple bash profile that should be suitable for most users.</para>
-
-</sect1>
Index: OK/system-config/common/locale.xml
===================================================================
--- BOOK/system-config/common/locale.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-locale">
-  <title>Setting Up Locale Information</title>
-  <?dbhtml filename="locale.html"?>
-
-  <indexterm zone="ch-scripts-locale">
-    <primary sortas="e-/etc/locale.conf">/etc/locale.conf</primary>
-  </indexterm>
-
-  <para>The <filename>/etc/locale.conf</filename> below sets some environment
-  variables necessary for native language support. Setting them properly
-  results in:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>The output of programs translated into the native language</para>
-    </listitem>
-    <listitem>
-      <para>Correct classification of characters into letters, digits and other
-      classes. This is necessary for <command>bash</command> to properly accept
-      non-ASCII characters in command lines in non-English locales</para>
-    </listitem>
-    <listitem>
-      <para>The correct alphabetical sorting order for the country</para>
-    </listitem>
-    <listitem>
-      <para>Appropriate default paper size</para>
-    </listitem>
-    <listitem>
-      <para>Correct formatting of monetary, time, and date values</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Replace <replaceable>[ll]</replaceable> below with the
-  two-letter code for the desired language (e.g., <quote>en</quote>) and
-  <replaceable>[CC]</replaceable> with the two-letter code for the
-  appropriate country (e.g., <quote>GB</quote> or <quote>US</quote>).
-  <replaceable>[charmap]</replaceable> should be replaced with the
-  canonical charmap for your chosen locale. Optional modifiers such as
-  <quote>@euro</quote> may also be present.</para>
-
-  <para>The list of all locales supported by Glibc can be obtained by running
-  the following command:</para>
-
-<screen role="nodump"><userinput>locale -a</userinput></screen>
-
-  <para>Locales can have a number of synonyms, e.g. <quote>ISO-8859-1</quote>
-  is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
-  Some applications cannot handle the various synonyms correctly, so it is
-  safest to choose the canonical name for a particular locale. To determine
-  the canonical name, run the following command, where <replaceable>[locale
-  name]</replaceable> is the output given by <command>locale -a</command> for
-  your preferred locale (<quote>en_US.utf8</quote> in our example).</para>
-
-<screen role="nodump"><userinput>LC_ALL=<replaceable>[locale name]</replaceable> locale charmap</userinput></screen>
-
-  <para>For the <quote>en_US.utf8</quote> locale, the above command
-  will print:</para>
-
-<screen><computeroutput>UTF-8</computeroutput></screen>
-
-  <para>This results in a final locale setting of <quote>en_US.UTF-8</quote>.
-  It is important that the locale found using the heuristic above is tested
-  prior to it being added to <filename>/etc/locale.conf</filename>:</para>
-
-<screen role="nodump"><userinput>LC_ALL=[locale name] locale territory
-LC_ALL=[locale name] locale language
-LC_ALL=[locale name] locale charmap
-LC_ALL=[locale name] locale int_curr_symbol
-LC_ALL=[locale name] locale int_prefix</userinput></screen>
-
-  <para>The above commands should print the language name, the character
-  encoding used by the locale, the local currency, and the prefix to dial
-  before the telephone number in order to get into the country. If any of the
-  commands above fail with a message similar to the one shown below, this means
-  that your locale was either not installed in Chapter 10 or is not supported by
-  the default installation of Glibc.</para>
-
-<screen><computeroutput>locale: Cannot set LC_* to default locale: No such file or directory</computeroutput></screen>
-
-  <para>If this happens, you should either install the desired locale using
-  the <command>localedef</command> command, or consider choosing a different
-  locale. Further instructions assume that there are no such error messages
-  from Glibc.</para>
-
-  <para>Some packages beyond CLFS may also lack support for your chosen locale.
-  One example is the X library (part of the X Window System), which outputs
-  the following error message:</para>
-
-<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
-
-  <para>Sometimes it is possible to fix this by removing the charmap part of
-  the locale specification, as long as that does not change the character map
-  that Glibc associates with the locale (this can be checked by running the
-  <command>locale charmap</command> command in both locales). For example,
-  one would have to change &quot;de_DE.ISO-8859-15@euro&quot; to
-  &quot;de_DE@euro&quot; in order to get this locale recognized by Xlib.</para>
-
-  <para>Other packages can also function incorrectly (but may not necessarily
-  display any error messages) if the locale name does not meet their
-  expectations. In those cases, investigating how other Linux distributions
-  support your locale might provide some useful information.</para>
-
-  <para>Once the proper locale settings have been determined, create the
-  <filename>/etc/locale.conf</filename> file:</para>
-
-<screen><userinput>cat &gt; /etc/locale.conf &lt;&lt; "EOF"
-<literal># Begin /etc/locale.conf
-
-LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable><replaceable>[@modifiers]</replaceable>
-
-# End /etc/locale.conf</literal>
-EOF</userinput></screen>
-
-  <para>Note that you can modify <filename>/etc/locale.conf</filename> with
-  systemd's <command>localectl</command> utility. To use
-  <command>localectl</command> for the example above, run:</para>
-
-<screen role="nodump"><userinput>localectl set-locale LANG="<replaceable>[ll]_[CC][charmap][@modifiers]</replaceable>"</userinput></screen>
-
-  <para>You can also specify other language specific environment variables such
-  as <envar>LANG</envar>, <envar>LC_CTYPE</envar>, <envar>LC_NUMERIC</envar> or
-  any other environment variable from <command>locale</command> output. Just
-  separate them with a space. An example where <envar>LANG</envar> is set as
-  en_US.UTF-8 but <envar>LC_CTYPE</envar> is set as just en_US is:</para>
-
-<screen role="nodump"><userinput>localectl set-locale LANG="en_US.UTF-8" LC_CTYPE="en_US"</userinput></screen>
-
-  <note><para>Please note that <command>localectl</command> command can
-  be used  only on a system booted with systemd.</para></note>
-  <para>Setting the keyboard layout, screen font, and locale-related
-  environment variables are the only internationalization steps needed to
-  support locales that use ordinary single-byte encodings and left-to-right
-  writing direction. UTF-8 has been tested on the English, French, German,
-  Italian, and Spanish locales. All other locales are untested. If you discover
-  issues with any other locale please open a ticket in our Trac system.</para>
-
-  <para>Some locales need additional programs and support. CLFS will not be
-  supporting these locales in the book. We welcome the support for these other
-  locales via <ulink url="&cblfs-root;"/>.</para>
-
-</sect1>
Index: OK/system-config/common/profile.xml
===================================================================
--- BOOK/system-config/common/profile.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-profile">
-  <title>The Bash Shell Startup Files</title>
-  <?dbhtml filename="profile.html"?>
-
-  <indexterm zone="ch-scripts-profile">
-    <primary sortas="e-/etc/profile">/etc/profile</primary>
-  </indexterm>
-
-  <para>The shell program <command>/bin/bash</command> (hereafter
-  referred to as <quote>the shell</quote>) uses a collection of startup
-  files to help create an environment to run in. Each file has a
-  specific use and may affect login and interactive environments
-  differently. The files in the <filename class="directory">/etc</filename>
-  directory provide global settings. If an equivalent file exists in the
-  home directory, it may override the global settings.</para>
-
-  <para>An interactive login shell is started after a successful login,
-  using <command>/bin/login</command>, by reading the
-  <filename>/etc/passwd</filename> file. An interactive non-login shell
-  is started at the command-line (e.g.,
-  <prompt>[prompt]$</prompt><command>/bin/bash</command>). A
-  non-interactive shell is usually present when a shell script is
-  running. It is non-interactive because it is processing a script and
-  not waiting for user input between commands.</para>
-
-  <para>For more information, see <command>info bash</command> under the
-  <emphasis>Bash Startup Files and Interactive Shells</emphasis> section,
-  and <ulink url="&cblfs-root;index.php/Bash_Startup_Files">Bash Startup
-  Files</ulink> in CBLFS.</para>
-
-  <para>The files <filename>/etc/profile</filename> and
-  <filename>~/.bash_profile</filename> are read when the shell is
-  invoked as an interactive login shell. Create a base
-  <filename>/etc/profile</filename> that will setup locale information and load
-  any bash auto completion files that may be on the system. This script also
-  sets the <envar>INPUTRC</envar> environment variable that makes Bash and
-  Readline use <filename>/etc/inputrc</filename>.</para>
-
-<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
-
-source /etc/locale.conf
-for f in /etc/bash_completion.d/*.sh; do source $f; done; unset f
-export INPUTRC=/etc/inputrc
-
-# End /etc/profile</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: OK/system-config/common/symlinks.xml
===================================================================
--- BOOK/system-config/common/symlinks.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-symlinks">
-  <?dbhtml filename="symlinks.html"?>
-
-  <title>Creating custom symlinks to devices</title>
-
-  <sect2>
-
-    <title>CD-ROM symlinks</title>
-
-    <para>Some software that you may want to install later (e.g., various
-    media players) expect the /dev/cdrom and /dev/dvd symlinks to exist.
-    Also, it may be convenient to put references to those symlinks into
-    <filename>/etc/fstab</filename>. For each of your CD-ROM devices,
-    find the corresponding directory under
-    <filename class="directory">/sys</filename> (e.g., this can be
-    <filename class="directory">/sys/block/hdd</filename>) and
-    run a command similar to the following:</para>
-
-<screen role="nodump"><userinput>udevadm test /sys/block/hdd</userinput></screen>
-
-    <para>Look at the lines containing the output of various *_id programs.</para>
-
-    <para>There are two approaches to creating symlinks. The first one is to
-    use the model name and the serial number, the second one is based on the
-    location of the device on the bus. If you are going to use the first
-    approach, create a file similar to the following:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
-<literal>
-# Custom CD-ROM symlinks
-SUBSYSTEM=="block", ENV{ID_MODEL}=="SAMSUNG_CD-ROM_SC-148F", \
-    ENV{ID_REVISION}=="PS05", SYMLINK+="cdrom"
-SUBSYSTEM=="block", ENV{ID_MODEL}=="PHILIPS_CDD5301", \
-    ENV{ID_SERIAL}=="5VO1306DM00190", SYMLINK+="cdrom1 dvd"
-</literal>
-EOF</userinput></screen>
-
-    <note>
-      <para>Although the examples in this book work properly, be aware
-      that Udev does not recognize the backslash for line continuation.
-      If modifying Udev rules with an editor, be sure to leave each rule
-      on one physical line.</para>
-    </note>
-
-    <para>This way, the symlinks will stay correct even if you move the drives
-    to different positions on the IDE bus, but the
-    <filename>/dev/cdrom</filename> symlink won't be created if you replace
-    the old SAMSUNG CD-ROM with a new drive.</para>
-<!-- The symlinks in the first approach survive even the transition
-     to libata for IDE drives, but that is not for the book. -->
-
-    <para>The SUBSYSTEM==&quot;block&quot; key is needed in order to avoid
-    matching SCSI generic devices. Without it, in the case with SCSI
-    CD-ROMs, the symlinks will sometimes point to the correct
-    <filename>/dev/srX</filename> devices, and sometimes to
-    <filename>/dev/sgX</filename>, which is wrong.</para>
-
-    <para>The second approach yields:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
-<literal>
-# Custom CD-ROM symlinks
-SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
-    ENV{ID_PATH}=="pci-0000:00:07.1-ide-0:1", SYMLINK+="cdrom"
-SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
-    ENV{ID_PATH}=="pci-0000:00:07.1-ide-1:1", SYMLINK+="cdrom1 dvd"
-</literal>
-EOF</userinput></screen>
-
-    <para>This way, the symlinks will stay correct even if you replace drives
-    with different models, but place them to the old positions on the IDE
-    bus. The ENV{ID_TYPE}==&quot;cd&quot; key makes sure that the symlink
-    disappears if you put something other than a CD-ROM in that position on
-    the bus.</para>
-
-    <para>Of course, it is possible to mix the two approaches.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Dealing with duplicate devices</title>
-
-    <para>As explained in <xref linkend="ch-scripts-udev"/>, the order in
-    which devices with the same function appear in
-    <filename class="directory">/dev</filename> is essentially random.
-    E.g., if you have a USB web camera and a TV tuner, sometimes
-    <filename>/dev/video0</filename> refers to the camera and
-    <filename>/dev/video1</filename> refers to the tuner, and sometimes
-    after a reboot the order changes to the opposite one.
-    For all classes of hardware except sound cards and network cards, this is
-    fixable by creating udev rules for custom persistent symlinks.
-    The case of network cards is covered separately in
-    <xref linkend="chapter-network"/>, and sound card configuration can
-    be found in <ulink url="&cblfs-root;">CBLFS</ulink>.</para>
-
-    <para>For each of your devices that is likely to have this problem
-    (even if the problem doesn't exist in your current Linux distribution),
-    find the corresponding directory under
-    <filename class="directory">/sys/class</filename> or
-    <filename class="directory">/sys/block</filename>.
-    For video devices, this may be
-    <filename
-    class="directory">/sys/class/video4linux/video<replaceable>X</replaceable></filename>.
-    Figure out the attributes that identify the device uniquely (usually,
-    vendor and product IDs and/or serial numbers work):</para>
-
-<screen role="nodump"><userinput>udevadm info -a -p /sys/class/video4linux/video0</userinput></screen>
-
-    <para>Then write rules that create the symlinks, e.g.:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/83-duplicate_devs.rules &lt;&lt; EOF
-<literal>
-# Persistent symlinks for webcam and tuner
-KERNEL=="video*", SYSFS{idProduct}=="1910", SYSFS{idVendor}=="0d81", \
-    SYMLINK+="webcam"
-KERNEL=="video*", SYSFS{device}=="0x036f", SYSFS{vendor}=="0x109e", \
-    SYMLINK+="tvtuner"
-</literal>
-EOF</userinput></screen>
-
-    <para>The result is that <filename>/dev/video0</filename> and
-    <filename>/dev/video1</filename> devices still refer randomly to the tuner
-    and the web camera (and thus should never be used directly), but there are
-    symlinks <filename>/dev/tvtuner</filename> and
-    <filename>/dev/webcam</filename> that always point to the correct
-    device.</para>
-
- </sect2>
-
-</sect1>
Index: OK/system-config/common/udev.xml
===================================================================
--- BOOK/system-config/common/udev.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,316 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-udev">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Device and Module Handling on a CLFS System</title>
-
-  <indexterm zone="ch-scripts-udev">
-    <primary sortas="a-systemd">Systemd</primary>
-    <secondary>udev usage</secondary>
-  </indexterm>
-
-  <para>In <xref linkend="chapter-building-system"/>, we installed systemd,
-  which contains systemd-udevd, previously known as Udev. Before we go into
-  the details regarding how this works, a brief history of previous methods of
-  handling devices is in order.</para>
-
-  <para>Linux systems in general traditionally use a static device creation
-  method, whereby a great many device nodes are created under <filename
-  class="directory">/dev</filename> (sometimes literally thousands of nodes),
-  regardless of whether the corresponding hardware devices actually exist. This
-  is typically done via a <command>MAKEDEV</command> script, which contains a
-  number of calls to the <command>mknod</command> program with the relevant
-  major and minor device numbers for every possible device that might exist in
-  the world.</para>
-
-  <para>Using the Udev method, only those devices which are detected by the
-  kernel get device nodes created for them. Because these device nodes will be
-  created each time the system boots, they will be stored on a <systemitem
-  class="filesystem">tmpfs</systemitem> file system (a virtual file system that
-  resides entirely in system memory). Device nodes do not require much space, so
-  the memory that is used is negligible.</para>
-
-  <sect2>
-    <title>History</title>
-
-    <para>In February 2000, a new filesystem called <systemitem
-    class="filesystem">devfs</systemitem> was merged into the 2.3.46 kernel
-    and was made available during the 2.4 series of stable kernels. Although
-    it was present in the kernel source itself, this method of creating devices
-    dynamically never received overwhelming support from the core kernel
-    developers.</para>
-
-    <para>The main problem with the approach adopted by <systemitem
-    class="filesystem">devfs</systemitem> was the way it handled device
-    detection, creation, and naming. The latter issue, that of device node
-    naming, was perhaps the most critical. It is generally accepted that if
-    device names are allowed to be configurable, then the device naming policy
-    should be up to a system administrator, not imposed on them by any
-    particular developer(s). The <systemitem
-    class="filesystem">devfs</systemitem> file system also suffers from race
-    conditions that are inherent in its design and cannot be fixed without a
-    substantial revision to the kernel. It has also been marked as deprecated
-    due to a lack of recent maintenance.</para>
-
-    <para>With the development of the unstable 2.5 kernel tree, later released
-    as the 2.6 series of stable kernels, a new virtual filesystem called
-    <systemitem class="filesystem">sysfs</systemitem> came to be. The job of
-    <systemitem class="filesystem">sysfs</systemitem> is to export a view of
-    the system's hardware configuration to userspace processes. With this
-    userspace-visible representation, the possibility of seeing a userspace
-    replacement for <systemitem class="filesystem">devfs</systemitem> became
-    much more realistic.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Udev Implementation</title>
-
-    <sect3>
-      <title>Sysfs</title>
-
-      <para>The <systemitem class="filesystem">sysfs</systemitem> filesystem was
-      mentioned briefly above. One may wonder how <systemitem
-      class="filesystem">sysfs</systemitem> knows about the devices present on
-      a system and what device numbers should be used for them. Drivers that
-      have been compiled into the kernel directly register their objects with
-      <systemitem class="filesystem">sysfs</systemitem> as they are detected by
-      the kernel. For drivers compiled as modules, this registration will happen
-      when the module is loaded. Once the <systemitem
-      class="filesystem">sysfs</systemitem> filesystem is mounted (on <filename
-      class="directory">/sys</filename>), data which the built-in drivers
-      registered with <systemitem class="filesystem">sysfs</systemitem> are
-      available to userspace processes and to <command>udevd</command> for device
-      node creation.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Device Node Creation</title>
-
-      <para>To obtain the right major and minor number for a device, Udev relies
-      on the information provided by <systemitem
-      class="filesystem">sysfs</systemitem> in <filename
-      class="directory">/sys</filename>.  For example,
-      <filename>/sys/class/tty/vcs/dev</filename> contains the string
-      <quote>7:0</quote>. This string is used by <command>udevd</command>
-      to create a device node with major number <emphasis>7</emphasis> and minor
-      <emphasis>0</emphasis>. The names and permissions of the nodes created
-      under the <filename class="directory">/dev</filename> directory are
-      determined by rules specified in the files within the
-      <filename class="directory">/lib/udev/rules.d</filename> and <filename
-      class="directory">/etc/udev/rules.d/</filename> directories. These files
-      have names that start with numbers, and are evaluated in numerical order.
-      If <command>udevd</command> can't find a rule for the device it is
-      creating, it will default permissions to <emphasis>660</emphasis> and
-      ownership to <emphasis>root:root</emphasis>. </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Module Loading</title>
-
-      <para>Device drivers compiled as modules may have aliases built into them.
-      Aliases are visible in the output of the <command>modinfo</command>
-      program and are usually related to the bus-specific identifiers of devices
-      supported by a module. For example, the <emphasis>snd-fm801</emphasis>
-      driver supports PCI devices with vendor ID 0x1319 and device ID 0x0801,
-      and has an alias of <quote>pci:v00001319d00000801sv*sd*bc04sc01i*</quote>.
-      For most devices, the bus driver exports the alias of the driver that
-      would handle the device via <systemitem
-      class="filesystem">sysfs</systemitem>. E.g., the
-      <filename>/sys/bus/pci/devices/0000:00:0d.0/modalias</filename> file
-      might contain the string
-      <quote>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</quote>.
-      The default rules provided by Udev will cause <command>udevd</command>
-      to call out to <command>/sbin/modprobe</command> with the contents of the
-      <envar>MODALIAS</envar> uevent environment variable (that should be the
-      same as the contents of the <filename>modalias</filename> file in sysfs),
-      thus loading all modules whose aliases match this string after wildcard
-      expansion.</para>
-
-      <para>In this example, this means that, in addition to
-      <emphasis>snd-fm801</emphasis>, the obsolete (and unwanted)
-      <emphasis>forte</emphasis> driver will be loaded if it is
-      available. See below for ways in which the loading of unwanted drivers can
-      be prevented.</para>
-
-      <para>The kernel itself is also able to load modules for network
-      protocols, filesystems and NLS support on demand.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Handling Hotpluggable/Dynamic Devices</title>
-
-      <para>When you plug in a device, such as a Universal Serial Bus (USB) MP3
-      player, the kernel recognizes that the device is now connected and
-      generates a uevent. This uevent is then handled by
-      <command>udevd</command> as described above.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Problems with Loading Modules and Creating Devices</title>
-
-    <para>There are a few possible problems when it comes to automatically
-    creating device nodes.</para>
-
-    <sect3>
-      <title>A kernel module is not loaded automatically</title>
-
-      <para>Udev will only load a module if it has a bus-specific alias and the
-      bus driver properly exports the necessary aliases to <systemitem
-      class="filesystem">sysfs</systemitem>. In other cases, one should
-      arrange module loading by other means. With Linux-&linux-version;, Udev is
-      known to load properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
-      SERIO and FireWire devices.</para>
-
-      <para>To determine if the device driver you require has the necessary
-      support for Udev, run <command>modinfo</command> with the module name as
-      the argument.  Now try locating the device directory under
-      <filename class="directory">/sys/bus</filename> and check whether there is
-      a <filename>modalias</filename> file there.</para>
-
-      <para>If the <filename>modalias</filename> file exists in <systemitem
-      class="filesystem">sysfs</systemitem>, the driver supports the device and
-      can talk to it directly, but doesn't have the alias, it is a bug in the
-      driver. Load the driver without the help from Udev and expect the issue
-      to be fixed later.</para>
-
-      <para>If there is no <filename>modalias</filename> file in the relevant
-      directory under <filename class="directory">/sys/bus</filename>, this
-      means that the kernel developers have not yet added modalias support to
-      this bus type. With Linux-&linux-version;, this is the case with ISA
-      busses. Expect this issue to be fixed in later kernel versions.</para>
-
-      <para>Udev is not intended to load <quote>wrapper</quote> drivers such as
-      <emphasis>snd-pcm-oss</emphasis> and non-hardware drivers such as
-      <emphasis>loop</emphasis> at all.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>A kernel module is not loaded automatically, and Udev is not
-      intended to load it</title>
-
-      <para>If the <quote>wrapper</quote> module only enhances the functionality
-      provided by some other module (e.g., <emphasis>snd-pcm-oss</emphasis>
-      enhances the functionality of <emphasis>snd-pcm</emphasis> by making the
-      sound cards available to OSS applications), configure
-      <command>modprobe</command> to load the wrapper after Udev loads the
-      wrapped module. To do this, add an <quote>install</quote> line to a file
-      in <filename>/etc/modprobe.d</filename>. For example:</para>
-
-<screen role="nodump"><literal>install snd-pcm /sbin/modprobe -i snd-pcm ; \
-    /sbin/modprobe snd-pcm-oss ; true</literal></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev loads some unwanted module</title>
-
-      <para>Either don't build the module, or blacklist it in
-      <filename>/etc/modprobe.d</filename> file as done with the
-      <emphasis>forte</emphasis> module in the example below:</para>
-
-<screen role="nodump"><literal>blacklist forte</literal></screen>
-
-      <para>Blacklisted modules can still be loaded manually with the
-      explicit <command>modprobe</command> command.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev creates a device incorrectly, or makes a wrong symlink</title>
-
-      <para>This usually happens if a rule unexpectedly matches a device. For
-      example, a poorly-writen rule can match both a SCSI disk (as desired)
-      and the corresponding SCSI generic device (incorrectly) by vendor.
-      Find the offending rule and make it more specific, with the help of
-      <command>udevadm info</command>.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev rule works unreliably</title>
-
-      <para>This may be another manifestation of the previous problem. If not,
-      and your rule uses <systemitem class="filesystem">sysfs</systemitem>
-      attributes, it may be a kernel timing issue, to be fixed in later kernels.
-      For now, you can work around it by creating a rule that waits for the used
-      <systemitem class="filesystem">sysfs</systemitem> attribute and appending
-      it to the <filename>/etc/udev/rules.d/10-wait_for_sysfs.rules</filename>
-      file. Please notify the CLFS Development list if you do so and it
-      helps.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev does not create a device</title>
-
-      <para>Further text assumes that the driver is built statically into the
-      kernel or already loaded as a module, and that you have already checked
-      that Udev doesn't create a misnamed device.</para>
-
-      <para>Udev has no information needed to create a device node if a kernel
-      driver does not export its data to <systemitem
-      class="filesystem">sysfs</systemitem>.
-      This is most common with third party drivers from outside the kernel
-      tree. Create a static device node in
-      <filename>/lib/udev/devices</filename> with the appropriate major/minor
-      numbers (see the file <filename>devices.txt</filename> inside the kernel
-      documentation or the documentation provided by the third party driver
-      vendor). The static device node will be copied to
-      <filename class="directory">/dev</filename> by the
-      <command>S10udev</command> bootscript.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Device naming order changes randomly after rebooting</title>
-
-      <para>This is due to the fact that Udev, by design, handles uevents and
-      loads modules in parallel, and thus in an unpredictable order. This will
-      never be <quote>fixed</quote>. You should not rely upon the kernel device
-      names being stable. Instead, create your own rules that make symlinks with
-      stable names based on some stable attributes of the device, such as a
-      serial number or the output of various *_id utilities installed by Udev.
-      See <xref linkend="ch-scripts-symlinks"/> and
-      <xref linkend="chapter-network"/> for examples.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Useful Reading</title>
-
-    <para>Additional helpful documentation is available at the following
-    sites:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para remap="verbatim">A Userspace Implementation of <systemitem class="filesystem">devfs</systemitem>
-        <ulink url="http://www.kroah.com/linux/talks/ols_2003_udev_paper/Reprint-Kroah-Hartman-OLS2003.pdf"/></para>
-      </listitem>
-
-      <listitem>
-        <para remap="verbatim">The <systemitem class="filesystem">sysfs</systemitem> Filesystem
-        <ulink url="http://www.kernel.org/pub/linux/kernel/people/mochel/doc/papers/ols-2005/mochel.pdf"/></para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect2>
-
-</sect1>
Index: OK/system-config/common/usage.xml
===================================================================
--- BOOK/system-config/common/usage.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-usage">
-  <?dbhtml filename="usage.html"?>
-
-  <title>How does Systemd work?</title>
-
-  <indexterm zone="ch-scripts-usage">
-    <primary sortas="a-systemd">Systemd</primary>
-  <secondary>usage</secondary></indexterm>
-
-  <warning>
-    <para>Please disregard this page until it is complete and verified.</para>
-  </warning>
-
-  <sect2>
-    <title>Introduction to Systemd</title>
-
-
-    <para>Systemd is a system management daemon designed exclusively for the
-    Linux kernel API. In the Linux startup process, it is the first process to
-    execute in user land; therefore, it is also the parent process of all child
-    processes in user land.</para>
-
-    <para>Systemd's initialization instructions for each daemon are recorded in
-    a declarative configuration file rather than a shell script. For
-    inter-process communication, systemd makes Unix domain sockets and D-Bus
-    available to the running daemons. Because systemd tracks processes using
-    Linux cgroups instead of process identifiers (PIDs), daemons cannot "escape"
-    systemd; not even by double-forking. Systemd is also capable of aggressive
-    parallelization.</para>
-
-    <para>Among systemd's auxiliary features are a cron-like job scheduler
-    called systemd Calendar Timers, and an event logging subsystem called
-    journal. The system administrator may choose whether to log system events
-    with systemd or syslog. Systemd's logfile is a binary file. The state of
-    systemd itself can be preserved in a snapshot for future recall.</para>
-
-    <para>Systemd provides a replacement for sysvinit, pm-utils, inetd, acpid,
-    syslog, watchdog, cron and atd, and obsoletes ConsoleKit.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Systemctl</title>
-
-    <para><command>systemctl</command> is the main command used to introspect
-     and control systemd.</para>
-
-    <variablelist>
-
-      <varlistentry>
-        <term>List running units:</term>
-        <listitem>
-          <para><command>systemctl</command> or <command>systemctl list-units</command></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>List failed units:</term>
-        <listitem>
-          <para><command>systemctl --failed</command></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>List available unit files:</term>
-        <listitem>
-          <para><command>systemctl list-unit-files</command></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Activate a unit immediately:</term>
-        <listitem>
-          <para><command>systemctl start</command> <replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Stop a unit immediately:</term>
-        <listitem>
-          <para><command>systemctl stop </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Restart a unit:</term>
-        <listitem>
-          <para><command>systemctl restart </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Reload unit configuration:</term>
-        <listitem>
-          <para><command>systemctl reload </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Show status of a unit:</term>
-        <listitem>
-          <para><command>systemctl status </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Check if a unit is enabled or disabled:</term>
-        <listitem>
-          <para><command>systemctl is-enabled </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Enable a unit to start during boot:</term>
-        <listitem>
-          <para><command>systemctl enable </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Disable a unit to not start during boot:</term>
-        <listitem>
-          <para><command>systemctl disable </command><replaceable>unit</replaceable></para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Reload systemd and scan for new or changed units:</term>
-        <listitem>
-          <para><command>systemctl daemon-reload</command></para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>For more information regarding systemd, please refer to the systemd
-    and related man-pages and
-    <ulink url="https://fedoraproject.org/wiki/Systemd">Systemd at
-    FedoraProject</ulink> for documentation, examples, features, and other
-    information.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/system-config/mips-chapter.xml
===================================================================
--- BOOK/system-config/mips-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/mips64-64-chapter.xml
===================================================================
--- BOOK/system-config/mips64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/mips64-chapter.xml
===================================================================
--- BOOK/system-config/mips64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/ppc-chapter.xml
===================================================================
--- BOOK/system-config/ppc-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/ppc64-64-chapter.xml
===================================================================
--- BOOK/system-config/ppc64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/ppc64-chapter.xml
===================================================================
--- BOOK/system-config/ppc64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/sparc-chapter.xml
===================================================================
--- BOOK/system-config/sparc-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/sparc64-64-chapter.xml
===================================================================
--- BOOK/system-config/sparc64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/sparc64-chapter.xml
===================================================================
--- BOOK/system-config/sparc64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/x86-chapter.xml
===================================================================
--- BOOK/system-config/x86-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/x86_64-64-chapter.xml
===================================================================
--- BOOK/system-config/x86_64-64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: OK/system-config/x86_64-chapter.xml
===================================================================
--- BOOK/system-config/x86_64-chapter.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-system-config" xreflabel="System Configuration">
-  <?dbhtml dir="system-config"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Configuration</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/locale.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/inputrc.xml"/>
-
-</chapter>
Index: BOOK/x86-index.xml
===================================================================
--- BOOK/x86-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/x86-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86-chapter.xml"/>
Index: BOOK/x86_64-64-index.xml
===================================================================
--- BOOK/x86_64-64-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/x86_64-64-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86_64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86_64-64-chapter.xml"/>
Index: BOOK/x86_64-index.xml
===================================================================
--- BOOK/x86_64-index.xml	(revision db713443c6ede7262fa0e1ab480d849cb50a2a7f)
+++ BOOK/x86_64-index.xml	(revision 82fc053d495bb443305423c3ea5d85aa1e50d1a4)
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="system-config/x86_64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/x86_64-chapter.xml"/>
