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-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="../common/eglibc.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
    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="../common/eglibc.xml"
    4646    xpointer="xpointer(//*[@os='f'])"/>
    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="../sparc64/eglibc-64bit.xml"
    5050    xpointer="xpointer(//*[@os='t1'])"/>
    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="../sparc64/eglibc-64bit.xml"
    5454    xpointer="xpointer(//*[@os='t2'])"/>
    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="../x86_64-64/eglibc.xml"
    5858    xpointer="xpointer(//*[@os='l1'])"/>
    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="../x86_64-64/eglibc.xml"
    6262    xpointer="xpointer(//*[@os='l2'])"/>
    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="../common/eglibc.xml"
    6666    xpointer="xpointer(//*[@os='g'])"/>
    … …  
    7171    --cache-file=config.cache</userinput></screen>
    7272
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     73    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7474    href="../x86_64-64/eglibc.xml"
    7575    xpointer="xpointer(//*[@os='i'])"/>
    7676
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     77    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7878    href="../common/eglibc.xml"
    7979    xpointer="xpointer(//*[@os='j'])"/>
    8080
    81     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     81    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8282    href="../common/eglibc.xml"
    8383    xpointer="xpointer(//*[@os='k'])"/>
    8484
    85     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     85    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8686    href="../common/eglibc.xml"
    8787    xpointer="xpointer(//*[@os='l'])"/>
    8888
    89     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     89    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9090    href="../common/eglibc.xml"
    9191    xpointer="xpointer(//*[@os='m'])"/>
    9292
    93     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     93    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9494    href="../multilib/eglibc-64bit.xml"
    9595    xpointer="xpointer(//*[@os='n'])"/>
    9696
    97     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     97    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9898    href="../multilib/eglibc-64bit.xml"
    9999    xpointer="xpointer(//*[@os='o'])"/>
    100100
    101     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     101    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    102102    href="../multilib/eglibc-64bit.xml"
    103103    xpointer="xpointer(//*[@os='p'])"/>
    104104
    105     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     105    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    106106    href="../common/eglibc.xml"
    107107    xpointer="xpointer(//*[@os='q'])"/>
    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(//*[@os='r'])"/>
    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(//*[@os='s'])"/>
    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="../common/eglibc.xml"
    119119    xpointer="xpointer(//*[@os='t'])"/>
    … …  
    127127  </sect2>
    128128
    129   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     129  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    130130  href="../common/eglibc.xml"
    131131  xpointer="xpointer(id('i18n-eglibc'))"/>
    132132
    133   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     133  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    134134  href="../common/eglibc.xml"
    135135  xpointer="xpointer(id('conf-eglibc'))"/>
    136136
    137   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     137  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    138138  href="../common/eglibc.xml"
    139139  xpointer="xpointer(id('conf-ld'))"/>
    140140
    141   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     141  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    142142  href="../common/eglibc.xml"
    143143  xpointer="xpointer(id('contents-eglibc'))"/>
Note: See TracChangeset for help on using the changeset viewer.