Bläddra i källkod

Several minor wording changes (chapters 1 - 5).

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6232 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Archaic 20 år sedan
förälder
incheckning
663ecfcc5f

+ 9 - 9
chapter01/administrativa.xml

@@ -29,6 +29,15 @@ locations, and additional information, visit
 <ulink url="&lfs-root;mail.html"/>.</para>
 </sect2>
 
+<para>The mailing lists hosted at <uri>linuxfromscratch.org</uri> are
+also accessible via the Network News Transfer Protocol (NNTP) server.
+All messages posted to a mailing list are copied to the corresponding
+newsgroup, and vice versa.</para>
+
+<para>The news server is located at
+<uri>news.linuxfromscratch.org</uri>.</para>
+</sect2>
+
 <sect2 id="ch-scatter-irc">
 <title>IRC</title>
 
@@ -43,15 +52,6 @@ The support channel is named #LFS-support.</para>
 <sect2 id="ch-scatter-newsserver">
 <title>News Server</title>
 
-<para>The mailing lists hosted at <uri>linuxfromscratch.org</uri> are
-also accessible via the Network News Transfer Protocol (NNTP) server.
-All messages posted to a mailing list are copied to the corresponding
-newsgroup, and vice versa.</para>
-
-<para>The news server is located at
-<uri>news.linuxfromscratch.org</uri>.</para>
-</sect2>
-
 <sect2 id="ch-scatter-wiki">
 <title>Wiki</title>
 

+ 1 - 1
chapter01/askforhelp.xml

@@ -15,7 +15,7 @@ following hint will give you some guidance for troubleshooting: <ulink
 url="&hints-root;errors.txt"/>.</para>
 
 <para>We also have a wonderful LFS community that is willing to offer
-assistance through IRC and the mailing lists (see the <xref
+assistance through the mailing lists and IRC (see the <xref
 linkend="ch-scatter-administrativa"/> section of this book). In order
 to assist with diagnosing and solving the problem, please include
 all relevant information in your request for help.</para>

+ 3 - 3
chapter01/changelog.xml

@@ -10,9 +10,9 @@
 <?dbhtml filename="changelog.html"?>
 
 <para>This is version &version; of the Linux From Scratch book, dated
-&releasedate;. If this book is more than two months old, a newer and better
-version is probably already available. To find out, please check one of the
-mirrors via <ulink url="&lfs-root;"/>.</para>
+&releasedate;. If this book is more than four to six months old, a newer and
+better version is probably already available. To find out, please check one of
+the mirrors via <ulink url="&lfs-root;"/>.</para>
 
 <para>Below is a list of changes made since the previous release of the book.
 First a summary, then a detailed log.</para>

+ 7 - 7
chapter01/how.xml

@@ -29,7 +29,7 @@ where the new LFS system will be compiled and installed. <xref
 linkend="chapter-getting-materials"/> explains which packages and
 patches need to be downloaded to build an LFS system and how to store
 them on the new file system. <xref linkend="chapter-final-preps"/>
-discusses the setup for an appropriate work environment. Please read
+discusses the setup for an appropriate working environment. Please read
 <xref linkend="chapter-final-preps"/> carefully as it explains several
 important issues the developer should be aware of before beginning to
 work through <xref linkend="chapter-temporary-tools"/> and
@@ -54,16 +54,16 @@ pass toolchain. When this is done, the LFS installation process will no longer
 depend on the host distribution, with the exception of the running kernel.
 </para>
 
-<para>While this may initially seem like a lot of work to get away
-from a host distribution, a full technical explanation is provided at
-the beginning of <xref linkend="chapter-temporary-tools"/>.</para>
+<para>While this may initially seem like a lot of work to isolate the new system
+from the host distribution, a full technical explanation is provided at the
+beginning of <xref linkend="chapter-temporary-tools"/>.</para>
 
 <para>In <xref linkend="chapter-building-system"/>, the full LFS system is
-built. The chroot (change root) program is used to enter a virtual
+built. The <command>chroot</command> (change root) program is used to enter a virtual
 environment and start a new shell whose root directory will be set to
 the LFS partition. This is very similar to rebooting and instructing
 the kernel to mount the LFS partition as the root partition. The
-system does not actually reboot, but instead chroots because creating a
+system does not actually reboot, but instead <command>chroot</command>'s because creating a
 bootable system requires additional work which is not necessary just
 yet. The major advantage is that <quote>chrooting</quote> allows the
 builder to continue using the host while LFS is being built. While
@@ -82,7 +82,7 @@ LFS system.</para>
 <para>This is the process in a nutshell. Detailed information on each
 step is discussed in the following chapters and package descriptions.
 Items that may seem complicated will be clarified, and everything will
-fall into place as the developer embarks on the LFS adventure.</para>
+fall into place as the reader embarks on the LFS adventure.</para>
 
 </sect1>
 

+ 1 - 1
chapter02/creatingpartition.xml

@@ -22,7 +22,7 @@ using a fresh partition for the installation.</para>
 (GB).  This is enough to store all the source tarballs and compile 
 the packages. However, if the LFS system is intended to be the primary
 Linux system, additional software will probably be installed which
-will require additional space (2 or 3 GB). The LFS system itself will
+will require additional space (2-3 GB). The LFS system itself will
 not take up this much room. A large portion of this requirement
 is to provide sufficient free temporary storage. Compiling
 packages can require a lot of disk space which will be reclaimed after

+ 8 - 13
chapter03/introduction.xml

@@ -7,22 +7,17 @@
 <title>Introduction</title>
 <?dbhtml filename="introduction.html"?>
 
-<para>This chapter includes a list of packages that need to be
-downloaded for building a basic Linux system. The listed version numbers
-correspond to versions of the software that are known to work, and
-this book is based on their use. We highly recommend not using newer
-versions because the build commands for one version may not work with
-a newer version. The newest package versions may also have problems
-that work-arounds have not been developed for yet.</para>
-
-<para>All the URLs, when possible, refer to the package's information
-page at <ulink url="http://www.freshmeat.net/"/>. The Freshmeat pages
-provide easy access to official download sites, as well as project
-websites, mailing lists, FAQ, changelogs, and more.</para>
+<para>This chapter includes a list of packages that need to be downloaded for
+building a basic Linux system. The listed version numbers correspond to versions
+of the software that are known to work, and this book is based on their use. We
+highly recommend not using newer versions because the build commands for one
+version may not work with a newer version. The newest package versions may also
+have problems that require work-arounds. These work-arounds will be developed
+and stabilized in the SVN version of the book.</para>
 
 <para>Download locations may not always be accessible. If a download
 location has changed since this book was published, Google (<ulink
-url="http://www.google.com"/>) provides a useful search engine for
+url="http://www.google.com/"/>) provides a useful search engine for
 most packages. If this search is unsuccessful, try one of the
 alternate means of downloading discussed at <ulink
 url="&lfs-root;lfs/packages.html"/>.</para>

