From 373a7084412bfba56d90b4be70190c3adfcfd050 Mon Sep 17 00:00:00 2001 From: Archaic Date: Fri, 17 Jun 2005 01:13:15 +0000 Subject: [PATCH] Several minor grammatical fixes. (merged from trunk r6011) git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@6041 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/binutils-pass1.xml | 6 ++--- chapter06/automake.xml | 2 +- chapter06/bash.xml | 4 ++-- chapter06/binutils.xml | 19 +++++++-------- chapter06/bzip2.xml | 5 ++-- chapter06/chroot.xml | 2 +- chapter06/coreutils.xml | 9 ++++---- chapter06/createfiles.xml | 2 +- chapter06/creatingdirs.xml | 7 +++--- chapter06/devices.xml | 25 ++++++++++---------- chapter06/e2fsprogs.xml | 2 +- chapter06/gcc.xml | 8 +++---- chapter06/glibc.xml | 5 ++-- chapter06/groff.xml | 6 ++--- chapter06/gzip.xml | 6 +++-- chapter06/hotplug.xml | 3 ++- chapter06/iproute2.xml | 2 +- chapter06/make.xml | 2 +- chapter06/module-init-tools.xml | 41 ++++----------------------------- chapter06/perl.xml | 7 +++--- chapter06/pwdgroup.xml | 16 ++++++------- chapter06/readline.xml | 2 +- chapter06/texinfo.xml | 2 +- chapter06/vim.xml | 2 +- chapter06/zlib.xml | 9 ++++---- 25 files changed, 83 insertions(+), 111 deletions(-) diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index bb9970559..634098937 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -48,9 +48,9 @@ cd ../binutils-build In order for the SBU values listed in the rest of the book to be of any use, measure the time it takes to build this package from the configuration, up to and including the first install. To achieve -this easily, wrap the four commands in a time -command like this: time { ./configure ... && ... -&& ... && make install; }. +this easily, wrap the three commands in a time +command like this: time { ./configure ... && make +&& make install; }. Now prepare Binutils for compilation: diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 7aaefecc4..e78ea9151 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -96,7 +96,7 @@ sortas="b-aclocal-&automake-version;">aclocal-&automake-version;Makefile.in files for a package, run this program in the top-level directory. By scanning the configure.in file, it automatically finds each -appropriate Makefile.am file and generate the +appropriate Makefile.am file and generates the corresponding Makefile.in file automake diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 6469a485f..d81b926a7 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -102,8 +102,8 @@ it, thus making this interpreter a powerful tool bashbug -A shell script to help the user compose and mail bug reports -concerning bash in a standard format +A shell script to help the user compose and mail standard formatted bug +reports concerning bash. bashbug diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index dbc661ee6..800826e01 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -66,15 +66,16 @@ cd ../binutils-build make tooldir=/usr -Normally, the tooldir (the directory where the executables will -ultimately be located) is set to $(exec_prefix)/$(target_alias), which -expands into /usr/i686-pc-linux-gnu. -Because this is a custom system, this target-specific directory in /usr is not required. This setup would be -used if the system was used to cross-compile (for example, compiling a -package on an Intel machine that generates code that can be executed -on PowerPC machines). +Normally, the tooldir (the directory where the executables will ultimately +be located) is set to $(exec_prefix)/$(target_alias). For example, i686 +machines would expand that to /usr/i686-pc-linux-gnu. Because this is a custom +system, this target-specific directory in /usr is not required. $(exec_prefix)/$(target_alias) would be used if the +system was used to cross-compile (for example, compiling a package on an Intel +machine that generates code that can be executed on PowerPC machines). diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml index e5bba87ca..f8907d789 100644 --- a/chapter06/bzip2.xml +++ b/chapter06/bzip2.xml @@ -11,7 +11,7 @@ <para>The Bzip2 package contains programs for compressing and decompressing -files. Compressing text files with <command>bzip2</command> yield a much better +files. Compressing text files with <command>bzip2</command> yields a much better compression percentage than with the traditional <command>gzip</command>.</para> <segmentedlist> @@ -77,8 +77,7 @@ ln -s bzip2 /bin/bzcat</userinput></screen> <segtitle>Installed libraries</segtitle> <seglistitem><seg>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp, bzdiff, bzegrep, bzfgrep, bzgrep, bzip2, bzip2recover, bzless, and bzmore</seg> -<seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to -libbz2.so.&bzip2-version;), and libbz2.so.&bzip2-version;</seg></seglistitem> +<seg>libbz2.[a,so]</seg></seglistitem> </segmentedlist> <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead> diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml index b58886f53..80a27709f 100644 --- a/chapter06/chroot.xml +++ b/chapter06/chroot.xml @@ -45,7 +45,7 @@ locations of executed binaries—for this reason, hashing is switched off by passing the <parameter>+h</parameter> option to <command>bash</command>.</para> <para>It is important that all the commands throughout the remainder -of this chapter and the following chapters be run from within the +of this chapter and the following chapters are run from within the chroot environment. If you leave this environment for any reason (rebooting for example), remember to first mount the <systemitem class="filesystem">proc</systemitem> and <systemitem diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 644213276..602643a80 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -50,13 +50,12 @@ installed by other packages:</para> <screen><userinput>make</userinput></screen> -<para>The test suite of Coreutils makes several assumptions about the -presence of files and users that are not valid this early in the LFS -build. Therefore, additional items need to be set up before running -the tests. Skip down to <quote>Install the package</quote> if +<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>Create two dummy groups and a dummy user name:</para> +<para>Create two dummy groups and a dummy user:</para> <screen><userinput>echo "dummy1:x:1000:" >> /etc/group echo "dummy2:x:1001:dummy" >> /etc/group diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 7e5ddc97a..8126a11a9 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -7,7 +7,7 @@ <title>Creating Essential Symlinks -Some programs hard-wire paths to programs which do not yet +Some programs use hard-wired paths to programs which do not yet exist. In order to satisfy these programs, create a number of symbolic links which will be replaced by real files throughout the course of this chapter after the software has been installed. diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml index e7881c982..3a574fee6 100644 --- a/chapter06/creatingdirs.xml +++ b/chapter06/creatingdirs.xml @@ -7,9 +7,8 @@ Creating Directories -It is time to create some structure in the LFS file system. -Create a directory tree. Issuing the following commands will create a -standard tree: +It is time to create some structure in the LFS file system. Create a +standard directory tree by issuing the following commands: install -d /{bin,boot,dev,etc/opt,home,lib,mnt} install -d /{sbin,srv,usr/local,var,opt} @@ -43,7 +42,7 @@ as a normal user would do with his or her home directory. The second mode change makes sure that any user can write to the /tmp and /var/tmp directories, but cannot remove -other users' files from them. The latter is prohibited by the +another user's files from them. The latter is prohibited by the so-called sticky bit, the highest bit (1) in the 1777 bit mask. diff --git a/chapter06/devices.xml b/chapter06/devices.xml index 46a10120f..f16fdb780 100644 --- a/chapter06/devices.xml +++ b/chapter06/devices.xml @@ -24,21 +24,22 @@ mknod -m 666 /dev/null c 1 3 Mounting ramfs and Populating /dev -The ideal way to populate /dev is to mount a ramfs onto /dev, like tmpfs, and create the devices on there -during each bootup. Since the system has not been booted, it is -necessary to do what the bootscripts would otherwise do and populate -/dev. Begin by mounting -/dev: +The recommended method of populating the /dev directory with devices is to mount a virtual +filesystem (such as ramfs or +tmpfs) on the /dev directory, and allow the devices to be created +dynamically on that virtual filesystem as they are detected or accessed. This is +generally done during the boot process. Since this new system has not been +booted, it is necessary to do what the bootscripts would otherwise do by +mounting /dev: mount -n -t ramfs none /dev - -Since the Udev package will not be installed until later on in the -process, create a minimal set of device nodes used for building: +The Udev package is what actually creates the devices in the /dev directory. Since it will not be installed +until later on in the process, manually create the minimal set of device nodes +needed to complete the building of this system: mknod -m 622 /dev/console c 5 1 mknod -m 666 /dev/null c 1 3 diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 1b2818373..46c9cd42a 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -254,7 +254,7 @@ sortas="b-fsck.ext3">fsck.ext3 mk_cmds -Converts a table of command names and helps messages into a C +Converts a table of command names and help messages into a C source file suitable for use with the libss subsystem library mk_cmds diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index ae6a64d8c..ddd5479ae 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -47,9 +47,9 @@ versions of Binutils. Apply the following patch to fix this issue: patch -Np1 -i ../gcc-&gcc-version;-linkonce-1.patch -Apply a sed substitution that will suppress the installation of -libiberty.a. The version of -libiberty.a provided by +Apply a sed substitution that will suppress the +installation of libiberty.a. The +version of libiberty.a provided by Binutils will be used instead: sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in @@ -87,7 +87,7 @@ refer back to them as necessary. make install -Some packages expect the C PreProcessor to be installed in the +Some packages expect the C preprocessor to be installed in the /lib directory. To support those packages, create this symlink: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index e0ba806e8..ada6a0754 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -410,8 +410,7 @@ for built-in operations mtrace -Reads and interprets a memory trace file and -ouputs a summary in human-readable format +Reads and interprets a memory trace file and displays a summary in human-readable format mtrace @@ -635,7 +634,7 @@ information about the memory usage of a program The Name Service Switch libraries, containing functions for resolving host names, user names, group names, -aliases, services, protocols, etc +aliases, services, protocols, etc. libnss diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 5ed178f12..473610e26 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -171,7 +171,7 @@ files, and reports the groff command including those options< grolj4 Is a driver for groff that produces output -in PCL5 format suitable for an HP Laserjet 4 printer +in PCL5 format suitable for an HP LaserJet 4 printer grolj4 @@ -294,7 +294,7 @@ within troff or TeX input files into commands understood by TeX or trof post-grohtml -Translates the output of GNU troff to html +Translates the output of GNU troff to HTML post-grohtml @@ -302,7 +302,7 @@ within troff or TeX input files into commands understood by TeX or trof pre-grohtml -Translates the output of GNU troff to html +Translates the output of GNU troff to HTML pre-grohtml diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index cb9ab9600..cc22feb33 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -29,7 +29,7 @@ GCC, Glibc, Grep, Make, and Sed Installation of Gzip -Gzip has 2 known security vulnerabilites. The following patch +Gzip has 2 known security vulnerabilities. The following patch addresses both of them: patch -Np1 -i ../gzip-&gzip-version;-security_fixes-1.patch @@ -53,7 +53,9 @@ that the new location gets placed into the script: make install -Move the programs to the /bin directory: +Move the gzipprogram to the /bin directory and create some commonly used +symlinks to it: mv /usr/bin/gzip /bin rm /usr/bin/{gunzip,zcat} diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml index 49f50347e..363c406f8 100644 --- a/chapter06/hotplug.xml +++ b/chapter06/hotplug.xml @@ -81,7 +81,8 @@ that reason, remove the network hotplug agent: hotplug This script is called by default by the Linux kernel when something -changes in its internal state (e.g., a new device is added or removed) +changes in its internal state (e.g., a new device is added or an existing device +is removed) diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index b5cbf42a2..6d545c21b 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -110,7 +110,7 @@ ifstat - Shows the interfaces statistic, including the amount of transmitted + Shows the interface statistics, including the amount of transmitted and received packages by interface ifstat diff --git a/chapter06/make.xml b/chapter06/make.xml index bc07e3813..6855f7337 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -10,7 +10,7 @@ Make -<para>The Make package contains a program for compiling large packages.</para> +<para>The Make package contains a program for compiling packages.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml index cfb1688cb..62e371ac4 100644 --- a/chapter06/module-init-tools.xml +++ b/chapter06/module-init-tools.xml @@ -78,14 +78,6 @@ automatically load the required modules</para> </listitem> </varlistentry> -<varlistentry id="genksyms"> -<term><command>genksyms</command></term> -<listitem> -<para>Generates symbol version information</para> -<indexterm zone="ch-system-module-init-tools genksyms"><primary sortas="b-genksyms">genksyms</primary></indexterm> -</listitem> -</varlistentry> - <varlistentry id="insmod"> <term><command>insmod</command></term> <listitem> @@ -94,35 +86,12 @@ automatically load the required modules</para> </listitem> </varlistentry> -<varlistentry id="insmod_ksymoops_clean"> -<term><command>insmod_ksymoops_clean</command></term> +<varlistentry id="insmod.static"> +<term><command>insmod.static</command></term> <listitem> -<para>Deletes saved ksyms and modules not accessed for two days</para> -<indexterm zone="ch-system-module-init-tools insmod_ksymoops_clean"><primary sortas="b-insmod_ksymoops_clean">insmod_ksymoops_clean</primary></indexterm> -</listitem> -</varlistentry> - -<varlistentry id="kallsyms"> -<term><command>kallsyms</command></term> -<listitem> -<para>Extracts all kernel symbols for debugging</para> -<indexterm zone="ch-system-module-init-tools kallsyms"><primary sortas="b-kallsyms">kallsyms</primary></indexterm> -</listitem> -</varlistentry> - -<varlistentry id="kernelversion"> -<term><command>kernelversion</command></term> -<listitem> -<para>Reports the major version of the running kernel</para> -<indexterm zone="ch-system-module-init-tools kernelversion"><primary sortas="b-kernelversion">kernelversion</primary></indexterm> -</listitem> -</varlistentry> - -<varlistentry id="ksyms"> -<term><command>ksyms</command></term> -<listitem> -<para>Displays exported kernel symbols</para> -<indexterm zone="ch-system-module-init-tools ksyms"><primary sortas="b-ksyms">ksyms</primary></indexterm> +<para>A static version of insmod</para> +<indexterm zone="ch-system-module-init-tools insmod.static"><primary +sortas="b-insmod.static">insmod.static</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index efe18a1a1..11db9847e 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -152,8 +152,9 @@ Unicode Character Mappings or Tcl Encoding Files</para> <varlistentry id="perl"> <term><command>perl</command></term> <listitem> -<para>Combines some of the best features of C, sed, awk and sh into a -single swiss-army language</para> +<para>Combines some of the best features of C, <command>sed</command>, +<command>awk</command> and <command>sh</command> into a single swiss-army +language</para> <indexterm zone="ch-system-perl perl"><primary sortas="b-perl">perl</primary></indexterm> </listitem> </varlistentry> @@ -297,7 +298,7 @@ files to Perl5 <filename class="extension">.pm</filename> modules</para> <varlistentry id="s2p"> <term><command>s2p</command></term> <listitem> -<para>Translates sed to Perl</para> +<para>Translates <command>sed</command> scripts to Perl</para> <indexterm zone="ch-system-perl s2p"><primary sortas="b-s2p">s2p</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml index d3879768e..624ebbcbc 100644 --- a/chapter06/pwdgroup.xml +++ b/chapter06/pwdgroup.xml @@ -15,8 +15,8 @@ <indexterm zone="ch-system-pwdgroup"><primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary></indexterm> <para>In order for user <emphasis>root</emphasis> to be able to login -and for the name <quote>root</quote> to be recognized, there need to -be relevant entries in the <filename>/etc/passwd</filename> and +and for the name <quote>root</quote> to be recognized, there must be relevant +entries in the <filename>/etc/passwd</filename> and <filename>/etc/group</filename> files.</para> <para>Create the <filename>/etc/passwd</filename> file by running the following @@ -69,12 +69,12 @@ work.</para> <screen><userinput>exec /tools/bin/bash --login +h</userinput></screen> -<para>Note the use of the <parameter>+h</parameter> directive. This -tells <command>bash</command> not to use its internal path hashing. -Without this directive, <command>bash</command> would remember the -paths to binaries it has executed. In order to use the newly compiled -binaries as soon as they are installed, turn off this function for the -duration of this chapter.</para> +<para>Note the use of the <parameter>+h</parameter> directive. This tells +<command>bash</command> not to use its internal path hashing. Without this +directive, <command>bash</command> would remember the paths to binaries it has +executed. In ensure the use of the newly compiled binaries as soon as they are +installed, the <parameter>+h</parameter> directive will be used for the duration +of this chapter.</para> <beginpage/> diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 6f4ca5fcb..6c5bc73cb 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -66,7 +66,7 @@ location:</para> <screen><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen> -<para>Next we will remove the old, <filename class="extension">.so</filename> files in +<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> diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml index d560747a5..46cc633c7 100644 --- a/chapter06/texinfo.xml +++ b/chapter06/texinfo.xml @@ -123,7 +123,7 @@ file</para> <term><command>makeinfo</command></term> <listitem> <para>Translates the given Texinfo source documents into -info files, plain text, or HTML</para> +Info files, plain text, or HTML</para> <indexterm zone="ch-system-texinfo makeinfo"><primary sortas="b-makeinfo">makeinfo</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 390c3f527..808d223ad 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -84,7 +84,7 @@ symlink:</para> <screen><userinput>ln -s vim /usr/bin/vi</userinput></screen> -<para>If the X Window System is going to be installed on the LFS +<para>If an X Window System is going to be installed on the LFS system, it may be necessary to recompile Vim after installing X. Vim comes with a GUI version of the editor that requires X and some additional libraries to be installed. For more information on this diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 33b40598c..d47a4da16 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -50,9 +50,10 @@ configure command below, then remove it afterwards.</para></note> <screen><userinput>make install</userinput></screen> -<para>Next we will remove the old <filename class="extension">.so</filename> files in -the <filename class="directory">/lib</filename> directory and relink them -into <filename class="directory">/usr/lib</filename>:</para> +<para>The previous command installed a <filename +class="extension">.so</filename> file in <filename +class="directory">/lib</filename>. We will remove it and relink it into +<filename class="directory">/usr/lib</filename>:</para> <screen><userinput>rm /lib/libz.so ln -sf ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen> @@ -81,7 +82,7 @@ make</userinput></screen> <segmentedlist> <segtitle>Installed libraries</segtitle> -<seglistitem><seg>libz[a,so]</seg></seglistitem> +<seglistitem><seg>libz.[a,so]</seg></seglistitem> </segmentedlist> <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>