r779 - in trunk/BOOK: . boot/common boot/mips boot/mips64 boot/multilib boot/sparc64 chroot/common chroot/multilib final-system final-system/common final-system/mips final-system/mips64 final-system/mips64-64 final-system/multilib final-system/ppc final-system/sparc final-system/sparc64 final-system/x86_64 final-system/x86_64-64 introduction/common temp-system/common temp-system/mips temp-system/mips64 temp-system/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Nov 30 22:14:16 PST 2005


Author: jim
Date: 2005-11-30 23:14:06 -0700 (Wed, 30 Nov 2005)
New Revision: 779

Added:
   trunk/BOOK/final-system/multilib/procps-n32.xml
Removed:
   trunk/BOOK/final-system/mips64-64/file.xml
   trunk/BOOK/final-system/mips64-64/mktemp.xml
   trunk/BOOK/final-system/mips64-64/module-init-tools.xml
   trunk/BOOK/final-system/mips64/procps-n32.xml
Modified:
   trunk/BOOK/
   trunk/BOOK/boot/common/e2fsprogs.xml
   trunk/BOOK/boot/common/inetutils.xml
   trunk/BOOK/boot/common/util-linux.xml
   trunk/BOOK/boot/mips/module-init-tools.xml
   trunk/BOOK/boot/mips64/module-init-tools.xml
   trunk/BOOK/boot/mips64/util-linux.xml
   trunk/BOOK/boot/multilib/inetutils.xml
   trunk/BOOK/boot/multilib/util-linux.xml
   trunk/BOOK/boot/sparc64/e2fsprogs-libs.xml
   trunk/BOOK/chroot/common/util-linux.xml
   trunk/BOOK/chroot/multilib/util-linux.xml
   trunk/BOOK/final-system/common/autoconf.xml
   trunk/BOOK/final-system/common/automake.xml
   trunk/BOOK/final-system/common/bash.xml
   trunk/BOOK/final-system/common/bison.xml
   trunk/BOOK/final-system/common/bzip2.xml
   trunk/BOOK/final-system/common/diffutils.xml
   trunk/BOOK/final-system/common/e2fsprogs.xml
   trunk/BOOK/final-system/common/findutils.xml
   trunk/BOOK/final-system/common/flex.xml
   trunk/BOOK/final-system/common/gettext.xml
   trunk/BOOK/final-system/common/groff.xml
   trunk/BOOK/final-system/common/gzip.xml
   trunk/BOOK/final-system/common/hotplug.xml
   trunk/BOOK/final-system/common/iana-etc.xml
   trunk/BOOK/final-system/common/inetutils.xml
   trunk/BOOK/final-system/common/iproute2.xml
   trunk/BOOK/final-system/common/kbd.xml
   trunk/BOOK/final-system/common/less.xml
   trunk/BOOK/final-system/common/libtool.xml
   trunk/BOOK/final-system/common/m4.xml
   trunk/BOOK/final-system/common/man-pages.xml
   trunk/BOOK/final-system/common/man.xml
   trunk/BOOK/final-system/common/mktemp.xml
   trunk/BOOK/final-system/common/module-init-tools.xml
   trunk/BOOK/final-system/common/ncurses.xml
   trunk/BOOK/final-system/common/patch.xml
   trunk/BOOK/final-system/common/perl.xml
   trunk/BOOK/final-system/common/procps.xml
   trunk/BOOK/final-system/common/psmisc.xml
   trunk/BOOK/final-system/common/readline.xml
   trunk/BOOK/final-system/common/sed.xml
   trunk/BOOK/final-system/common/shadow.xml
   trunk/BOOK/final-system/common/sysklogd.xml
   trunk/BOOK/final-system/common/tar.xml
   trunk/BOOK/final-system/common/texinfo.xml
   trunk/BOOK/final-system/common/udev.xml
   trunk/BOOK/final-system/common/util-linux.xml
   trunk/BOOK/final-system/common/vim.xml
   trunk/BOOK/final-system/common/zlib.xml
   trunk/BOOK/final-system/mips/flex.xml
   trunk/BOOK/final-system/mips/grep.xml
   trunk/BOOK/final-system/mips/make.xml
   trunk/BOOK/final-system/mips/mktemp.xml
   trunk/BOOK/final-system/mips/module-init-tools.xml
   trunk/BOOK/final-system/mips64-64-chapter.xml
   trunk/BOOK/final-system/mips64-64/make.xml
   trunk/BOOK/final-system/mips64-chapter.xml
   trunk/BOOK/final-system/mips64/file-64bit.xml
   trunk/BOOK/final-system/mips64/file-n32.xml
   trunk/BOOK/final-system/mips64/file.xml
   trunk/BOOK/final-system/mips64/flex-64bit.xml
   trunk/BOOK/final-system/mips64/flex-n32.xml
   trunk/BOOK/final-system/mips64/flex.xml
   trunk/BOOK/final-system/mips64/grep.xml
   trunk/BOOK/final-system/mips64/make.xml
   trunk/BOOK/final-system/mips64/mktemp.xml
   trunk/BOOK/final-system/mips64/module-init-tools.xml
   trunk/BOOK/final-system/mips64/util-linux.xml
   trunk/BOOK/final-system/multilib/autoconf.xml
   trunk/BOOK/final-system/multilib/automake.xml
   trunk/BOOK/final-system/multilib/bash.xml
   trunk/BOOK/final-system/multilib/bison.xml
   trunk/BOOK/final-system/multilib/bzip2-64bit.xml
   trunk/BOOK/final-system/multilib/bzip2-n32.xml
   trunk/BOOK/final-system/multilib/bzip2.xml
   trunk/BOOK/final-system/multilib/diffutils.xml
   trunk/BOOK/final-system/multilib/e2fsprogs-64bit.xml
   trunk/BOOK/final-system/multilib/e2fsprogs-n32.xml
   trunk/BOOK/final-system/multilib/e2fsprogs.xml
   trunk/BOOK/final-system/multilib/file-64bit.xml
   trunk/BOOK/final-system/multilib/file.xml
   trunk/BOOK/final-system/multilib/findutils.xml
   trunk/BOOK/final-system/multilib/flex-64bit.xml
   trunk/BOOK/final-system/multilib/flex.xml
   trunk/BOOK/final-system/multilib/gawk.xml
   trunk/BOOK/final-system/multilib/gettext-64bit.xml
   trunk/BOOK/final-system/multilib/gettext-n32.xml
   trunk/BOOK/final-system/multilib/gettext.xml
   trunk/BOOK/final-system/multilib/grep.xml
   trunk/BOOK/final-system/multilib/groff.xml
   trunk/BOOK/final-system/multilib/gzip.xml
   trunk/BOOK/final-system/multilib/inetutils.xml
   trunk/BOOK/final-system/multilib/iproute2.xml
   trunk/BOOK/final-system/multilib/kbd.xml
   trunk/BOOK/final-system/multilib/less.xml
   trunk/BOOK/final-system/multilib/libtool-64bit.xml
   trunk/BOOK/final-system/multilib/libtool-n32.xml
   trunk/BOOK/final-system/multilib/libtool.xml
   trunk/BOOK/final-system/multilib/m4.xml
   trunk/BOOK/final-system/multilib/make.xml
   trunk/BOOK/final-system/multilib/man.xml
   trunk/BOOK/final-system/multilib/mktemp.xml
   trunk/BOOK/final-system/multilib/module-init-tools.xml
   trunk/BOOK/final-system/multilib/ncurses-64bit.xml
   trunk/BOOK/final-system/multilib/ncurses-n32.xml
   trunk/BOOK/final-system/multilib/ncurses.xml
   trunk/BOOK/final-system/multilib/patch.xml
   trunk/BOOK/final-system/multilib/perl-64bit.xml
   trunk/BOOK/final-system/multilib/procps-64bit.xml
   trunk/BOOK/final-system/multilib/procps.xml
   trunk/BOOK/final-system/multilib/psmisc.xml
   trunk/BOOK/final-system/multilib/readline-64bit.xml
   trunk/BOOK/final-system/multilib/readline-n32.xml
   trunk/BOOK/final-system/multilib/readline.xml
   trunk/BOOK/final-system/multilib/sed.xml
   trunk/BOOK/final-system/multilib/shadow-64bit.xml
   trunk/BOOK/final-system/multilib/shadow-n32.xml
   trunk/BOOK/final-system/multilib/shadow.xml
   trunk/BOOK/final-system/multilib/sysklogd.xml
   trunk/BOOK/final-system/multilib/tar.xml
   trunk/BOOK/final-system/multilib/texinfo.xml
   trunk/BOOK/final-system/multilib/udev.xml
   trunk/BOOK/final-system/multilib/util-linux.xml
   trunk/BOOK/final-system/multilib/vim.xml
   trunk/BOOK/final-system/multilib/zlib-64bit.xml
   trunk/BOOK/final-system/multilib/zlib-n32.xml
   trunk/BOOK/final-system/multilib/zlib.xml
   trunk/BOOK/final-system/ppc/patch.xml
   trunk/BOOK/final-system/sparc/kbd.xml
   trunk/BOOK/final-system/sparc64/kbd.xml
   trunk/BOOK/final-system/x86_64-64/gettext.xml
   trunk/BOOK/final-system/x86_64-chapter.xml
   trunk/BOOK/final-system/x86_64/gettext-64bit.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/temp-system/common/tar.xml
   trunk/BOOK/temp-system/mips/grep.xml
   trunk/BOOK/temp-system/mips/make.xml
   trunk/BOOK/temp-system/mips64/grep.xml
   trunk/BOOK/temp-system/mips64/make.xml
   trunk/BOOK/temp-system/multilib/bzip2.xml
   trunk/BOOK/temp-system/multilib/tar.xml
Log:
 r836 at server:  jim | 2005-11-30 22:13:02 -0800
 Text updates to final-system



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:835
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:836
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/common/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/common/e2fsprogs.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/common/e2fsprogs.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -43,11 +43,11 @@
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='l'])"/>
+      xpointer="xpointer(//*[@os='e2'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='m'])"/>
+      xpointer="xpointer(//*[@os='e3'])"/>
 
     </variablelist>
 

Modified: trunk/BOOK/boot/common/inetutils.xml
===================================================================
--- trunk/BOOK/boot/common/inetutils.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/common/inetutils.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,19 +24,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"

Modified: trunk/BOOK/boot/common/util-linux.xml
===================================================================
--- trunk/BOOK/boot/common/util-linux.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/common/util-linux.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,19 +24,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="ba">Util-linux does not use the freshly installed headers and
     libraries from the <filename class="directory">/tools</filename>
@@ -54,13 +54,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="be"><userinput>./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen os="bf"><userinput>make HAVE_KILL=yes HAVE_SLN=yes \
 HAVE_SHADOW=no CPUOPT="" ARCH="" \
