r6757 - in branches/cross-lfs/BOOK: boot/common boot/mips boot/mips64 boot/multilib chroot/common chroot/mips chroot/mips64 chroot/multilib cross-tools/sparc64 cross-tools/sparc64-64 partitioning/common partitioning/mips partitioning/sparc temp-system/multilib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Aug 26 12:26:30 PDT 2005


Author: manuel
Date: 2005-08-26 13:26:29 -0600 (Fri, 26 Aug 2005)
New Revision: 6757

Modified:
   branches/cross-lfs/BOOK/boot/common/changingowner.xml
   branches/cross-lfs/BOOK/boot/common/createfiles.xml
   branches/cross-lfs/BOOK/boot/common/creatingdirs.xml
   branches/cross-lfs/BOOK/boot/common/pwdgroup.xml
   branches/cross-lfs/BOOK/boot/mips/creatingdirs.xml
   branches/cross-lfs/BOOK/boot/mips64/createfiles.xml
   branches/cross-lfs/BOOK/boot/mips64/creatingdirs.xml
   branches/cross-lfs/BOOK/boot/multilib/createfiles.xml
   branches/cross-lfs/BOOK/boot/multilib/creatingdirs.xml
   branches/cross-lfs/BOOK/chroot/common/changingowner.xml
   branches/cross-lfs/BOOK/chroot/common/createfiles.xml
   branches/cross-lfs/BOOK/chroot/common/creatingdirs.xml
   branches/cross-lfs/BOOK/chroot/common/pwdgroup.xml
   branches/cross-lfs/BOOK/chroot/mips/creatingdirs.xml
   branches/cross-lfs/BOOK/chroot/mips64/createfiles.xml
   branches/cross-lfs/BOOK/chroot/mips64/creatingdirs.xml
   branches/cross-lfs/BOOK/chroot/multilib/createfiles.xml
   branches/cross-lfs/BOOK/chroot/multilib/creatingdirs.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64-64/flags.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64/flags.xml
   branches/cross-lfs/BOOK/partitioning/common/creatingfilesystem.xml
   branches/cross-lfs/BOOK/partitioning/common/creatingpartition.xml
   branches/cross-lfs/BOOK/partitioning/mips/creatingfilesystem.xml
   branches/cross-lfs/BOOK/partitioning/mips/creatingpartition.xml
   branches/cross-lfs/BOOK/partitioning/sparc/creatingpartition.xml
   branches/cross-lfs/BOOK/temp-system/multilib/gettext-64bit.xml
   branches/cross-lfs/BOOK/temp-system/multilib/gettext-n32.xml
   branches/cross-lfs/BOOK/temp-system/multilib/ncurses-n32.xml
   branches/cross-lfs/BOOK/temp-system/multilib/zlib-64bit.xml
   branches/cross-lfs/BOOK/temp-system/multilib/zlib-n32.xml
Log:
Xinclude redo up to chroot/.

Modified: branches/cross-lfs/BOOK/boot/common/changingowner.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/changingowner.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/common/changingowner.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -10,7 +10,7 @@
 
   <title>Changing Ownership</title>
 
-  <para>Currently, the <filename class="directory">/tools</filename>
+  <para os="a">Currently, the <filename class="directory">/tools</filename>
   directory is owned by the user <systemitem class="username">lfs</systemitem>,
   a user that exists only on the host system. Although the <filename
   class="directory">/tools</filename> directory can be deleted once the
@@ -22,7 +22,7 @@
   class="directory">/tools</filename> directory and all the files therein,
   thus exposing these files to possible malicious manipulation.</para>
 
-  <para>To avoid this issue, add the <systemitem
+  <para os="b">To avoid this issue, add the <systemitem
   class="username">lfs</systemitem> user to the new LFS system later when
   creating the <filename>/etc/passwd</filename> file, taking care to assign
   it the same user and group IDs as on the host system. Alternatively,
