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/multilib/man.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/man.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2222    <title>Installation of Man</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/man.xml"
    2626    xpointer="xpointer(//*[@os='p1'])"/>
    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/man.xml"
    3030    xpointer="xpointer(//*[@os='p2'])"/>
    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/man.xml"
    3434    xpointer="xpointer(//*[@os='a'])"/>
    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/man.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/man.xml"
    4242    xpointer="xpointer(//*[@os='c'])"/>
    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/man.xml"
    4646    xpointer="xpointer(//*[@os='d'])"/>
    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="../common/man.xml"
    5050    xpointer="xpointer(//*[@os='e'])"/>
    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="../common/man.xml"
    5454    xpointer="xpointer(//*[@os='h'])"/>
    … …  
    5656<screen os="i"><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
    5757
    58     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     58    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5959    href="../common/man.xml"
    6060    xpointer="xpointer(//*[@os='j'])"/>
    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="../common/man.xml"
    6464    xpointer="xpointer(//*[@os='k'])"/>
    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="../common/man.xml"
    6868    xpointer="xpointer(//*[@os='l'])"/>
    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="../common/man.xml"
    7272    xpointer="xpointer(//*[@os='m'])"/>
    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="../common/man.xml"
    7676    xpointer="xpointer(//*[@os='n'])"/>
    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="../common/man.xml"
    8080    xpointer="xpointer(//*[@os='o'])"/>
    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="../common/man.xml"
    8484    xpointer="xpointer(//*[@os='p'])"/>
    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="../common/man.xml"
    8888    xpointer="xpointer(//*[@os='q'])"/>
    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/man.xml"
    9292    xpointer="xpointer(//*[@os='r'])"/>
    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="../common/man.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="../common/man.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/man.xml"
    106106  xpointer="xpointer(id('contents-man'))"/>
Note: See TracChangeset for help on using the changeset viewer.