@@ -71,11 +71,11 @@
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/util-linux.xml"
-      xpointer="xpointer(//*[@os='fa'])"/>
+      xpointer="xpointer(//*[@os='e1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/util-linux.xml"
-      xpointer="xpointer(//*[@os='fb'])"/>
+      xpointer="xpointer(//*[@os='e2'])"/>
 
       <varlistentry>
         <term><parameter>HAVE_SHADOW=no</parameter></term>

Modified: trunk/BOOK/boot/mips/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/mips/module-init-tools.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/mips/module-init-tools.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,11 +24,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/module-init-tools.xml"

Modified: trunk/BOOK/boot/mips64/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/mips64/module-init-tools.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/mips64/module-init-tools.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,11 +24,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"

Modified: trunk/BOOK/boot/mips64/util-linux.xml
===================================================================
--- trunk/BOOK/boot/mips64/util-linux.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/mips64/util-linux.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,27 +24,27 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='p5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
@@ -64,7 +64,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/util-linux.xml"
@@ -72,7 +72,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"

Modified: trunk/BOOK/boot/multilib/inetutils.xml
===================================================================
--- trunk/BOOK/boot/multilib/inetutils.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/multilib/inetutils.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,19 +24,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"

Modified: trunk/BOOK/boot/multilib/util-linux.xml
===================================================================
--- trunk/BOOK/boot/multilib/util-linux.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/multilib/util-linux.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,19 +24,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
@@ -56,13 +56,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"

Modified: trunk/BOOK/boot/sparc64/e2fsprogs-libs.xml
===================================================================
--- trunk/BOOK/boot/sparc64/e2fsprogs-libs.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/boot/sparc64/e2fsprogs-libs.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -43,11 +43,11 @@
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='l'])"/>
+      xpointer="xpointer(//*[@os='e2'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='m'])"/>
+      xpointer="xpointer(//*[@os='e3'])"/>
 
     </variablelist>
 

Modified: trunk/BOOK/chroot/common/util-linux.xml
===================================================================
--- trunk/BOOK/chroot/common/util-linux.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/chroot/common/util-linux.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,11 +24,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../boot/common/util-linux.xml"

Modified: trunk/BOOK/chroot/multilib/util-linux.xml
===================================================================
--- trunk/BOOK/chroot/multilib/util-linux.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/chroot/multilib/util-linux.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,6 +23,14 @@
     <title>Installation of Util-linux</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='ba'])"/>
 

Modified: trunk/BOOK/final-system/common/autoconf.xml
===================================================================
--- trunk/BOOK/final-system/common/autoconf.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/autoconf.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -35,18 +35,18 @@
 
     <para os="a">Prepare Autoconf for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para os="b">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen os="c"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="d">To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="e">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/automake.xml
===================================================================
--- trunk/BOOK/final-system/common/automake.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/automake.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -36,18 +36,18 @@
 
     <para os="a">Prepare Automake for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para os="b">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen os="c"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="d">To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="e">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/bash.xml
===================================================================
--- trunk/BOOK/final-system/common/bash.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/bash.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -53,10 +53,10 @@
 
     <para os="g">Prepare Bash for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --bindir=/bin \
+<screen os="h"><userinput>./configure --prefix=/usr --bindir=/bin \
     --without-bash-malloc --with-installed-readline</userinput></screen>
 
-    <variablelist os="h">
+    <variablelist os="i">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -70,23 +70,23 @@
       </varlistentry>
     </variablelist>
 
-    <para os="i">Compile the package:</para>
+    <para os="j">Compile the package:</para>
 
-<screen os="j"><userinput>make</userinput></screen>
+<screen os="k"><userinput>make</userinput></screen>
 
-    <para os="k">To test the results, issue:
+    <para os="l">To test the results, issue:
     <userinput>make tests</userinput>.</para>
 
-    <para os="l">Install the package:</para>
+    <para os="m">Install the package:</para>
 
-<screen os="m"><userinput>make install</userinput></screen>
+<screen os="n"><userinput>make install</userinput></screen>
 