@@ -33,7 +33,7 @@
 <screen><userinput>chown -R 0:0 /tools
 chown -R 0:0 ${LFS}</userinput></screen>
 
-  <para>The command uses <parameter>0:0</parameter> instead of
+  <para os="c">The command uses <parameter>0:0</parameter> instead of
   <parameter>root:root</parameter>, because <command>chown</command>
   is unable to resolve the name <quote>root</quote> until the password
   file has been created. This book assumes you ran this

Modified: branches/cross-lfs/BOOK/boot/common/createfiles.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/createfiles.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/common/createfiles.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -10,7 +10,7 @@
 
   <title>Creating Essential Symlinks</title>
 
-  <para>Some programs use hard-wired paths to programs which do not exist
+  <para os="a">Some programs use hard-wired paths to programs which do not exist
   yet. In order to satisfy these programs, create a number of symbolic
   links which will be replaced by real files throughout the course of
   the next chapter after the software has been installed.</para>

Modified: branches/cross-lfs/BOOK/boot/common/creatingdirs.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/creatingdirs.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/common/creatingdirs.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -10,7 +10,7 @@
 
   <title>Creating Directories</title>
 
-  <para>It is time to create some structure in the LFS file system. Create a
+  <para os="a">It is time to create some structure in the LFS file system. Create a
   standard directory tree by issuing the following commands:</para>
 
 <screen><userinput>install -d ${LFS}/{bin,boot,dev,etc/opt,home,lib,mnt}
@@ -33,13 +33,13 @@
 install -d ${LFS}/opt/{bin,doc,include,info}
 install -d ${LFS}/opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
 
-  <para>Directories are, by default, created with permission mode 755,
+  <para os="b">Directories are, by default, created with permission mode 755,
   but this is not desirable for all directories. In the commands above,
   two changes are made—one to the home directory of user
   <systemitem class="username">root</systemitem>, and another to the
   directories for temporary files.</para>
 
-  <para>The first mode change ensures that not just anybody can enter
+  <para os="c">The first mode change ensures that not just anybody can enter
   the <filename class="directory">${LFS}/root</filename> directory—the
   same as a normal user would do with his or her home directory. The
   second mode change makes sure that any user can write to the
@@ -49,7 +49,7 @@
   by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
   1777 bit mask.</para>
 
-  <sect2>
+  <sect2 os="d">
     <title>FHS Compliance Note</title>
 
     <para>The directory tree is based on the Filesystem Hierarchy Standard

Modified: branches/cross-lfs/BOOK/boot/common/pwdgroup.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/pwdgroup.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/common/pwdgroup.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -47,7 +47,7 @@
 nobody:x:65534:65534:Nobody:/:/sbin/nologin</literal>
 EOF</userinput></screen>
 
-  <para>The actual password for <systemitem class="username">root</systemitem>
+  <para os="a">The actual password for <systemitem class="username">root</systemitem>
   (the <quote>x</quote> used here is just a placeholder) will be set
   later.</para>
 
@@ -64,7 +64,7 @@
 nogroup:x:65534:</literal>
 EOF</userinput></screen>
 
-  <para>The created groups are not part of any standard—they are
+  <para os="b">The created groups are not part of any standard—they are
   groups decided on in part by the requirements of the Udev configuration
   in the final system, and in part by common convention employed by a
   number of existing Linux distributions. The Linux Standard Base (LSB,
@@ -75,7 +75,7 @@
   well-written programs do not depend on GID numbers, but rather use the
   group's name.</para>
 
-  <para>The <command>login</command>, <command>agetty</command>, and
+  <para os="c">The <command>login</command>, <command>agetty</command>, and
   <command>init</command> programs (and others) use a number of log
   files to record information such as who was logged into the system and
   when. However, these programs will not write to the log files if they

Modified: branches/cross-lfs/BOOK/boot/mips/creatingdirs.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips/creatingdirs.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/mips/creatingdirs.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -d ${LFS}/{bin,boot,dev,etc/opt,home,lib,mnt}
 install -d ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
@@ -37,14 +37,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/sect2)"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/boot/mips64/createfiles.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/createfiles.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/mips64/createfiles.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/createfiles.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>ln -s /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
 ln -s /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib

