diff options
author | Archaic <archaic@linuxfromscratch.org> | 2005-06-30 17:53:21 +0000 |
---|---|---|
committer | Archaic <archaic@linuxfromscratch.org> | 2005-06-30 17:53:21 +0000 |
commit | e5846effb0fab3c1f10b071660f96b45749d74cb (patch) | |
tree | 19a0470656a5a047b8fd36cb265fd363687f921e | |
parent | 7efa3be047998850dec035e52784fb6ea63eb1bc (diff) |
Round 2 of several minor wording changes in chapter 6 (matt).
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6258 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r-- | chapter06/coreutils.xml | 11 | ||||
-rw-r--r-- | chapter06/e2fsprogs.xml | 23 | ||||
-rw-r--r-- | chapter06/file.xml | 3 | ||||
-rw-r--r-- | chapter06/findutils.xml | 2 | ||||
-rw-r--r-- | chapter06/flex.xml | 2 | ||||
-rw-r--r-- | chapter06/gettext.xml | 2 | ||||
-rw-r--r-- | chapter06/groff.xml | 6 | ||||
-rw-r--r-- | chapter06/gzip.xml | 4 | ||||
-rw-r--r-- | chapter06/hotplug.xml | 2 | ||||
-rw-r--r-- | chapter06/iana-etc.xml | 4 | ||||
-rw-r--r-- | chapter06/iproute2.xml | 2 | ||||
-rw-r--r-- | chapter06/kbd.xml | 2 | ||||
-rw-r--r-- | chapter06/man.xml | 20 | ||||
-rw-r--r-- | chapter06/module-init-tools.xml | 10 | ||||
-rw-r--r-- | chapter06/ncurses.xml | 2 | ||||
-rw-r--r-- | chapter06/perl.xml | 4 | ||||
-rw-r--r-- | chapter06/psmisc.xml | 4 | ||||
-rw-r--r-- | chapter06/readline.xml | 19 | ||||
-rw-r--r-- | chapter06/shadow.xml | 5 | ||||
-rw-r--r-- | chapter06/vim.xml | 34 | ||||
-rw-r--r-- | chapter06/zlib.xml | 2 |
21 files changed, 89 insertions, 74 deletions
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 00de6addf..4622366aa 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -38,7 +38,7 @@ fixes this behavior for Intel architectures:</para> <screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen> -<para>Prevent Coreutils from installing binaries that will be later be +<para>Prevent Coreutils from installing binaries that will later be installed by other packages:</para> <screen><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen> @@ -51,10 +51,11 @@ installed by other packages:</para> <screen><userinput>make</userinput></screen> -<para>The test suite of Coreutils makes several invalid assumptions about the -presence of system users and groups. Therefore, additional items need to be set -up before running the tests. Skip down to <quote>Install the package</quote> if -not running the test suite.</para> +<para>The test suite of Coreutils makes several assumptions about the presence +of system users and groups that are not valid within the minimal environment +that exists at the moment. Therefore, additional items need to be set up before +running the tests. Skip down to <quote>Install the package</quote> if not +running the test suite.</para> <para>Create two dummy groups and a dummy user:</para> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index dae7254c3..2df545de7 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -52,15 +52,15 @@ cd build</userinput></screen> <variablelist> <varlistentry> <term><parameter>--with-root-prefix=""</parameter></term> -<listitem><para>Certain programs (such as the -<command>e2fsck</command> program) are considered essential programs. -When, for example, <filename class="directory">/usr</filename> is not -mounted, these essential programs need to be available. They belong in -directories like <filename class="directory">/lib</filename> and -<filename class="directory">/sbin</filename>. If this option is not -passed to E2fsprogs' configure, the programs are installed into the -<filename class="directory">/usr</filename> directory, which is not -where they should be.</para></listitem> +<listitem><para>Certain programs (such as the <command>e2fsck</command> program) +are considered essential programs. When, for example, <filename +class="directory">/usr</filename> is not mounted, these essential programs need +to be available. They belong in directories like <filename +class="directory">/lib</filename> and <filename +class="directory">/sbin</filename>. If this option is not passed to E2fsprogs' +configure, the programs are installed into the <filename +class="directory">/usr</filename> directory.</para></listitem> + </varlistentry> <varlistentry> @@ -87,7 +87,7 @@ information regarding EVMS.</para></listitem> <para>To test the results, issue: <userinput>make check</userinput>.</para> -<para>Install most of the package:</para> +<para>Install the binaries and documentation:</para> <screen><userinput>make install</userinput></screen> @@ -264,8 +264,7 @@ class="libraryfile">libss</filename> subsystem library</para> <varlistentry id="mke2fs"> <term><command>mke2fs</command></term> <listitem> -<para>Is used to create a second extended file system on the given -device</para> +<para>Creates an ext2 or ext3 file system on the given device</para> <indexterm zone="ch-system-e2fsprogs mke2fs"><primary sortas="b-mke2fs">mke2fs</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/file.xml b/chapter06/file.xml index 354f930f8..ff33100fa 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -12,7 +12,8 @@ <indexterm zone="ch-system-file"><primary sortas="a-File">File</primary></indexterm> <sect2 role="package"><title/> -<para>The File package contains a utility for determining the type of files.</para> +<para>The File package contains a utility for determining the type of a given +file or files.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index 378c79613..0c34ac14b 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -38,7 +38,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make and Sed</seg></seglistitem> <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \ --localstatedir=/var/lib/locate</userinput></screen> -<para>The <parameter>localstatedir</parameter> directive above changes the +<para>The <parameter>localstatedir</parameter> option above changes the location of the <command>locate</command> database to be in <filename class="directory">/var/lib/locate</filename>, which is FHS-compliant.</para> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 5a4ab3368..2a0e66910 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -117,7 +117,7 @@ program</para> <varlistentry id="lex"> <term><command>lex</command></term> <listitem> -<para>Script that runs <command>flex</command> in <command>lex</command> +<para>A script that runs <command>flex</command> in <command>lex</command> emulation mode</para> <indexterm zone="ch-system-flex lex"><primary sortas="b-lex">lex</primary></indexterm> </listitem> diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index a0976b514..1ff20a908 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -196,7 +196,7 @@ to the given <filename class="extension">.po</filename> files</para> <varlistentry id="msgfmt"> <term><command>msgfmt</command></term> <listitem> -<para>Generates a binary message catalog from from a translation catalog</para> +<para>Generates a binary message catalog from a translation catalog</para> <indexterm zone="ch-system-gettext msgfmt"><primary sortas="b-msgfmt">msgfmt</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/groff.xml b/chapter06/groff.xml index c518fb937..c413cae8b 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -106,7 +106,7 @@ within troff input files into commands that are understood by <command>troff</co </varlistentry> <varlistentry id="geqn"> -<term><command>eqn</command></term> +<term><command>geqn</command></term> <listitem> <para>A link to <command>eqn</command></para> <indexterm zone="ch-system-groff geqn"><primary sortas="b-geqn">geqn</primary></indexterm> @@ -198,7 +198,7 @@ a form suitable for typewriter-like devices</para> <varlistentry id="gtbl"> <term><command>gtbl</command></term> <listitem> -<para>Is the GNU implementation of <command>tbl</command></para> +<para>A link to <command>tbl</command></para> <indexterm zone="ch-system-groff gtbl"><primary sortas="b-gtbl">gtbl</primary></indexterm> </listitem> </varlistentry> @@ -362,7 +362,7 @@ appropriate order and with the appropriate options</para> <varlistentry id="zsoelim"> <term><command>zsoelim</command></term> <listitem> -<para>Is the GNU implementation of <command>soelim</command></para> +<para>A link to <command>soelim</command></para> <indexterm zone="ch-system-groff zsoelim"><primary sortas="b-zsoelim">zsoelim</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index 4a99c251f..c0347e5b8 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -85,7 +85,7 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg></seglistitem> <varlistentry id="compress"> <term><command>compress</command></term> <listitem> -<para>Compresses and uncompresses compressed files</para> +<para>Compresses and decompresses files</para> <indexterm zone="ch-system-gzip compress"><primary sortas="b-compress">compress</primary></indexterm> </listitem> </varlistentry> @@ -101,7 +101,7 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg></seglistitem> <varlistentry id="gzexe"> <term><command>gzexe</command></term> <listitem> -<para>Creates self-uncompressing executable files</para> +<para>Creates self-decompressing executable files</para> <indexterm zone="ch-system-gzip gzexe"><primary sortas="b-gzexe">gzexe</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml index 6832fda2c..eccb9de52 100644 --- a/chapter06/hotplug.xml +++ b/chapter06/hotplug.xml @@ -47,7 +47,7 @@ using the script included with LFS-Bootscripts:</para> <screen><userinput>rm -rf /etc/init.d</userinput></screen> -<para>Network device hotplugging is not supported by LFS bootscripts yet. For +<para>Network device hotplugging is not supported by LFS-Bootscripts yet. For that reason, remove the network hotplug agent:</para> <screen><userinput>rm -f /etc/hotplug/net.agent</userinput></screen> diff --git a/chapter06/iana-etc.xml b/chapter06/iana-etc.xml index 856ff2f21..556c9c55a 100644 --- a/chapter06/iana-etc.xml +++ b/chapter06/iana-etc.xml @@ -29,7 +29,9 @@ <sect2 role="installation"> <title>Installation of Iana-Etc</title> -<para>Parse the data:</para> +<para>The following command converts the raw data provided by IANA into the +correct formats for the <filename>/etc/protocols</filename> and +<filename>/etc/services</filename> data files:</para> <screen><userinput>make</userinput></screen> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index bf79aced1..20701c0e5 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -113,7 +113,7 @@ </term> <listitem> <para>Shows the interface statistics, including the amount of transmitted - and received packages by interface</para> + and received packets by interface</para> <indexterm zone="ch-system-iproute2 ifstat"> <primary sortas="b-ifstat">ifstat</primary> </indexterm> diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index 511e465b6..70a5980fe 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -103,7 +103,7 @@ showconsolefont, showkey, unicode_start, and unicode_stop</seg></seglistitem> <varlistentry id="getunimap"> <term><command>getunimap</command></term> <listitem> -<para>Prints the currently used unimap</para> +<para>Prints the currently used unicode-to-font mapping table</para> <indexterm zone="ch-system-kbd getunimap"><primary sortas="b-getunimap">getunimap</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/man.xml b/chapter06/man.xml index ad40e1186..4caa3ad8f 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -68,15 +68,17 @@ class="directory">/etc</filename> directory.</para></listitem> <screen><userinput>make install</userinput></screen> -<note><para>To disable Select Graphic Rendition (SGR) escape -sequences, edit the <filename>man.conf</filename> file and -add the <parameter>-c</parameter> switch to -the <envar>NROFF</envar> variable.</para></note> - -<para>If the character set uses 8-bit characters, search for the line -beginning with <quote>NROFF</quote> in -<filename>/etc/man.conf</filename>, and verify that it looks as -follows:</para> +<note><para>If you will be working on a terminal that does not support text +attributes such as color and bold, you can disable Select Graphic Rendition +(SGR) escape sequences by editing the <filename>man.conf</filename> file and +adding the <parameter>-c</parameter> option to the <envar>NROFF</envar> +variable. If you use multiple terminal types for one computer it may be better +to selectively add the <envar>GROFF_NO_SGR</envar> environment variable for the +terminals that do not support SGR.</para></note> + +<para>If the character set of the locale uses 8-bit characters, search for the +line beginning with <quote>NROFF</quote> in <filename>/etc/man.conf</filename>, +and verify that it looks as follows:</para> <screen>NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen> diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml index 82fecbef3..3d990f214 100644 --- a/chapter06/module-init-tools.xml +++ b/chapter06/module-init-tools.xml @@ -42,6 +42,16 @@ installed in LFS. Run the following command to avoid this:</para> <screen><userinput>./configure --prefix="" --enable-zlib</userinput></screen> +<para>The meaning of the configure options:</para> + +<variablelist> +<varlistentry> +<term><parameter>--enable-zlib</parameter></term> +<listitem><para>This allows the Module-Init-Tools package to handle compressed +kernel modules.</para></listitem> +</varlistentry> +</variablelist> + <para>Compile the package:</para> <screen><userinput>make</userinput></screen> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 38153e3eb..33ff5341d 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -58,7 +58,7 @@ where they are expected to reside:</para> <screen><userinput>mv /usr/lib/libncurses.so.5* /lib</userinput></screen> -<para>Because the libraries have been moved, a few symlinks are pointing to +<para>Because the libraries have been moved, a few symlinks point to non-existent files. Recreate those symlinks:</para> <screen><userinput>ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so diff --git a/chapter06/perl.xml b/chapter06/perl.xml index aa90509e7..3d8188561 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -52,8 +52,8 @@ of the <command>less</command> program.</para></listitem> <screen><userinput>make</userinput></screen> <para>To run the test suite, first create a basic -<filename>/etc/hosts</filename> file which is needed by a couple of -tests to resolve the network name localhost:</para> +<filename>/etc/hosts</filename> file which is needed by a couple of the tests to +resolve the network name localhost:</para> <screen><userinput>echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen> diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index 5b8b20f34..f430462d5 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -12,8 +12,8 @@ <indexterm zone="ch-system-psmisc"><primary sortas="a-Psmisc">Psmisc</primary></indexterm> <sect2 role="package"><title/> -<para>The Psmisc package contains programs for displaying information on -processes.</para> +<para>The Psmisc package contains programs for displaying information about +running processes.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 40f0bd53b..f3180a46d 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -12,7 +12,8 @@ <indexterm zone="ch-system-readline"><primary sortas="a-Readline">Readline</primary></indexterm> <sect2 role="package"><title/> -<para>The Readline package contains the Readline command-line library.</para> +<para>The Readline package is a set of libraries that offers command-line +editing and history capabilities.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -30,10 +31,9 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem> <sect2 role="installation"> <title>Installation of Readline</title> -<para>The following patch includes a fix for the problem where -Readline sometimes only shows 33 characters on a line and then wraps -to the next line. It also includes other fixes recommended by the -Readline author.</para> +<para>The following patch includes a fix for a problem where Readline sometimes +only shows 33 characters on a line and then wraps to the next line. It also +includes other fixes recommended by the Readline author.</para> <screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen> @@ -63,14 +63,13 @@ Readline author.</para> <screen><userinput>chmod 755 /lib/lib{readline,history}.so*</userinput></screen> -<para>Now we move the static libraries to a more appropriate -location:</para> +<para>Now move the static libraries to a more appropriate location:</para> <screen><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen> -<para>Next we will remove the <filename class="extension">.so</filename> files in -<filename class="directory">/lib</filename> and relink them into -<filename class="directory">/usr/lib</filename>.</para> +<para>Next, remove the <filename class="extension">.so</filename> files in +<filename class="directory">/lib</filename> and relink them into <filename +class="directory">/usr/lib</filename>.</para> <screen><userinput>rm /lib/lib{readline,history}.so ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index 094ccbed4..8e62fefa6 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -50,7 +50,8 @@ sed -i '/groups/d' man/Makefile</userinput></screen> <screen><userinput>make install</userinput></screen> <para id="shadow-limits-login_access">Shadow uses two files to configure -authentication settings for the system. Install these two config files:</para> +authentication settings for the system. Install these two configuration +files:</para> <indexterm zone="shadow-limits-login_access"><primary sortas="e-/etc/limits">/etc/limits</primary></indexterm> <indexterm zone="shadow-limits-login_access"><primary sortas="e-/etc/login.access">/etc/login.access</primary></indexterm> @@ -164,7 +165,7 @@ password changes</para> <varlistentry id="chfn"> <term><command>chfn</command></term> <listitem> -<para>Used to change a user's full name and other info</para> +<para>Used to change a user's full name and other information</para> <indexterm zone="ch-system-shadow chfn"><primary sortas="b-chfn">chfn</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 073d0a5a4..2accc832d 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -69,11 +69,10 @@ Core that use UTF-8 as a default character set.</para> <screen><userinput>make</userinput></screen> -<para>To test the results, issue: -<userinput>make test</userinput>. However, this test suite outputs a -lot of chaotic characters to the screen, which can cause issues with -the settings of the current terminal. Therefore, running the test -suite here is optional.</para> +<para>To test the results, issue: <userinput>make test</userinput>. However, +this test suite outputs a lot of binary data to the screen, which can cause +issues with the settings of the current terminal. This can be resolved by +redirecting the output to a log file.</para> <para>Install the package:</para> @@ -99,13 +98,13 @@ url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para> <sect2 id="conf-vim" role="configuration"><title>Configuring Vim</title> <indexterm zone="conf-vim"><primary sortas="e-/etc/vim">/etc/vim</primary></indexterm> -<para>By default, <command>vim</command> runs in vi-incompatible mode. -This may be new to users who have used other editors in the past. The -<quote>nocompatible</quote> setting is included below to highlight the -fact that a new behavior is being used. It also reminds those who -would change to <quote>compatible</quote> mode that it should appear -first. This is necessary because it changes other settings, and -overrides must come after this setting. Create a default <command>vim</command> +<para>By default, <command>vim</command> runs in vi-incompatible mode. This may +be new to users who have used other editors in the past. The +<quote>nocompatible</quote> setting is included below to highlight the fact that +a new behavior is being used. It also reminds those who would change to +<quote>compatible</quote> mode that it should be the first setting in the +configuration file. This is necessary because it changes other settings, and +overrides must come after this setting. Create a default <command>vim</command> configuration file by running the following:</para> <screen><userinput>cat > /etc/vimrc << "EOF" @@ -233,7 +232,7 @@ commands can be started and <command>vim</command> cannot be suspended</para> <varlistentry id="shtags.pl"> <term><command>shtags.pl</command></term> <listitem> -<para>Generates a tag file for Perl scripts</para> +<para>Generates a tags file for Perl scripts</para> <indexterm zone="ch-system-vim shtags.pl"><primary sortas="b-shtags.pl">shtags.pl</primary></indexterm> </listitem> </varlistentry> @@ -241,7 +240,7 @@ commands can be started and <command>vim</command> cannot be suspended</para> <varlistentry id="tcltags"> <term><command>tcltags</command></term> <listitem> -<para>Generates a tag file for TCL code</para> +<para>Generates a tags file for TCL code</para> <indexterm zone="ch-system-vim tcltags"><primary sortas="b-tcltags">tcltags</primary></indexterm> </listitem> </varlistentry> @@ -305,9 +304,10 @@ commands can be started and <command>vim</command> cannot be suspended</para> <varlistentry id="vimspell.sh"> <term><command>vimspell.sh</command></term> <listitem> -<para>Spells a file and generates the syntax statements necessary -to highlight in <command>vim</command>. This script requires the old Unix <command>spell</command> -command, which is provided neither in LFS nor in BLFS</para> +<para>Spell checks a file and generates the syntax statements necessary to +highlight in <command>vim</command>. This script requires the old Unix +<command>spell</command> command, which is provided neither in LFS nor in +BLFS</para> <indexterm zone="ch-system-vim vimspell.sh"><primary sortas="b-vimspell.sh">vimspell.sh</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 93c21e44a..0c9fa8abc 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -12,7 +12,7 @@ <indexterm zone="ch-system-zlib"><primary sortas="a-Zlib">Zlib</primary></indexterm> <sect2 role="package"><title/> -<para>The Zlib package contains compression and un-compression routines used by +<para>The Zlib package contains compression and decompression routines used by some programs.</para> <segmentedlist> |