-    <para os="n">Run the newly compiled <command>bash</command> program (replacing
+    <para os="o">Run the newly compiled <command>bash</command> program (replacing
     the one that is currently being executed):</para>
 
-<screen os="o"><userinput>exec /bin/bash --login +h</userinput></screen>
+<screen os="p"><userinput>exec /bin/bash --login +h</userinput></screen>
 
-    <note os="p">
+    <note os="q">
       <para>The parameters used make the <command>bash</command>
       process an interactive login shell and continue to disable hashing so
       that new programs are found as they become available.</para>

Modified: trunk/BOOK/final-system/common/bison.xml
===================================================================
--- trunk/BOOK/final-system/common/bison.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/bison.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,20 +33,20 @@
   <sect2 role="installation">
     <title>Installation of Bison</title>
 
-    <para>Prepare Bison for compilation:</para>
+    <para os="a">Prepare Bison for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/bzip2.xml
===================================================================
--- trunk/BOOK/final-system/common/bzip2.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/bzip2.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -35,47 +35,47 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para os="j">Apply a patch to install the documentation for this
+    <para os="p1">Apply a patch to install the documentation for this
     package:</para>
 
-<screen os="k"><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
 
-    <para os="l">The <command>bzgrep</command> command does not escape '|' and
+    <para os="p3">The <command>bzgrep</command> command does not escape '|' and
     '&' in filenames passed to it. This allows arbitrary commands to be
     executed with the privileges of the user running <command>bzgrep</command>.
     Apply the following patch to address this:</para>
 
-<screen os="m"><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
 
     <para os="a">The Bzip2 package does not contain a <command>configure</command>
     script. Compile it with:</para>
 
-<screen><userinput>make -f Makefile-libbz2_so
+<screen os="b"><userinput>make -f Makefile-libbz2_so
 make clean</userinput></screen>
 
-    <para os="b">The <parameter>-f</parameter> flag will cause Bzip2 to be built
+    <para os="c">The <parameter>-f</parameter> flag will cause Bzip2 to be built
     using a different <filename>Makefile</filename> file, in this case the
     <filename>Makefile-libbz2_so</filename> file, which creates a dynamic
     <filename class="libraryfile">libbz2.so</filename> library and links the
     Bzip2 utilities against it.</para>
 
-    <para os="c">Compile and test the package:</para>
+    <para os="d">Compile and test the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">If reinstalling Bzip2, perform
+    <para os="f">If reinstalling Bzip2, perform
     <userinput>rm -f /usr/bin/bz*</userinput> first, otherwise the
     following <command>make install</command> will fail.</para>
 
-    <para os="f">Install the programs:</para>
+    <para os="g">Install the programs:</para>
 
-<screen os="g"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="h">Install the shared <command>bzip2</command> binary into the
+    <para os="i">Install the shared <command>bzip2</command> binary into the
     <filename class="directory">/bin</filename> directory, make
     some necessary symbolic links, and clean up:</para>
 
-<screen os="i"><userinput>cp bzip2-shared /bin/bzip2
+<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
 cp -a libbz2.so* /lib
 ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
 rm /usr/bin/{bunzip2,bzcat,bzip2}

Modified: trunk/BOOK/final-system/common/diffutils.xml
===================================================================
--- trunk/BOOK/final-system/common/diffutils.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/diffutils.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,19 +34,19 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
-    <para>Prepare Diffutils for compilation:</para>
+    <para os="a">Prepare Diffutils for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para os="e">This package does not come with a test suite.</para>
 
-    <para>Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- trunk/BOOK/final-system/common/e2fsprogs.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/e2fsprogs.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -44,13 +44,13 @@
 
     <para os="c">Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput>../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-evms</userinput></screen>
 
-    <variablelist os="d">
+    <variablelist os="e">
       <title>The meaning of the configure options:</title>
 
-      <varlistentry>
+      <varlistentry os="e1">
         <term><parameter>--with-root-prefix=""</parameter></term>
         <listitem>
           <para>Certain programs (such as the <command>e2fsck</command>
@@ -64,7 +64,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="l">
+      <varlistentry os="e2">
         <term><parameter>--enable-elf-shlibs</parameter></term>
         <listitem>
           <para>This creates the shared libraries which some programs
@@ -72,7 +72,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="m">
+      <varlistentry os="e3">
         <term><parameter>--disable-evms</parameter></term>
         <listitem>
           <para>This disables the building of the Enterprise Volume
@@ -83,22 +83,23 @@
           information regarding EVMS.</para>
         </listitem>
       </varlistentry>
+
     </variablelist>
 
-    <para os="e">Compile the package:</para>
+    <para os="f">Compile the package:</para>
 
-<screen os="f"><userinput>make</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
-    <para os="g">To test the results, issue:
+    <para os="h">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="h">Install the binaries and documentation:</para>
+    <para os="i">Install the binaries and documentation:</para>
 
-<screen os="i"><userinput>make install</userinput></screen>
+<screen os="j"><userinput>make install</userinput></screen>
 
-    <para os="j">Install the shared libraries:</para>
+    <para os="k">Install the shared libraries:</para>
 
-<screen os="k"><userinput>make install-libs</userinput></screen>
+<screen os="l"><userinput>make install-libs</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/findutils.xml
===================================================================
--- trunk/BOOK/final-system/common/findutils.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/findutils.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -38,10 +38,10 @@
 
     <para os="a">Prepare Findutils for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
+<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
     --localstatedir=/var/lib/locate</userinput></screen>
 
-    <variablelist os="b">
+    <variablelist os="c">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -55,16 +55,16 @@
 
     </variablelist>
 
-    <para os="c">Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
+    <para os="f">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="f">Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen os="g"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/flex.xml
===================================================================
--- trunk/BOOK/final-system/common/flex.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/flex.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -48,33 +48,33 @@
 
     <para os="e">Prepare Flex for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="f"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para os="f">Compile the package:</para>
+    <para os="g">Compile the package:</para>
 
-<screen os="g"><userinput>make</userinput></screen>
+<screen os="h"><userinput>make</userinput></screen>
 
-    <para os="h">To test the results, issue:
+    <para os="i">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="i">Install the package:</para>
+    <para os="j">Install the package:</para>
 
-<screen os="j"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
 
-    <para os="k">There are some packages that expect to find the
+    <para os="l">There are some packages that expect to find the
     <filename class="libraryfile">lex</filename> library in <filename
     class="directory">/usr/lib</filename>. Create a symlink to account for
     this:</para>
 
-<screen os="l"><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
+<screen os="m"><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
 
-    <para os="m">A few programs do not know about <command>flex</command> yet and
+    <para os="n">A few programs do not know about <command>flex</command> yet and
     try to run its predecessor, <command>lex</command>. To support those
     programs, create a wrapper script named <filename>lex</filename> that
     calls <filename>flex</filename> in <command>lex</command> emulation
     mode:</para>
 
-<screen os="n"><userinput>cat > /usr/bin/lex << "EOF"
+<screen os="o"><userinput>cat > /usr/bin/lex << "EOF"
 <literal>#!/bin/sh
 # Begin /usr/bin/lex
 

Modified: trunk/BOOK/final-system/common/gettext.xml
===================================================================
--- trunk/BOOK/final-system/common/gettext.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/gettext.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -36,19 +36,19 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
-    <para>Prepare Gettext for compilation:</para>
+    <para os="a">Prepare Gettext for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/groff.xml
===================================================================
--- trunk/BOOK/final-system/common/groff.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/groff.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -41,20 +41,20 @@
 
     <para os="b">Prepare Groff for compilation:</para>
 
-<screen><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr</userinput></screen>
+<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr</userinput></screen>
 
-    <para os="c">Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="g">Some documentation programs, such as <command>xman</command>,
+    <para os="h">Some documentation programs, such as <command>xman</command>,
     will not work properly without the following symlinks:</para>
 
-<screen os="h"><userinput>ln -s soelim /usr/bin/zsoelim
+<screen os="i"><userinput>ln -s soelim /usr/bin/zsoelim
 ln -s eqn /usr/bin/geqn
 ln -s tbl /usr/bin/gtbl</userinput></screen>
 

Modified: trunk/BOOK/final-system/common/gzip.xml
===================================================================
--- trunk/BOOK/final-system/common/gzip.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/gzip.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,37 +34,37 @@
   <sect2 role="installation">
     <title>Installation of Gzip</title>
 
-    <para os="a">The following patch fixes two security vulnerabilities in Gzip.
+    <para os="p1">The following patch fixes two security vulnerabilities in Gzip.
     First, a path traversal bug when using the <option>-N</option> option
     (CAN-2005-1228) Second, a race condition in the file permission restore
     code (CAN-2005-0998)</para>
 
-<screen os="b"><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>
 
-    <para os="c">Prepare Gzip for compilation:</para>
+    <para os="a">Prepare Gzip for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para os="d">The <command>gzexe</command> script has the location of the
+    <para os="c">The <command>gzexe</command> script has the location of the
     <command>gzip</command> binary hard-wired into it. Because the
     location of the binary is changed later, the following command ensures
     that the new location gets placed into the script:</para>
 
-<screen os="e"><userinput>sed -i 's@"BINDIR"@/bin at g' gzexe.in</userinput></screen>
+<screen os="d"><userinput>sed -i 's@"BINDIR"@/bin at g' gzexe.in</userinput></screen>
 
-    <para os="f">Compile the package:</para>
+    <para os="e">Compile the package:</para>
 
-<screen os="g"><userinput>make</userinput></screen>
+<screen os="f"><userinput>make</userinput></screen>
 
-    <para os="h">Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen os="i"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="j">Move the <command>gzip</command> program to the <filename
+    <para os="i">Move the <command>gzip</command> program to the <filename
     class="directory">/bin</filename> directory and create some commonly
     used symlinks to it:</para>
 
-<screen os="k"><userinput>mv /usr/bin/gzip /bin
+<screen os="j"><userinput>mv /usr/bin/gzip /bin
 rm /usr/bin/{gunzip,zcat}
 ln -s gzip /bin/gunzip
 ln -s gzip /bin/zcat

Modified: trunk/BOOK/final-system/common/hotplug.xml
===================================================================
--- trunk/BOOK/final-system/common/hotplug.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/hotplug.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -37,25 +37,25 @@
   <sect2 role="installation">
     <title>Installation of Hotplug</title>
 
-    <para>Install the Hotplug package:</para>
+    <para os="a">Install the Hotplug package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="b"><userinput>make install</userinput></screen>
 
-    <para>Remove the init script that Hotplug installs since we are going
+    <para os="c">Remove the init script that Hotplug installs since we are going
     to be using the script included in the LFS-Bootscripts package:</para>
 
-<screen><userinput>rm -rf /etc/init.d</userinput></screen>
+<screen os="d"><userinput>rm -rf /etc/init.d</userinput></screen>
 
-    <para>Network device hotplugging is not yet supported by the
+    <para os="e">Network device hotplugging is not yet supported by the
     LFS-Bootscripts package. For that reason, remove the network
     hotplug agent:</para>
 
-<screen><userinput>rm -f /etc/hotplug/net.agent</userinput></screen>
+<screen os="f"><userinput>rm -f /etc/hotplug/net.agent</userinput></screen>
 
-    <para>Create a directory for storing firmware that can be loaded by
+    <para os="g">Create a directory for storing firmware that can be loaded by
     <command>hotplug</command>:</para>
 
-<screen><userinput>mkdir /lib/firmware</userinput></screen>
+<screen os="h"><userinput>mkdir /lib/firmware</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/iana-etc.xml
===================================================================
--- trunk/BOOK/final-system/common/iana-etc.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/iana-etc.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,15 +33,15 @@
   <sect2 role="installation">
     <title>Installation of Iana-Etc</title>
 
-    <para>The following command converts the raw data provided by IANA into
+    <para os="a">The following command converts the raw data provided by IANA into
     the correct formats for the <filename>/etc/protocols</filename> and
     <filename>/etc/services</filename> data files:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="b"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="c">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="d"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/inetutils.xml
===================================================================
--- trunk/BOOK/final-system/common/inetutils.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/inetutils.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,25 +33,25 @@
   <sect2 role="installation">
     <title>Installation of Inetutils</title>
 
-    <para os="a">All programs that come with Inetutils will not be installed.
+    <para os="p1">All programs that come with Inetutils will not be installed.
     However, the Inetutils build system will insist on installing all the
     man pages anyway. The following patch will correct this
     situation:</para>
 
-<screen os="b"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
 
-    <para os="b1">The following patches addresses build issues with GCC 4.x:</para>
+    <para os="p3">The following patches addresses build issues with GCC 4.x:</para>
 
-<screen os="b2"><userinput>patch -Np1 -i ../&inetutils-gcc4_fixes-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&inetutils-gcc4_fixes-patch;</userinput></screen>
 
-    <para os="c">Prepare Inetutils for compilation:</para>
+    <para os="a">Prepare Inetutils for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
+<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
     --sysconfdir=/etc --localstatedir=/var \
     --disable-logger --disable-syslogd \
     --disable-whois --disable-servers</userinput></screen>
 
-    <variablelist os="d">
+    <variablelist os="c">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -97,18 +97,18 @@
       </varlistentry>
     </variablelist>
 
-    <para os="e">Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen os="f"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="g">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="i">Move the <command>ping</command> program to its FHS-compliant
+    <para os="h">Move the <command>ping</command> program to its FHS-compliant
     place:</para>
 
-<screen os="j"><userinput>mv /usr/bin/ping /bin</userinput></screen>
+<screen os="i"><userinput>mv /usr/bin/ping /bin</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/iproute2.xml
===================================================================
--- trunk/BOOK/final-system/common/iproute2.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/iproute2.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,7 +33,7 @@
   <sect2 role="installation">
     <title>Installation of IPRoute2</title>
 
-    <para os="a">The <command>arpd</command> binary included in this package is
+    <para os="s1">The <command>arpd</command> binary included in this package is
     dependent on Berkeley DB.  Because <command>arpd</command> is not a
     very common requirement on a base Linux system, remove the dependency
     on Berkeley DB by applying the <command>sed</command> command below.
@@ -41,17 +41,17 @@
     compiling Berkeley DB can be found in the BLFS Book at <ulink
     url="&blfs-root;view/svn/server/databases.html#db"/>.</para>
 
-<screen os="b"><userinput>sed -i '/^TARGETS/s at arpd@@g' misc/Makefile</userinput></screen>
+<screen os="s2"><userinput>sed -i '/^TARGETS/s at arpd@@g' misc/Makefile</userinput></screen>
 
-    <para os="c">Prepare IPRoute2 for compilation:</para>
+    <para os="a">Prepare IPRoute2 for compilation:</para>
 
-<screen os="d"><userinput>sh configure </userinput></screen>
+<screen os="b"><userinput>sh configure </userinput></screen>
 
-    <para os="e">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make SBINDIR=/sbin</userinput></screen>
+<screen os="d"><userinput>make SBINDIR=/sbin</userinput></screen>
 
-    <variablelist os="f">
+    <variablelist os="e">
       <title>The meaning of the make option:</title>
 
       <varlistentry>
@@ -65,9 +65,9 @@
       </varlistentry>
     </variablelist>
 
-    <para os="g">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="h"><userinput>make SBINDIR=/sbin install</userinput></screen>
+<screen os="g"><userinput>make SBINDIR=/sbin install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/kbd.xml
===================================================================
--- trunk/BOOK/final-system/common/kbd.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/kbd.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,21 +34,21 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
-    <para os="a1">The following patch fixes build issues with GCC 4.x:</para>
+    <para os="p1">The following patch fixes build issues with GCC 4.x:</para>
 
-<screen os="a2"><userinput>patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen>
 
-    <para>Prepare Kbd for compilation:</para>
+    <para os="a">Prepare Kbd for compilation:</para>
 
-<screen><userinput>./configure</userinput></screen>
+<screen os="b"><userinput>./configure</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/less.xml
===================================================================
--- trunk/BOOK/final-system/common/less.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/less.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -35,9 +35,9 @@
 
     <para os="a">Prepare Less for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
 
-    <variablelist os="b">
+    <variablelist os="c">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -50,17 +50,17 @@
       </varlistentry>
     </variablelist>
 
-    <para os="c">Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="g">Move less to /bin:</para>
+    <para os="h">Move less to /bin:</para>
 
-<screen os="h"><userinput>mv /usr/bin/less /bin</userinput></screen>
+<screen os="i"><userinput>mv /usr/bin/less /bin</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/libtool.xml
===================================================================
--- trunk/BOOK/final-system/common/libtool.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/libtool.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -37,23 +37,23 @@
 
     <para os="a">Prepare Libtool for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para os="b">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen os="c"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="d">To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="e">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="g">Correct the ownership of the <filename
+    <para os="h">Correct the ownership of the <filename
     class="libraryfile">libltdl</filename> data files:</para>
 
-<screen os="h"><userinput>chown -R root:root /usr/share/libtool/libltdl</userinput></screen>
+<screen os="i"><userinput>chown -R root:root /usr/share/libtool/libltdl</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/m4.xml
===================================================================
--- trunk/BOOK/final-system/common/m4.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/m4.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,20 +33,20 @@
   <sect2 role="installation">
     <title>Installation of M4</title>
 
-    <para>Prepare M4 for compilation:</para>
+    <para os="a">Prepare M4 for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/man-pages.xml
===================================================================
--- trunk/BOOK/final-system/common/man-pages.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/man-pages.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -32,9 +32,9 @@
   <sect2 role="installation">
     <title>Installation of Man-pages</title>
 
-    <para>Install Man-pages by running:</para>
+    <para os="a">Install Man-pages by running:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="b"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/man.xml
===================================================================
--- trunk/BOOK/final-system/common/man.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/man.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -51,9 +51,9 @@
 
     <para os="f">Prepare Man for compilation:</para>
 
-<screen><userinput>./configure -confdir=/etc</userinput></screen>
+<screen os="g"><userinput>./configure -confdir=/etc</userinput></screen>
 
-    <variablelist os="g">
+    <variablelist os="h">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -66,15 +66,15 @@
       </varlistentry>
     </variablelist>
 
-    <para os="h">Compile the package:</para>
+    <para os="i">Compile the package:</para>
 
-<screen os="i"><userinput>make</userinput></screen>
+<screen os="j"><userinput>make</userinput></screen>
 
-    <para os="j">Install the package:</para>
+    <para os="k">Install the package:</para>
 
-<screen os="k"><userinput>make install</userinput></screen>
+<screen os="l"><userinput>make install</userinput></screen>
 
-    <note os="l">
+    <note os="m">
       <para>If you will be working on a terminal that does not support
       text attributes such as color and bold, you can disable Select
       Graphic Rendition (SGR) escape sequences by editing the
@@ -85,14 +85,14 @@
       that do not support SGR.</para>
     </note>
 
-    <para os="m">If the character set of the locale uses 8-bit characters, search
+    <para os="n">If the character set of the locale uses 8-bit characters, search
     for the line beginning with <quote>NROFF</quote> in
     <filename>/etc/man.conf</filename>, and verify that it matches the
     following:</para>
 
-<screen os="n">NROFF  /usr/bin/nroff -Tlatin1 -mandoc</screen>
+<screen os="o">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
 
-    <para os="o">Note that <quote>latin1</quote> should be used even if it is not
+    <para os="p">Note that <quote>latin1</quote> should be used even if it is not
     the character set of the locale. The reason is that, according to the
     specification, <command>groff</command> has no means of typesetting
     characters outside International Organization for Standards (ISO) 8859-1
@@ -104,14 +104,14 @@
     ormatted result is really in the same encoding as input, and therefore
     it is usable as the input for a pager.</para>
 
-    <para os="p">This does not solve the problem of a non-working
+    <para os="q">This does not solve the problem of a non-working
     <command>man2dvi</command> program for localized man pages in
     non-ISO 8859-1 locales. Also, it does not work with multibyte
     character sets. The first problem does not currently have a solution.
     The second issue is not of concern because the LFS installation does
     not support multibyte character sets.</para>
 
-    <para os="q">Additional information with regards to the compression of
+    <para os="r">Additional information with regards to the compression of
     man and info pages can be found in the BLFS book at
     <ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para>
 

Modified: trunk/BOOK/final-system/common/mktemp.xml
===================================================================
--- trunk/BOOK/final-system/common/mktemp.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/mktemp.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -41,9 +41,9 @@
 
     <para os="c">Prepare Mktemp for compilation:</para>
 
-<screen os="c1"><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
+<screen os="d"><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
 
-    <variablelist os="d">
+    <variablelist os="e">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -56,13 +56,13 @@
       </varlistentry>
     </variablelist>
 
-    <para os="e">Compile the package:</para>
+    <para os="f">Compile the package:</para>
 
-<screen os="f"><userinput>make</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
-    <para os="g">Install the package:</para>
+    <para os="h">Install the package:</para>
 
-<screen os="h"><userinput>make install
+<screen os="i"><userinput>make install
 make install-tempfile</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/final-system/common/module-init-tools.xml
===================================================================
--- trunk/BOOK/final-system/common/module-init-tools.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/module-init-tools.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -42,23 +42,23 @@
 
 <screen os="b"><userinput>touch modprobe.conf.5</userinput></screen>
 
-    <para os="g">If you wish to run the test suite for Module-Init-Tools, you
+    <para os="c">If you wish to run the test suite for Module-Init-Tools, you
     will need to download the separate testsuite tarball. Issue the
     following commands to perform the tests (note that the
     <command>make distclean</command> command is required to clean up
     the source tree, as the source gets recompiled as part of the testing
     process):</para>
 
-<screen os="g1"><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-path=1 &&
+<screen os="d"><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-path=1 &&
 ./configure &&
 make check &&
 make distclean</userinput></screen>
 
-    <para os="c">Prepare Module-Init-Tools for compilation:</para>
+    <para os="e">Prepare Module-Init-Tools for compilation:</para>
 
-<screen os="c1"><userinput>./configure --prefix=/ --enable-zlib</userinput></screen>
+<screen os="f"><userinput>./configure --prefix=/ --enable-zlib</userinput></screen>
 
-    <variablelist os="d">
+    <variablelist os="g">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -71,13 +71,13 @@
 
     </variablelist>
 
-    <para os="e">Compile the package:</para>
+    <para os="h">Compile the package:</para>
 
-<screen os="f"><userinput>make</userinput></screen>
+<screen os="i"><userinput>make</userinput></screen>
 
-    <para os="h">Install the package:</para>
+    <para os="j">Install the package:</para>
 
-<screen os="i"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/ncurses.xml
===================================================================
--- trunk/BOOK/final-system/common/ncurses.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/ncurses.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -36,35 +36,35 @@
 
     <para os="a">Prepare Ncurses for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --libdir=/lib \
+<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
     --with-shared --without-debug</userinput></screen>
 
-    <para os="b">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen os="c"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="d">This package does not come with a test suite.</para>
+    <para os="e">This package does not come with a test suite.</para>
 
-    <para os="e">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="g">Move the Ncurses static libraries to the proper locations:</para>
+    <para os="h">Move the Ncurses static libraries to the proper locations:</para>
 
-<screen os="h"><userinput>mv /lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib</userinput></screen>
+<screen os="i"><userinput>mv /lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib</userinput></screen>
 
-    <para os="i">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
+    <para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
 
-<screen os="j"><userinput>rm /lib/lib{ncurses,menu,panel,form,curses}.so
+<screen os="k"><userinput>rm /lib/lib{ncurses,menu,panel,form,curses}.so
 ln -sf ../../lib/libncurses.so.5 /usr/lib/libcurses.so
 ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
 ln -sf ../../lib/libmenu.so.5 /usr/lib/libmenu.so
 ln -sf ../../lib/libpanel.so.5 /usr/lib/libpanel.so
 ln -sf ../../lib/libform.so.5 /usr/lib/libform.so</userinput></screen>
 
-    <para os="k">Give the Ncurses libraries execute permissions:</para>
+    <para os="l">Give the Ncurses libraries execute permissions:</para>
 
-<screen os="l"><userinput>chmod 755 /lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
+<screen os="m"><userinput>chmod 755 /lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/patch.xml
===================================================================
--- trunk/BOOK/final-system/common/patch.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/patch.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -35,19 +35,19 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
 
-    <para>Prepare Patch for compilation:</para>
+    <para os="a">Prepare Patch for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para os="e">This package does not come with a test suite.</para>
 
-    <para>Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/perl.xml
===================================================================
--- trunk/BOOK/final-system/common/perl.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/perl.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -39,12 +39,12 @@
     this package is built. If the defaults it auto-detects are suitable,
     prepare Perl for compilation with:</para>
 
-<screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
+<screen os="b"><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
 
-    <variablelist os="b">
+    <variablelist os="c">
       <title>The meaning of the configure option:</title>
 
-      <varlistentry>
+      <varlistentry os="c1">
         <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
         <listitem>
           <para>This corrects an error in the way that <command>perldoc</command>
@@ -53,23 +53,23 @@
       </varlistentry>
     </variablelist>
 
-    <para os="c">Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">To run the test suite, first create a basic
+    <para os="f">To run the test suite, first create a basic
     <filename>/etc/hosts</filename> file which is needed by a couple of
     the tests to resolve the network name localhost:</para>
 
-<screen os="f"><userinput>echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
+<screen os="g"><userinput>echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
 
-    <para os="g">Now run the tests, if desired:</para>
+    <para os="h">Now run the tests, if desired:</para>
 
-<screen os="h"><userinput>make test</userinput></screen>
+<screen os="i"><userinput>make test</userinput></screen>
 
-    <para os="i">Install the package:</para>
+    <para os="j">Install the package:</para>
 
-<screen os="j"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/procps.xml
===================================================================
--- trunk/BOOK/final-system/common/procps.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/procps.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,13 +33,13 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
 
-    <para>Compile the package:</para>
+    <para os="a">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="b"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="c">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="d"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/psmisc.xml
===================================================================
--- trunk/BOOK/final-system/common/psmisc.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/psmisc.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -36,9 +36,9 @@
 
     <para os="a">Prepare Psmisc for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen>
 
-    <variablelist os="b">
+    <variablelist os="c">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -53,28 +53,28 @@
       </varlistentry>
     </variablelist>
 
-    <para os="c">Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="g">There is no reason for the <command>pstree</command> and
+    <para os="h">There is no reason for the <command>pstree</command> and
     <command>pstree.x11</command> programs to reside in <filename
     class="directory">/bin</filename>. Therefore, move them to <filename
     class="directory">/usr/bin</filename>:</para>
 
-<screen os="h"><userinput>mv /bin/pstree* /usr/bin</userinput></screen>
+<screen os="i"><userinput>mv /bin/pstree* /usr/bin</userinput></screen>
 
-    <para os="i">By default, Psmisc's <command>pidof</command> program is not installed.
+    <para os="j">By default, Psmisc's <command>pidof</command> program is not installed.
     This usually is not a problem because it is installed later in the Sysvinit
     package, which provides a better <command>pidof</command> program. If
     Sysvinit will not be used for a particular system, complete the installation
     of Psmisc by creating the following symlink:</para>
 
-<screen os="j"><userinput>ln -s killall /bin/pidof</userinput></screen>
+<screen os="k"><userinput>ln -s killall /bin/pidof</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/readline.xml
===================================================================
--- trunk/BOOK/final-system/common/readline.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/readline.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -43,13 +43,13 @@
 
     <para os="c">Prepare Readline for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
+<screen os="d"><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
-    <para os="d">Compile the package:</para>
+    <para os="e">Compile the package:</para>
 
-<screen os="e"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+<screen os="f"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
 
-    <variablelist os="f">
+    <variablelist os="g">
       <title>The meaning of the make option:</title>
 
       <varlistentry>
@@ -61,24 +61,24 @@
       </varlistentry>
     </variablelist>
 
-    <para os="g">Install the package:</para>
+    <para os="h">Install the package:</para>
 
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="i"><userinput>make install</userinput></screen>
 
-    <para os="i">Give Readline's dynamic libraries to a more appropriate
+    <para os="j">Give Readline's dynamic libraries to a more appropriate
     permissions:</para>
 
-<screen os="j"><userinput>chmod 755 /lib/lib{readline,history}.so*</userinput></screen>
+<screen os="k"><userinput>chmod 755 /lib/lib{readline,history}.so*</userinput></screen>
 
-    <para os="k">Now move the static libraries to a more appropriate location:</para>
+    <para os="l">Now move the static libraries to a more appropriate location:</para>
 
-<screen os="l"><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
+<screen os="m"><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
 
-    <para os="m">Next, remove the <filename class="extension">.so</filename>
+    <para os="n">Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib</filename> and relink them into
     <filename class="directory">/usr/lib</filename>.</para>
 
-<screen os="n"><userinput>rm /lib/lib{readline,history}.so
+<screen os="o"><userinput>rm /lib/lib{readline,history}.so
 ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
 ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
 

Modified: trunk/BOOK/final-system/common/sed.xml
===================================================================
--- trunk/BOOK/final-system/common/sed.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/sed.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -42,18 +42,18 @@
 
     <para os="c">Prepare Sed for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="d"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
 
-    <para os="d">Compile the package:</para>
+    <para os="e">Compile the package:</para>
 
-<screen os="e"><userinput>make</userinput></screen>
+<screen os="f"><userinput>make</userinput></screen>
 
-    <para os="f">To test the results, issue:
+    <para os="g">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="g">Install the package:</para>
+    <para os="h">Install the package:</para>
 
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="i"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/shadow.xml
===================================================================
--- trunk/BOOK/final-system/common/shadow.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/shadow.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -49,20 +49,8 @@
 
     <para os="b">Prepare Shadow for compilation:</para>
 
-<screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
+<screen os="c"><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
 
-    <variablelist os="c">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>to be done</parameter></term>
-        <listitem>
-          <para>to be done</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
     <para os="d">Disable the installation of the <command>groups</command> program
     and it's man page, as Coreutils provides a better version:</para>
 

Modified: trunk/BOOK/final-system/common/sysklogd.xml
===================================================================
--- trunk/BOOK/final-system/common/sysklogd.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/sysklogd.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -40,11 +40,11 @@
 
     <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="d">Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen os="e"><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/tar.xml
===================================================================
--- trunk/BOOK/final-system/common/tar.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/tar.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,30 +33,30 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
-<para os="a">Apply a patch to fix some issues with the test suite when using
+<para os="p1">Apply a patch to fix some issues with the test suite when using
 GCC-&gcc-version;:</para>
 
-<screen os="a1"><userinput>patch -Np1 -i ../&tar-gcc4_fix-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&tar-gcc4_fix-patch;</userinput></screen>
 
-    <para os="b">Tar has a bug when the <option>-S</option> option is used with
+    <para os="p3">Tar has a bug when the <option>-S</option> option is used with
     files larger than 4 GB. The following patch properly fixes this issue:</para>
 
-<screen os="b1"><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
 
-    <para os="c">Prepare Tar for compilation:</para>
+    <para os="a">Prepare Tar for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
 
-    <para os="d">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen os="e"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="f">To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="g">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/texinfo.xml
===================================================================
--- trunk/BOOK/final-system/common/texinfo.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/texinfo.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -41,25 +41,25 @@
 
     <para os="a">Prepare Texinfo for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para os="b">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen os="c"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="d">To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="e">Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen os="f"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="g">Optionally, install the components belonging in a TeX
+    <para os="h">Optionally, install the components belonging in a TeX
     installation:</para>
 
-<screen os="h"><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
+<screen os="i"><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
 
-    <variablelist os="i">
+    <variablelist os="j">
       <title>The meaning of the make parameter:</title>
 
       <varlistentry>
@@ -73,7 +73,7 @@
 
     </variablelist>
 
-    <para os="j">The Info documentation system uses a plain text file to hold
+    <para os="k">The Info documentation system uses a plain text file to hold
     its list of menu entries. The file is located at
     <filename>/usr/share/info/dir</filename>. Unfortunately, due to occasional
     problems in the Makefiles of various packages, it can sometimes get out of
@@ -81,7 +81,7 @@
     <filename>/usr/share/info/dir</filename> file ever needs to be recreated,
     the following optional commands will accomplish the task:</para>
 
-<screen os="k"><userinput>cd /usr/share/info
+<screen os="l"><userinput>cd /usr/share/info
 rm dir
 for f in *
 do install-info $f dir 2>/dev/null

Modified: trunk/BOOK/final-system/common/udev.xml
===================================================================
--- trunk/BOOK/final-system/common/udev.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/udev.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,11 +33,11 @@
   <sect2 role="installation">
     <title>Installation of Udev</title>
 
-    <para os="c">Compile the package:</para>
+    <para os="a">Compile the package:</para>
 
-<screen><userinput>make EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
+<screen os="b"><userinput>make EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
 
-    <variablelist os="d">
+    <variablelist os="c">
       <title>The meaning of the make parameter:</title>
 
       <varlistentry>
@@ -51,14 +51,14 @@
 
     </variablelist>
 
-    <para os="e">To test the results, issue:
+    <para os="d">To test the results, issue:
     <userinput>make test</userinput>.</para>
 
-    <para os="f">Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen os="g"><userinput>make DESTDIR=/ EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=/ EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
 
-    <variablelist os="g1">
+    <variablelist os="g">
       <title>The meaning of the make parameter:</title>
 
       <varlistentry>
@@ -71,20 +71,21 @@
       </varlistentry>
 
     </variablelist>
+
     <para os="h">Udev's configuration is far from ideal by default, so install
     the configuration files here:</para>
 
 <screen os="i"><userinput>cp ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
-    <para os="a">Install the documentation that explains how to create
+    <para os="j">Install the documentation that explains how to create
     Udev rules:</para>
 
-<screen os="b"><userinput>install -m644 -D docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
+<screen os="k"><userinput>install -m644 -D docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
 
-    <para os="j">Run the <command>udevstart</command> program to create our full
+    <para os="l">Run the <command>udevstart</command> program to create our full
     complement of device nodes.</para>
 
-<screen os="k"><userinput>/sbin/udevstart</userinput></screen>
+<screen os="m"><userinput>/sbin/udevstart</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/util-linux.xml
===================================================================
--- trunk/BOOK/final-system/common/util-linux.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/util-linux.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -50,27 +50,27 @@
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-    <para os="a">Util-linux fails to compile against newer versions of
+    <para os="p1">Util-linux fails to compile against newer versions of
     Linux-Libc-Headers. The following patch properly fixes this issue:</para>
 
-<screen os="b"><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
-    <para os="b1">The following patch fixes build issues with GCC 4.x:</para>
+    <para os="p3">The following patch fixes build issues with GCC 4.x:</para>
 
-<screen os="b2"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
 
-    <para os="c">Prepare Util-linux for compilation:</para>
+    <para os="a">Prepare Util-linux for compilation:</para>
 
-<screen><userinput>./configure</userinput></screen>
+<screen os="b"><userinput>./configure</userinput></screen>
 
-    <para os="d">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen os="e"><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
+<screen os="d"><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
 
-    <variablelist os="f">
+    <variablelist os="e">
       <title>The meaning of the make parameters:</title>
 
-      <varlistentry os="fa">
+      <varlistentry os="e1">
         <term><parameter>HAVE_KILL=yes</parameter></term>
         <listitem>
           <para>This prevents the <command>kill</command> program (already
@@ -78,7 +78,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry os="fb">
+      <varlistentry os="e2">
         <term><parameter>HAVE_SLN=yes</parameter></term>
         <listitem>
           <para>This prevents the <command>sln</command> program (a
@@ -89,13 +89,13 @@
 
     </variablelist>
 
-    <para os="g">This package does not come with a test suite.</para>
+    <para os="f">This package does not come with a test suite.</para>
 
-    <para os="h">Install the package and move the <command>logger</command> binary
+    <para os="g">Install the package and move the <command>logger</command> binary
     to <filename class="directory">/bin</filename> as it is needed by the
     LFS-Bootscripts package:</para>
 
-<screen os="i"><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
+<screen os="h"><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
 mv /usr/bin/logger /bin</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/final-system/common/vim.xml
===================================================================
--- trunk/BOOK/final-system/common/vim.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/vim.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -50,11 +50,11 @@
 
 <screen os="b"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen>
 
-    <para os="e">Prepare Vim for compilation:</para>
+    <para os="c">Prepare Vim for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
+<screen os="d"><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-    <variablelist os="f">
+    <variablelist os="e">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -71,20 +71,20 @@
 
     </variablelist>
 
-    <para os="g">Compile the package:</para>
+    <para os="f">Compile the package:</para>
 
-<screen os="h"><userinput>make</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
-    <para os="i">To test the results, issue: <userinput>make test</userinput>.
+    <para os="h">To test the results, issue: <userinput>make test</userinput>.
     However, this test suite outputs a lot of binary data to the
     screen, which can cause issues with the settings of the current terminal.
     This can be resolved by redirecting the output to a log file.</para>
 
-    <para os="j">Install the package:</para>
+    <para os="i">Install the package:</para>
 
-<screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
+<screen os="j"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
 
-    <variablelist os="k1">
+    <variablelist os="k">
       <title>The meaning of the make option:</title>
 
       <varlistentry>

Modified: trunk/BOOK/final-system/common/zlib.xml
===================================================================
--- trunk/BOOK/final-system/common/zlib.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/common/zlib.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -44,43 +44,43 @@
 
     <para os="b">Prepare Zlib for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
+<screen os="c"><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
 
-    <para os="c">Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
+    <para os="f">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="f">Install the shared library:</para>
+    <para os="g">Install the shared library:</para>
 
-<screen os="g"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="h">The previous command installed a <filename
+    <para os="i">The previous command installed a <filename
     class="extension">.so</filename> file in <filename
     class="directory">/lib</filename>. We will remove it and relink it into
     <filename class="directory">/usr/lib</filename>:</para>
 
-<screen os="i"><userinput>rm /lib/libz.so
+<screen os="j"><userinput>rm /lib/libz.so
 ln -sf ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
 
-    <para os="j">Build the static library:</para>
+    <para os="k">Build the static library:</para>
 
-<screen><userinput>make clean
+<screen os="l"><userinput>make clean
 ./configure --prefix=/usr
 make</userinput></screen>
 
-    <para os="k">To test the results again, issue:
+    <para os="m">To test the results again, issue:
     <userinput>make check</userinput>.</para>
 
-    <para os="l">Install the static library:</para>
+    <para os="n">Install the static library:</para>
 
-<screen os="m"><userinput>make install</userinput></screen>
+<screen os="o"><userinput>make install</userinput></screen>
 
-    <para os="n">Fix the permissions on the static library:</para>
+    <para os="p">Fix the permissions on the static library:</para>
 
-<screen os="o"><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
+<screen os="q"><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/mips/flex.xml
===================================================================
--- trunk/BOOK/final-system/mips/flex.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips/flex.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,10 +21,10 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
-    <para os="ba">This patch updates <filename>config.guess</filename> and
+    <para os="p1">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen os="bb"><userinput>patch -Np1 -i ../&flex-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&flex-mips_update-patch;</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
@@ -82,6 +82,10 @@
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
 </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/mips/grep.xml
===================================================================
--- trunk/BOOK/final-system/mips/grep.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips/grep.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,10 +21,10 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
-    <para os="ba">This patch updates <filename>config.guess</filename> and
+    <para os="p1">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen os="bb"><userinput>patch -Np1 -i ../&grep-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&grep-mips_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"

Modified: trunk/BOOK/final-system/mips/make.xml
===================================================================
--- trunk/BOOK/final-system/mips/make.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips/make.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,10 +21,10 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
-    <para os="m1">This patch updates <filename>config.guess</filename> and
+    <para os="p1">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen os="m2"><userinput>patch -Np1 -i ../&make-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&make-mips_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/make.xml"

Modified: trunk/BOOK/final-system/mips/mktemp.xml
===================================================================
--- trunk/BOOK/final-system/mips/mktemp.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips/mktemp.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -29,10 +29,10 @@
     href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para os="m1">This patch updates <filename>config.guess</filename> and
+    <para os="p1">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen os="m2"><userinput>patch -Np1 -i ../&mktemp-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&mktemp-mips_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/mktemp.xml"
@@ -40,10 +40,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -62,6 +58,10 @@
     href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/mips/module-init-tools.xml
===================================================================
--- trunk/BOOK/final-system/mips/module-init-tools.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips/module-init-tools.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,10 +21,10 @@
   <sect2 role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-    <para os="m1">This patch updates <filename>config.guess</filename> and
+    <para os="p1">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen os="m2"><userinput>patch -Np1 -i ../&module-init-tools-mips_update-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&module-init-tools-mips_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
@@ -36,39 +36,39 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/mips64/file-64bit.xml
===================================================================
--- trunk/BOOK/final-system/mips64/file-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/file-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,7 +34,7 @@
     href="file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/mips64/file-n32.xml
===================================================================
--- trunk/BOOK/final-system/mips64/file-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/file-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,7 +34,7 @@
     href="file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/mips64/file.xml
===================================================================
--- trunk/BOOK/final-system/mips64/file.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/file.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,7 +34,7 @@
     href="../common/file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"

Modified: trunk/BOOK/final-system/mips64/flex-64bit.xml
===================================================================
--- trunk/BOOK/final-system/mips64/flex-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/flex-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
@@ -51,18 +51,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/flex-64bit.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
+    href="../common/flex.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70,15 +66,11 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
+    href="flex.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -86,13 +78,17 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="../multilib/flex-64bit.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/mips64/flex-n32.xml
===================================================================
--- trunk/BOOK/final-system/mips64/flex-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/flex-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
@@ -49,27 +49,31 @@
     href="flex.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
+<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+   --libdir=/usr/lib32</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <para>There are some packages that expect to find the
+    <para os="l">There are some packages that expect to find the
     <filename class="libraryfile">lex</filename> library in <filename
     class="directory">/usr/lib32</filename>. Create a symlink to account for
     this:</para>
 
-<screen><userinput>ln -s libfl.a /usr/lib32/libl.a</userinput></screen>
+<screen os="m"><userinput>ln -s libfl.a /usr/lib32/libl.a</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/mips64/flex.xml
===================================================================
--- trunk/BOOK/final-system/mips64/flex.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/flex.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/flex.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/flex.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
@@ -50,29 +50,33 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
+    href="../multilib/flex.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/flex.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/mips64/grep.xml
===================================================================
--- trunk/BOOK/final-system/mips64/grep.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/grep.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/grep.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/grep.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
@@ -35,7 +35,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/grep.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"

Modified: trunk/BOOK/final-system/mips64/make.xml
===================================================================
--- trunk/BOOK/final-system/mips64/make.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/make.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,17 +23,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/make.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/make.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/make.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/make.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/make.xml"

Modified: trunk/BOOK/final-system/mips64/mktemp.xml
===================================================================
--- trunk/BOOK/final-system/mips64/mktemp.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/mktemp.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -31,26 +31,22 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
+    href="../multilib/mktemp.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,6 +65,10 @@
     href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/mips64/module-init-tools.xml
===================================================================
--- trunk/BOOK/final-system/mips64/module-init-tools.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/module-init-tools.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,11 +23,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
@@ -39,22 +39,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -62,7 +50,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../multilib/module-init-tools.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -77,6 +65,14 @@
     href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Deleted: trunk/BOOK/final-system/mips64/procps-n32.xml
===================================================================
--- trunk/BOOK/final-system/mips64/procps-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/procps-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps-n32" role="wrap">
-  <?dbhtml filename="procps-n32.html"?>
-
-  <title>Procps-&procps-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-procps-n32">
-    <primary sortas="a-Procps">Procps</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps</title>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install lib64=lib32</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips64/util-linux.xml
===================================================================
--- trunk/BOOK/final-system/mips64/util-linux.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64/util-linux.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -27,38 +27,45 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
-    <para os="aa">Util-linux has a compilation error when built using 64bit
+    <para os="p5">Util-linux has a compilation error when built using 64bit
     and a MIPS processor. The follow patch addresses this error:</para>
 
-<screen os="ab"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
+<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/util-linux.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='f'])"/>
@@ -71,10 +78,6 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Deleted: trunk/BOOK/final-system/mips64-64/file.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/file.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64-64/file.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-system-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of file</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/file.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/file.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(id('contents-file'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips64-64/make.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/make.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64-64/make.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,7 +33,9 @@
     href="../common/make.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/make.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/make.xml"

Deleted: trunk/BOOK/final-system/mips64-64/mktemp.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/mktemp.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64-64/mktemp.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-system-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(id('contents-mktemp'))"/>
-
-</sect1>

Deleted: trunk/BOOK/final-system/mips64-64/module-init-tools.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/module-init-tools.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64-64/module-init-tools.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
-
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
-
-  <indexterm zone="ch-system-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/module-init-tools.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/module-init-tools.xml"
-  xpointer="xpointer(id('contents-module-init-tools'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64-chapter.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64-64-chapter.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -39,7 +39,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
@@ -50,7 +50,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/module-init-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
@@ -60,7 +60,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/mktemp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hotplug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/dvhtool.xml"/>

Modified: trunk/BOOK/final-system/mips64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-chapter.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/mips64-chapter.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -73,7 +73,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/procps-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>

Modified: trunk/BOOK/final-system/multilib/autoconf.xml
===================================================================
--- trunk/BOOK/final-system/multilib/autoconf.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/autoconf.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,14 +25,10 @@
     href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -47,6 +43,10 @@
     href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/automake.xml
===================================================================
--- trunk/BOOK/final-system/multilib/automake.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/automake.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,14 +25,10 @@
     href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -47,6 +43,10 @@
     href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/bash.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bash.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/bash.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -49,16 +49,12 @@
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ./configure --prefix=/usr --bindir=/bin \
     --without-bash-malloc --with-installed-readline</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -89,6 +85,10 @@
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/bison.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bison.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/bison.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,20 +21,31 @@
   <sect2 role="installation">
     <title>Installation of Bison</title>
 
-    <para>Prepare Bison for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,47 +23,51 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
-    <para os="ba">We need to remove the tests since they won't work on
+    <para os="m1">We need to remove the tests since they won't work on
     a multi-architecture build, and tell change the default lib path
     to <filename class="directory">lib64</filename>:</para>
 
-<screen os="bb"><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' \
+<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' \
     -e 's@/lib\(/\| \|$\)@/lib64\1 at g' Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"
+<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"
 make clean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
+<screen os="d"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
 
-    <para>Now we remove the 32 bit versions of the programs so we
+    <para os="m3">Now we remove the 32 bit versions of the programs so we
     can install the 64 bit versions.</para>
 
-<screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
+<screen os="m4"><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -74,7 +78,11 @@
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>cp bzip2-shared /bin/bzip2
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
 cp -a libbz2.so* /lib64
 ln -s ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
 rm /usr/bin/{bunzip2,bzcat,bzip2}

Modified: trunk/BOOK/final-system/multilib/bzip2-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/bzip2-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,39 +24,45 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
-    <para>We need to remove the tests since they won't work on
+    <para os="m1">We need to remove the tests since they won't work on
     a multi-architecture build, and tell change the default lib path
     to <filename class="directory">lib32</filename>:</para>
 
-<screen><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' \
+<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1 at g' \
     -e 's@/lib\(/\| \|$\)@/lib32\1 at g' Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
+<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
 make clean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
+<screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
 
-    <para>Now we remove the 32 bit versions of the programs so we
+    <para os="m3">Now we remove the 32 bit versions of the programs so we
     can install the n32 bit versions.</para>
 
-<screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2-64bit.xml"
+    xpointer="xpointer(//*[@os='m4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -67,7 +73,11 @@
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>cp bzip2-shared /bin/bzip2
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
 cp -a libbz2.so* /lib32
 ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so
 rm /usr/bin/{bunzip2,bzcat,bzip2}

Modified: trunk/BOOK/final-system/multilib/bzip2.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/bzip2.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,35 +24,31 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
+<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
 make clean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"</userinput></screen>
+<screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -67,6 +63,10 @@
     href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/diffutils.xml
===================================================================
--- trunk/BOOK/final-system/multilib/diffutils.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/diffutils.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,19 +21,31 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
-    <para>Prepare Diffutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>This package does not come with a test suite.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/e2fsprogs-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/e2fsprogs-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,10 +21,10 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para>Change the library directory to <filename
+    <para os="m3">Change the library directory to <filename
     class="directory">lib64</filename>:</para>
 
-<screen><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib64 at g' configure</userinput></screen>
+<screen os="m4"><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib64 at g' configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="e2fsprogs.xml"
@@ -38,7 +38,7 @@
     href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ../configure --prefix=/usr \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ../configure --prefix=/usr \
     --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,14 +49,10 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+<screen os="g"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -64,13 +60,17 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/e2fsprogs-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/e2fsprogs-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -22,10 +22,10 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para>Change the library directory to <filename
+    <para os="m3">Change the library directory to <filename
     class="directory">lib32</filename>:</para>
 
-<screen><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib32 at g' configure</userinput></screen>
+<screen os="m4"><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib32 at g' configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="e2fsprogs.xml"
@@ -39,24 +39,26 @@
     href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" ../configure --prefix=/usr \
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" ../configure --prefix=/usr \
     --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="e2fsprogs.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Compile the libraries:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen><userinput>make CC="gcc ${BUILDN32}" libs</userinput></screen>
+<screen os="m2"><userinput>make CC="gcc ${BUILDN32}" libs</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/e2fsprogs.xml
===================================================================
--- trunk/BOOK/final-system/multilib/e2fsprogs.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/e2fsprogs.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,24 +34,24 @@
     href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" ../configure --prefix=/usr \
+<screen os="d"><userinput>CC="gcc ${BUILD32}" ../configure --prefix=/usr \
     --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Compile the libraries:</para>
+    <para os="m1">Compile the libraries:</para>
 
-<screen><userinput>make libs</userinput></screen>
+<screen os="m2"><userinput>make CC="gcc ${BUILD32}" libs</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/file-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/file-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/file-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,7 +25,7 @@
     href="file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --libdir=/usr/lib64</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/file.xml
===================================================================
--- trunk/BOOK/final-system/multilib/file.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/file.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -26,7 +26,7 @@
     href="../common/file.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/file.xml"

Modified: trunk/BOOK/final-system/multilib/findutils.xml
===================================================================
--- trunk/BOOK/final-system/multilib/findutils.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/findutils.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,15 +25,11 @@
     href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     --libexecdir=/usr/lib64/locate --localstatedir=/var/lib64/locate</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -52,6 +48,10 @@
     href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/findutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <sect2 id="contents-findutils" role="content">

Modified: trunk/BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/flex-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/flex-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -41,43 +41,43 @@
     href="flex.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="m4"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
+    href="../common/flex.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="flex.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <para os="k">There are some packages that expect to find the
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <para os="l">There are some packages that expect to find the
     <filename class="libraryfile">lex</filename> library in <filename
     class="directory">/usr/lib64</filename>. Create a symlink to account for
     this:</para>
 
-<screen os="l"><userinput>ln -s libfl.a /usr/lib64/libl.a</userinput></screen>
+<screen os="m"><userinput>ln -s libfl.a /usr/lib64/libl.a</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+    xpointer="xpointer(//*[@os='o'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/flex.xml
===================================================================
--- trunk/BOOK/final-system/multilib/flex.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/flex.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -42,24 +42,16 @@
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="m1"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="f"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="m2"><userinput>make libfl.a</userinput></screen>
+<screen os="h"><userinput>make libfl.a</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70,6 +62,10 @@
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/gawk.xml
===================================================================
--- trunk/BOOK/final-system/multilib/gawk.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/gawk.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,7 +33,7 @@
     href="../common/gawk.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --libexecdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/gettext-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/gettext-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/gettext-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,20 +21,32 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
-    <para>Prepare Gettext for compilation:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/gettext-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/gettext-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/gettext-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -22,20 +22,32 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
-    <para>Prepare Gettext for compilation:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
 
-    <para>Compile the package:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/gettext.xml
===================================================================
--- trunk/BOOK/final-system/multilib/gettext.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/gettext.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -22,20 +22,32 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
-    <para>Prepare Gettext for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/grep.xml
===================================================================
--- trunk/BOOK/final-system/multilib/grep.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/grep.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,7 +25,7 @@
     href="../common/grep.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="aa"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --bindir=/bin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/groff.xml
===================================================================
--- trunk/BOOK/final-system/multilib/groff.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/groff.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -29,15 +29,11 @@
     href="../common/groff.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>PAGE=<replaceable>[paper_size]</replaceable> CC="gcc ${BUILD64}" \
+<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> CC="gcc ${BUILD64}" \
    CXX="g++ ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -56,6 +52,10 @@
     href="../common/groff.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/groff.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/gzip.xml
===================================================================
--- trunk/BOOK/final-system/multilib/gzip.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/gzip.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,20 +23,24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -63,10 +67,6 @@
     href="../common/gzip.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/inetutils.xml
===================================================================
--- trunk/BOOK/final-system/multilib/inetutils.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/inetutils.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,31 +23,35 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libexecdir=/usr/sbin \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libexecdir=/usr/sbin \
     --sysconfdir=/etc --localstatedir=/var \
     --disable-logger --disable-syslogd \
     --disable-whois --disable-servers</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70,10 +74,6 @@
     href="../common/inetutils.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/iproute2.xml
===================================================================
--- trunk/BOOK/final-system/multilib/iproute2.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/iproute2.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,6 +23,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -33,16 +41,12 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+<screen os="d"><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='f'])"/>
@@ -51,10 +55,6 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/kbd.xml
===================================================================
--- trunk/BOOK/final-system/multilib/kbd.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/kbd.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,23 +23,31 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
-    <para>Prepare Kbd for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+<screen os="d"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/less.xml
===================================================================
--- trunk/BOOK/final-system/multilib/less.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/less.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,15 +25,11 @@
     href="../common/less.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     --sysconfdir=/etc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/less.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -56,6 +52,10 @@
     href="../common/less.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/less.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/libtool-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/libtool-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/libtool-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,15 +25,11 @@
     href="libtool.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="libtool.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,13 +45,17 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
+    href="libtool.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/libtool-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/libtool-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/libtool-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -26,15 +26,11 @@
     href="libtool.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="libtool.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,6 +45,10 @@
     href="libtool.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="libtool.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/libtool.xml
===================================================================
--- trunk/BOOK/final-system/multilib/libtool.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/libtool.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -26,14 +26,10 @@
     href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -48,6 +44,10 @@
     href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/m4.xml
===================================================================
--- trunk/BOOK/final-system/multilib/m4.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/m4.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,20 +21,31 @@
   <sect2 role="installation">
     <title>Installation of M4</title>
 
-    <para>Prepare M4 for compilation:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/m4.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/make.xml
===================================================================
--- trunk/BOOK/final-system/multilib/make.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/make.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,7 +25,7 @@
     href="../common/make.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/make.xml"

Modified: trunk/BOOK/final-system/multilib/man.xml
===================================================================
--- trunk/BOOK/final-system/multilib/man.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/man.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -45,14 +45,10 @@
     href="../common/man.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
+<screen os="g"><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -91,6 +87,10 @@
     href="../common/man.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='r'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/mktemp.xml
===================================================================
--- trunk/BOOK/final-system/multilib/mktemp.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/mktemp.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,14 +33,10 @@
     href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="c1"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --with-libc</userinput></screen>
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --with-libc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -55,6 +51,10 @@
     href="../common/mktemp.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/module-init-tools.xml
===================================================================
--- trunk/BOOK/final-system/multilib/module-init-tools.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/module-init-tools.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -31,43 +31,39 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="g1"><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-path=1 &&
+<screen os="d"><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-path=1 &&
 CC="gcc ${BUILD64}" ./configure &&
 make check &&
 make distclean</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="c1"><userinput>CC="gcc ${BUILD64}" ./configure --prefix="" --enable-zlib</userinput></screen>
+<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix="" --enable-zlib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/ncurses-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/ncurses-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,16 +25,12 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    ./configure --prefix=/usr --libdir=/lib64 \
    --with-shared --without-debug</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -53,11 +49,15 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>mv /lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="ncurses.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
+<screen os="i"><userinput>mv /lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib64</userinput></screen>
 
-<screen><userinput>rm /lib64/lib{ncurses,menu,panel,form,curses}.so
+    <para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
+
+<screen os="k"><userinput>rm /lib64/lib{ncurses,menu,panel,form,curses}.so
 ln -sf ../../lib64/libncurses.so.5 /usr/lib64/libncurses.so
 ln -sf ../../lib64/libncurses.so.5 /usr/lib64/libcurses.so
 ln -sf ../../lib64/libmenu.so.5 /usr/lib64/libmenu.so
@@ -66,9 +66,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>chmod 755 /lib64/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
+<screen os="m"><userinput>chmod 755 /lib64/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/ncurses-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/ncurses-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/ncurses-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -26,16 +26,12 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    ./configure --prefix=/usr --libdir=/lib32 \
    --with-shared --without-debug</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -54,11 +50,15 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>mv /lib32/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib32</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="ncurses.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
+<screen os="i"><userinput>mv /lib32/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib32</userinput></screen>
 
-<screen><userinput>rm /lib32/lib{ncurses,menu,panel,form,curses}.so
+    <para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
+
+<screen os="k"><userinput>rm /lib32/lib{ncurses,menu,panel,form,curses}.so
 ln -sf ../../lib32/libncurses.so.5 /usr/lib32/libncurses.so
 ln -sf ../../lib32/libncurses.so.5 /usr/lib32/libcurses.so
 ln -sf ../../lib32/libmenu.so.5 /usr/lib32/libmenu.so
@@ -67,9 +67,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>chmod 755 /lib32/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
+<screen os="m"><userinput>chmod 755 /lib32/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/ncurses.xml
===================================================================
--- trunk/BOOK/final-system/multilib/ncurses.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/ncurses.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -26,16 +26,12 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    ./configure --prefix=/usr --libdir=/lib \
    --with-shared --without-debug</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -74,6 +70,10 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/patch.xml
===================================================================
--- trunk/BOOK/final-system/multilib/patch.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/patch.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,19 +21,31 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
 
-    <para>Prepare Patch for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>This package does not come with a test suite.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/perl-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/perl-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/perl-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,7 +21,7 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
 
-    <para>In multilib builds we install compilers and libraries for each available
+    <para os="m1">In multilib builds we install compilers and libraries for each available
     architecture.  The description below says that perl installs several hundred
     libraries, but they are used by invoking <command>perl</command>, not by linking
     to them with <command>ld</command>.  Although it is possible to install perl for
@@ -30,31 +30,31 @@
     libraries and modules for the last version installed will be accessible. We
     therefore only install one version.</para>
 
-    <para>Perl does not, by default, know about library directories with names other
+    <para os="p1">Perl does not, by default, know about library directories with names other
     than lib, such as lib64.  The following patch will allow it to install to lib64.</para>
 
-<screen><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
 
-    <para>There is a further (possibly cosmetic) anomaly - if we install perl and
+    <para os="p3">There is a further (possibly cosmetic) anomaly - if we install perl and
     then run <command>perl -V</command> it will claim that libc is in /lib.  The
     following patch fixes this, but only takes effect when <command>make install
     </command> is run.</para>
 
-<screen><userinput>patch -Np1 -i ../&perl-lib64-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&perl-lib64-patch;</userinput></screen>
 
-    <para>We still need to tell perl to actually use lib64</para>
+    <para os="m2">We still need to tell perl to actually use lib64</para>
 
-<screen><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>
+<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
+<screen os="b"><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
    -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
    -Dcc="gcc ${BUILD64}"</userinput></screen>
 
-    <variablelist>
+    <variablelist os="m4">
       <title>The meaning of the new configure option:</title>
 
       <varlistentry>
@@ -64,12 +64,12 @@
         </listitem>
       </varlistentry>
 
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='c1'])"/>
 
