Index: BOOK/temp-system/64/zlib.xml
===================================================================
--- BOOK/temp-system/64/zlib.xml	(revision aa3ee8bb8b616596b628c9d33fdb0bf43d1b3b5c)
+++ BOOK/temp-system/64/zlib.xml	(revision 06a21d14ca71abd0dc6638fcf3f6897e70516817)
@@ -31,18 +31,14 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
+<screen os="c"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <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'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -53,4 +49,8 @@
     href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
Index: BOOK/temp-system/common/zlib.xml
===================================================================
--- BOOK/temp-system/common/zlib.xml	(revision aa3ee8bb8b616596b628c9d33fdb0bf43d1b3b5c)
+++ BOOK/temp-system/common/zlib.xml	(revision 06a21d14ca71abd0dc6638fcf3f6897e70516817)
@@ -31,10 +31,10 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="aa"><userinput>./configure --prefix=/tools --shared</userinput></screen>
+<screen os="c"><userinput>./configure --prefix=/tools --shared</userinput></screen>
 
-    <variablelist os="ab">
+    <variablelist os="aa">
       <title>The meaning of the configure options:</title>
 
-      <varlistentry os="ab1">
+      <varlistentry os="aa1">
         <term><parameter>--shared</parameter></term>
         <listitem>
@@ -47,17 +47,17 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/zlib.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/zlib-64bit.xml
===================================================================
--- BOOK/temp-system/multilib/zlib-64bit.xml	(revision aa3ee8bb8b616596b628c9d33fdb0bf43d1b3b5c)
+++ BOOK/temp-system/multilib/zlib-64bit.xml	(revision 06a21d14ca71abd0dc6638fcf3f6897e70516817)
@@ -31,10 +31,6 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
+<screen os="c"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --shared --libdir=/tools/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"
@@ -44,9 +40,13 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/zlib-n32.xml
===================================================================
--- BOOK/temp-system/multilib/zlib-n32.xml	(revision aa3ee8bb8b616596b628c9d33fdb0bf43d1b3b5c)
+++ BOOK/temp-system/multilib/zlib-n32.xml	(revision 06a21d14ca71abd0dc6638fcf3f6897e70516817)
@@ -31,8 +31,8 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILDN32}" \
+<screen os="c"><userinput>CC="${CC} ${BUILDN32}" \
    ./configure --prefix=/tools --shared --libdir=/tools/lib32</userinput></screen>
 
-    <variablelist os="ab">
+    <variablelist os="aa">
       <title>The meaning of the new configure options:</title>
 
@@ -49,17 +49,17 @@
     <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"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/zlib.xml
===================================================================
--- BOOK/temp-system/multilib/zlib.xml	(revision aa3ee8bb8b616596b628c9d33fdb0bf43d1b3b5c)
+++ BOOK/temp-system/multilib/zlib.xml	(revision 06a21d14ca71abd0dc6638fcf3f6897e70516817)
@@ -33,7 +33,7 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <variablelist os="ab">
+    <variablelist os="aa">
       <title>The meaning of the configure options:</title>
 
@@ -48,11 +48,7 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/zlib.xml"
-      xpointer="xpointer(//*[@os='ab1'])"/>
+      xpointer="xpointer(//*[@os='aa1'])"/>
 
     </variablelist>
-
-    <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"
@@ -62,9 +58,13 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