+ 5 - 4
chapter04/aboutsbus.xml

@@ -29,10 +29,11 @@ install the first pass of Binutils, it will take
 Fortunately, most build times are shorter than the one for Binutils.</para>
 
 <para>In general, SBUs are not entirely accurate because they depend on many
-factors, not just the GCC version. Note that on Symmetric Multi-Processor
-(SMP)-based machines, SBUs are even less accurate.  They are provided here to
-give an estimate of how long it might take to install a package, but the numbers
-can vary by as much as dozens of minutes in some cases.</para>
+factors, including the host system's version of GCC. Note that on Symmetric
+Multi-Processor (SMP)-based machines, SBUs are even less accurate.  They are
+provided here to give an estimate of how long it might take to install a
+package, but the numbers can vary by as much as dozens of minutes in some
+cases.</para>
 
 <para>To view actual timings for a number of specific machines, we recommend
 The LinuxFromScratch SBU Home Page at <ulink url="&lfs-root;~bdubbs/"/>.</para>

+ 4 - 3
chapter04/abouttestsuites.xml

@@ -41,9 +41,10 @@ most likely cause is that the host system does not have the
 correctly. This issue is discussed in greater detail in <xref
 linkend="chapter-temporary-tools"/>.</para>
 
-<para>Sometimes package test suites will give false failures. Consult the logs
-located at <ulink url="&test-results;"/> to verify whether or not these failures
-are expected. This site is valid for all tests throughout this book.</para>
+<para>Sometimes package test suites will fail, but for reasons which the
+developers are aware of and have deemed non-critical. Consult the logs located
+at <ulink url="&test-results;"/> to verify whether or not these failures are
+expected. This site is valid for all tests throughout this book.</para>
 
 </sect1>
 

+ 9 - 10
chapter04/addinguser.xml

@@ -7,13 +7,12 @@
 <title>Adding the LFS User</title>
 <?dbhtml filename="addinguser.html"?>
 
