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-64/eglibc.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='z'])"/>
    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/eglibc.xml"
    3030    xpointer="xpointer(//*[@os='l3'])"/>
    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='l4'])"/>
    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='b'])"/>
    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="../mips/eglibc.xml"
    4242    xpointer="xpointer(//*[@os='g1'])"/>
    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="../mips/eglibc.xml"
    4646    xpointer="xpointer(//*[@os='g2'])"/>
    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="../mips64/eglibc-64bit.xml"
    5050    xpointer="xpointer(//*[@os='m3'])"/>
    5151
    52     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     52    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5353    href="../mips64/eglibc-64bit.xml"
    5454    xpointer="xpointer(//*[@os='m4'])"/>
    5555
    56     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     56    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5757    href="../common/eglibc.xml"
    5858    xpointer="xpointer(//*[@os='e'])"/>
    5959
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     60    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6161    href="../common/eglibc.xml"
    6262    xpointer="xpointer(//*[@os='f'])"/>
    6363
    64     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     64    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6565    href="../x86_64-64/eglibc.xml"
    6666    xpointer="xpointer(//*[@os='l1'])"/>
    6767
    68     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     68    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6969    href="../x86_64-64/eglibc.xml"
    7070    xpointer="xpointer(//*[@os='l2'])"/>
    … …  
    7676       ports/sysdeps/mips/preconfigure</userinput></screen>
    7777
    78     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     78    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7979    href="../common/eglibc.xml"
    8080    xpointer="xpointer(//*[@os='g'])"/>
    8181
    82     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     82    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8383    href="../x86_64-64/eglibc.xml"
    8484    xpointer="xpointer(//*[@os='h'])"/>
    8585
    86     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     86    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8787    href="../x86_64-64/eglibc.xml"
    8888    xpointer="xpointer(//*[@os='i'])"/>
    8989
    90     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     90    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9191    href="../common/eglibc.xml"
    9292    xpointer="xpointer(//*[@os='j'])"/>
    9393
    94     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     94    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9595    href="../common/eglibc.xml"
    9696    xpointer="xpointer(//*[@os='k'])"/>
    9797
    98     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     98    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9999    href="../common/eglibc.xml"
    100100    xpointer="xpointer(//*[@os='l'])"/>
    101101
    102     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    103103    href="../common/eglibc.xml"
    104104    xpointer="xpointer(//*[@os='m'])"/>
    105105
    106     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    107107    href="../multilib/eglibc-64bit.xml"
    108108    xpointer="xpointer(//*[@os='n'])"/>
    109109
    110     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111111    href="../multilib/eglibc-64bit.xml"
    112112    xpointer="xpointer(//*[@os='o'])"/>
    113113
    114     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     114    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115115    href="../multilib/eglibc-64bit.xml"
    116116    xpointer="xpointer(//*[@os='p'])"/>
    117117
    118     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119119    href="../common/eglibc.xml"
    120120    xpointer="xpointer(//*[@os='q'])"/>
    121121
    122     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123123    href="../common/eglibc.xml"
    124124    xpointer="xpointer(//*[@os='r'])"/>
    125125
    126     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    127127    href="../common/eglibc.xml"
    128128    xpointer="xpointer(//*[@os='s'])"/>
    129129
    130     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    131131    href="../common/eglibc.xml"
    132132    xpointer="xpointer(//*[@os='t'])"/>
    … …  
    134134  </sect2>
    135135
    136   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     136  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    137137  href="../common/eglibc.xml"
    138138  xpointer="xpointer(id('i18n-eglibc'))"/>
    139139
    140   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     140  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    141141  href="../common/eglibc.xml"
    142142  xpointer="xpointer(id('conf-eglibc'))"/>
    143143
    144   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     144  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    145145  href="../mips/eglibc.xml"
    146146  xpointer="xpointer(id('conf-ld'))"/>
    147147
    148   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     148  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    149149  href="../common/eglibc.xml"
    150150  xpointer="xpointer(id('contents-eglibc'))"/>
Note: See TracChangeset for help on using the changeset viewer.