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/gcc.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/gcc.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2222    <title>Installation of GCC</title>
    2323
    24     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/gcc.xml"
    2626    xpointer="xpointer(//*[@os='d'])"/>
    2727
    28     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/gcc.xml"
    3030    xpointer="xpointer(//*[@os='e'])"/>
    3131
    32     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/gcc.xml"
    3434    xpointer="xpointer(//*[@os='f'])"/>
    3535
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3737    href="../common/gcc.xml"
    3838    xpointer="xpointer(//*[@os='g'])"/>
    3939
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     40    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4141    href="../common/gcc.xml"
    4242    xpointer="xpointer(//*[@os='h'])"/>
    … …  
    4949    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
    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/gcc.xml"
    5353    xpointer="xpointer(//*[@os='j'])"/>
    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/gcc.xml"
    5757    xpointer="xpointer(//*[@os='k'])"/>
    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/gcc.xml"
    6161    xpointer="xpointer(//*[@os='l'])"/>
    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/gcc.xml"
    6565    xpointer="xpointer(//*[@os='m'])"/>
    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/gcc.xml"
    6969    xpointer="xpointer(//*[@os='n'])"/>
    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/gcc.xml"
    7373    xpointer="xpointer(//*[@os='o'])"/>
    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="../common/gcc.xml"
    7777    xpointer="xpointer(//*[@os='p'])"/>
    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="../common/gcc.xml"
    8181    xpointer="xpointer(//*[@os='q'])"/>
    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="../common/gcc.xml"
    8585    xpointer="xpointer(//*[@os='r'])"/>
    8686
    87     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     87    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8888    href="../common/gcc.xml"
    8989    xpointer="xpointer(//*[@os='s'])"/>
    9090
    91     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     91    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9292    href="../common/gcc.xml"
    9393    xpointer="xpointer(//*[@os='t'])"/>
    9494
    95     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     95    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9696    href="../common/gcc.xml"
    9797    xpointer="xpointer(//*[@os='u'])"/>
    9898
    99     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     99    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    100100    href="../common/gcc.xml"
    101101    xpointer="xpointer(//*[@os='v'])"/>
    102102
    103     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     103    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    104104    href="../common/gcc.xml"
    105105    xpointer="xpointer(//*[@os='w'])"/>
    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/gcc.xml"
    109109    xpointer="xpointer(//*[@os='x'])"/>
    … …  
    111111  </sect2>
    112112
    113   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     113  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    114114  href="../common/gcc.xml"
    115115  xpointer="xpointer(id('contents-gcc'))"/>
Note: See TracChangeset for help on using the changeset viewer.