Changeset 03e6a40 for BOOK/final-system/multilib/xml-parser.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/multilib/xml-parser.xml (moved) (moved from BOOK/final-system/multilib/libee.xml ) (2 diffs)

BOOK/final-system/multilib/xml-parser.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-libee-32" role="wrap">
-  <?dbhtml filename="libee.html"?>
+<sect1 id="ch-system-xml-parser-32" role="wrap">
+  <?dbhtml filename="xml-parser.html"?>
 
-  <title>Libee-&libee-version; 32 Bit Libraries</title>
+  <title>XML-Parser-&xml-parser-version; 32 Bit</title>
 
-  <indexterm zone="ch-system-libee-32">
-    <primary sortas="a-Libee">Libee</primary>
+  <indexterm zone="ch-system-xml-parser-32">
+    <primary sortas="a-XML-Parser">XML::Parser</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
+  href="../common/xml-parser.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Libee</title>
+    <title>Installation of XML-Parser</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
-  ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>USE_ARCH=32 perl Makefile.PL</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
+    href="../common/xml-parser.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/xml-parser.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
@@ -60 +59 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-libee" role="."/></para>
+    linkend="contents-xml-parser" role="."/></para>
 
   </sect2>
+</sect1>
 
-</sect1>