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 edited

Legend:

Unmodified
Added
Removed

  • BOOK/prologue/common/hostreqs.xml

    r88ef769 r03e6a40  
    6363    <listitem>
    6464      <para><emphasis role="strong">Glibc-2.2.5</emphasis> (Versions
    65       greater than &eglibc-version; are not recommended as they have
     65      greater than &glibc-version; are not recommended as they have
    6666      not been tested)</para>
    6767    </listitem>
    … …  
    104104
    105105    <listitem>
    106       <para><emphasis role="strong">XZ-Utils-4.999.8beta</emphasis></para>
     106      <para><emphasis role="strong">XZ Utils-4.999.8beta</emphasis></para>
    107107    </listitem>
    108108
Note: See TracChangeset for help on using the changeset viewer.