Changeset 03e6a40 for BOOK/temp-system/multilib/xz.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/temp-system/multilib/xz.xml (modified) (3 diffs)

BOOK/temp-system/multilib/xz.xml

@@ -12 +12 @@
 
   <indexterm zone="ch-temp-system-xz">
-    <primary sortas="a-XZ-Utils">XZ-Utils</primary>
+    <primary sortas="a-XZ Utils">XZ Utils</primary>
     <secondary>temporary system</secondary>
   </indexterm>
@@ -21 +21 @@
 
   <sect2 role="installation">
-    <title>Installation of XZ-Utils</title>
+    <title>Installation of XZ Utils</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -28 +28 @@
 
 <screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-     --build=${CLFS_HOST} --host=${CLFS_TARGET}\
+     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --libdir=/tools/lib64</userinput></screen>