Modified: branches/cross-lfs/BOOK/boot/mips64/creatingdirs.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/creatingdirs.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/mips64/creatingdirs.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -d ${LFS}/{bin,boot,dev,etc/opt,home,lib{,32,64},mnt}
 install -d ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
@@ -40,14 +40,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/sect2)"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/boot/multilib/createfiles.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/createfiles.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/multilib/createfiles.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/createfiles.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>ln -s /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
 ln -s /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib

Modified: branches/cross-lfs/BOOK/boot/multilib/creatingdirs.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/creatingdirs.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/boot/multilib/creatingdirs.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -d ${LFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt}
 install -d ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
@@ -38,14 +38,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/sect2)"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/chroot/common/changingowner.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/common/changingowner.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/common/changingowner.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,16 +12,16 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/changingowner.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/changingowner.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>chown -R 0:0 /tools</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/changingowner.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/chroot/common/createfiles.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/common/createfiles.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/common/createfiles.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/createfiles.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>ln -s /tools/bin/{bash,cat,pwd,stty} /bin
 ln -s /tools/bin/perl /usr/bin

Modified: branches/cross-lfs/BOOK/chroot/common/creatingdirs.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/common/creatingdirs.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/common/creatingdirs.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -d /{bin,boot,dev,etc/opt,home,lib,mnt}
 install -d /{sbin,srv,usr/local,var,opt,proc,sys}
@@ -36,9 +36,9 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
-  <para>The first mode change ensures that not just anybody can enter
+  <para os="c">The first mode change ensures that not just anybody can enter
   the <filename class="directory">/root</filename> directory—the
   same as a normal user would do with his or her home directory. The
   second mode change makes sure that any user can write to the
@@ -50,6 +50,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/sect2)"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/chroot/common/pwdgroup.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/common/pwdgroup.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/common/pwdgroup.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -11,27 +11,27 @@
   <title>Creating the passwd, group, and log Files</title>
 
   <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-${LFS}/etc/passwd">${LFS}/etc/passwd</primary>
+    <primary sortas="e-/etc/passwd">/etc/passwd</primary>
   </indexterm>
 
   <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-${LFS}/etc/group">${LFS}/etc/group</primary>
+    <primary sortas="e-/etc/group">/etc/group</primary>
   </indexterm>
 
   <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-${LFS}/var/run/utmp">${LFS}/var/run/utmp</primary>
+    <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
   </indexterm>
 
   <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/btmp">${LFS}/var/log/btmp</primary>
+    <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
   </indexterm>
 
   <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/lastlog">${LFS}/var/log/lastlog</primary>
+    <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
   </indexterm>
 
   <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/wtmp">${LFS}/var/log/wtmp</primary>
+    <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
   </indexterm>
 
   <para>In order for user <systemitem class="username">root</systemitem> to
@@ -49,7 +49,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
   <para>Create the <filename>/etc/group</filename> file by running the
   following command:</para>
@@ -66,7 +66,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(/sect1/para[5])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <para>To remove the <quote>I have no name!</quote> prompt, start a
   new shell. Since a full Glibc was installed in <xref
@@ -85,7 +85,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(/sect1/para[6])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
 chgrp utmp /var/run/utmp /var/log/lastlog

Modified: branches/cross-lfs/BOOK/chroot/mips/creatingdirs.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/mips/creatingdirs.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/mips/creatingdirs.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -d /{bin,boot,dev,etc/opt,home,lib,mnt}
 install -d /{sbin,srv,usr/local,var,opt,proc,sys}
@@ -37,14 +37,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/sect2)"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/chroot/mips64/createfiles.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/mips64/createfiles.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/mips64/createfiles.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/createfiles.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>ln -s /tools/bin/{bash,cat,pwd,stty} /bin
 ln -s /tools/lib/libgcc_s.so{,.1} /usr/lib

