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/eglibc.xml

    r957d7a0 r4317f44  
    1616  </indexterm>
    1717
    18   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1919  href="../common/eglibc.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323    <title>Installation of Glibc</title>
    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/eglibc.xml"
    2727    xpointer="xpointer(//*[@os='z'])"/>
    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/eglibc.xml"
    3131    xpointer="xpointer(//*[@os='l3'])"/>
    3232
    33     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3434    href="../common/eglibc.xml"
    3535    xpointer="xpointer(//*[@os='l4'])"/>
    3636
    37     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3838    href="../common/eglibc.xml"
    3939    xpointer="xpointer(//*[@os='b'])"/>
    4040
    41     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4242    href="../mips/eglibc.xml"
    4343    xpointer="xpointer(//*[@os='g1'])"/>
    4444
    45     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4646    href="../mips/eglibc.xml"
    4747    xpointer="xpointer(//*[@os='g2'])"/>
    4848
    49     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5050    href="../common/eglibc.xml"
    5151    xpointer="xpointer(//*[@os='e'])"/>
    5252
    53     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5454    href="../common/eglibc.xml"
    5555    xpointer="xpointer(//*[@os='f'])"/>
    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'])"/>
    6060
    61     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     61    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262    href="../multilib/eglibc.xml"
    6363    xpointer="xpointer(//*[@os='h'])"/>
    6464
    65     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     65    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666    href="../common/eglibc.xml"
    6767    xpointer="xpointer(//*[@os='i'])"/>
    6868
    69     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     69    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7070    href="../common/eglibc.xml"
    7171    xpointer="xpointer(//*[@os='j'])"/>
    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="../common/eglibc.xml"
    7575    xpointer="xpointer(//*[@os='k'])"/>
    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='l'])"/>
    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="../multilib/eglibc.xml"
    8383    xpointer="xpointer(//*[@os='l1'])"/>
    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="../multilib/eglibc.xml"
    8787    xpointer="xpointer(//*[@os='l2'])"/>
    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="../common/eglibc.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="../common/eglibc.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="../common/eglibc.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'])"/>
Note: See TracChangeset for help on using the changeset viewer.