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/cross-tools/common/file.xml

    r88ef769 r03e6a40  
    2828
    2929    <variablelist>
    30       <title>The meaning of the configure options:</title>
    31 
    32       <varlistentry>
    33         <term><parameter>--prefix=/cross-tools</parameter></term>
    34         <listitem>
    35           <para>This tells the configure script to prepare to install the
    36           package in the <filename class="directory">/cross-tools</filename>
    37           directory.</para>
    38         </listitem>
    39       </varlistentry>
     30      <title>The meaning of the new configure option:</title>
    4031
    4132      <varlistentry>
Note: See TracChangeset for help on using the changeset viewer.