Ignore:
Timestamp:
Feb 22, 2011, 4:53:14 PM (14 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/ppl-n32.xml

    r957d7a0 r4317f44  
    1616  </indexterm>
    1717
    18   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1919  href="../common/ppl.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323    <title>Installation of PPL</title>
    2424
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/ppl.xml"
    2727    xpointer="xpointer(//*[@os='s1'])"/>
    2828
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3030    href="../common/ppl.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
    3232
    33     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3434    href="../common/ppl.xml"
    3535    xpointer="xpointer(//*[@os='a'])"/>
    … …  
    4141      --enable-shared --disable-optimization</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/ppl.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/ppl.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/ppl.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/ppl.xml"
    5757    xpointer="xpointer(//*[@os='f'])"/>
    5858
    59     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6060    href="../common/ppl.xml"
    6161    xpointer="xpointer(//*[@os='g'])"/>
    6262
    63     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     63    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6464    href="../common/ppl.xml"
    6565    xpointer="xpointer(//*[@os='h'])"/>
    6666
    67     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     67    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6868    href="../common/ppl.xml"
    6969    xpointer="xpointer(//*[@os='i'])"/>
    7070
    71     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     71    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7272    href="ppl.xml"
    7373    xpointer="xpointer(//*[@os='m1'])"/>
Note: See TracChangeset for help on using the changeset viewer.