grammar fixes from Alex

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2447 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter06/config-glibc.xml

@@ -2,10 +2,10 @@
 
 <sect2><title>Configuring Glibc</title>
 
-<para>We need to create the /etc/nsswitch.conf file. Although glibc should 
-provide defaults when this file is missing or corrupt, its defaults don't work
-well with networking. That is dealt with in a later chapter. Also, our
-timezone needs to be set up.</para>
+<para>We need to create the <filename>/etc/nsswitch.conf</filename> file,
+because, although Glibc provides defaults when this file is missing or corrupt,
+the Glibc defaults don't work well with networking. Also, our timezone needs
+to be set up.</para>
 
 <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running the
 following:</para>
@@ -32,27 +32,21 @@ netgroup: db files
 # End /etc/nsswitch.conf
 <userinput>EOF</userinput></screen></para>
 
-<para>The <userinput>tzselect</userinput> script has to be run and the 
-questions regarding your timezone have to be answered.
-When you're done, the script will give the 
-location of the needed timezone file.</para>
+<para>To find out what timezone you're in, run the following script:</para>
 
-<para> Create the <filename class="directory">/etc/localtime</filename> symlink
-by running:</para>
+<para><screen><userinput>tzselect</userinput></screen></para>
 
-<para><screen><userinput>ln -sf ../usr/share/zoneinfo/&lt;tzselect's output&gt; /etc/localtime</userinput></screen></para>
-
-<para>tzselect's output can be something like <emphasis>EST5EDT</emphasis> or
-<emphasis>Canada/Eastern</emphasis>.</para>
-
-<para>The symlink you'd create with that information would be:</para>
-
-<para><screen><userinput>ln -sf ../usr/share/zoneinfo/EST5EDT /etc/localtime</userinput></screen></para>
-
-<para>Or:</para>
+<para>When you've answered a few questions about your location, the script will
+output the name of your timezone, something like <emphasis>EST5EDT</emphasis>
+or <emphasis>Canada/Eastern</emphasis>. Then create the
+<filename>/etc/localtime</filename> symlink by running:</para>
 
 <para><screen><userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern /etc/localtime </userinput></screen></para>
 
+<para>Of course, instead of <emphasis>Canada/Eastern</emphasis>, fill in
+the name of the timezone that the <userinput>tzselect</userinput> script
+gave you.</para>
+
 </sect2>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>

chapter06/glibc-inst.xml

@@ -3,38 +3,37 @@
 <sect2>
 <title>Glibc installation</title>
 
-<para>Before starting to install glibc, you must cd into the
-glibc-&glibc-version; directory and unpack glibc-linuxthreads inside
-the glibc-&glibc-version; directory, not in /usr/src as you normally
-would do.</para>
+<para>Before starting to install Glibc, you must <userinput>cd</userinput>
+into the <filename>glibc-&glibc-version;</filename> directory and unpack
+Glibc-linuxthreads in that directory, not in <filename>/usr/src</filename> as
+you would normally do.</para>
 
 <para>This package is known to behave badly when you have changed its
 default optimization flags (including the -march and -mcpu options).
 Therefore, if you have defined any environment variables that override
 default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
-or modifying them when building Glibc.</para>
+them when building Glibc.</para>
 
 <para>Basically, compiling Glibc in any other way than the book suggests
 is putting your system at a very high risk.</para>
 
-<para>We'll start by applying a patch to Glibc that fixes the following:</para>
+<para>We'll start by applying a patch that does the following:</para>
 
 <itemizedlist>
 <listitem><para>It converts all occurrences of <emphasis>$(PERL)</emphasis>
 to <emphasis>/usr/bin/perl</emphasis> in the
 <filename>malloc/Makefile</filename> file. This is done because Glibc
-can't autodetect the location of perl because the Perl package hasn't been
-installed yet. And if Glibc thinks Perl isn't installed, the
-<userinput>mtrace</userinput> perl program won't be installed
+can't autodetect the location of <filename>perl</filename> because the Perl
+package hasn't been installed yet. And if Glibc thinks Perl isn't installed, the
+perl program <filename>mtrace</filename> won't be installed
 either.</para></listitem>
 
 <listitem><para>It replaces all occurrences of <emphasis>root</emphasis>
 with <emphasis>0</emphasis> in the <filename>login/Makefile</filename>
 file. This is done because Glibc itself isn't installed yet and therefore
-username to userid resolving isn't working yet, so a
-<userinput>chown root file</userinput> will fail, however it'll work fine
-if you use the numeric IDs (such as <userinput>chown 0
-file</userinput>).</para></listitem>
+username-to-userid resolving isn't working yet, so a
+<userinput>chown root file</userinput> would fail. Using numeric IDs (as in
+<userinput>chown 0 file</userinput>) works fine.</para></listitem>
 
 </itemizedlist>
 
@@ -45,14 +44,14 @@ to crash that were linked against Glibc-2.2 or older libraries. Even though
 static binaries have all the necessary parts of Glibc built-in, they still
 rely on one external library set: Glibc's NSS libraries. These libraries,
 among other things, tell programs where the system's password database is
-(/etc/password, or NIS, or whatever other scheme has been
-configured).</para>
+(in <filename>/etc/password</filename>, NIS, or whatever other scheme has
+been configured).</para>
 
 <para>Glibc has undergone some changes since version 2.2.x and the new NSS
-code is incompatible with the old one. So when Glibc is installed, it will
-install its new NSS libraries and static programs will load these new NSS
-libraries and start to abort with <emphasis>segmentation fault</emphasis>
-error. This patch undoes a few of the changes to overcome the problem.</para>
+code is incompatible with the old one. So when Glibc is installed it will
+install its new NSS libraries, and static programs will load these new NSS
+libraries and will abort with a <emphasis>segmentation fault</emphasis>
+error. This patch undoes some of the changes to overcome the problem.</para>
 
 <para>If you started chapter 5 with a host system that uses Glibc-2.2.x
 or older, you must apply the following patch. We will install Glibc again at
