Index: BOOK/boot/64/eudev.xml
===================================================================
--- BOOK/boot/64/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/boot/64/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -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-eudev" role="wrap">
+  <?dbhtml filename="eudev.html"?>
+
+  <title>Eudev-&eudev-version;</title>
+
+  <indexterm zone="ch-boot-eudev">
+    <primary sortas="a-Eudev">Eudev</primary>
+    <secondary>boot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/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="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
+    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin --libdir=/lib64 \
+    --disable-introspection --disable-gtk-doc-html --disable-gudev \
+    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <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="../../final-system/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>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/boot/64/udev.xml
===================================================================
--- BOOK/boot/64/udev.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(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-boot-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Eudev-&udev-version;</title>
-
-  <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
-CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
-    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
-    --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin --libdir=/lib64 \
-    --disable-introspection --disable-gtk-doc-html --disable-gudev \
-    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='r2'])"/>
-
- </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/alpha-chapter.xml
===================================================================
--- BOOK/boot/alpha-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/alpha-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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/kmod.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/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/kernel.xml"/>
Index: BOOK/boot/common/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/boot/common/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -0,0 +1,76 @@
+<?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-eudev" role="wrap">
+  <?dbhtml filename="eudev.html"?>
+
+  <title>Eudev-&eudev-version;</title>
+
+  <indexterm zone="ch-boot-eudev">
+    <primary sortas="a-Eudev">Eudev</primary>
+    <secondary>boot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/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="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/usr \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib --bindir=/sbin --sbindir=/sbin --libdir=/usr/lib \
+    --with-rootlibdir=/lib --disable-introspection --disable-gtk-doc-html \
+    --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
+    --enable-libkmod</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="k"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='r1'])"/>
+
+<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \
+> ${CLFS}/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
+
+ </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/boot/common/udev.xml
===================================================================
--- BOOK/boot/common/udev.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(revision )
@@ -1,76 +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-boot-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Eudev-&udev-version;</title>
-
-  <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
-LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/usr \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
-    --libexecdir=/lib --bindir=/sbin --sbindir=/sbin --libdir=/usr/lib \
-    --with-rootlibdir=/lib --disable-introspection --disable-gtk-doc-html \
-    --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
-    --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="k"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \
-> ${CLFS}/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
-
- </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/mips-chapter.xml
===================================================================
--- BOOK/boot/mips-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/mips-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -21,5 +21,5 @@
   <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/kmod.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/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/mips64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -21,5 +21,5 @@
   <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="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
Index: BOOK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/mips64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -21,5 +21,5 @@
   <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/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.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="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
