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/mips64/glibc-64bit.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc" role="wrap">
     8<sect1 id="ch-system-glibc" role="wrap">
    99  <?dbhtml filename="glibc-64bit.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version; 64-Bit</title>
     11  <title>GLIBC-&glibc-version; 64-Bit</title>
    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="eglibc.xml"
     18  href="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='l3'])"/>
    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="../multilib/eglibc-64bit.xml"
     37    href="../multilib/glibc-64bit.xml"
    3838    xpointer="xpointer(//*[@os='l4'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="eglibc.xml"
     41    href="glibc.xml"
    4242    xpointer="xpointer(//*[@os='b'])"/>
    4343
    44     <para os="m3">The following will cause EGLIBC to use an absolute path to the
     44    <para os="m3">The following will cause GLIBC to use an absolute path to the
    4545    ldd-rewrite-script instead of a relative path:</para>
    4646
    … …  
    4949
    5050    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    51     href="../common/eglibc.xml"
     51    href="../common/glibc.xml"
    5252    xpointer="xpointer(//*[@os='s1'])"/>
    5353
    5454    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    55     href="../common/eglibc.xml"
     55    href="../common/glibc.xml"
    5656    xpointer="xpointer(//*[@os='s2'])"/>
    5757
    5858    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    59     href="eglibc.xml"
     59    href="glibc.xml"
    6060    xpointer="xpointer(//*[@os='e'])"/>
    6161
    6262    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    63     href="eglibc.xml"
     63    href="glibc.xml"
    6464    xpointer="xpointer(//*[@os='f'])"/>
    6565
    6666    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    67     href="../multilib/eglibc-64bit.xml"
     67    href="../multilib/glibc-64bit.xml"
    6868    xpointer="xpointer(//*[@os='m1'])"/>
    6969
    7070    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    71     href="../multilib/eglibc-64bit.xml"
     71    href="../multilib/glibc-64bit.xml"
    7272    xpointer="xpointer(//*[@os='m2'])"/>
    7373
    7474    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    75     href="eglibc.xml"
     75    href="glibc.xml"
    7676    xpointer="xpointer(//*[@os='g'])"/>
    7777
    7878    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    79     href="../multilib/eglibc-64bit.xml"
     79    href="../multilib/glibc-64bit.xml"
    8080    xpointer="xpointer(//*[@os='h'])"/>
    8181
    8282    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    83     href="../multilib/eglibc-64bit.xml"
     83    href="../multilib/glibc-64bit.xml"
    8484    xpointer="xpointer(//*[@os='i'])"/>
    8585
    8686    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    87     href="eglibc.xml"
     87    href="glibc.xml"
    8888    xpointer="xpointer(//*[@os='j'])"/>
    8989
    9090    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    91     href="eglibc.xml"
     91    href="glibc.xml"
    9292    xpointer="xpointer(//*[@os='k'])"/>
    9393
    9494    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    95     href="eglibc.xml"
     95    href="glibc.xml"
    9696    xpointer="xpointer(//*[@os='l'])"/>
    9797
    9898    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    99     href="eglibc.xml"
     99    href="glibc.xml"
    100100    xpointer="xpointer(//*[@os='m'])"/>
    101101
    102102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    103     href="../multilib/eglibc-64bit.xml"
     103    href="../multilib/glibc-64bit.xml"
    104104    xpointer="xpointer(//*[@os='n'])"/>
    105105
    106106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    107     href="../multilib/eglibc-64bit.xml"
     107    href="../multilib/glibc-64bit.xml"
    108108    xpointer="xpointer(//*[@os='o'])"/>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111     href="../multilib/eglibc-64bit.xml"
     111    href="../multilib/glibc-64bit.xml"
    112112    xpointer="xpointer(//*[@os='p'])"/>
    113113
    114114    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115     href="eglibc.xml"
     115    href="glibc.xml"
    116116    xpointer="xpointer(//*[@os='s'])"/>
    117117
    118118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119     href="eglibc.xml"
     119    href="glibc.xml"
    120120    xpointer="xpointer(//*[@os='t'])"/>
     121
     122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     123    href="../common/glibc.xml"
     124    xpointer="xpointer(//*[@os='u'])"/>
     125
     126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     127    href="../common/glibc.xml"
     128    xpointer="xpointer(//*[@os='v'])"/>
     129
     130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     131    href="../common/glibc.xml"
     132    xpointer="xpointer(//*[@os='w'])"/>
     133
     134    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     135    href="../common/glibc.xml"
     136    xpointer="xpointer(//*[@os='x'])"/>
    121137
    122138  </sect2>
    123139
    124140  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    125   href="../common/eglibc.xml"
    126   xpointer="xpointer(id('i18n-eglibc'))"/>
     141  href="../common/glibc.xml"
     142  xpointer="xpointer(id('i18n-glibc'))"/>
    127143
    128144  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    129   href="../common/eglibc.xml"
    130   xpointer="xpointer(id('conf-eglibc'))"/>
     145  href="../common/glibc.xml"
     146  xpointer="xpointer(id('conf-glibc'))"/>
    131147
    132148  <sect2 id="conf-ld" role="configuration">
    … …  
    177193
    178194  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    179   href="../common/eglibc.xml"
    180   xpointer="xpointer(id('contents-eglibc'))"/>
     195  href="../common/glibc.xml"
     196  xpointer="xpointer(id('contents-glibc'))"/>
    181197
    182198</sect1>
Note: See TracChangeset for help on using the changeset viewer.