@@ -66,8 +65,8 @@ and abort with an error if the file is missing, so we must create it:</para>
 
 <para><screen><userinput>touch /etc/ld.so.conf</userinput></screen></para>
 
-<para>It is recommended by the Glibc installation documentation to build
-Glibc outside of the source directory in a dedicated directory:</para>
+<para>The documentation that comes with Glibc recommends to build the package
+not in the source directory but in a separate, dedicated directory:</para>
 
 <para><screen><userinput>mkdir ../glibc-build &amp;&amp;
 cd ../glibc-build</userinput></screen></para>
@@ -82,15 +81,15 @@ cd ../glibc-build</userinput></screen></para>
 
 <itemizedlist>
 <listitem><para><userinput>--disable-profile</userinput>: This disables the
-building of libraries with profiling information. This command may be
-omitted if you plan to do profiling.</para></listitem>
+building of the libraries with profiling information. Omit this option if you
+plan to do profiling.</para></listitem>
 
-<listitem><para><userinput>--enable-add-ons</userinput>: This enables the
-add-on that we install with Glibc, linuxthreads</para></listitem>
+<listitem><para><userinput>--enable-add-ons</userinput>: This enables any
+add-ons that we installed with Glibc, in our case Linuxthreads.</para></listitem>
 
 <listitem><para><userinput>--libexecdir=/usr/bin</userinput>: This will
-cause the pt_chown program to be installed in the /usr/bin
-directory.</para></listitem>
+cause the <filename>pt_chown</filename> program to be installed in the
+<filename>/usr/bin</filename> directory.</para></listitem>
 </itemizedlist>
 
 <para>During this stage you will see the following warning:</para>
@@ -100,22 +99,23 @@ directory.</para></listitem>
 *** some features will be disabled.
 *** Check the INSTALL file for required versions.</screen></blockquote>
 
-<para>The missing msgfmt (from the gettext package which we will install
-later in this chapter) won't cause any problems. msgfmt is used to generate
-the binary translation files that are used to make your system talk in a
-different language. Because these translation files have already been
-generated for you, there is no need for msgfmt. You'd only need msgfmt if
-you change the translation source files (the <filename>*.po</filename>
-files in the <filename class="directory">po</filename> subdirectory) which
-would require you to re-generate the binary files.</para>
+<para>The missing <filename>msgfmt</filename> program (from the Gettext
+package, which we'll install later) won't cause any problems. The
+<filename>msgfmt</filename> is used to generate the binary translation
+files that can make your system talk in a different language. Because these
+translation files have already been generated for you, there is no need for
+<filename>msgfmt</filename>. You'd only need the program if you change the
+translation source files (the <filename>*.po</filename> files in the
+<filename class="directory">po</filename> subdirectory), which
+would require you to regenerate the binary files.</para>
 
 <para>Because Glibc hasn't been installed yet, one of the tests that was
-run by the configure script failed. This test is supposed to test gcc to
-determine whether or not a cross-compiler is installed. However, Glibc
-needs to be installed already to run this test. Since the test failed, the
-configure script automatically assumed we do have a cross-compiler. We have
-to override that assumption by explicitly telling Glibc we're not
-cross-compiling. Not doing this has a couple of unintended side effects,
+run by the configure script has failed. This test is supposed to test
+<filename>gcc</filename> to determine whether a cross-compiler is installed.
+However, Glibc needs to be already installed to run this test. Since the test
+failed, the configure script assumes we have a cross-compiler. We override
+that assumption by explicitly telling Glibc we're not cross-compiling.
+Not doing this would have a couple of unintended side effects,
 such as the timezone files not being installed.</para>
 
 <para><screen><userinput>echo "cross-compiling = no" &gt; configparms</userinput></screen></para>
@@ -132,21 +132,19 @@ time at the end of this chapter.</para>
 
 <para><screen><userinput>make install</userinput></screen></para>
 
-<para>Locales aren't installed when you ran
-<userinput>make install</userinput>, so we have to do that ourselves now.
-Locales are used by Glibc to make your Linux system talk in a different
-language:</para>
+<para>The locales (used by Glibc to make your Linux system talk in a different
+language) weren't installed when you ran the previous command, so we have to
+do that ourselves now:</para>
 
 <para><screen><userinput>make localedata/install-locales</userinput></screen></para>
 
-<para>An alternative to running <userinput>make
-localedata/install-locales</userinput> is to only install those locales
-which you need or want. This can be achieved using the localedef
-command. Information on this can be found in the INSTALL
-file in the glibc-&glibc-version; tree.</para>
+<para>An alternative to running the previous command is to install only those
+locales which you need or want. This can be achieved using the localedef
+command. Information on this can be found in the <filename>INSTALL</filename>
+file in the <filename>glibc-&glibc-version;</filename> tree.</para>
 
-<para>To finish off the installation we'll reload Bash so it uses the
-libnss files. This will also get rid of the
+<para>To finish off the installation we'll reload Bash so it will use the new
+<filename>libnss_*</filename> files. This will also get rid of the
 <emphasis>I have no name!</emphasis> message in the command prompt:</para>
 
 <para><screen><userinput>exec /static/bin/bash --login</userinput></screen></para>

index.xml

@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20030217">
-<!ENTITY releasedate "February 17th, 2003">
+<!ENTITY version "20030219">
+<!ENTITY releasedate "February 19th, 2003">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">