Ignore:
Timestamp:
Feb 22, 2011, 4:53:14 PM (13 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/attr.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/attr.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323    <title>Installation of Attr</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/attr.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    … …  
    3131    --libexecdir=/usr/lib</userinput></screen>
    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/attr.xml"
    3535    xpointer="xpointer(//*[@os='c'])"/>
    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/attr.xml"
    3939    xpointer="xpointer(//*[@os='d'])"/>
    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/attr.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/attr.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/attr.xml"
    5151    xpointer="xpointer(//*[@os='g'])"/>
    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/attr.xml"
    5555    xpointer="xpointer(//*[@os='h'])"/>
    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/attr.xml"
    5959    xpointer="xpointer(//*[@os='i'])"/>
    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="../common/attr.xml"
    6363    xpointer="xpointer(//*[@os='j'])"/>
    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/attr.xml"
    6767    xpointer="xpointer(//*[@os='k'])"/>
Note: See TracChangeset for help on using the changeset viewer.