diff options
author | Archaic <archaic@linuxfromscratch.org> | 2005-06-16 16:47:40 +0000 |
---|---|---|
committer | Archaic <archaic@linuxfromscratch.org> | 2005-06-16 16:47:40 +0000 |
commit | bc2136ecacbb2f5d6d888fdf1e0432f052a3e0f4 (patch) | |
tree | 0e38131e60a11b6b14bc34775a475f11dfce792a /chapter06 | |
parent | 9c80e02769dc33c2b63d1630b87370ad79d590fc (diff) |
Several minor grammatical fixes. Thanks to Randy and Steve.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6011 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r-- | chapter06/automake.xml | 2 | ||||
-rw-r--r-- | chapter06/bash.xml | 4 | ||||
-rw-r--r-- | chapter06/binutils.xml | 19 | ||||
-rw-r--r-- | chapter06/bzip2.xml | 5 | ||||
-rw-r--r-- | chapter06/chroot.xml | 2 | ||||
-rw-r--r-- | chapter06/coreutils.xml | 9 | ||||
-rw-r--r-- | chapter06/createfiles.xml | 2 | ||||
-rw-r--r-- | chapter06/creatingdirs.xml | 7 | ||||
-rw-r--r-- | chapter06/devices.xml | 25 | ||||
-rw-r--r-- | chapter06/e2fsprogs.xml | 2 | ||||
-rw-r--r-- | chapter06/gcc.xml | 8 | ||||
-rw-r--r-- | chapter06/glibc.xml | 5 | ||||
-rw-r--r-- | chapter06/groff.xml | 6 | ||||
-rw-r--r-- | chapter06/gzip.xml | 6 | ||||
-rw-r--r-- | chapter06/hotplug.xml | 3 | ||||
-rw-r--r-- | chapter06/iproute2.xml | 2 | ||||
-rw-r--r-- | chapter06/make.xml | 2 | ||||
-rw-r--r-- | chapter06/module-init-tools.xml | 41 | ||||
-rw-r--r-- | chapter06/perl.xml | 7 | ||||
-rw-r--r-- | chapter06/pwdgroup.xml | 16 | ||||
-rw-r--r-- | chapter06/readline.xml | 2 | ||||
-rw-r--r-- | chapter06/texinfo.xml | 2 | ||||
-rw-r--r-- | chapter06/vim.xml | 2 | ||||
-rw-r--r-- | chapter06/zlib.xml | 9 |
24 files changed, 80 insertions, 108 deletions
diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 7a486ded7..d48a53dfd 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -98,7 +98,7 @@ sortas="b-aclocal-&automake-version;">aclocal-&automake-version;</primary></inde <filename>Makefile.in</filename> files for a package, run this program in the top-level directory. By scanning the <filename>configure.in</filename> file, it automatically finds each -appropriate <filename>Makefile.am</filename> file and generate the +appropriate <filename>Makefile.am</filename> file and generates the corresponding <filename>Makefile.in</filename> file</para> <indexterm zone="ch-system-automake automake"><primary sortas="b-automake">automake</primary></indexterm> </listitem> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index f5a676a8d..7f6c5bff0 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -104,8 +104,8 @@ it, thus making this interpreter a powerful tool</para> <varlistentry id="bashbug"> <term><command>bashbug</command></term> <listitem> -<para>A shell script to help the user compose and mail bug reports -concerning <command>bash</command> in a standard format</para> +<para>A shell script to help the user compose and mail standard formatted bug +reports concerning <command>bash</command>.</para> <indexterm zone="ch-system-bash bashbug"><primary sortas="b-bashbug">bashbug</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index 27b369b4e..e6ba783d8 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -68,15 +68,16 @@ cd ../binutils-build</userinput></screen> <screen><userinput>make tooldir=/usr</userinput></screen> -<para>Normally, the tooldir (the directory where the executables will -ultimately be located) is set to <filename -class="directory">$(exec_prefix)/$(target_alias)</filename>, which -expands into <filename class="directory">/usr/i686-pc-linux-gnu</filename>. -Because this is a custom system, this target-specific directory in <filename -class="directory">/usr</filename> 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).</para> +<para>Normally, the tooldir (the directory where the executables will ultimately +be located) is set to <filename +class="directory">$(exec_prefix)/$(target_alias)</filename>. For example, i686 +machines would expand that to <filename +class="directory">/usr/i686-pc-linux-gnu</filename>. Because this is a custom +system, this target-specific directory in <filename +class="directory">/usr</filename> is not required. <filename +class="directory">$(exec_prefix)/$(target_alias)</filename> 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).</para> <important><para>The test suite for Binutils in this section is considered critical. Do not skip it under any diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml index b16819d6f..d276f6df8 100644 --- a/chapter06/bzip2.xml +++ b/chapter06/bzip2.xml @@ -13,7 +13,7 @@ <sect2 role="package"><title/> <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> @@ -79,8 +79,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 c9afcdc13..f9ff7207d 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 d2786179f..00de6addf 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -51,13 +51,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</title> <?dbhtml filename="createfiles.html"?> -<para>Some programs hard-wire paths to programs which do not yet +<para>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.</para> 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 @@ <title>Creating Directories</title> <?dbhtml filename="creatingdirs.html"?> -<para>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:</para> +<para>It is time to create some structure in the LFS file system. Create a +standard directory tree by issuing the following commands:</para> <screen><userinput>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 <filename class="directory">/tmp</filename> and <filename class="directory">/var/tmp</filename> 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 <quote>sticky bit,</quote> the highest bit (1) in the 1777 bit mask.</para> 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</userinput></screen> <sect2> <title>Mounting ramfs and Populating /dev</title> -<para>The ideal way to populate <filename -class="directory">/dev</filename> is to mount a <systemitem -class="filesystem">ramfs</systemitem> onto <filename -class="directory">/dev</filename>, like <systemitem -class="filesystem">tmpfs</systemitem>, 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 -<filename class="directory">/dev</filename>. Begin by mounting -<filename class="directory">/dev</filename>:</para> +<para>The recommended method of populating the <filename +class="directory">/dev</filename> directory with devices is to mount a virtual +filesystem (such as <systemitem class="filesystem">ramfs</systemitem> or +<systemitem class="filesystem">tmpfs</systemitem>) on the <filename +class="directory">/dev</filename> 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 <filename class="directory">/dev</filename>:</para> <screen><userinput>mount -n -t ramfs none /dev</userinput></screen> -<!-- Edit Me --> -<para>Since the Udev package will not be installed until later on in the -process, create a minimal set of device nodes used for building:</para> +<para>The Udev package is what actually creates the devices in the <filename +class="directory">/dev</filename> 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:</para> <screen><userinput>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 15f9eafd3..dae7254c3 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -254,7 +254,7 @@ sortas="b-fsck.ext3">fsck.ext3</primary></indexterm> <varlistentry id="mk_cmds"> <term><command>mk_cmds</command></term> <listitem> -<para>Converts a table of command names and helps messages into a C +<para>Converts a table of command names and help messages into a C source file suitable for use with the <filename class="libraryfile">libss</filename> subsystem library</para> <indexterm zone="ch-system-e2fsprogs mk_cmds"><primary sortas="b-mk_cmds">mk_cmds</primary></indexterm> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 05e5f50ba..4c13eed95 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -49,9 +49,9 @@ versions of Binutils. Apply the following patch to fix this issue:</para> <screen><userinput>patch -Np1 -i ../&gcc-linkonce-patch;</userinput></screen> -<para>Apply a sed substitution that will suppress the installation of -<filename class="libraryfile">libiberty.a</filename>. The version of -<filename class="libraryfile">libiberty.a</filename> provided by +<para>Apply a <command>sed</command> substitution that will suppress the +installation of <filename class="libraryfile">libiberty.a</filename>. The +version of <filename class="libraryfile">libiberty.a</filename> provided by Binutils will be used instead:</para> <screen><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen> @@ -89,7 +89,7 @@ refer back to them as necessary.</para> <screen><userinput>make install</userinput></screen> -<para>Some packages expect the C PreProcessor to be installed in the +<para>Some packages expect the C preprocessor to be installed in the <filename class="directory">/lib</filename> directory. To support those packages, create this symlink:</para> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 247ce2c4f..29949bb22 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -405,8 +405,7 @@ for built-in operations</para> <varlistentry id="mtrace"> <term><command>mtrace</command></term> <listitem> -<para>Reads and interprets a memory trace file and -ouputs a summary in human-readable format</para> +<para>Reads and interprets a memory trace file and displays a summary in human-readable format</para> <indexterm zone="ch-system-glibc mtrace"><primary sortas="b-mtrace">mtrace</primary></indexterm> </listitem> </varlistentry> @@ -630,7 +629,7 @@ information about the memory usage of a program</para> <listitem> <para>The Name Service Switch libraries, containing functions for resolving host names, user names, group names, -aliases, services, protocols, etc</para> +aliases, services, protocols, etc.</para> <indexterm zone="ch-system-glibc libnss"><primary sortas="c-libnss">libnss</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 2c7a00214..c518fb937 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -173,7 +173,7 @@ files, and reports the <command>groff</command> command including those options< <term><command>grolj4</command></term> <listitem> <para>Is a driver for <command>groff</command> that produces output -in PCL5 format suitable for an HP Laserjet 4 printer</para> +in PCL5 format suitable for an HP LaserJet 4 printer</para> <indexterm zone="ch-system-groff grolj4"><primary sortas="b-grolj4">grolj4</primary></indexterm> </listitem> </varlistentry> @@ -296,7 +296,7 @@ within troff or TeX input files into commands understood by TeX or <command>trof <varlistentry id="post-grohtml"> <term><command>post-grohtml</command></term> <listitem> -<para>Translates the output of GNU <command>troff</command> to html</para> +<para>Translates the output of GNU <command>troff</command> to HTML</para> <indexterm zone="ch-system-groff post-grohtml"><primary sortas="b-post-grohtml">post-grohtml</primary></indexterm> </listitem> </varlistentry> @@ -304,7 +304,7 @@ within troff or TeX input files into commands understood by TeX or <command>trof <varlistentry id="pre-grohtml"> <term><command>pre-grohtml </command></term> <listitem> -<para>Translates the output of GNU <command>troff</command> to html</para> +<para>Translates the output of GNU <command>troff</command> to HTML</para> <indexterm zone="ch-system-groff pre-grohtml"><primary sortas="b-pre-grohtml">pre-grohtml</primary></indexterm> </listitem> </varlistentry> diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index 311f05150..b0087761e 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -31,7 +31,7 @@ GCC, Glibc, Grep, Make, and Sed</seg></seglistitem> <sect2 role="installation"> <title>Installation of Gzip</title> -<para>Gzip has 2 known security vulnerabilites. The following patch +<para>Gzip has 2 known security vulnerabilities. The following patch addresses both of them:</para> <screen><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen> @@ -55,7 +55,9 @@ that the new location gets placed into the script:</para> <screen><userinput>make install</userinput></screen> -<para>Move the programs to the <filename class="directory">/bin</filename> directory:</para> +<para>Move the <command>gzip</command>program to the <filename +class="directory">/bin</filename> directory and create some commonly used +symlinks to it:</para> <screen><userinput>mv /usr/bin/gzip /bin rm /usr/bin/{gunzip,zcat} diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml index c516161ec..582a3f239 100644 --- a/chapter06/hotplug.xml +++ b/chapter06/hotplug.xml @@ -82,7 +82,8 @@ that reason, remove the network hotplug agent:</para> <indexterm zone="ch-system-hotplug hotplug"><primary sortas="b-hotplug">hotplug</primary></indexterm> <para>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)</para> +changes in its internal state (e.g., a new device is added or an existing device +is removed)</para> </listitem> </varlistentry> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index 05a92f2fc..bf79aced1 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -112,7 +112,7 @@ <command>ifstat</command> </term> <listitem> - <para>Shows the interfaces statistic, including the amount of transmitted + <para>Shows the interface statistics, including the amount of transmitted and received packages by interface</para> <indexterm zone="ch-system-iproute2 ifstat"> <primary sortas="b-ifstat">ifstat</primary> diff --git a/chapter06/make.xml b/chapter06/make.xml index 16e9bf626..674d39fd6 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -12,7 +12,7 @@ <indexterm zone="ch-system-make"><primary sortas="a-Make">Make</primary></indexterm> <sect2 role="package"><title/> -<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 49bbb9216..cc7de31fe 100644 --- a/chapter06/module-init-tools.xml +++ b/chapter06/module-init-tools.xml @@ -80,14 +80,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> @@ -96,35 +88,12 @@ automatically load the required modules</para> </listitem> </varlistentry> -<varlistentry id="insmod_ksymoops_clean"> -<term><command>insmod_ksymoops_clean</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> +<varlistentry id="insmod.static"> +<term><command>insmod.static</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 00f8accfb..4bb925d1d 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -154,8 +154,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> @@ -299,7 +300,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 990fe976e..0a4e53f4e 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> <para>The <command>login</command>, <command>agetty</command>, and <command>init</command> programs (and others) use a number of log diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 1ef68e67b..40f0bd53b 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -68,7 +68,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 17798915d..23c54ca45 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 752c669b9..073d0a5a4 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -86,7 +86,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 4ed3d9422..93c21e44a 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -52,9 +52,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> @@ -83,7 +84,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> |