+    </variablelist>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='d'])"/>

Modified: trunk/BOOK/final-system/multilib/procps-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/procps-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/procps-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,13 +21,17 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make install lib64=lib64</userinput></screen>
+<screen os="d"><userinput>make install lib64=lib64</userinput></screen>
 
   </sect2>
 

Added: trunk/BOOK/final-system/multilib/procps-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/procps-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/procps-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-procps-n32" role="wrap">
+  <?dbhtml filename="procps-n32.html"?>
+
+  <title>Procps-&procps-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-procps-n32">
+    <primary sortas="a-Procps">Procps</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/procps.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Procps</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="d"><userinput>make install lib64=lib32</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-file" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/final-system/multilib/procps.xml
===================================================================
--- trunk/BOOK/final-system/multilib/procps.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/procps.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -22,13 +22,19 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make install lib64=lib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/psmisc.xml
===================================================================
--- trunk/BOOK/final-system/multilib/psmisc.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/psmisc.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -25,15 +25,11 @@
     href="../common/psmisc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --exec-prefix=""</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -64,6 +60,10 @@
     href="../common/psmisc.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/psmisc.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/readline-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/readline-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/readline-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,15 +33,11 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -56,19 +52,23 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>chmod 755 /lib64/lib{readline,history}.so*</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
