Changeset 1718e20 for BOOK/final-system/multilib/xz-n32.xml

Timestamp:

May 23, 2011, 3:04:49 PM (13 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

cfb2026a

Parents:

30a199c (diff), 1ac2d0c (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 'master' into systemd

Conflicts:

BOOK/final-system/common/kbd.xml

File:

• BOOK/final-system/multilib/xz-n32.xml (modified) (1 diff)

BOOK/final-system/multilib/xz-n32.xml

@@ -57 +57 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="xz.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
 
   </sect2>