Ported several typos and redaction fixes from trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7063 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Manuel Canales Esparcia 2005-10-19 21:52:55 +00:00
parent 1d09f12b26
commit e925d78aa0
16 changed files with 66 additions and 52 deletions

View File

@ -42,10 +42,10 @@ First a summary, then a detailed log.</para>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para>October 19, 2005 [manuel]: Updated the acknowledgements <listitem><para>October 19, 2005 [manuel]: Updated the acknowledgements to
to current trunk version. Ported also some redaction changes in preface current trunk version. Ported some redaction changes in preface and chapter01
and chapter01 pages. Moved chapter02 to part II. Added -v pages. Moved chapter02 to part II. Added -v switches. Ported several typos
switches.</para></listitem> and redaction fixes from trunk</para></listitem>
<listitem><para>October 19, 2005 [manuel]: Updated the stylesheets, Makefile <listitem><para>October 19, 2005 [manuel]: Updated the stylesheets, Makefile
and related files to current trunk versions.</para></listitem> and related files to current trunk versions.</para></listitem>

View File

@ -38,9 +38,9 @@ unset them when building Glibc.</para>
the method suggested in this book puts the stability of the system at the method suggested in this book puts the stability of the system at
risk.</para> risk.</para>
<para>Glibc has two tests which fail when the running kernel is 2.6.11.x The <para>Glibc has two tests which fail when the running kernel is 2.6.11 or later.
problem has been determined to be with the tests themselves, not with the libc The problem has been determined to be with the tests themselves, not with the C
nor the kernel. If you plan to run the testsuite apply this patch:</para> library or the kernel. If you plan to run the testsuite apply this patch:</para>
<screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen> <screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>

View File

@ -25,10 +25,10 @@ host production directories. Since the packages compiled here are
temporary, we do not want them to pollute the soon-to-be LFS temporary, we do not want them to pollute the soon-to-be LFS
system.</para> system.</para>
<para>Before issuing the build instructions for a package, the package <important><para>Before issuing the build instructions for a package, the package
should be unpacked as user <emphasis>lfs</emphasis>, and a should be unpacked as user <emphasis>lfs</emphasis>, and a
<command>cd</command> into the created directory should be performed. The build <command>cd</command> into the created directory should be performed. The build
instructions assume that the <command>bash</command> shell is in use.</para> instructions assume that the <command>bash</command> shell is in use.</para></important>
<para>Several of the packages are patched before compilation, but only <para>Several of the packages are patched before compilation, but only
when the patch is needed to circumvent a problem. A patch is often when the patch is needed to circumvent a problem. A patch is often
@ -46,13 +46,12 @@ deprecated, but not invalid, use of the C or C++ syntax. C standards
change fairly often, and some packages still use the older standard. change fairly often, and some packages still use the older standard.
This is not a problem, but does prompt the warning.</para> This is not a problem, but does prompt the warning.</para>
<para>After installing each package, delete its source and build <important><para>After installing each package, delete its source and build
directories, unless specifically instructed otherwise. Deleting the directories, unless specifically instructed otherwise. Deleting the
sources saves space and prevents mis-configuration when the same sources prevents mis-configuration when the same package is reinstalled later.
package is reinstalled later. Only three of the packages need to Only three of the packages need to retain the source and build directories in
retain the source and build directories in order for their contents to order for their contents to be used by later commands. Pay special attention to
be used by later commands. Pay special attention to these these reminders.</para></important>
reminders.</para>
<para>Check one last time that the <envar>LFS</envar> environment <para>Check one last time that the <envar>LFS</envar> environment
variable is set up properly:</para> variable is set up properly:</para>

View File

@ -49,7 +49,7 @@ following patch resolves this problem:</para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><parameter>--with-installed-readline</parameter></term> <term><parameter>--with-installed-readline</parameter></term>
<listitem><para>This options tells Bash to use the <listitem><para>This option tells Bash to use the
<filename class="libraryfile">readline</filename> library that is already installed <filename class="libraryfile">readline</filename> library that is already installed
on the system rather than using its own readline version.</para></listitem> on the system rather than using its own readline version.</para></listitem>
</varlistentry> </varlistentry>

View File

