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 edited

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/how.xml

    r88ef769 r03e6a40  
    7777  alternative booting methods in <xref linkend="ch-boot-whatnext"/></para>
    7878
    79   <para>To finish the installation, the CLFS-Bootscripts are set up in <xref
    80   linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
     79  <para>To finish the installation, several configuration files are created in
     80  <xref linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
    8181  up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
    8282  contains information on furthering the CLFS experience beyond this book.
Note: See TracChangeset for help on using the changeset viewer.