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

BOOK/boot/multilib/sysvinit.xml

@@ -13 +13 @@
   <indexterm zone="ch-boot-sysvinit">
     <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/sysvinit.xml"
+  href="../common/sysvinit.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
@@ -25 +24 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -52 +51 @@
   xpointer="xpointer(//*[@role='configuration'])"/>
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/sysvinit.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
 
 </sect1>