Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/chroot/mips/creatingdirs.xml

    r88ef769 r03e6a40  
    1313  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1414  href="../common/creatingdirs.xml"
    15   xpointer="xpointer(//*[@os='a'])"/>
     15  xpointer="xpointer(//*[@os='b'])"/>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1818  href="../common/creatingdirs.xml"
    19   xpointer="xpointer(//*[@os='b'])"/>
     19  xpointer="xpointer(//*[@os='c'])"/>
    2020
    2121   <para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
    … …  
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2828  href="../common/creatingdirs.xml"
    29   xpointer="xpointer(//*[@os='c'])"/>
    30 
    31   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    32   href="../common/creatingdirs.xml"
    3329  xpointer="xpointer(//*[@os='d'])"/>
    3430
    … …  
    3733  xpointer="xpointer(//*[@os='e'])"/>
    3834
     35  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     36  href="../common/creatingdirs.xml"
     37  xpointer="xpointer(//*[@os='f'])"/>
     38
    3939</sect1>
Note: See TracChangeset for help on using the changeset viewer.