Changeset 4ce7c10 for BOOK/final-system/multilib/util-linux-64bit.xml

Timestamp:

Jan 29, 2011, 4:28:46 PM (13 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

d2759bb

Parents:

f33b74f (diff), 9fedd70f (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/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.xml
BOOK/final-system/multilib/util-linux.xml

File:

• BOOK/final-system/multilib/util-linux-64bit.xml (moved) (moved from BOOK/final-system/multilib/util-linux-ng-64bit.xml) (3 diffs)

BOOK/final-system/multilib/util-linux-64bit.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng-64bit.html"?>
+<sect1 id="ch-system-util-linux" role="wrap">
+  <?dbhtml filename="util-linux-64bit.html"?>
 
-  <title>Util-linux-ng-&util-linux-ng-version; 64 Bit</title>
+  <title>Util-linux-&util-linux-version; 64 Bit</title>
 
-  <indexterm zone="ch-system-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+  <indexterm zone="ch-system-util-linux">
+    <primary sortas="a-Util-linux">Util-linux</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
+  href="../common/util-linux.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@id='fhs-util-linux-ng'])"/>
+  href="../common/util-linux.xml"
+  xpointer="xpointer(//*[@id='fhs-util-linux'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
+    <title>Installation of Util-linux</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -34 +34 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
@@ -60 +60 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(id('contents-util-linux-ng'))"/>
+  href="../common/util-linux.xml"
+  xpointer="xpointer(id('contents-util-linux'))"/>
 
 </sect1>