Modified: branches/cross-lfs/BOOK/chroot/mips64/creatingdirs.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/mips64/creatingdirs.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/mips64/creatingdirs.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -d /{bin,boot,dev,etc/opt,home,lib{,32,64},mnt}
 install -d /{sbin,srv,usr/local,var,opt,proc,sys}
@@ -40,14 +40,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/sect2)"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/chroot/multilib/createfiles.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/multilib/createfiles.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/multilib/createfiles.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/createfiles.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>ln -s /tools/bin/{bash,cat,pwd,stty} /bin
 ln -s /tools/lib/libgcc_s.so{,.1} /usr/lib

Modified: branches/cross-lfs/BOOK/chroot/multilib/creatingdirs.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/multilib/creatingdirs.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/chroot/multilib/creatingdirs.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,7 +12,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>install -d /{bin,boot,dev,etc/opt,home,lib{,64},mnt}
 install -d /{sbin,srv,usr/local,var,opt,proc,sys}
@@ -38,14 +38,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(/sect1/sect2)"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64/flags.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64/flags.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64/flags.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -44,7 +44,7 @@
           <entry>Processor</entry>
           <entry>BUILD32</entry>
           <entry>BUILD64</entry>
-	  <entry>GCCTARGET</entry>
+          <entry>GCCTARGET</entry>
         </row>
       </thead>
       <tbody>
@@ -52,13 +52,13 @@
           <entry>Ultrasparc and Ultrasparc2</entry>
           <entry>-m32 -mcpu=ultrasparc -mtune=ultrasparc</entry>
           <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-	  <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
+          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
         </row>
         <row>
           <entry>Ultrasparc3</entry>
           <entry>-m32 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
           <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-	  <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
         </row>
       </tbody>
     </tgroup>

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64-64/flags.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64-64/flags.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64-64/flags.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -35,19 +35,19 @@
         <row>
           <entry>Processor</entry>
           <entry>BUILD64</entry>
-	  <entry>GCCTARGET</entry>
+          <entry>GCCTARGET</entry>
         </row>
       </thead>
       <tbody>
         <row>
           <entry>Ultrasparc and Ultrasparc2</entry>
           <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-	  <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
+          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
         </row>
         <row>
           <entry>Ultrasparc3</entry>
           <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-	  <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
         </row>
       </tbody>
     </tgroup>

Modified: branches/cross-lfs/BOOK/partitioning/common/creatingfilesystem.xml
===================================================================
--- branches/cross-lfs/BOOK/partitioning/common/creatingfilesystem.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/partitioning/common/creatingfilesystem.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -10,7 +10,7 @@
 
   <title>Creating a File System on the Partition</title>
 
-  <para>Now that a blank partition has been set up, the file system can be
+  <para os="a">Now that a blank partition has been set up, the file system can be
   created. The most widely-used system in the Linux world is the second
   extended file system (ext2), but with newer high-capacity hard disks,
   journaling file systems are becoming increasingly popular. We will create
@@ -18,16 +18,16 @@
   Build instructions for other file systems can be found at
   <ulink url="&blfs-root;view/svn/postlfs/filesystems.html"/>.</para>
 
-  <para>To create an <systemitem class="filesystem">ext2</systemitem> file
+  <para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file
   system on the LFS partition, run the following:</para>
 
-<screen><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
+<screen os="c"><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
 
-  <para>Replace <replaceable>[xxx]</replaceable> with the name of the LFS
+  <para os="d">Replace <replaceable>[xxx]</replaceable> with the name of the LFS
   partition (<filename class="devicefile">hda5</filename> in our previous
   example).</para>
 
-  <note>
+  <note os="e">
     <para>Some host distributions use custom features in their filesystem
     creation tools (E2fsprogs). This can cause problems when booting into
     your new LFS, as those features will not be supported by the LFS-installed
@@ -36,7 +36,7 @@
     if your host system uses custom enhancements, run the following
     command:</para>
 