@ -80,17 +80,19 @@ groups:</para>
<screen><userinput>make install</userinput></screen> <screen><userinput>make install</userinput></screen>
<para>Move programs to the proper locations:</para> <para>Move programs to the locations specified by the FHS:</para>
<screen><userinput>mv -v /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin <screen><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
mv -v /usr/bin/{date,echo,false,head,hostname,install,ln} /bin mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
mv -v /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
mv -v /usr/bin/{sleep,stty,test,touch,true,uname} /bin
mv -v /usr/bin/chroot /usr/sbin</userinput></screen> mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
<para>Finally, create a symlink to be FHS-compliant:</para> <para>Some of the scripts in the LFS-Bootscripts package depend on
<command>head</command> and <command>sleep</command>. As
<filename class="directory">/usr</filename> may not be available during the
early stages of booting, those binaries need to be on the root partition:</para>
<screen><userinput>ln -sv ../../bin/install /usr/bin</userinput></screen> <screen><userinput>mv -v /usr/bin/{head,sleep} /bin</userinput></screen>
</sect2> </sect2>

View File

@ -36,9 +36,16 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make and Sed</seg></seglistitem>
<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \ <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
--localstatedir=/var/lib/locate</userinput></screen> --localstatedir=/var/lib/locate</userinput></screen>
<para>The <parameter>localstatedir</parameter> option above changes the <para>The meaning of the configure options:</para>
location of the <command>locate</command> database to be in <filename
class="directory">/var/lib/locate</filename>, which is FHS-compliant.</para> <variablelist>
<varlistentry>
<term><parameter>--localstatedir</parameter></term>
<listitem><para>This option changes the location of the <command>locate</command>
database to be in <filename class="directory">/var/lib/locate</filename>, which
is FHS-compliant.</para></listitem>
</varlistentry>
</variablelist>
<para>Compile the package:</para> <para>Compile the package:</para>

View File

@ -85,7 +85,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
<segmentedlist> <segmentedlist>
<segtitle>Installed programs</segtitle> <segtitle>Installed programs</segtitle>
<segtitle>Installed library</segtitle> <segtitle>Installed library</segtitle>
<seglistitem><seg>flex, lex</seg> <seglistitem><seg>flex and lex</seg>
<seg>libfl.a</seg></seglistitem> <seg>libfl.a</seg></seglistitem>
</segmentedlist> </segmentedlist>

View File

