Changeset 4317f44 for BOOK/chroot/common

Timestamp:

Feb 22, 2011, 4:53:14 PM (13 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

Location:

BOOK/chroot/common

Files:

• createfiles.xml (modified) (1 diff)
• creatingdirs.xml (modified) (2 diffs)
• kernfs.xml (modified) (1 diff)
• pwdgroup.xml (modified) (4 diffs)
• util-linux.xml (modified) (4 diffs)

BOOK/chroot/common/createfiles.xml

@@ -11 +11 @@
   <title>Creating Essential Symlinks</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/createfiles.xml"
   xpointer="xpointer(//*[@os='a'])"/>

BOOK/chroot/common/creatingdirs.xml

@@ -11 +11 @@
   <title>Creating Directories</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='a'])"/>
@@ -29 +29 @@
 done</userinput></screen>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='e'])"/>

BOOK/chroot/common/kernfs.xml

@@ -11 +11 @@
   <title>Mounting Virtual Kernel File Systems</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../boot/common/devices.xml"
     xpointer="xpointer(//*[@os='a'])"/>

BOOK/chroot/common/pwdgroup.xml

@@ -35 +35 @@
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/pwdgroup.xml"
   xpointer="xpointer(//*[@os='a'])"/>
@@ -51 +51 @@
   used here is just a placeholder) will be set later.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/pwdgroup.xml"
   xpointer="xpointer(//*[@os='c'])"/>
@@ -78 +78 @@
 EOF</userinput></screen>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/pwdgroup.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/pwdgroup.xml"
   xpointer="xpointer(//*[@os='e'])"/>
@@ -101 +101 @@
   for the duration of the next chapters.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/pwdgroup.xml"
   xpointer="xpointer(//*[@os='f'])"/>

BOOK/chroot/common/util-linux.xml

@@ -16 +16 @@
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../final-system/common/util-linux.xml"
   xpointer="xpointer(//*[@role='package'])"/>
@@ -23 +23 @@
     <title>Installation of Util-linux</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
@@ -31 +31 @@
     --disable-makeinstall-chown</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='d'])"/>
@@ -37 +37 @@
 <screen os="e"><userinput>make</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='g'])"/>