-<screen><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
+<screen os="f"><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
 
     <para>If the output contains features other than: dir_index; filetype;
     large_file; resize_inode or sparse_super then your host system may have custom
@@ -44,7 +44,7 @@
     stock E2fsprogs package and use the resulting binaries to re-create the
     filesystem on your LFS partition:</para>
 
-<screen><userinput>cd /tmp
+<screen os="g"><userinput>cd /tmp
 tar xjf /path/to/sources/e2fsprogs-&e2fsprogs-version;.tar.bz2
 cd e2fsprogs-&e2fsprogs-version;
 mkdir build
@@ -57,15 +57,13 @@
 
   </note>
 
-  <para>If a swap partition was created, it will need to be initialized
+  <para os="h">If a swap partition was created, it will need to be initialized
   for use by issuing the command below. If you are using an existing swap
   partition, there is no need to format it.</para>
 
-<screen><userinput>mkswap /dev/<replaceable>[yyy]</replaceable></userinput></screen>
+<screen os="i"><userinput>mkswap /dev/<replaceable>[yyy]</replaceable></userinput></screen>
 
-  <para>Replace <replaceable>[yyy]</replaceable> with the name of the
+  <para os="j">Replace <replaceable>[yyy]</replaceable> with the name of the
   swap partition.</para>
 
-  <para/>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/partitioning/common/creatingpartition.xml
===================================================================
--- branches/cross-lfs/BOOK/partitioning/common/creatingpartition.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/partitioning/common/creatingpartition.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -10,7 +10,7 @@
 
   <title>Creating a New Partition</title>
 