@ -123,7 +123,7 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg></seglistitem>
<varlistentry id="zcat"> <varlistentry id="zcat">
<term><command>zcat</command></term> <term><command>zcat</command></term>
<listitem> <listitem>
<para>Uncompresses the given gzipped files to standard output</para> <para>Decompresses the given gzipped files to standard output</para>
<indexterm zone="ch-system-gzip zcat"><primary sortas="b-zcat">zcat</primary></indexterm> <indexterm zone="ch-system-gzip zcat"><primary sortas="b-zcat">zcat</primary></indexterm>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -70,7 +70,7 @@ find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;</userinput></scre
<varlistentry id="linux-libc-headers"> <varlistentry id="linux-libc-headers">
<term><filename class="headerfile">/usr/include/{asm,linux}/*.h</filename></term> <term><filename class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
<listitem> <listitem>
<para>The Linux headers API</para> <para>The Linux API headers</para>
<indexterm zone="ch-system-linux-libc-headers linux-libc-headers"><primary sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary></indexterm> <indexterm zone="ch-system-linux-libc-headers linux-libc-headers"><primary sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary></indexterm>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -40,8 +40,9 @@ prepare Perl for compilation with:</para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><parameter>-Dpager="/bin/less -isR"</parameter></term> <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
<listitem><para>This corrects an error in the way that the <command>perldoc</command> <listitem><para>This corrects an error in the way that
command invokes the <command>less</command> program.</para></listitem> <command>perldoc</command> invokes the <command>less</command> program.</para>
</listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

View File

@ -52,8 +52,8 @@ cdrom:x:15:</literal>
EOF</userinput></screen> EOF</userinput></screen>
<para>The created groups are not part of any standard&mdash;they are groups <para>The created groups are not part of any standard&mdash;they are groups
decided on in part by the requirements of the Udev configuration in the next decided on in part by the requirements of the Udev configuration in this
section, and in part by common convention employed by a number of existing Linux chapter, and in part by common convention employed by a number of existing Linux
distributions. The Linux Standard Base (LSB, available at <ulink distributions. The Linux Standard Base (LSB, available at <ulink
url="http://www.linuxbase.org"/>) recommends only that, besides the group url="http://www.linuxbase.org"/>) recommends only that, besides the group
<quote>root</quote> with a Group ID (GID) of 0, a group <quote>bin</quote> with <quote>root</quote> with a Group ID (GID) of 0, a group <quote>bin</quote> with

View File

@ -33,8 +33,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
<screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen> <screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
<para>Remove the installation of the <command>groups</command> program, and its man page as <para>Disable the installation of the <command>groups</command> program and
Coreutils provides a better version:</para> its man page, as Coreutils provides a better version:</para>
<screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile <screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
sed -i '/groups/d' man/Makefile</userinput></screen> sed -i '/groups/d' man/Makefile</userinput></screen>

View File

@ -144,7 +144,8 @@ device-independent file that can be printed</para>
<varlistentry id="texi2pdf"> <varlistentry id="texi2pdf">
<term><command>texi2pdf</command></term> <term><command>texi2pdf</command></term>
<listitem> <listitem>
<para>Create a PDF file from a Texinfo file.</para> <para>Used to format the given Texinfo document into a
Portable Document Format (PDF) file</para>
<indexterm zone="ch-system-texinfo texi2pdf"><primary sortas="b-texi2pdf">texi2pdf</primary></indexterm> <indexterm zone="ch-system-texinfo texi2pdf"><primary sortas="b-texi2pdf">texi2pdf</primary></indexterm>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -38,16 +38,14 @@ for suggested installation instructions.</para>
<para>First, unpack both <para>First, unpack both
<filename>vim-&vim-version;.tar.bz2</filename> and (optionally) <filename>vim-&vim-version;.tar.bz2</filename> and (optionally)
<filename>vim-&vim-version;-lang.tar.gz</filename> archives into the <filename>vim-&vim-version;-lang.tar.gz</filename> archives into the
same directory. Then, change the default locations of the same directory. Then, change the default location of the
<filename>vimrc</filename> and <filename>gvimrc</filename> <filename>vimrc</filename> configuration file to <filename
configuration files to <filename
class="directory">/etc</filename>:</para> class="directory">/etc</filename>:</para>
<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h <screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput></screen>
<para>Vim has a security vulnerability already addressed upstream. The <para>Vim has two known security vulnerabilities that have already been
following patch fixes the problem:</para> addressed upstream. The following patch fixes the problems:</para>
<screen><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen> <screen><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen>
@ -55,13 +53,19 @@ following patch fixes the problem:</para>
<screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen> <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
<para>The optional but highly recommended <para>The meaning of the configure options:</para>
<parameter>--enable-multibyte</parameter> switch includes support for
editing files in multibyte character encodings into <variablelist>
<command>vim</command>. This is needed if using a locale with <varlistentry>
a multibyte character set. This switch is also helpful to be able to <term><parameter>--enable-multibyte</parameter></term>
edit text files initially created in Linux distributions like Fedora <listitem><para>This optional but highly recommended switch enables support for
Core that use UTF-8 as a default character set.</para> editing files in multibyte character encodings. This is needed if using a
locale with a multibyte character set. This switch is also helpful to be able to
edit text files initially created in Linux distributions like Fedora Core that
use UTF-8 as a default character set.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Compile the package:</para> <para>Compile the package:</para>

View File

@ -92,7 +92,7 @@ make</userinput></screen>
<varlistentry id="libz"> <varlistentry id="libz">
<term><filename class="libraryfile">libz</filename></term> <term><filename class="libraryfile">libz</filename></term>
<listitem> <listitem>
<para>Contains compression and un-compression <para>Contains compression and decompression
functions used by some programs</para> functions used by some programs</para>
<indexterm zone="ch-system-zlib libz"><primary sortas="c-libz">libz</primary></indexterm> <indexterm zone="ch-system-zlib libz"><primary sortas="c-libz">libz</primary></indexterm>
</listitem> </listitem>

View File

@ -72,7 +72,7 @@ we do not recommend this option. It is often better to explore all the
configuration menus and create the kernel configuration from configuration menus and create the kernel configuration from
scratch.</para> scratch.</para>
<note><para>NPTL requires the kernel to be compiled with GCC-3.x, in this case <note><para>NPTL requires the kernel to be compiled with GCC-3.x or later, in this case
&gcc-version;. It is not recommended to compile the kernel with GCC-2.95.x, as &gcc-version;. It is not recommended to compile the kernel with GCC-2.95.x, as
this causes failures in the Glibc test suite. Normally, this wouldn't be this causes failures in the Glibc test suite. Normally, this wouldn't be
mentioned as LFS doesn't build GCC-2.95.x. Unfortunately, the kernel mentioned as LFS doesn't build GCC-2.95.x. Unfortunately, the kernel