Index: BOOK/final-system/common/attr.xml
===================================================================
--- BOOK/final-system/common/attr.xml	(revision 72d6a1b070122b57554075d13ae42e2ff9f5563d)
+++ BOOK/final-system/common/attr.xml	(revision 4c1c923aa4f31850c743b8fe71db6a4b13f67af3)
@@ -26,27 +26,36 @@
     <title>Installation of Attr</title>
 
-    <para os="a">Prepare Attr for compilation:</para>
+    <para os="a">Apply a sed to install the documentation with a versioned
+    directory:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
 
-    <para os="c">Compile the package:</para>
+    <para os="c">Prepare Attr for compilation:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="d"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para os="e">This package does not come with a test suite.</para>
+    <para os="e">Compile the package:</para>
 
-    <para os="f">Install the package:</para>
+<screen os="f"><userinput>make</userinput></screen>
 
-<screen os="g"><userinput>make install install-dev install-lib</userinput></screen>
+    <para os="g">The tests need to run with a filesystem which supports extended
+    attributes. Test the results:</para>
 
-    <para os="h">Move the shared library to <filename class="directory">/lib</filename>
-    and recreate the symlink in <filename class="directory">/usr/lib</filename>:</para>
+<screen os="h"><userinput remap="test">make -j1 tests root-tests</userinput></screen>
 
-<screen os="i"><userinput>mv -v /usr/lib/libattr.so.* /lib
+    <para os="i">Install the package:</para>
+
+<screen os="j"><userinput>make install install-dev install-lib</userinput></screen>
+
+    <para os="k">Move the shared library to <filename class="directory">/lib
+    </filename> and recreate the symlink in <filename class="directory">/usr/lib
+    </filename>:</para>
+
+<screen os="l"><userinput>mv -v /usr/lib/libattr.so.* /lib
 ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput></screen>
 
-    <para os="j">Set the proper permissions on the shared library:</para>
+    <para os="m">Set the proper permissions on the shared library:</para>
 
-<screen os="k"><userinput>chmod 755 -v /lib/libattr.so.1.1.0</userinput></screen>
+<screen os="n"><userinput>chmod 755 -v /lib/libattr.so.1.1.0</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/attr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/attr-64bit.xml	(revision 72d6a1b070122b57554075d13ae42e2ff9f5563d)
+++ BOOK/final-system/multilib/attr-64bit.xml	(revision 4c1c923aa4f31850c743b8fe71db6a4b13f67af3)
@@ -23,42 +23,56 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure \
     --prefix=/usr --libdir=/lib64 \
     --libexecdir=/usr/lib64</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="h">Recreate the symlink in <filename class="directory">/usr/lib64</filename> and remove the shared link from <filename class="directory">/lib64</filename>:</para>
+    <para os="j">Recreate the symlink in <filename class="directory">/usr/lib64
+    </filename> and remove the shared link from <filename class="directory">
+    /lib64</filename>:</para>
 
-<screen os="i"><userinput>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='k'])"/>
+
+<screen os="l"><userinput>
 ln -sfv ../../lib64/$(readlink /lib64/libattr.so) /usr/lib64/libattr.so
 rm -v /lib64/libattr.so</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='m'])"/>
 
-<screen os="k"><userinput>chmod 755 -v /lib64/libattr.so.1.1.0</userinput></screen>
+<screen os="n"><userinput>chmod 755 -v /lib64/libattr.so.1.1.0</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/attr-n32.xml
===================================================================
--- BOOK/final-system/multilib/attr-n32.xml	(revision 72d6a1b070122b57554075d13ae42e2ff9f5563d)
+++ BOOK/final-system/multilib/attr-n32.xml	(revision 4c1c923aa4f31850c743b8fe71db6a4b13f67af3)
@@ -24,42 +24,56 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" ./configure \
     --prefix=/usr --libdir=/lib32 \
     --libexecdir=/usr/lib32</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="h">Recreate the symlink in <filename class="directory">/usr/lib32</filename> and remove the shared link from <filename class="directory">/lib32</filename>:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="i"><userinput>
+    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib32
+    </filename> and remove the shared link from <filename class="directory">
+    /lib32</filename>:</para>
+
+<screen os="l"><userinput>
 ln -sfv ../../lib32/$(readlink /lib32/libattr.so) /usr/lib32/libattr.so
 rm -v /lib32/libattr.so</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='m'])"/>
 
-<screen os="k"><userinput>chmod 755 -v /lib32/libattr.so.1.1.0</userinput></screen>
+<screen os="n"><userinput>chmod 755 -v /lib32/libattr.so.1.1.0</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/attr.xml
===================================================================
--- BOOK/final-system/multilib/attr.xml	(revision 72d6a1b070122b57554075d13ae42e2ff9f5563d)
+++ BOOK/final-system/multilib/attr.xml	(revision 4c1c923aa4f31850c743b8fe71db6a4b13f67af3)
@@ -24,44 +24,58 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILD32}" ./configure \
     --prefix=/usr --libdir=/lib \
     --libexecdir=/usr/lib</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">Recreate the symlink in <filename class="directory">/usr/lib</filename> and remove the shared link from <filename class="directory">/lib</filename>:</para>
-
-<screen os="i"><userinput>
-ln -sfv ../../lib/$(readlink /lib/libattr.so) /usr/lib/libattr.so
-rm -v /lib/libattr.so</userinput></screen>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='j'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/attr.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='k'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='l'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='m'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='n'])"/>
 
   </sect2>
