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/mips64/gmp-64bit.xml

    r957d7a0 r4317f44  
    1515  </indexterm>
    1616
    17   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     17  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1818  href="../common/gmp.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323
    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/gmp.xml"
    2727    xpointer="xpointer(//*[@os='p1'])"/>
    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/gmp.xml"
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    … …  
    3333-->
    3434
    35     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3636    href="../common/gmp.xml"
    3737    xpointer="xpointer(//*[@os='n1'])"/>
    3838
    39     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4040    href="../common/gmp.xml"
    4141    xpointer="xpointer(//*[@os='a'])"/>
    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="../multilib/gmp-64bit.xml"
    4545    xpointer="xpointer(//*[@os='b'])"/>
    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/gmp.xml"
    4949    xpointer="xpointer(//*[@os='c'])"/>
    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/gmp.xml"
    5353    xpointer="xpointer(//*[@os='d'])"/>
    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/gmp.xml"
    5757    xpointer="xpointer(//*[@os='e'])"/>
    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/gmp.xml"
    6161    xpointer="xpointer(//*[@os='f'])"/>
    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/gmp.xml"
    6565    xpointer="xpointer(//*[@os='g'])"/>
    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/gmp.xml"
    6969    xpointer="xpointer(//*[@os='h'])"/>
    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="../common/gmp.xml"
    7373    xpointer="xpointer(//*[@os='i'])"/>
    7474
    75     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     75    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7676    href="../multilib/gmp-64bit.xml"
    7777    xpointer="xpointer(//*[@os='j'])"/>
    7878
    79     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     79    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8080    href="../multilib/gmp-64bit.xml"
    8181    xpointer="xpointer(//*[@os='k'])"/>
    8282
    83     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     83    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8484    href="../multilib/gmp-64bit.xml"
    8585    xpointer="xpointer(//*[@os='l'])"/>
    … …  
    105105  </sect2>
    106106
    107   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     107  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    108108  href="../common/gmp.xml"
    109109  xpointer="xpointer(id('contents-gmp'))"/>
Note: See TracChangeset for help on using the changeset viewer.