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/ppc64/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 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='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'])"/>
    … …  
    4747<screen os="m2"><userinput>echo "slibdir=/lib64" &gt;&gt; configparms</userinput></screen>
    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="eglibc.xml"
    5151    xpointer="xpointer(//*[@os='g'])"/>
    … …  
    7070    </variablelist>
    7171
    72     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     72    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7373    href="eglibc.xml"
    7474    xpointer="xpointer(//*[@os='j'])"/>
    7575
    76     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     76    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7777    href="eglibc.xml"
    7878    xpointer="xpointer(//*[@os='k'])"/>
    7979
    80     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     80    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8181    href="eglibc.xml"
    8282    xpointer="xpointer(//*[@os='l'])"/>
    8383
    84     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     84    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8585    href="eglibc.xml"
    8686    xpointer="xpointer(//*[@os='m'])"/>
    8787
    88     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     88    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8989    href="eglibc.xml"
    9090    xpointer="xpointer(//*[@os='n'])"/>
    9191
    92     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     92    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9393    href="eglibc.xml"
    9494    xpointer="xpointer(//*[@os='o'])"/>
    9595
    96     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     96    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9797    href="../common/eglibc.xml"
    9898    xpointer="xpointer(//*[@os='p'])"/>
    9999
    100     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     100    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    101101    href="eglibc.xml"
    102102    xpointer="xpointer(//*[@os='s'])"/>
    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="eglibc.xml"
    106106    xpointer="xpointer(//*[@os='t'])"/>
    … …  
    108108  </sect2>
    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="../common/eglibc.xml"
    112112  xpointer="xpointer(id('i18n-eglibc'))"/>
    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="../common/eglibc.xml"
    116116  xpointer="xpointer(id('conf-eglibc'))"/>
    … …  
    142142    so add those directories to the dynamic loader's search path.</para>
    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="../multilib/eglibc-64bit.xml"
    146146    xpointer="xpointer(//*[@os='ld-b'])"/>
    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="../multilib/eglibc-64bit.xml"
    150150    xpointer="xpointer(//*[@os='ld-c'])"/>
    … …  
    152152  </sect2>
    153153
    154   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     154  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    155155  href="../common/eglibc.xml"
    156156  xpointer="xpointer(id('contents-eglibc'))"/>
Note: See TracChangeset for help on using the changeset viewer.