+<screen os="k"><userinput>chmod 755 /lib64/lib{readline,history}.so*</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>mv /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
+<screen os="m"><userinput>mv /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
 
-    <para>Next, remove the <filename class="extension">.so</filename>
+    <para os="n">Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib64</filename> and relink them into
     <filename class="directory">/usr/lib64</filename>.</para>
 
-<screen><userinput>rm /lib64/lib{readline,history}.so
+<screen os="o"><userinput>rm /lib64/lib{readline,history}.so
 ln -sf ../../lib64/libreadline.so.5 /usr/lib64/libreadline.so
 ln -sf ../../lib64/libhistory.so.5 /usr/lib64/libhistory.so</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/readline-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/readline-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/readline-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,15 +34,11 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -57,19 +53,23 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>chmod 755 /lib32/lib{readline,history}.so*</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="readline.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
+<screen os="k"><userinput>chmod 755 /lib32/lib{readline,history}.so*</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>mv /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
+<screen os="m"><userinput>mv /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
 
-    <para>Next, remove the <filename class="extension">.so</filename>
+    <para os="n">Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib32</filename> and relink them into
     <filename class="directory">/usr/lib32</filename>.</para>
 
-<screen><userinput>rm /lib32/lib{readline,history}.so
+<screen os="o"><userinput>rm /lib32/lib{readline,history}.so
 ln -sf ../../lib32/libreadline.so.5 /usr/lib32/libreadline.so
 ln -sf ../../lib32/libhistory.so.5 /usr/lib32/libhistory.so</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/readline.xml