-<para>When logged in as user <emphasis>root</emphasis>, making a
-single mistake can damage or destroy a system. Therefore, we recommend
-building the packages in this chapter as an unprivileged user. You
-could use your own user name, but to make it easier to set up a clean
-work environment, create a new user called <emphasis>lfs</emphasis> as
-a member of a new group (also named <emphasis>lfs</emphasis>) and use
-this user during the installation process. As
+<para>When logged in as user <emphasis>root</emphasis>, making a single mistake
+can damage or destroy a system. Therefore, we recommend building the packages in
+this chapter as an unprivileged user. You could use your own user name, but to
+make it easier to set up a clean working environment, create a new user called
+<emphasis>lfs</emphasis> as a member of a new group (also named
+<emphasis>lfs</emphasis>) and use this user during the installation process. As
 <emphasis>root</emphasis>, issue the following commands to add the new
 user:</para>
 
@@ -83,9 +82,9 @@ following substitute user command:</para>
 <screen><userinput>su - lfs</userinput></screen>
 
 <para>The <quote><parameter>-</parameter></quote> instructs
-<command>su</command> to start a login shell as opposed to a non-login
-shell. The difference between these two types of shells can be found
-in detail in the Bash man and info pages.</para>
+<command>su</command> to start a login shell as opposed to a non-login shell.
+The difference between these two types of shells can be found in detail in the
+<command>man</command> and <command>info</command> pages for Bash.</para>
 
 </sect1>
 

+ 3 - 3
chapter04/creatingtoolsdir.xml

@@ -30,9 +30,9 @@ well:</para>
 
 <screen><userinput>ln -s $LFS/tools /</userinput></screen>
 
-<note><para>The above command is correct. The <command>ln</command>
-command has a few syntactic variations, so be sure to check the info
-and man pages before reporting what you may think is an
+<note><para>The above command is correct. The <command>ln</command> command has
+a few syntactic variations, so be sure to check the <command>info</command> and
+<command>man</command> pages before reporting what you may think is an
 error.</para></note>
 
 <para>The created symlink enables the toolchain to be compiled so that

+ 6 - 7
chapter04/settingenviron.xml

@@ -76,13 +76,12 @@ later. Setting <envar>LC_ALL</envar> to <quote>POSIX</quote>
 or <quote>C</quote> (the two are equivalent) ensures that
 everything will work as expected in the chroot environment.</para>
 
-<para>By putting <filename class="directory">/tools/bin</filename>
-ahead of the standard <envar>PATH</envar>, all the programs installed in <xref
-linkend="chapter-temporary-tools"/> are picked up by the shell
-immediately after their installation. This, combined with turning off 
-hashing, limits the risk that old programs from
-the host are being used when they should not be used any
-longer.</para>
+<para>By putting <filename class="directory">/tools/bin</filename> ahead of the
+standard <envar>PATH</envar>, all the programs installed in <xref
+linkend="chapter-temporary-tools"/> are picked up by the shell immediately after
+their installation. This, combined with turning off hashing, limits the risk
+that old programs are used from the host when the same programs are available in
+the chapter 5 environment.</para>
 
 <para>Finally, to have the environment fully prepared for building the
 temporary tools, source the just-created user profile:</para>

+ 4 - 3
chapter05/expect.xml

@@ -55,15 +55,16 @@ one on the host system.</para></listitem>
 <term><parameter>--with-tclinclude=$TCLPATH</parameter></term>
 <listitem><para>This explicitly tells Expect where to find Tcl's source
 directory and internal headers. Using this option avoids conditions
-where <command>configure</command> fails because it hasn't automatically
-discovered the location of the Tcl source directory.</para></listitem>
+where <command>configure</command> fails because it cannot automatically
+discover the location of the Tcl source directory.</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term><parameter>--with-x=no</parameter></term>
 <listitem><para>This tells the configure script not to search for Tk
 (the Tcl GUI component) or the X Window System libraries, both of
-which may reside on the host system.</para></listitem>
+which may reside on the host system but will not exist in the temporary
+environment.</para></listitem>
 </varlistentry>
 </variablelist>
 

+ 1 - 1
chapter05/gawk.xml

@@ -37,7 +37,7 @@
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results (not necessary), issue: <userinput>make
+<para>To test the results, issue: <userinput>make
 check</userinput>.</para>
 
 <para>Install the package:</para>

+ 3 - 4
chapter05/gettext.xml

