Browse Source

Minor textual tweaks.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3219 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Alex Gronenwoud 21 years ago
parent
commit
4248b0ec14

+ 1 - 0
appendixa/file-down.xml

@@ -1,4 +1,5 @@
 <literallayout>Official download location for File (&file-version;): 
 <literallayout>Official download location for File (&file-version;): 
 <ulink url="ftp://ftp.astron.com/pub/file/"/>
 <ulink url="ftp://ftp.astron.com/pub/file/"/>
+
 Alternative download location:
 Alternative download location:
 <ulink url="ftp://gaosu.rave.org/pub/linux/lfs/"/></literallayout>
 <ulink url="ftp://gaosu.rave.org/pub/linux/lfs/"/></literallayout>

+ 1 - 0
appendixa/glibc-down.xml

@@ -1,5 +1,6 @@
 <literallayout>Official download location for Glibc (&glibc-version;): 
 <literallayout>Official download location for Glibc (&glibc-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
+
 Alternative download locations (courtesy of the generous LFS Mirrors):
 Alternative download locations (courtesy of the generous LFS Mirrors):
 <ulink url="ftp://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/&glibc-package;"/>
 <ulink url="ftp://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/&glibc-package;"/>
 <ulink url="http://lfs.mirror.intermedia.com.sg/packages/glibc/&glibc-package;"/>
 <ulink url="http://lfs.mirror.intermedia.com.sg/packages/glibc/&glibc-package;"/>

+ 1 - 2
appendixa/tcl-down.xml

@@ -1,3 +1,2 @@
 <literallayout>Official download location for Tcl (&tcl-version;):
 <literallayout>Official download location for Tcl (&tcl-version;):
-<ulink url="http://download.sourceforge.net/tcl/"/>
-<ulink url="ftp://download.sourceforge.net/pub/sourceforge/tcl/"/></literallayout>
+<ulink url="http://download.sourceforge.net/tcl/"/></literallayout>

+ 1 - 1
chapter03/chapter03.xml

@@ -75,7 +75,7 @@ file system, but build instructions for other file systems can be found at
 
 
 <para>If you created a (new) swap partition you need to initialize it as a
 <para>If you created a (new) swap partition you need to initialize it as a
 swap partition too (also known as formatting, like you did above with
 swap partition too (also known as formatting, like you did above with
-<userinput>mke2fs</userinput>) by running:</para>
+<command>mke2fs</command>) by running:</para>
 
 
 <screen><userinput>mkswap /dev/yyy</userinput></screen>
 <screen><userinput>mkswap /dev/yyy</userinput></screen>
 
 

+ 1 - 1
chapter06/coreutils.xml

@@ -16,7 +16,7 @@ basic system characteristics.</para>
 <sect2>
 <sect2>
 <title>Installation of Coreutils</title>
 <title>Installation of Coreutils</title>
 
 
-<para>Apply the same "Posixver" patch we used previously:</para>
+<para>Apply the same Posixver patch we used previously:</para>
 
 
 <screen><userinput>patch -Np1 -i ../&coreutils-posixver-patch;</userinput></screen>
 <screen><userinput>patch -Np1 -i ../&coreutils-posixver-patch;</userinput></screen>
 
 

+ 5 - 5
chapter06/ed.xml

@@ -20,12 +20,12 @@ because it can be used by the patch program if you encounter an ed-based patch
 file. This happens rarely because diff-based patches are preferred these
 file. This happens rarely because diff-based patches are preferred these
 days.</para></note>
 days.</para></note>
 
 
-<para>Ed normally uses the mktemp function to create temporary files in
-<filename class="directory">/tmp</filename>, but this function contains a
-vulnerability (see the section on Temporary Files in <ulink
+<para>Ed normally uses the <emphasis>mktemp</emphasis> function to create
+temporary files in <filename class="directory">/tmp</filename>, but this
+function contains a vulnerability (see the section on Temporary Files in <ulink
 url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). The
 url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). The
-following patch makes Ed use mkstemp instead, which is the recommended way to
-create temporary files.</para>
+following patch makes Ed use <emphasis>mkstemp</emphasis> instead, which is
+the recommended way to create temporary files.</para>
 
 
 <para>Apply the patch:</para>
 <para>Apply the patch:</para>
 
 

+ 5 - 4
chapter06/flex.xml

@@ -34,15 +34,16 @@ following command will do so:</para>
 
 
 <screen><userinput>make install</userinput></screen>
 <screen><userinput>make install</userinput></screen>
 
 
-<para>There are some packages that expect to find the Lex library in
-<filename>/usr/lib</filename>. Create a symlink to account for this:</para>
+<para>There are some packages that expect to find the <emphasis>lex</emphasis>
+library in <filename>/usr/lib</filename>. Create a symlink to account for
+this:</para>
 
 
 <screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
 <screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
 
 
 <para>A few programs don't know about <command>flex</command> yet and try
 <para>A few programs don't know about <command>flex</command> yet and try
 to run its predecessor <command>lex</command>. To support those programs,
 to run its predecessor <command>lex</command>. To support those programs,
-create a shell script named <filename>lex</filename> that calls
-<command>flex</command> in Lex emulation mode:</para>
+create a wrapper script named <filename>lex</filename> that calls
+<command>flex</command> in <emphasis>lex</emphasis> emulation mode:</para>
 
 
 <screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
 <screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 #!/bin/sh

+ 3 - 6
chapter06/gcc.xml

@@ -10,7 +10,7 @@ the C and C++ compilers.</para>
 
 
 <literallayout>Official download location for GCC (&gcc-version;): 
 <literallayout>Official download location for GCC (&gcc-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
-And for the GCC No-Fixincludes Patch:
+And for the patch:
 <ulink url="&patches-root;&gcc-nofixincludes-patch;"/></literallayout>
 <ulink url="&patches-root;&gcc-nofixincludes-patch;"/></literallayout>
 
 
 &aa-gcc-dep;
 &aa-gcc-dep;
@@ -32,11 +32,8 @@ GCC-testsuite package. The full GCC package contains even more
 compilers. Instructions for building these can be found at
 compilers. Instructions for building these can be found at
 <ulink url="&blfs-root;view/stable/general/gcc.html"/>.</para>
 <ulink url="&blfs-root;view/stable/general/gcc.html"/>.</para>
 
 
-<note><para>Be careful <emphasis role="strong">not</emphasis> to apply the GCC
-Specs patch from <xref linkend="chapter05"/> here.</para></note>
-
-<para>First apply the No-Fixincludes patch that we also used in the previous
-chapter:</para>
+<para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
+the Specs patch) also used in the previous chapter:</para>
 
 
 <screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;</userinput></screen>
 <screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;</userinput></screen>
 
 

+ 2 - 1
chapter06/inetutils.xml

@@ -61,7 +61,8 @@ replacements are available for many of these servers.</para></listitem>
 
 
 <screen><userinput>make install</userinput></screen>
 <screen><userinput>make install</userinput></screen>
 
 
-<para>And move the <command>ping</command> program to its proper place:</para>
+<para>And move the <command>ping</command> program to its FHS-compliant
+place:</para>
 
 
 <screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
 <screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
 
 

+ 5 - 7
chapter06/nettools.xml

@@ -25,19 +25,17 @@ to actually enable these protocols in the kernel -- what you do here is merely
 telling the package to include support for those protocols in its programs,
 telling the package to include support for those protocols in its programs,
 but it's up to the kernel to make the protocols available.</para>
 but it's up to the kernel to make the protocols available.</para>
 
 
-<para>First fix a small syntax problem in the sources of the mii-tool
-program:</para>
+<para>First fix a small syntax problem in the sources of the
+<command>mii-tool</command> program:</para>
 
 
 <screen><userinput>patch -Np1 -i ../&net-tools-mii-patch;</userinput></screen>
 <screen><userinput>patch -Np1 -i ../&net-tools-mii-patch;</userinput></screen>
 
 
-<para>Now prepare Net-tools for compilation with:</para>
+<para>Now prepare Net-tools for compilation (if you intend to accept the
+defaults, you can skip all the questions by running <userinput>yes "" |
+make config</userinput> instead):</para>
 
 
 <screen><userinput>make config</userinput></screen>
 <screen><userinput>make config</userinput></screen>
 
 
-<para>If you intend to accept the default settings, you may skip the
-questions generated by <command>make config</command> by running
-<userinput>yes "" | make config</userinput> instead.</para>
-
 <para>Compile the package:</para>
 <para>Compile the package:</para>
 
 
 <screen><userinput>make</userinput></screen>
 <screen><userinput>make</userinput></screen>

+ 4 - 7
chapter06/perl.xml

@@ -17,16 +17,13 @@
 <sect2>
 <sect2>
 <title>Installation of Perl</title>
 <title>Installation of Perl</title>
 
 
-<para>Prepare Perl for compilation:</para>
+<para>If you want full control over the way Perl is set up, you can run the
+interactive <command>Configure</command> script and hand-pick the way this
+package is built. If, however, you guess you can live with the (sensible)
+defaults it auto-detects, then prepare Perl for compilation with:</para>
 
 
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
 
 
-<para>If you want more control over the way Perl sets itself up to be
-built, you can run the interactive <command>Configure</command> script
-instead and modify the way Perl is built. If you think you can live with the
-(sensible) defaults Perl auto-detects, then just use the command listed
-above.</para>
-
 <para>The meaning of the configure option:</para>
 <para>The meaning of the configure option:</para>
 
 
 <itemizedlist>
 <itemizedlist>

+ 6 - 6
chapter06/zlib.xml

@@ -16,16 +16,16 @@ some programs.</para>
 <sect2>
 <sect2>
 <title>Installation of Zlib</title>
 <title>Installation of Zlib</title>
 
 
-<para>Prepare Zlib for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --shared</userinput></screen>
-
 <note><para>Zlib is known to build its shared library incorrectly if CFLAGS is
 <note><para>Zlib is known to build its shared library incorrectly if CFLAGS is
 specified in the environment. If you are using your own CFLAGS variable, be
 specified in the environment. If you are using your own CFLAGS variable, be
-sure to add the <emphasis role="strong">-fPIC</emphasis> directive to your
-CFLAGS for the duration of the above command, then remove it
+sure to add the <emphasis>-fPIC</emphasis> directive to your CFLAGS for the
+duration of the below <command>configure</command> command, then remove it
 afterwards.</para></note>
 afterwards.</para></note>
 
 
+<para>Prepare Zlib for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --shared</userinput></screen>
+
 <para>Compile the package:</para>
 <para>Compile the package:</para>
 
 
 <screen><userinput>make</userinput></screen>
 <screen><userinput>make</userinput></screen>