Ignore:
Timestamp:
Feb 22, 2011, 4:53:14 PM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/multilib/systemd-64bit.xml

    r957d7a0 r4317f44  
    1414  </indexterm>
    1515
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     16  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1717  href="../common/systemd.xml"
    1818  xpointer="xpointer(//*[@role='package'])"/>
     
    2121    <title>Installation of systemd</title>
    2222
    23     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     23    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2424    href="../common/systemd.xml"
    2525    xpointer="xpointer(//*[@os='s1'])"/>
    2626
    27     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     27    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2828    href="../common/systemd.xml"
    2929    xpointer="xpointer(//*[@os='s2'])"/>
    3030
    31     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3232    href="../common/systemd.xml"
    3333    xpointer="xpointer(//*[@os='a'])"/>
     
    4141    --with-sysvrcd-path=/etc/rc.d</userinput></screen>
    4242
    43     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="../common/systemd.xml"
    4545    xpointer="xpointer(//*[@os='c'])"/>
    4646
    47     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     47    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4848    href="../common/systemd.xml"
    4949    xpointer="xpointer(//*[@os='d'])"/>
    5050
    51     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     51    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5252    href="../common/systemd.xml"
    5353    xpointer="xpointer(//*[@os='e'])"/>
    5454
    55     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     55    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5656    href="../common/systemd.xml"
    5757    xpointer="xpointer(//*[@os='f'])"/>
     
    5959  </sect2>
    6060
    61   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     61  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262  href="../common/systemd.xml"
    6363  xpointer="xpointer(id('conf-systemd'))"/>
    6464
    65   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     65  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666  href="../common/systemd.xml"
    6767  xpointer="xpointer(id('contents-systemd'))"/>
Note: See TracChangeset for help on using the changeset viewer.