@@ -47,10 +47,9 @@ exclude it to save time and space.</para></listitem>
 
 <varlistentry>
 <term><parameter>--without-csharp</parameter></term>
-<listitem><para>This tells Gettext not to use a C# compiler, even if a
-C# compiler is installed on the host. This needs to be done because
-once we enter the chroot environment, C# will no longer be
-available.</para></listitem>
+<listitem><para>This ensures that Gettext does not build support for the C#
+compiler which may be present on the host but will not be available once we
+enter the chroot environment.</para></listitem>
 </varlistentry>
 </variablelist>
 

+ 4 - 7
chapter05/glibc.xml

@@ -104,16 +104,13 @@ installed to the tools directory, so that it knows exactly what features the
 kernel has and can optimize itself accordingly.</para></listitem>
 </varlistentry>
 
-<!-- Edit Me -->
 <varlistentry>
 <term><parameter>--without-selinux</parameter></term>
-<listitem><para>When building from hosts using SELinux functionality
-(i.e. Fedora Core 3), Glibc will try to integrate this functionality into
-itself, but will fail, because we do not have this functionality in the LFS
-tools environment.  This option will disable this, allowing Glibc to build
-correctly, but will not otherwise affect the build.</para></listitem>
+<listitem><para>When building from hosts that include SELinux functionality
+(e.g. Fedora Core 3), Glibc will build with support for SELinux. As the LFS
+tools environment does not contain support for SELinux, a Glibc compiled with
+such support will fail to operate correctly.</para></listitem>
 </varlistentry>
-<!-- -->
 </variablelist>
 
 <para>During this stage the following warning might appear:</para>

+ 3 - 4
chapter05/grep.xml

@@ -39,10 +39,9 @@
 <variablelist>
 <varlistentry>
 <term><parameter>--disable-perl-regexp</parameter></term>
-<listitem><para>This makes sure that the <command>grep</command>
-program does not get linked against a Perl Compatible Regular
-Expression (PCRE) library that may be present on the host and would
-not be available once we enter the chroot
+<listitem><para>This ensures that the <command>grep</command> program does not
+get linked against a Perl Compatible Regular Expression (PCRE) library that may
+be present on the host but will not be available once we enter the chroot
 environment.</para></listitem>
 </varlistentry>
 </variablelist>

+ 3 - 4
chapter05/ncurses.xml

@@ -39,10 +39,9 @@
 <variablelist>
 <varlistentry>
 <term><parameter>--without-ada</parameter></term>
-<listitem><para>This tells Ncurses not to build its Ada bindings, even
-if an Ada compiler is installed on the host. This needs to be done
-because once we enter the chroot environment, Ada will no longer be
-available.</para></listitem>
+<listitem><para>This ensures that Ncurses does not build support for the ada
+compiler which may be present on the host but will not be available once we
+enter the chroot environment.</para></listitem>
 </varlistentry>
 
 <varlistentry>

+ 3 - 2
chapter05/perl.xml

@@ -50,7 +50,8 @@ the next chapter.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para>Compile only the required tools:</para>
+<para>Only a few of the utilities contained in this package need to be
+built:</para>
 
 <screen><userinput>make perl utilities</userinput></screen>
 
@@ -60,7 +61,7 @@ run it at this point. Only part of Perl was built and running
 built as well, which is unnecessary at this point. The test suite can
 be run in the next chapter if desired.</para>
 
-<para>Copy these tools and their libraries:</para>
+<para>Install these tools and their libraries:</para>
 
 <screen><userinput>cp perl pod/pod2man /tools/bin
 mkdir -p /tools/lib/perl5/&perl-version;

+ 1 - 1
chapter05/tcl.xml

@@ -57,7 +57,7 @@ considered critical. The <parameter>TZ=UTC</parameter> parameter sets
 the time zone to Coordinated Universal Time (UTC), also known as
 Greenwich Mean Time (GMT), but only for the duration of the test suite
 run. This ensures that the clock tests are exercised correctly.
-Details on the <envar>TZ</envar> environment variable is provided in
+Details on the <envar>TZ</envar> environment variable are provided in
 <xref linkend="chapter-bootscripts"/>.</para>
 
 <para>Install the package:</para>

+ 8 - 10
chapter05/toolchaintechnotes.xml

@@ -13,16 +13,14 @@ immediately understand everything in this section. Most of this
 information will be clearer after performing an actual build. This
 section can be referred back to at any time during the process.</para>
 
