Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 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/mips/glibc.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc" role="wrap">
    9   <title>EGLIBC-&eglibc-version;</title>
     8<sect1 id="ch-system-glibc" role="wrap">
     9  <title>GLIBC-&glibc-version;</title>
    1010
    11   <?dbhtml filename="eglibc.html"?>
     11  <?dbhtml filename="glibc.html"?>
    1212
    13   <indexterm zone="ch-system-eglibc">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-system-glibc">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/eglibc.xml"
     18  href="../common/glibc.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of EGLIBC</title>
     22    <title>Installation of GLIBC</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/eglibc.xml"
     25    href="../common/glibc.xml"
    2626    xpointer="xpointer(//*[@os='z'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/eglibc.xml"
     29    href="../common/glibc.xml"
    3030    xpointer="xpointer(//*[@os='l1'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/eglibc.xml"
     33    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l2'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/eglibc.xml"
     37    href="../common/glibc.xml"
    3838    xpointer="xpointer(//*[@os='l3'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/eglibc.xml"
     41    href="../common/glibc.xml"
    4242    xpointer="xpointer(//*[@os='l4'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/eglibc.xml"
     45    href="../common/glibc.xml"
    4646    xpointer="xpointer(//*[@os='b'])"/>
    4747
    4848    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/eglibc.xml"
     49    href="../common/glibc.xml"
    5050    xpointer="xpointer(//*[@os='s1'])"/>
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../common/eglibc.xml"
     53    href="../common/glibc.xml"
    5454    xpointer="xpointer(//*[@os='s2'])"/>
    5555
    5656    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="../common/eglibc.xml"
     57    href="../common/glibc.xml"
    5858    xpointer="xpointer(//*[@os='e'])"/>
    5959
    6060    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    61     href="../common/eglibc.xml"
     61    href="../common/glibc.xml"
    6262    xpointer="xpointer(//*[@os='f'])"/>
    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='g'])"/>
    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='h'])"/>
    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='i'])"/>
    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='j'])"/>
    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='k'])"/>
    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='l'])"/>
    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='m'])"/>
    9191
    9292    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    93     href="../multilib/eglibc-64bit.xml"
     93    href="../multilib/glibc-64bit.xml"
    9494    xpointer="xpointer(//*[@os='n'])"/>
    9595
    9696    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    97     href="../multilib/eglibc-64bit.xml"
     97    href="../multilib/glibc-64bit.xml"
    9898    xpointer="xpointer(//*[@os='o'])"/>
    9999
    100100    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    101     href="../multilib/eglibc-64bit.xml"
     101    href="../multilib/glibc-64bit.xml"
    102102    xpointer="xpointer(//*[@os='p'])"/>
    103103
    104104    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    105     href="../common/eglibc.xml"
     105    href="../common/glibc.xml"
    106106    xpointer="xpointer(//*[@os='q'])"/>
    107107
    108108    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../common/eglibc.xml"
     109    href="../common/glibc.xml"
    110110    xpointer="xpointer(//*[@os='r'])"/>
    111111
    112112    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/eglibc.xml"
     113    href="../common/glibc.xml"
    114114    xpointer="xpointer(//*[@os='s'])"/>
    115115
    116116    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    117     href="../common/eglibc.xml"
     117    href="../common/glibc.xml"
    118118    xpointer="xpointer(//*[@os='t'])"/>
     119
     120    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     121    href="../common/glibc.xml"
     122    xpointer="xpointer(//*[@os='u'])"/>
     123
     124    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     125    href="../common/glibc.xml"
     126    xpointer="xpointer(//*[@os='v'])"/>
     127
     128    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     129    href="../common/glibc.xml"
     130    xpointer="xpointer(//*[@os='w'])"/>
     131
     132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     133    href="../common/glibc.xml"
     134    xpointer="xpointer(//*[@os='x'])"/>
    119135
    120136  </sect2>
    121137
    122138  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123   href="../common/eglibc.xml"
    124   xpointer="xpointer(id('i18n-eglibc'))"/>
     139  href="../common/glibc.xml"
     140  xpointer="xpointer(id('i18n-glibc'))"/>
    125141
    126142  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    127   href="../common/eglibc.xml"
    128   xpointer="xpointer(id('conf-eglibc'))"/>
     143  href="../common/glibc.xml"
     144  xpointer="xpointer(id('conf-glibc'))"/>
    129145
    130146  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    131   href="../common/eglibc.xml"
     147  href="../ppc/glibc.xml"
    132148  xpointer="xpointer(id('conf-ld'))"/>
    133149
    134150  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    135   href="../common/eglibc.xml"
    136   xpointer="xpointer(id('contents-eglibc'))"/>
     151  href="../common/glibc.xml"
     152  xpointer="xpointer(id('contents-glibc'))"/>
    137153
    138154</sect1>
Note: See TracChangeset for help on using the changeset viewer.