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/materials/common/introduction.xml

    r88ef769 r03e6a40  
    5555following MD5 or SHA1 checksum lists:</para>
    5656
    57   <para><ulink url="/files/packages/git/MD5SUMS">MD5SUMS</ulink>:</para>
     57  <para><ulink url="&packages-root;MD5SUMS">MD5SUMS</ulink>:</para>
    5858
    5959<screen><userinput>pushd ${CLFS}/sources
    … …  
    6161popd</userinput></screen>
    6262
    63   <para><ulink url="/files/packages/git/SHA1SUMS">SHA1SUMS</ulink>:</para>
     63  <para><ulink url="&packages-root;SHA1SUMS">SHA1SUMS</ulink>:</para>
    6464
    6565<screen><userinput>pushd ${CLFS}/sources
Note: See TracChangeset for help on using the changeset viewer.