Ignore:
Timestamp:
Feb 23, 2011, 12:53:14 AM (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/x86_64/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 EGLIBC</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="../common/eglibc.xml"
    4343    xpointer="xpointer(//*[@os='e'])"/>
    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="../common/eglibc.xml"
    4747    xpointer="xpointer(//*[@os='f'])"/>
    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='g'])"/>
    … …  
    5757    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
    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/eglibc.xml"
    6161    xpointer="xpointer(//*[@os='i'])"/>
    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/eglibc.xml"
    6565    xpointer="xpointer(//*[@os='j'])"/>
    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/eglibc.xml"
    6969    xpointer="xpointer(//*[@os='k'])"/>
    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='l'])"/>
    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="../multilib/eglibc.xml"
    7777    xpointer="xpointer(//*[@os='l1'])"/>
    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="../multilib/eglibc.xml"
    8181    xpointer="xpointer(//*[@os='l2'])"/>
    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="../common/eglibc.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="../common/eglibc.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="../common/eglibc.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='q'])"/>
    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='r'])"/>
    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/eglibc.xml"
    109109    xpointer="xpointer(//*[@os='s'])"/>
    110110
    111     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     111    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    112112    href="../common/eglibc.xml"
    113113    xpointer="xpointer(//*[@os='t'])"/>
Note: See TracChangeset for help on using the changeset viewer.