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/final-system/common/perl.xml

    r88ef769 r03e6a40  
    3737    <note os="a00">
    3838      <para>If you are following the boot method you will need to enable the
    39       loopback device as well as set a hostname for some of the tests:</para>
    40 
    41   <screen os="a01"><userinput remap="test">ip link set lo up
    42 hostname clfs</userinput></screen>
     39      loopback device:</para>
     40
     41<screen><userinput remap="test">ip link set lo up</userinput></screen>
    4342    </note>
    4443
    45     <para os="a02">Before starting to configure, create a basic
     44    <para os="a01">Before starting to configure, create a basic
    4645    <filename>/etc/hosts</filename> file which will be referenced by one
    4746    of Perl's configuration files as well as used by the testsuite:</para>
    4847
    49 <screen os="a03"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
     48<screen os="a02"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
    5049
    5150    <para os="a">To have full control over the way Perl is set up, you can
     
    6766        <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
    6867        <listitem>
    69           <para>This corrects an error in the way that <command>perldoc</command>
    70           invokes the <command>less</command> program.</para>
     68          <para>This ensures that <command>perldoc</command> invokes the
     69          <command>less</command> program rather than <command>more</command>,
     70          as Less has not yet been installed.</para>
    7171        </listitem>
    7272      </varlistentry>
Note: See TracChangeset for help on using the changeset viewer.