-  <para>Like most other operating systems, LFS is usually installed on
+  <para os="a">Like most other operating systems, LFS is usually installed on
   a dedicated partition. The recommended approach to building an LFS
   system is to use an available empty partition or, if you have enough
   unpartitioned space, to create one. However, an LFS system (in fact
@@ -21,7 +21,7 @@
   implement this, whereas this book discusses the method of using a fresh
   partition for the installation.</para>
 
-  <para>A minimal system requires a partition of around 1.3 gigabytes (GB).
+  <para os="b">A minimal system requires a partition of around 1.3 gigabytes (GB).
   This is enough to store all the source tarballs and compile the packages.
   However, if the LFS system is intended to be the primary Linux system,
   additional software will probably be installed which will require
@@ -30,14 +30,14 @@
   free temporary storage. Compiling packages can require a lot of disk space
   which will be reclaimed after the package is installed.</para>
 
-  <para>Because there is not always enough Random Access Memory (RAM)
+  <para os="c">Because there is not always enough Random Access Memory (RAM)
   available for compilation processes, it is a good idea to use a small disk
   partition as swap space. This is used by the kernel to store seldom-used
   data and leave more memory available for active processes. The swap
   partition for an LFS system can be the same as the one used by the host
   system, in which case it is not necessary to create another one.</para>
 
-  <para>Start a disk partitioning program such as <command>cfdisk</command>
+  <para os="d">Start a disk partitioning program such as <command>cfdisk</command>
   or <command>fdisk</command> with a command line option naming the hard
   disk on which the new partition will be created—for example
   <filename class="devicefile">/dev/hda</filename> for the primary
@@ -46,12 +46,10 @@
   <filename>cfdisk(8)</filename> or <filename>fdisk(8)</filename> if you
   do not yet know how to use the programs.</para>
 
-  <para>Remember the designation of the new partition (e.g.,
+  <para os="e">Remember the designation of the new partition (e.g.,
   <filename class="devicefile">hda5</filename>). This book will refer to
   this as the LFS partition. Also remember the designation of the swap
   partition. These names will be needed later for the
   <filename>/etc/fstab</filename> file.</para>
 
-  <para/>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/partitioning/mips/creatingfilesystem.xml
===================================================================
--- branches/cross-lfs/BOOK/partitioning/mips/creatingfilesystem.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/partitioning/mips/creatingfilesystem.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,8 +12,44 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(/sect1/para[1]/range-to(/sect1/para[last()]))"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingfilesystem.xml"
+  xpointer="xpointer(//*[@os='j'])"/>
+
   <para>If you used the partition scheme that was recommended, here are
   the commands you can use to format the necessary drives:</para>
 

Modified: branches/cross-lfs/BOOK/partitioning/mips/creatingpartition.xml
===================================================================
--- branches/cross-lfs/BOOK/partitioning/mips/creatingpartition.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/partitioning/mips/creatingpartition.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,8 +12,24 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingpartition.xml"
-  xpointer="xpointer(/sect1/para[1]/range-to(/sect1/para[last()]))"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingpartition.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingpartition.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingpartition.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingpartition.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
   <para>On a Cobalt RaQ2/Cube2 we use the existing firmware for a boot loader,
   it requires an <systemitem class="filesystem">ext2</systemitem> revision 0
   partition to boot from. So here is the recommended partition for a Cobalt

Modified: branches/cross-lfs/BOOK/partitioning/sparc/creatingpartition.xml
===================================================================
--- branches/cross-lfs/BOOK/partitioning/sparc/creatingpartition.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/partitioning/sparc/creatingpartition.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -12,15 +12,32 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingpartition.xml"
-  xpointer="xpointer(/sect1/para[1]/range-to(/sect1/para[last()]))"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
-  <para>On a Sparc system we have to create special partition first. This
-  partition is called Whole disk, and must be the 3rd partition on the
-  disk.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingpartition.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-  <para>The other partitions are virtual slices of this Whole disk partition.
-  But there are some limitations on the first partion of hda or sda on the
-  system. This partition must be less than 2 gigabytes and this partition must
-  be root.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingpartition.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingpartition.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingpartition.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+  <para>On a Sparc system we have to create an special partition first. This
+  partition is called <quote>Whole disk</quote>, and must be the 3rd partition
+  on the disk.</para>
+
+  <para>The other partitions are virtual slices of this <quote>Whole disk</quote>
+  partition. But there are some limitations on the first partion of
+  <filename class="devicefile">hda</filename> or <filename
+  class="devicefile">sda</filename> on the system. This partition must be less
+  than 2 gigabytes and this partition must be root.</para>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/temp-system/multilib/gettext-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/gettext-64bit.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/temp-system/multilib/gettext-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -43,11 +43,11 @@
     <title>Installation of Gettext</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
+    href="gettext.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
+    href="gettext.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <para>Prepare Gettext for compilation:</para>

Modified: branches/cross-lfs/BOOK/temp-system/multilib/gettext-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/gettext-n32.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/temp-system/multilib/gettext-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -43,11 +43,11 @@
     <title>Installation of Gettext</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
+    href="gettext.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
+    href="gettext.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <para>Prepare Gettext for compilation:</para>

Modified: branches/cross-lfs/BOOK/temp-system/multilib/ncurses-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/ncurses-n32.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/temp-system/multilib/ncurses-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -44,15 +44,15 @@
     <title>Installation of Ncurses</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
@@ -61,19 +61,19 @@
    --enable-overwrite --with-build-cc=gcc --libdir=/tools/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
+    href="ncurses.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/temp-system/multilib/zlib-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/zlib-64bit.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/temp-system/multilib/zlib-64bit.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -44,30 +44,30 @@
     <title>Installation of Zlib</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --shared --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/temp-system/multilib/zlib-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/zlib-n32.xml	2005-08-26 19:17:00 UTC (rev 6756)
+++ branches/cross-lfs/BOOK/temp-system/multilib/zlib-n32.xml	2005-08-26 19:26:29 UTC (rev 6757)
@@ -44,30 +44,30 @@
     <title>Installation of Zlib</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="${CC} ${BUILDN32}" \
    ./configure --prefix=/tools --shared --libdir=/tools/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>




More information about the lfs-book mailing list