===================================================================
--- trunk/BOOK/final-system/multilib/readline.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/readline.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -34,15 +34,11 @@
     href="../common/readline.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+<screen os="d"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    ./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -81,6 +77,10 @@
     href="../common/readline.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
   </sect2>
 
  <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/sed.xml
===================================================================
--- trunk/BOOK/final-system/multilib/sed.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/sed.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,7 +33,7 @@
     href="../common/sed.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --bindir=/bin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -56,6 +56,10 @@
     href="../common/sed.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/shadow-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/shadow-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/shadow-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -37,7 +37,7 @@
     href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
    --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -108,7 +108,7 @@
     href="shadow.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
-<screen><userinput>mv /lib64/libshadow.*a /usr/lib64
+<screen os="u"><userinput>mv /lib64/libshadow.*a /usr/lib64
 rm /lib64/libshadow.so
 ln -sf ../../lib64/libshadow.so.0 /usr/lib64/libshadow.so</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/shadow-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/shadow-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/shadow-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -38,7 +38,7 @@
     href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
+<screen os="c"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
    --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -77,7 +77,7 @@
     href="shadow.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
-<screen><userinput>mv /lib32/libshadow.*a /usr/lib32
+<screen os="u"><userinput>mv /lib32/libshadow.*a /usr/lib32
 rm /lib32/libshadow.so
 ln -sf ../../lib32/libshadow.so.0 /usr/lib32/libshadow.so</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/shadow.xml
