浏览代码

Adding more missing markup, and rewording a few paragraphs.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2710 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Alex Gronenwoud 22 年之前
父节点
当前提交
4114088e91

+ 3 - 3
chapter06/coreutils-inst.xml

@@ -3,9 +3,9 @@
 <sect2>
 <sect2>
 <title>Installation of Coreutils</title>
 <title>Installation of Coreutils</title>
 
 
-<para>Normally the functionality of uname is somewhat broken, in that
-the -p switch always returns "unknown". This patch fixes that behaviour
-for Intel architectures:</para>
+<para>Normally the functionality of <userinput>uname</userinput> is somewhat
+broken, in that the <userinput>-p</userinput> switch always returns "unknown".
+The following patch fixes this behaviour for Intel architectures:</para>
 
 
 <para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch</userinput></screen></para>
 <para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch</userinput></screen></para>
 
 

+ 6 - 7
chapter06/flex-inst.xml

@@ -19,16 +19,15 @@
 
 
 <para><screen><userinput>make install</userinput></screen></para>
 <para><screen><userinput>make install</userinput></screen></para>
 
 
-<para>There are packages which expect to find the lex library
-in the <filename>/usr/lib</filename> directory. Create a symlink
-to account for this:</para>
+<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><screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen></para>
 <para><screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen></para>
 
 
-<para>Some programs don't know about flex and try to find the lex
-program (flex is a (better) alternative for lex). To please those
-programs, create a shell script named lex which calls flex in
-emulation mode:</para>
+<para>A few programs don't know about <userinput>flex</userinput> yet and try
+to run its predecessor <userinput>lex</userinput>. To support those programs,
+create a shell script named <filename>lex</filename> that calls
+<userinput>flex</userinput> in Lex emulation mode:</para>
 
 
 <para><screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
 <para><screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 #!/bin/sh

+ 4 - 4
chapter06/kbd-inst.xml

@@ -3,13 +3,13 @@
 <sect2>
 <sect2>
 <title>Installation of Kbd</title>
 <title>Installation of Kbd</title>
 
 
-<para>Kbd doesn't install some of its utilities (setlogcons, setvesablank
-and getunimap) by default. The kbd patch enables the compilation of these
-utilities. Apply the patch:</para>
+<para>By default some of Kbd's utilities (<userinput>setlogcons</userinput>,
+<userinput>setvesablank</userinput> and <userinput>getunimap</userinput>) are
+not installed . The patch enables the compilation of these utilities:</para>
 
 
 <para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput></screen></para>
 <para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput></screen></para>
 
 
-<para>Prepare Kbd for compilation:</para>
+<para>Now prepare Kbd for compilation:</para>
 
 
 <para><screen><userinput>./configure</userinput></screen></para>
 <para><screen><userinput>./configure</userinput></screen></para>
 
 

+ 11 - 10
chapter06/man-inst.xml

@@ -3,10 +3,11 @@
 <sect2>
 <sect2>
 <title>Installation of Man</title>
 <title>Installation of Man</title>
 
 
-<para>There are three patches for Man. The first patch comments out one of the
-lines in the <filename>man.conf</filename> file (MANPATH /usr/man) to
-prevent redundant results when using programs such as
-<userinput>whatis</userinput>:</para>
+<para>We'l make three adjustments to the sources of Man.</para>
+ 
+ <para>The first patch comments out the "MANPATH /usr/man" line in the
+ <filename>man.conf</filename> file to prevent redundant results when using
+ programs such as <userinput>whatis</userinput>:</para>
 
 
 <para><screen><userinput>patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch</userinput></screen></para>
 <para><screen><userinput>patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch</userinput></screen></para>
 
 
@@ -16,17 +17,17 @@ handled properly:</para>
 
 
 <para><screen><userinput>patch -Np1 -i ../man-&man-pager-patch-version;-pager.patch</userinput></screen></para>
 <para><screen><userinput>patch -Np1 -i ../man-&man-pager-patch-version;-pager.patch</userinput></screen></para>
 
 
-<para>The last patch prevents problem when man pages not formatted
-with more than 80 columns are used in conjunction with recent releases
-of <userinput>groff</userinput>:</para>
+<para>The third and last patch prevents a problem when man pages not formatted
+with more than 80 columns are used in conjunction with recent releases of
+<userinput>groff</userinput>:</para>
 
 
 <para><screen><userinput>patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch</userinput></screen></para>
 <para><screen><userinput>patch -Np1 -i ../man-&man-80cols-patch-version;-80cols.patch</userinput></screen></para>
 
 
-<para>The paths to some programs are written into man's files.
-Unfortunately, the configure script picks the last location in PATH
+<para>The paths to some programs are hard-wired into Man's executables.
+Unfortunately, the configuration script picks the last location in PATH
 rather than the first place a program is found. By appending
 rather than the first place a program is found. By appending
 <emphasis>/usr/bin:/bin</emphasis> to PATH for the
 <emphasis>/usr/bin:/bin</emphasis> to PATH for the