Index: BOOK/boot/multilib/eudev.xml
===================================================================
--- BOOK/boot/multilib/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/boot/multilib/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -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-boot-eudev" role="wrap">
+  <?dbhtml filename="eudev.html"?>
+
+  <title>Eudev-&eudev-version;</title>
+
+  <indexterm zone="ch-boot-eudev">
+    <primary sortas="a-Eudev">Eudev</primary>
+    <secondary>boot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/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="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
+CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
+    ./configure --prefix=/usr --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --with-rootprefix='' --enable-split-usr \
+    --sysconfdir=/etc --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin \
+    --libdir=/usr/lib64 --with-rootlibdir=/lib64 --disable-introspection \
+    --disable-gtk-doc-html --disable-gudev --disable-keymap \
+    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <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="../../final-system/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>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/boot/multilib/udev.xml
===================================================================
--- BOOK/boot/multilib/udev.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(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-boot-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Eudev-&udev-version;</title>
-
-  <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
-CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
-    ./configure --prefix=/usr --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --with-rootprefix='' --enable-split-usr \
-    --sysconfdir=/etc --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin \
-    --libdir=/usr/lib64 --with-rootlibdir=/lib64 --disable-introspection \
-    --disable-gtk-doc-html --disable-gudev --disable-keymap \
-    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='r2'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/ppc-chapter.xml
===================================================================
--- BOOK/boot/ppc-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/ppc-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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/kmod.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/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
Index: BOOK/boot/ppc64-64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/ppc64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
Index: BOOK/boot/ppc64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/ppc64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -22,5 +22,5 @@
   <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/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.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="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
Index: BOOK/boot/sparc-chapter.xml
===================================================================
--- BOOK/boot/sparc-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/sparc-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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/kmod.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/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/sparc64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.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="sparc/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
Index: BOOK/boot/x86-chapter.xml
===================================================================
--- BOOK/boot/x86-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/x86-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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/kmod.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/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
Index: BOOK/boot/x86_64-64/eudev.xml
===================================================================
--- BOOK/boot/x86_64-64/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/boot/x86_64-64/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -0,0 +1,78 @@
+<?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-eudev" role="wrap">
+  <?dbhtml filename="eudev.html"?>
+
+  <title>Eudev-&eudev-version;</title>
+
+  <indexterm zone="ch-boot-eudev">
+    <primary sortas="a-Eudev">Eudev</primary>
+    <secondary>boot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/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="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib:/lib" \
+    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
+    --libexecdir=/lib --bindir=/sbin --sbindir=/sbin --libdir=/lib \
+    --disable-introspection --disable-gtk-doc-html --disable-gudev \
+    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <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="../../final-system/common/eudev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/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>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-eudev" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/boot/x86_64-64/udev.xml
===================================================================
--- BOOK/boot/x86_64-64/udev.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(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-boot-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Eudev-&udev-version;</title>
-
-  <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
-CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib:/lib" \
-    ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
-    --libexecdir=/lib --bindir=/sbin --sbindir=/sbin --libdir=/lib \
-    --disable-introspection --disable-gtk-doc-html --disable-gudev \
-    --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='r2'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/x86_64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/boot/x86_64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -20,5 +20,5 @@
   <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/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.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="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
Index: BOOK/bootscripts/alpha-chapter.xml
===================================================================
--- BOOK/bootscripts/alpha-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/alpha-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/common/bootscripts.xml
===================================================================
--- BOOK/bootscripts/common/bootscripts.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/common/bootscripts.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -262,10 +262,10 @@
       </varlistentry>
 
-      <varlistentry id="udev-bootscripts">
+      <varlistentry id="eudev-bootscripts">
         <term><command>udev</command></term>
         <listitem>
           <para>Starts and stops the Eudev daemon</para>
-          <indexterm zone="ch-scripts-bootscripts udev-bootscripts">
-            <primary sortas="d-udev">udev</primary>
+          <indexterm zone="ch-scripts-bootscripts eudev-bootscripts">
+            <primary sortas="d-eudev">udev</primary>
           </indexterm>
         </listitem>
Index: BOOK/bootscripts/common/eudev.xml
===================================================================
--- BOOK/bootscripts/common/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/bootscripts/common/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -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/symlinks.xml
===================================================================
--- BOOK/bootscripts/common/symlinks.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/common/symlinks.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -89,5 +89,5 @@
     <title>Dealing with duplicate devices</title>
 
-    <para>As explained in <xref linkend="ch-scripts-udev"/>, the order in
+    <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.
Index: OK/bootscripts/common/udev.xml
===================================================================
--- BOOK/bootscripts/common/udev.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(revision )
@@ -1,348 +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-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/mips-chapter.xml
===================================================================
--- BOOK/bootscripts/mips-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/mips-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/mips64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/mips64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/mips64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/mips64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/ppc-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/ppc-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/ppc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/ppc64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/ppc64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/ppc64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/sparc-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/sparc-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/sparc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/sparc64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/sparc64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/sparc64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/x86-chapter.xml
===================================================================
--- BOOK/bootscripts/x86-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/x86-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/x86_64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/bootscripts/x86_64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/bootscripts/x86_64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -17,5 +17,5 @@
   <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/udev.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"/>
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/alpha-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>
Index: BOOK/final-system/common/eudev.xml
===================================================================
--- BOOK/final-system/common/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/final-system/common/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -0,0 +1,276 @@
+<?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 --enable-rule_generator \
+    --disable-introspection --disable-keymap --disable-gudev --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: <userinput>make check</userinput>.</para>
+
+    <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: OK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(revision )
@@ -1,276 +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-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Eudev-&udev-version;</title>
-
-  <indexterm zone="ch-system-udev">
-    <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 --enable-rule_generator \
-    --disable-introspection --disable-keymap --disable-gudev --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: <userinput>make check</userinput>.</para>
-
-    <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-udev" 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev 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-udev libudev">
-            <primary sortas="c-libudev">libudev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="etc-udev">
-        <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-udev etc-udev">
-            <primary sortas="e-/etc/udev">/etc/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lib-udev">
-        <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-udev lib-udev">
-            <primary sortas="e-/lib/udev">/lib/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/mips-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/mips64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -119,7 +119,7 @@
   <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/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev-64bit.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>
Index: BOOK/final-system/multilib/eudev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eudev-64bit.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/final-system/multilib/eudev-64bit.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -0,0 +1,77 @@
+<?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="udev-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 --enable-split-usr --enable-rule_generator \
+    --disable-introspection --disable-keymap --disable-gudev \
+    --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='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 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/final-system/multilib/eudev-n32.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -0,0 +1,68 @@
+<?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 --enable-rule_generator \
+    --disable-introspection --disable-keymap --disable-gudev --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='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 01b60c428d54948e6fb606f9752131d4bf1d1d21)
+++ BOOK/final-system/multilib/eudev.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -0,0 +1,65 @@
+<?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 --enable-rule_generator \
+    --disable-introspection --disable-keymap --disable-gudev --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='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: OK/final-system/multilib/udev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/udev-64bit.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(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-udev" role="wrap">
-  <?dbhtml filename="udev-64bit.html"?>
-
-  <title>Eudev-&udev-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-udev">
-    <primary sortas="a-Eudev">Eudev</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/udev.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/udev.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 --enable-split-usr --enable-rule_generator \
-    --disable-introspection --disable-keymap --disable-gudev \
-    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='r2'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/udev.xml"
-  xpointer="xpointer(id('contents-udev'))"/>
-
-</sect1>
Index: OK/final-system/multilib/udev-n32.xml
===================================================================
--- BOOK/final-system/multilib/udev-n32.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(revision )
@@ -1,68 +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-udev-n32" role="wrap">
-  <?dbhtml filename="udev-n32.html"?>
-
-  <title>Eudev-&udev-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-udev-n32">
-    <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/udev.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/udev.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 --enable-rule_generator \
-    --disable-introspection --disable-keymap --disable-gudev --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-</sect1>
-
-
-
Index: OK/final-system/multilib/udev.xml
===================================================================
--- BOOK/final-system/multilib/udev.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ 	(revision )
@@ -1,65 +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-udev-32" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Eudev-&udev-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-udev-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/udev.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/udev.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 --enable-rule_generator \
-    --disable-introspection --disable-keymap --disable-gudev --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-</sect1>
-
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/ppc-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
Index: BOOK/final-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/ppc64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/ppc64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -96,6 +96,6 @@
   <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/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev-64bit.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/sparc-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -96,6 +96,6 @@
   <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/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev-64bit.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/x86-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -72,5 +72,5 @@
   <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/udev.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/final-system/x86_64-chapter.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -96,6 +96,6 @@
   <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/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev-64bit.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/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/materials/common/packages.xml	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -160,9 +160,9 @@
 
     <varlistentry>
-      <term>Eudev (&udev-version;) - <token>&udev-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&udev-home;"/></para>
-        <para>Download: <ulink url="&udev-url;"/></para>
-        <para>MD5 sum: <literal>&udev-md5;</literal></para>
+      <term>Eudev (&eudev-version;) - <token>&eudev-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&eudev-home;"/></para>
+        <para>Download: <ulink url="&eudev-url;"/></para>
+        <para>MD5 sum: <literal>&eudev-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision e8d05207c9a714671c8551102392f17c6219f1df)
+++ BOOK/packages.ent	(revision 01b60c428d54948e6fb606f9752131d4bf1d1d21)
@@ -435,9 +435,9 @@
 <!ENTITY texinfo-home "&gnu-software;texinfo">
 
-<!ENTITY udev-version "1.2">
-<!ENTITY udev-size "1,678 KB">
-<!ENTITY udev-url "ftp://mirror.ovh.net/gentoo-distfiles/distfiles/eudev-&udev-version;.tar.gz">
-<!ENTITY udev-md5 "5ee0fd62ef2802858ab91a9652ffd620">
-<!ENTITY udev-home "http://www.gentoo.org/proj/en/eudev/">
+<!ENTITY eudev-version "1.2">
+<!ENTITY eudev-size "1,678 KB">
+<!ENTITY eudev-url "ftp://mirror.ovh.net/gentoo-distfiles/distfiles/eudev-&eudev-version;.tar.gz">
+<!ENTITY eudev-md5 "5ee0fd62ef2802858ab91a9652ffd620">
+<!ENTITY eudev-home "http://www.gentoo.org/proj/en/eudev/">
 
 <!ENTITY uname_hack-version "20080713">
