Changeset 4317f44 for BOOK/alpha-index.xml

Timestamp:

Feb 22, 2011, 4:53:14 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

1f9faab

Parents:

957d7a0 (diff), dabbced (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/boot/alpha-chapter.xml
BOOK/boot/common/bootscripts.xml
BOOK/boot/mips-chapter.xml
BOOK/boot/mips64-64-chapter.xml
BOOK/boot/mips64-chapter.xml
BOOK/boot/ppc-chapter.xml
BOOK/boot/ppc64-chapter.xml
BOOK/boot/sparc-chapter.xml
BOOK/boot/sparc64-64-chapter.xml
BOOK/boot/sparc64-chapter.xml
BOOK/boot/x86-chapter.xml
BOOK/boot/x86_64-64-chapter.xml
BOOK/boot/x86_64-chapter.xml
BOOK/bootscripts/alpha-chapter.xml
BOOK/bootscripts/mips-chapter.xml
BOOK/bootscripts/mips64-64-chapter.xml
BOOK/bootscripts/mips64-chapter.xml
BOOK/bootscripts/ppc-chapter.xml
BOOK/bootscripts/ppc64-chapter.xml
BOOK/bootscripts/sparc-chapter.xml
BOOK/bootscripts/sparc64-64-chapter.xml
BOOK/bootscripts/sparc64-chapter.xml
BOOK/bootscripts/x86-chapter.xml
BOOK/bootscripts/x86_64-64-chapter.xml
BOOK/bootscripts/x86_64-chapter.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/coreutils.xml
BOOK/final-system/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml

File:

• BOOK/alpha-index.xml (modified) (7 diffs)

BOOK/alpha-index.xml

@@ -8 +8 @@
 <book>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/alpha/bookinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/alpha/bookinfo.xml"/>
   <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
   -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/preface.xml"/>
 
   <part id="part1">
@@ -19 +19 @@
     <title>Introduction</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction/alpha-chapter.xml"/>
 
   </part>
@@ -28 +28 @@
     <title>Preparing for the Build</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
 
   </part>
@@ -39 +39 @@
     <title>Make the Cross-Compile Tools</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cross-tools/alpha-chapter.xml"/>
 
   </part>
@@ -48 +48 @@
     <title>Building the Basic Tools</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="temp-system/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boot/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot/alpha-chapter.xml"/>
 
   </part>
@@ -59 +59 @@
     <title>Building the CLFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testsuite-tools/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-system/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootable/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="the-end/chapter.xml"/>
 
   </part>
@@ -73 +73 @@
     <title>Appendices</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/alpha.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/acronymlist.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/common.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/dependencies/alpha.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendices/license.xml"/>
 
   </part>