-<para>The overall goal of <xref linkend="chapter-temporary-tools"/> is
-to provide a temporary environment that can be chrooted into and from
-which can be produced a clean, trouble-free build of the target LFS
-system in <xref linkend="chapter-building-system"/>. Along the way, we
-separate from the host system as much as possible, and in doing so,
-build a self-contained and self-hosted toolchain. It should be noted
-that the build process has been designed to minimize the risks for new
-readers and provide maximum educational value at the same time. In
-other words, more advanced techniques could be used to build the
-system.</para>
+<para>The overall goal of <xref linkend="chapter-temporary-tools"/> is to
+provide a temporary environment that can be chrooted into and from which can be
+produced a clean, trouble-free build of the target LFS system in <xref
+linkend="chapter-building-system"/>. Along the way, we separate the new system
+from the host system as much as possible, and in doing so, build a
+self-contained and self-hosted toolchain. It should be noted that the build
+process has been designed to minimize the risks for new readers and provide
+maximum educational value at the same time.</para>
 
 <important>
 <para>Before continuing, be aware of the name of the working platform,

+ 5 - 5
chapter05/util-linux.xml

@@ -29,9 +29,9 @@
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
 
-<para>Util-linux does not use the freshly installed headers and
-libraries from the <filename class="directory">/tools</filename>
-directory. This is fixed by altering the configure script:</para>
+<para>Util-linux does not use the freshly installed headers and libraries from
+the <filename class="directory">/tools</filename> directory by default. This is
+fixed by altering the configure script:</para>
 
 <screen><userinput>sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen>
 
@@ -43,8 +43,8 @@ directory. This is fixed by altering the configure script:</para>
 
 <screen><userinput>make -C lib</userinput></screen>
 
-<para>Since only a couple of the utilities contained in this package
-are needed, build only those:</para>
+<para>Only a few of the utilities contained in this package need to be
+built:</para>
 
 <screen><userinput>make -C mount mount umount
 make -C text-utils more</userinput></screen>

+ 2 - 2
chapter06/gettext.xml

@@ -13,8 +13,8 @@
 
 <sect2 role="package"><title/>
 <para>The Gettext package contains utilities for internationalization and
-localization. These allow programs to be compiled with NLS, enabling them
-to output messages in the user's native language.</para>
+localization. These allow programs to be compiled with NLS (Native Language
+Support), enabling them to output messages in the user's native language.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>

+ 3 - 3
prologue/audience.xml

@@ -8,7 +8,7 @@
 <?dbhtml filename="audience.html"?>
 
 <para>There are many reasons why somebody would want to read this
-book. The principle reason is to install a Linux system straight
+book. The principle reason is to install a Linux system
 from the source code. A question many people raise is, <quote>why go
 through all the hassle of manually building a Linux system from
 scratch when you can just download and install an existing
@@ -32,9 +32,9 @@ and how programs are installed.</para>
 <para>Another benefit of LFS is the ability to create a very compact
 Linux system. When installing a regular distribution, one is often
 forced to include several programs which are probably never used.
-These programs waste precious disk space, or worse, CPU cycles. It is
+These programs waste disk space, or worse, CPU cycles. It is
 not difficult to build an LFS system of less than 100 megabytes (MB),
-which is substantially smaller when compared to the majority of existing installations.  Does
+which is substantially smaller than the majority of existing installations.  Does
 this still sound like a lot of space? A few of us have been working on
 creating a very small embedded LFS system. We successfully built a
 system that was specialized to run the Apache web server with

+ 2 - 2
prologue/foreword.xml

@@ -11,7 +11,7 @@
 installed my first distribution. After working with it for awhile, I
 discovered issues I definitely would have liked to see improved upon.
 For example, I didn't like the arrangement of the bootscripts or the way
-programs were configured by default. I tried a number of alternate
+programs were configured by default. I tried a number of alternative
 distributions to address these issues, yet each had its pros and cons.
 Finally, I realized that if I wanted full satisfaction from my Linux
 system, I would have to build my own from scratch.</para>
@@ -47,7 +47,7 @@ readers with the background and instruction to design and build custom
 Linux systems. This book highlights the Linux from Scratch project and
 the benefits of using this system. Users can dictate all aspects of
 their system, including directory layout, script setup, and security.
-The resulting system will be compiled straight from the source code,
+The resulting system will be compiled completely from the source code,
 and the user will be able to specify where, why, and how programs are
 installed. This book allows readers to fully customize Linux systems
 to their own needs and allows users more control over their