Changeset 03e6a40 for BOOK/cross-tools/ppc64/glibc-64bit.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/cross-tools/ppc64/glibc-64bit.xml (moved) (moved from BOOK/cross-tools/ppc64/eglibc-64bit.xml ) (2 diffs)

BOOK/cross-tools/ppc64/glibc-64bit.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-cross-tools-eglibc-64" role="wrap">
-  <?dbhtml filename="eglibc-64.html"?>
+<sect1 id="ch-cross-tools-glibc-64" role="wrap">
+  <?dbhtml filename="glibc-64.html"?>
 
-  <title>EGLIBC-&eglibc-version; 64-Bit</title>
+  <title>GLIBC-&glibc-version; 64-Bit</title>
 
-  <indexterm zone="ch-cross-tools-eglibc-64">
-    <primary sortas="a-EGLIBC">EGLIBC</primary>
+  <indexterm zone="ch-cross-tools-glibc-64">
+    <primary sortas="a-GLIBC">GLIBC</primary>
     <secondary>cross tools, 64 Bit</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/eglibc.xml"
+  href="../../final-system/common/glibc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of EGLIBC</title>
+    <title>Installation of GLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
+    href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='de'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='n2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc-64bit.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dk'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dl'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dm'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
+    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dn'])"/>
 
@@ -105 +105 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-eglibc" role="."/></para>
+    linkend="contents-glibc" role="."/></para>
 
   </sect2>