===================================================================
--- trunk/BOOK/final-system/multilib/shadow.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/shadow.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -38,15 +38,11 @@
     href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
+<screen os="c"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
    --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/sysklogd.xml
===================================================================
--- trunk/BOOK/final-system/multilib/sysklogd.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/sysklogd.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,15 +33,15 @@
     href="../common/sysklogd.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+<screen os="d"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/tar.xml
===================================================================
--- trunk/BOOK/final-system/multilib/tar.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/tar.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,29 +23,33 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -60,10 +64,6 @@
     href="../common/tar.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/texinfo.xml
===================================================================
--- trunk/BOOK/final-system/multilib/texinfo.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/texinfo.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -33,14 +33,10 @@
     href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -75,6 +71,10 @@
     href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/udev.xml
===================================================================
--- trunk/BOOK/final-system/multilib/udev.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/udev.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,13 +23,17 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
     EXTRAS="extras/firmware extras/run_directory" udevdir=/dev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -46,10 +50,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -58,19 +58,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/util-linux.xml
===================================================================
--- trunk/BOOK/final-system/multilib/util-linux.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/util-linux.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -27,28 +27,32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -67,10 +71,6 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/vim.xml
===================================================================
--- trunk/BOOK/final-system/multilib/vim.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/vim.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -31,13 +31,17 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
    --enable-multibyte</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -62,10 +66,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='k1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/zlib-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/zlib-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/zlib-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -29,15 +29,11 @@
     href="zlib.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
