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/sparc64/eglibc-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/eglibc.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2222    <title>Installation of EGLIBC</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/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='l3'])"/>
    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="../multilib/eglibc-64bit.xml"
    3030    xpointer="xpointer(//*[@os='l4'])"/>
    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/eglibc.xml"
    3434    xpointer="xpointer(//*[@os='b'])"/>
    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/eglibc.xml"
    3838    xpointer="xpointer(//*[@os='e'])"/>
    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/eglibc.xml"
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     44    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    href="../multilib/eglibc-64bit.xml"
    4646    xpointer="xpointer(//*[@os='m1'])"/>
    4747
    48     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4949    href="../multilib/eglibc-64bit.xml"
    5050    xpointer="xpointer(//*[@os='m2'])"/>
    … …  
    5555<screen os="t2"><userinput>echo "libc_cv_sparc64_tls=yes" &gt;&gt; config.cache</userinput></screen>
    5656
    57     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     57    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5858    href="../common/eglibc.xml"
    5959    xpointer="xpointer(//*[@os='g'])"/>
    … …  
    6565    --cache-file=config.cache</userinput></screen>
    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="../multilib/eglibc-64bit.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="../common/eglibc.xml"
    7373    xpointer="xpointer(//*[@os='j'])"/>
    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/eglibc.xml"
    7777    xpointer="xpointer(//*[@os='k'])"/>
    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/eglibc.xml"
    8181    xpointer="xpointer(//*[@os='l'])"/>
    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/eglibc.xml"
    8585    xpointer="xpointer(//*[@os='m'])"/>
    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="../multilib/eglibc-64bit.xml"
    8989    xpointer="xpointer(//*[@os='n'])"/>
    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="../multilib/eglibc-64bit.xml"
    9393    xpointer="xpointer(//*[@os='o'])"/>
    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="../multilib/eglibc-64bit.xml"
    9797    xpointer="xpointer(//*[@os='p'])"/>
    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/eglibc.xml"
    101101    xpointer="xpointer(//*[@os='s'])"/>
    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/eglibc.xml"
    105105    xpointer="xpointer(//*[@os='t'])"/>
    … …  
    107107  </sect2>
    108108
    109   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     109  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    110110  href="../common/eglibc.xml"
    111111  xpointer="xpointer(id('i18n-eglibc'))"/>
    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/eglibc.xml"
    115115  xpointer="xpointer(id('conf-eglibc'))"/>
    116116
    117   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     117  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    118118  href="../multilib/eglibc-64bit.xml"
    119119  xpointer="xpointer(id('conf-ld'))"/>
    120120
    121   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     121  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    122122  href="../common/eglibc.xml"
    123123  xpointer="xpointer(id('contents-eglibc'))"/>
Note: See TracChangeset for help on using the changeset viewer.