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/cross-tools/ppc64/glibc.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-cross-tools-eglibc" role="wrap">
    9   <?dbhtml filename="eglibc.html"?>
     8<sect1 id="ch-cross-tools-glibc" role="wrap">
     9  <?dbhtml filename="glibc.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version; 32 Bit</title>
     11  <title>GLIBC-&glibc-version; 32 Bit</title>
    1212
    13   <indexterm zone="ch-cross-tools-eglibc">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-cross-tools-glibc">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515    <secondary>cross tools, 32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/eglibc.xml"
     19  href="../../final-system/common/glibc.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of EGLIBC</title>
     23    <title>Installation of GLIBC</title>
    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='da'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/eglibc.xml"
     30    href="../../final-system/common/glibc.xml"
    3131    xpointer="xpointer(//*[@os='s1'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../../final-system/common/eglibc.xml"
     34    href="../../final-system/common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='s2'])"/>
    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='e'])"/>
    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='f'])"/>
    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='dd'])"/>
    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='de'])"/>
    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='g'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../multilib/eglibc.xml"
     58    href="../multilib/glibc.xml"
    5959    xpointer="xpointer(//*[@os='df'])"/>
    6060
    … …  
    6363
    6464      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65       href="../common/eglibc.xml"
     65      href="../common/glibc.xml"
    6666      xpointer="xpointer(//*[@os='dg3'])"/>
    6767   
    6868      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    69       href="../common/eglibc.xml"
     69      href="../common/glibc.xml"
    7070      xpointer="xpointer(//*[@os='dg4'])"/>
    7171
    7272      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    73       href="../common/eglibc.xml"
     73      href="../common/glibc.xml"
    7474      xpointer="xpointer(//*[@os='dg5'])"/>
    7575
    7676      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    77       href="../common/eglibc.xml"
     77      href="../common/glibc.xml"
    7878      xpointer="xpointer(//*[@os='dg6'])"/>
    7979
    8080      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    81       href="../common/eglibc.xml"
     81      href="../common/glibc.xml"
    8282      xpointer="xpointer(//*[@os='dg7'])"/>
    8383
    8484      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    85       href="../common/eglibc.xml"
     85      href="../common/glibc.xml"
    8686      xpointer="xpointer(//*[@os='dg8'])"/>
    8787
    8888      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    89       href="../common/eglibc.xml"
     89      href="../common/glibc.xml"
    9090      xpointer="xpointer(//*[@os='dg9'])"/>
    9191
    9292      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    93       href="../common/eglibc.xml"
     93      href="../common/glibc.xml"
    9494      xpointer="xpointer(//*[@os='dg10'])"/>
    9595
    9696      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    97       href="../common/eglibc.xml"
     97      href="../common/glibc.xml"
    9898      xpointer="xpointer(//*[@os='dg11'])"/>
     99
     100      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     101      href="../common/glibc.xml"
     102      xpointer="xpointer(//*[@os='dg12'])"/>
    99103
    100104    </variablelist>
    101105
    102106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    103     href="../common/eglibc.xml"
     107    href="../common/glibc.xml"
    104108    xpointer="xpointer(//*[@os='dh'])"/>
    105109
    106110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    107     href="../common/eglibc.xml"
     111    href="../common/glibc.xml"
    108112    xpointer="xpointer(//*[@os='di'])"/>
    109113
    110114    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111     href="../common/eglibc.xml"
     115    href="../common/glibc.xml"
    112116    xpointer="xpointer(//*[@os='dj'])"/>
    113117
    114118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115     href="../common/eglibc.xml"
     119    href="../common/glibc.xml"
    116120    xpointer="xpointer(//*[@os='dk'])"/>
    117121
    118122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119     href="../common/eglibc.xml"
     123    href="../common/glibc.xml"
    120124    xpointer="xpointer(//*[@os='dl'])"/>
    121125
    122126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123     href="../common/eglibc.xml"
     127    href="../common/glibc.xml"
    124128    xpointer="xpointer(//*[@os='dm'])"/>
    125129
    126130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    127     href="../common/eglibc.xml"
     131    href="../common/glibc.xml"
    128132    xpointer="xpointer(//*[@os='dn'])"/>
    129133
    … …  
    134138
    135139    <para>Details on this package are located in <xref
    136     linkend="contents-eglibc" role="."/></para>
     140    linkend="contents-glibc" role="."/></para>
    137141
    138142  </sect2>
Note: See TracChangeset for help on using the changeset viewer.