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/bootable/ppc/kernel.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="../x86/kernel.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2222    <title>Installation of the kernel</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="../x86/kernel.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    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="../x86/kernel.xml"
    3030    xpointer="xpointer(//*[@os='b'])"/>
    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="../x86/kernel.xml"
    3434    xpointer="xpointer(//*[@os='c'])"/>
    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="../x86/kernel.xml"
    3838    xpointer="xpointer(//*[@os='d'])"/>
    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="../x86/kernel.xml"
    4242    xpointer="xpointer(//*[@os='h'])"/>
    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="../x86/kernel.xml"
    4646    xpointer="xpointer(//*[@os='i'])"/>
    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="../x86/kernel.xml"
    5050    xpointer="xpointer(//*[@os='j'])"/>
    … …  
    5858    </warning>
    5959   
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     60    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6161    href="../x86/kernel.xml"
    6262    xpointer="xpointer(//*[@os='k'])"/>
    6363
    64     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     64    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6565    href="../x86/kernel.xml"
    6666    xpointer="xpointer(//*[@os='m'])"/>
    6767
    68     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     68    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6969    href="../x86/kernel.xml"
    7070    xpointer="xpointer(//*[@os='n'])"/>
    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="../x86/kernel.xml"
    7474    xpointer="xpointer(//*[@os='o'])"/>
    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="../x86/kernel.xml"
    7878    xpointer="xpointer(//*[@os='p'])"/>
    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="../x86/kernel.xml"
    8282    xpointer="xpointer(//*[@os='q'])"/>
    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="../x86/kernel.xml"
    8686    xpointer="xpointer(//*[@os='r'])"/>
    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="../x86/kernel.xml"
    9090    xpointer="xpointer(//*[@os='s'])"/>
    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="../x86/kernel.xml"
    9494    xpointer="xpointer(//*[@os='t'])"/>
    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="../x86/kernel.xml"
    9898    xpointer="xpointer(//*[@os='u'])"/>
    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="../x86/kernel.xml"
    102102    xpointer="xpointer(//*[@os='v'])"/>
    … …  
    104104<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
    105105
    106     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    107107    href="../x86/kernel.xml"
    108108    xpointer="xpointer(//*[@os='w'])"/>
    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="../x86/kernel.xml"
    112112    xpointer="xpointer(//*[@os='w1'])"/>
    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="../x86/kernel.xml"
    116116    xpointer="xpointer(//*[@os='x'])"/>
    117117
    118     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119119    href="../x86/kernel.xml"
    120120    xpointer="xpointer(//*[@os='x1'])"/>
    121121
    122     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123123    href="../x86/kernel.xml"
    124124    xpointer="xpointer(//*[@os='y'])"/>
    125125
    126     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    127127    href="../x86/kernel.xml"
    128128    xpointer="xpointer(//*[@os='y1'])"/>
    129129
    130     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    131131    href="../x86/kernel.xml"
    132132    xpointer="xpointer(//*[@os='z'])"/>
    … …  
    134134  </sect2>
    135135
    136   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     136  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    137137  href="../x86/kernel.xml"
    138138  xpointer="xpointer(id('contents-kernel'))"/>
Note: See TracChangeset for help on using the changeset viewer.