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/sed.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/sed.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2222    <title>Installation of Sed</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/sed.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    … …  
    2929   --bindir=/bin</userinput></screen>
    3030
    31     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3232    href="../common/sed.xml"
    3333    xpointer="xpointer(//*[@os='c'])"/>
    3434
    35     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3636    href="../common/sed.xml"
    3737    xpointer="xpointer(//*[@os='d'])"/>
    3838
    39     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4040    href="../common/sed.xml"
    4141    xpointer="xpointer(//*[@os='e'])"/>
    4242
    43     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="../common/sed.xml"
    4545    xpointer="xpointer(//*[@os='f'])"/>
    4646
    47     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     47    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4848    href="../common/sed.xml"
    4949    xpointer="xpointer(//*[@os='g'])"/>
    5050
    51     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     51    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5252    href="../common/sed.xml"
    5353    xpointer="xpointer(//*[@os='h'])"/>
    5454
    55     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     55    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5656    href="../common/sed.xml"
    5757    xpointer="xpointer(//*[@os='i'])"/>
    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/sed.xml"
    6161    xpointer="xpointer(//*[@os='j'])"/>
    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/sed.xml"
    6565    xpointer="xpointer(//*[@os='k'])"/>
    … …  
    6767  </sect2>
    6868
    69   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     69  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7070  href="../common/sed.xml"
    7171  xpointer="xpointer(id('contents-sed'))"/>
Note: See TracChangeset for help on using the changeset viewer.