Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (12 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/mips64/glibc.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc-32" role="wrap">
    9   <?dbhtml filename="eglibc.html"?>
     8<sect1 id="ch-system-glibc-32" role="wrap">
     9  <?dbhtml filename="glibc.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
     11  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
    1212
    13   <indexterm zone="ch-system-eglibc-32">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-system-glibc-32">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/eglibc.xml"
     19  href="../common/glibc.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    … …  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/eglibc.xml"
     26    href="../common/glibc.xml"
    2727    xpointer="xpointer(//*[@os='z'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/eglibc.xml"
     30    href="../common/glibc.xml"
    3131    xpointer="xpointer(//*[@os='l1'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/eglibc.xml"
     34    href="../common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='l2'])"/>
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/eglibc.xml"
     38    href="../common/glibc.xml"
    3939    xpointer="xpointer(//*[@os='l3'])"/>
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/eglibc.xml"
     42    href="../common/glibc.xml"
    4343    xpointer="xpointer(//*[@os='l4'])"/>
    4444
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/eglibc.xml"
     46    href="../common/glibc.xml"
    4747    xpointer="xpointer(//*[@os='b'])"/>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/eglibc.xml"
     50    href="../common/glibc.xml"
    5151    xpointer="xpointer(//*[@os='s1'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/eglibc.xml"
     54    href="../common/glibc.xml"
    5555    xpointer="xpointer(//*[@os='s2'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../common/eglibc.xml"
     58    href="../common/glibc.xml"
    5959    xpointer="xpointer(//*[@os='e'])"/>
    6060
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    62     href="../common/eglibc.xml"
     62    href="../common/glibc.xml"
    6363    xpointer="xpointer(//*[@os='f'])"/>
    6464
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    66     href="../common/eglibc.xml"
     66    href="../common/glibc.xml"
    6767    xpointer="xpointer(//*[@os='g'])"/>
    6868
    6969    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../multilib/eglibc.xml"
     70    href="../multilib/glibc.xml"
    7171    xpointer="xpointer(//*[@os='h'])"/>
    7272
    7373    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74     href="../common/eglibc.xml"
     74    href="../common/glibc.xml"
    7575    xpointer="xpointer(//*[@os='i'])"/>
    7676
    7777    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    78     href="../common/eglibc.xml"
     78    href="../common/glibc.xml"
    7979    xpointer="xpointer(//*[@os='j'])"/>
    8080
    8181    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    82     href="../common/eglibc.xml"
     82    href="../common/glibc.xml"
    8383    xpointer="xpointer(//*[@os='k'])"/>
    8484
    8585    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    86     href="../common/eglibc.xml"
     86    href="../common/glibc.xml"
    8787    xpointer="xpointer(//*[@os='l'])"/>
    8888
    8989    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    90     href="../multilib/eglibc.xml"
     90    href="../multilib/glibc.xml"
    9191    xpointer="xpointer(//*[@os='l1b'])"/>
    9292
    9393    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    94     href="../multilib/eglibc.xml"
     94    href="../multilib/glibc.xml"
    9595    xpointer="xpointer(//*[@os='l2b'])"/>
    9696
    9797    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    98     href="../common/eglibc.xml"
     98    href="../common/glibc.xml"
    9999    xpointer="xpointer(//*[@os='m'])"/>
    100100
    101101    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    102     href="../common/eglibc.xml"
     102    href="../common/glibc.xml"
    103103    xpointer="xpointer(//*[@os='n'])"/>
    104104
    105105    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    106     href="../common/eglibc.xml"
     106    href="../common/glibc.xml"
    107107    xpointer="xpointer(//*[@os='o'])"/>
    108108
    109109    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    110     href="../common/eglibc.xml"
     110    href="../common/glibc.xml"
    111111    xpointer="xpointer(//*[@os='p'])"/>
    112112
    113113    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    114     href="../common/eglibc.xml"
     114    href="../common/glibc.xml"
    115115    xpointer="xpointer(//*[@os='q'])"/>
    116116
    117117    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    118     href="../common/eglibc.xml"
     118    href="../common/glibc.xml"
    119119    xpointer="xpointer(//*[@os='r'])"/>
    120120
    121121    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    122     href="../common/eglibc.xml"
     122    href="../common/glibc.xml"
    123123    xpointer="xpointer(//*[@os='s'])"/>
    124124
    125125    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    126     href="../common/eglibc.xml"
     126    href="../common/glibc.xml"
    127127    xpointer="xpointer(//*[@os='t'])"/>
    128128
    … …  
    133133
    134134    <para>Details on this package are located in <xref
    135     linkend="contents-eglibc" role="."/></para>
     135    linkend="contents-glibc" role="."/></para>
    136136
    137137  </sect2>
Note: See TracChangeset for help on using the changeset viewer.