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/bootscripts/sparc-chapter.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
     8<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
    99  <?dbhtml dir="bootscripts"?>
    1010  <?dbhtml filename="chapter.html"?>
    1111
    12   <title>Setting Up System Bootscripts</title>
     12  <title>Setting Up the System</title>
    1313
    1414  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
    15   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
    1615  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
    17   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
     16  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/clock.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
    2019  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/symlinks.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/profile.xml"/>
Note: See TracChangeset for help on using the changeset viewer.