+<screen os="c"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
    --shared --libdir=/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -52,40 +48,44 @@
     href="zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>The previous command installed a <filename
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <para os="i">The previous command installed a <filename
     class="extension">.so</filename> file in <filename
     class="directory">/lib64</filename>. We will remove it and relink it into
     <filename class="directory">/usr/lib64</filename>:</para>
 
-<screen><userinput>rm /lib64/libz.so
+<screen os="j"><userinput>rm /lib64/libz.so
 ln -sf ../../lib64/libz.so.&zlib-version; /usr/lib64/libz.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>make clean
+<screen os="l"><userinput>make clean
 CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
     --prefix=/usr --libdir=/usr/lib64
 make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+    xpointer="xpointer(//*[@os='p'])"/>
 
-<screen><userinput>chmod 644 /usr/lib64/libz.a</userinput></screen>
+<screen os="q"><userinput>chmod 644 /usr/lib64/libz.a</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/zlib-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/zlib-n32.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/zlib-n32.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -30,15 +30,11 @@
     href="zlib.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
+<screen os="c"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
    --shared --libdir=/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -53,40 +49,44 @@
     href="zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>The previous command installed a <filename
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <para os="i">The previous command installed a <filename
     class="extension">.so</filename> file in <filename
     class="directory">/lib32</filename>. We will remove it and relink it into
     <filename class="directory">/usr/lib32</filename>:</para>
 
-<screen><userinput>rm /lib32/libz.so
+<screen os="j"><userinput>rm /lib32/libz.so
 ln -sf ../../lib32/libz.so.&zlib-version; /usr/lib32/libz.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>make clean
+<screen os="l"><userinput>make clean
 CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure \
     --prefix=/usr --libdir=/usr/lib32
 make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+    xpointer="xpointer(//*[@os='p'])"/>
 
-<screen><userinput>chmod 644 /usr/lib32/libz.a</userinput></screen>
+<screen os="q"><userinput>chmod 644 /usr/lib32/libz.a</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/zlib.xml
===================================================================
--- trunk/BOOK/final-system/multilib/zlib.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/multilib/zlib.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -30,15 +30,11 @@
     href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr \
+<screen os="c"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr \
    --shared --libdir=/lib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -65,29 +61,33 @@
     href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen><userinput>make clean
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+<screen os="l"><userinput>make clean
 CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr
 make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+    xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
+    xpointer="xpointer(//*[@os='q'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/ppc/patch.xml
===================================================================
--- trunk/BOOK/final-system/ppc/patch.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/ppc/patch.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,19 +21,31 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
 
-    <para>Prepare Patch for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>This package does not come with a test suite.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/sparc/kbd.xml
===================================================================
--- trunk/BOOK/final-system/sparc/kbd.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/sparc/kbd.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,23 +21,43 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
-    <para os="a">Sparcs haven't updated the structure of <command>kbdrate</command>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <para os="p3">Sparcs haven't updated the structure of <command>kbdrate</command>
     yet, so until they do this patch is required:</para>
 
-<screen os="b"><userinput>patch -Np1 -i ../&kbd-sparc_kbdrate-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&kbd-sparc_kbdrate-patch;</userinput></screen>
 
-    <para>Prepare Kbd for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+	
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/sparc64/kbd.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/kbd.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/sparc64/kbd.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,31 +23,43 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/kbd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/kbd.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
-    <para>Prepare Kbd for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/kbd.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/kbd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/x86_64/gettext-64bit.xml
===================================================================
--- trunk/BOOK/final-system/x86_64/gettext-64bit.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/x86_64/gettext-64bit.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -23,26 +23,39 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64-64/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64-64/gettext.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='x2'])"/>
 
-    <para>Prepare Gettext for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/gettext-64bit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/x86_64-64/gettext.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/gettext.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/x86_64-64/gettext.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -21,28 +21,42 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
-    <para os="a">Gettext includes its own version of Libtool which is broken
+    <para os="x1">Gettext includes its own version of Libtool which is broken
     for x86_64 (it tries to link statically linked archives compiled without
     -fPIC against shared objects) see (<ulink
     url="http://lists.gnu.org/archive/html/bug-libtool/2005-03/msg00070.html"/>).
     Use the following <command>sed</command> to skip certain tests so that
     the main language tests can be run.</para>
 
-<screen os="b"><userinput>sed -i -e '2iexit 77' autoconf-lib-link/tests/rpath-3*[ef]</userinput></screen>
+<screen os="x2"><userinput>sed -i -e '2iexit 77' autoconf-lib-link/tests/rpath-3*[ef]</userinput></screen>
 
-    <para>Prepare Gettext for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/x86_64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-chapter.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/final-system/x86_64-chapter.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -37,7 +37,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -37,6 +37,15 @@
 -->
 
    <listitem>
+      <para>November 30, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Text updates to final-system.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+   <listitem>
       <para>November 29, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/temp-system/common/tar.xml
===================================================================
--- trunk/BOOK/temp-system/common/tar.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/temp-system/common/tar.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -44,11 +44,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/mips/grep.xml
===================================================================
--- trunk/BOOK/temp-system/mips/grep.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/temp-system/mips/grep.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,11 +24,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/grep.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/grep.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"

Modified: trunk/BOOK/temp-system/mips/make.xml
===================================================================
--- trunk/BOOK/temp-system/mips/make.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/temp-system/mips/make.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,11 +24,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/make.xml"

Modified: trunk/BOOK/temp-system/mips64/grep.xml
===================================================================
--- trunk/BOOK/temp-system/mips64/grep.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/temp-system/mips64/grep.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,11 +24,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/grep.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/grep.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"

Modified: trunk/BOOK/temp-system/mips64/make.xml
===================================================================
--- trunk/BOOK/temp-system/mips64/make.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/temp-system/mips64/make.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,11 +24,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/make.xml"

Modified: trunk/BOOK/temp-system/multilib/bzip2.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/bzip2.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/temp-system/multilib/bzip2.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -24,11 +24,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/multilib/bzip2-64bit.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
+    xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen os="bb"><userinput>cp Makefile{,.orig}
-sed -e 's@^\(all:.*\) test@\1 at g' \
-    -e 's@/lib\(/\| \|$\)@/lib64\1 at g' Makefile.orig > Makefile</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/multilib/bzip2-64bit.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"

Modified: trunk/BOOK/temp-system/multilib/tar.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/tar.xml	2005-12-01 06:13:58 UTC (rev 778)
+++ trunk/BOOK/temp-system/multilib/tar.xml	2005-12-01 06:14:06 UTC (rev 779)
@@ -47,11 +47,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 




More information about the cross-lfs mailing list