-<userinput>./configure</userinput> command, we ensure that man doesn't
+<userinput>./configure</userinput> command, we ensure that Man doesn't
 use the programs in the <filename class="directory">/stage1</filename>
 use the programs in the <filename class="directory">/stage1</filename>
 directory.</para>
 directory.</para>
 
 

+ 3 - 3
chapter06/perl-inst.xml

@@ -7,10 +7,10 @@
 
 
 <para><screen><userinput>./configure.gnu --prefix=/usr</userinput></screen></para>
 <para><screen><userinput>./configure.gnu --prefix=/usr</userinput></screen></para>
 
 
-<para>If you want more control over the way perl sets itself up to be
+<para>If you want more control over the way Perl sets itself up to be
 built, you can run the interactive <userinput>Configure</userinput> script
 built, you can run the interactive <userinput>Configure</userinput> 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
+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>
 above.</para>
 
 
 <para>Compile the package:</para>
 <para>Compile the package:</para>

+ 3 - 5
chapter06/procps-inst.xml

@@ -3,14 +3,12 @@
 <sect2>
 <sect2>
 <title>Installation of Procps</title>
 <title>Installation of Procps</title>
 
 
-<para>This package requires its patch to be applied before you can
-install it. This patch fixes a locale problem that makes
-<userinput>w</userinput> crash under certain locale settings. Apply
-the patch:</para>
+<para>First fix a locale problem that can crash <userinput>w</userinput> under
+certain locale settings:</para>
 
 
 <para><screen><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch</userinput></screen></para>
 <para><screen><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch</userinput></screen></para>
 
 
-<para>Compile Procps:</para>
+<para>Now compile Procps:</para>
 
 
 <para><screen><userinput>make</userinput></screen></para>
 <para><screen><userinput>make</userinput></screen></para>
 
 

+ 13 - 12
chapter06/psmisc-inst.xml

@@ -7,11 +7,15 @@
 
 
 <para><screen><userinput>./configure --prefix=/usr --exec-prefix=/</userinput></screen></para>
 <para><screen><userinput>./configure --prefix=/usr --exec-prefix=/</userinput></screen></para>
 
 
-<para>The <emphasis>--exec-prefix=/</emphasis> flag will cause the
-programs to be installed in /bin rather than in /usr/bin. The programs
-in this package are often used in bootscripts; they should be in the /bin
-directory so they can be used in the event that the <filename
-class="directory">/usr</filename> partition isn't mounted.</para>
+<para>The meaning of the new configure option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--exec-prefix=/</userinput>: This causes the
+binaries to be installed in <filename>/bin</filename> and not in
+<filename>/usr/bin</filename>. As the Psmisc programs are often used in
+bootscripts, they should be available also when the <filename>/usr</filename>
+filesystem isn't mounted.</para></listitem>
+</itemizedlist>
 
 
 <para>Compile the package:</para>
 <para>Compile the package:</para>
 
 
@@ -21,14 +25,11 @@ class="directory">/usr</filename> partition isn't mounted.</para>
 
 
 <para><screen><userinput>make install</userinput></screen></para>
 <para><screen><userinput>make install</userinput></screen></para>
 
 
-<para>Psmisc's <userinput>pidof</userinput> program isn't installed by default.
+<para>By default Psmisc's <userinput>pidof</userinput> program isn't installed.
 Generally, this isn't a problem because we later install the Sysvinit package,
 Generally, this isn't a problem because we later install the Sysvinit package,
-which provides a better <userinput>pidof</userinput> program.</para>
-
-<para>It's up to you to decide if you are going to use the Sysvinit package,
-which provides a <userinput>pidof</userinput> program, or not. If you're not
-going to use Sysvinit, you should complete this package's installation by
-creating the <filename>/bin/pidof</filename> symlink:</para>
+which provides a better <userinput>pidof</userinput> program. But if you're not
+going to use Sysvinit, you should complete the installation of Psmisc by
+creating the following symlink:</para>
 
 
 <para><screen><userinput>ln -s killall /bin/pidof</userinput></screen></para>
 <para><screen><userinput>ln -s killall /bin/pidof</userinput></screen></para>
 
 

+ 1 - 1
chapter06/revisedchroot.xml

@@ -5,7 +5,7 @@
 <para>From now on when you exit the chroot environment and wish to re-enter
 <para>From now on when you exit the chroot environment and wish to re-enter
 it, you need to run the following modified chroot command. The one at the
 it, you need to run the following modified chroot command. The one at the
 beginning of this chapter might not work anymore (if your host distribution
 beginning of this chapter might not work anymore (if your host distribution
-was based on glibc-2.2.x or older, the programs in <filename
+was based on Glibc-2.2.x or older, the programs in <filename
 class="directory">/stage1/bin</filename>, such as <filename>bash</filename>,
 class="directory">/stage1/bin</filename>, such as <filename>bash</filename>,
 will not work anymore). The following chroot command will work regardless
 will not work anymore). The following chroot command will work regardless
 of your host distribution's Glibc version.</para>
 of your host distribution's Glibc version.</para>