r782 - in trunk/BOOK: . temp-system/64 temp-system/common temp-system/multilib

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


Author: jim
Date: 2005-11-30 23:51:50 -0700 (Wed, 30 Nov 2005)
New Revision: 782

Modified:
   trunk/BOOK/
   trunk/BOOK/temp-system/64/zlib.xml
   trunk/BOOK/temp-system/common/zlib.xml
   trunk/BOOK/temp-system/multilib/zlib-64bit.xml
   trunk/BOOK/temp-system/multilib/zlib-n32.xml
   trunk/BOOK/temp-system/multilib/zlib.xml
Log:
 r843 at server:  jim | 2005-11-30 22:51:21 -0800
 Text fixes from final-system update



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

Modified: trunk/BOOK/temp-system/64/zlib.xml
===================================================================
--- trunk/BOOK/temp-system/64/zlib.xml	2005-12-01 06:29:11 UTC (rev 781)
+++ trunk/BOOK/temp-system/64/zlib.xml	2005-12-01 06:51:50 UTC (rev 782)
@@ -30,28 +30,28 @@
     href="../common/zlib.xml"
     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'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/common/zlib.xml
===================================================================
--- trunk/BOOK/temp-system/common/zlib.xml	2005-12-01 06:29:11 UTC (rev 781)
+++ trunk/BOOK/temp-system/common/zlib.xml	2005-12-01 06:51:50 UTC (rev 782)
@@ -30,12 +30,12 @@
     href="../../final-system/common/zlib.xml"
     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>
           <para>Tells zlib to build shared libraries.</para>
@@ -46,19 +46,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/multilib/zlib-64bit.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/zlib-64bit.xml	2005-12-01 06:29:11 UTC (rev 781)
+++ trunk/BOOK/temp-system/multilib/zlib-64bit.xml	2005-12-01 06:51:50 UTC (rev 782)
@@ -30,24 +30,24 @@
     href="zlib.xml"
     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'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/multilib/zlib-n32.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/zlib-n32.xml	2005-12-01 06:29:11 UTC (rev 781)
+++ trunk/BOOK/temp-system/multilib/zlib-n32.xml	2005-12-01 06:51:50 UTC (rev 782)
@@ -30,10 +30,10 @@
     href="zlib.xml"
     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>
 
       <varlistentry>
@@ -48,19 +48,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/multilib/zlib.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/zlib.xml	2005-12-01 06:29:11 UTC (rev 781)
+++ trunk/BOOK/temp-system/multilib/zlib.xml	2005-12-01 06:51:50 UTC (rev 782)
@@ -32,9 +32,9 @@
 
     <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>
 
       <varlistentry>
@@ -47,25 +47,25 @@
 
       <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'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <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"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 




More information about the cross-lfs mailing list