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-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="eglibc.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2222    <title>Installation of Glibc</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="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="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="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'])"/>
    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="eglibc.xml"
    5454    xpointer="xpointer(//*[@os='g'])"/>
    … …  
    6060    --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64</userinput></screen>
    6161
    62     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     62    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6363    href="../multilib/eglibc-64bit.xml"
    6464    xpointer="xpointer(//*[@os='i'])"/>
    6565
    66     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     66    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6767    href="eglibc.xml"
    6868    xpointer="xpointer(//*[@os='j'])"/>
    6969
    70     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     70    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7171    href="eglibc.xml"
    7272    xpointer="xpointer(//*[@os='k'])"/>
    7373
    74     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     74    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7575    href="eglibc.xml"
    7676    xpointer="xpointer(//*[@os='l'])"/>
    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="eglibc.xml"
    8080    xpointer="xpointer(//*[@os='m'])"/>
    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="eglibc.xml"
    8484    xpointer="xpointer(//*[@os='n'])"/>
    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="eglibc.xml"
    8888    xpointer="xpointer(//*[@os='o'])"/>
    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='p'])"/>
    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="eglibc.xml"
    9696    xpointer="xpointer(//*[@os='s'])"/>
    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="eglibc.xml"
    100100    xpointer="xpointer(//*[@os='t'])"/>
    … …  
    102102  </sect2>
    103103
    104   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     104  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    105105  href="../common/eglibc.xml"
    106106  xpointer="xpointer(id('i18n-eglibc'))"/>
    107107
    108   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     108  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109109  href="../common/eglibc.xml"
    110110  xpointer="xpointer(id('conf-eglibc'))"/>
    … …  
    136136    so add those directories to the dynamic loader's search path.</para>
    137137
    138     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     138    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    139139    href="../multilib/eglibc-64bit.xml"
    140140    xpointer="xpointer(//*[@os='ld-b'])"/>
    141141
    142     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    143143    href="../multilib/eglibc-64bit.xml"
    144144    xpointer="xpointer(//*[@os='ld-c'])"/>
    … …  
    146146  </sect2>
    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.