Automatic merge of trunk into multilib

chapter01/askforhelp.xml

@@ -13,7 +13,7 @@
   <para>If an issue or a question is encountered while working through
   this book, please check the FAQ page at <ulink url="&faq-root;#generalfaq"/>.
   Questions are often already answered there. If your question is not
-  answered on this page, try to find the source of the problem. The
+  answered on that page, try to find the source of the problem. The
   following hint will give you some guidance for troubleshooting:
   <ulink url="&hints-root;errors.txt"/>.</para>
 
@@ -23,18 +23,18 @@
   <para>We also have a wonderful LFS community that is willing to offer
   assistance through the mailing lists and IRC (see the <xref
   linkend="ch-intro-resources"/> section of this book). However,
-  we get several support questions every day and many of them can be easily
+  we get several support questions every day, and many of them could have been easily
-  answered by going to the FAQ and by searching the mailing lists first.
+  answered by going to the FAQ or by searching the mailing lists first.
-  So, for us to offer the best assistance possible, you need to do some
+  So, for us to offer the best assistance possible, you should first do some
-  research on your own first. That allows us to focus on the more unusual
+  research on your own. That allows us to focus on the more unusual
   support needs. If your searches do not produce a solution, please include
-  all relevant information (mentioned below) in your request for help.</para>
+  all the relevant information (mentioned below) in your request for help.</para>
 
   <sect2>
     <title>Things to Mention</title>
 
     <para>Apart from a brief explanation of the problem being experienced,
-    the essential things to include in any request for help are:</para>
+    any request for help should include these essential things:</para>
 
     <itemizedlist>
       <listitem>
@@ -50,7 +50,7 @@
         <para>The package or section the problem was encountered in</para>
       </listitem>
       <listitem>
-        <para>The exact error message or symptom being received</para>
+        <para>The exact error message, or a clear decription of the problem</para>
       </listitem>
       <listitem>
         <para>Note whether you have deviated from the book at all</para>
@@ -60,7 +60,7 @@
     <note>
       <para>Deviating from this book does <emphasis>not</emphasis> mean that
       we will not help you. After all, LFS is about personal preference.
-      Being upfront about any changes to the established procedure helps us
+      Being up-front about any changes to the established procedure helps us
       evaluate and determine possible causes of your problem.</para>
     </note>
 
@@ -84,9 +84,9 @@
     in determining the cause of compilation problems. The screen output from
     the <command>configure</command> script and the <command>make</command>
     run can be helpful. It is not necessary to include the entire output, but
-    do include enough of the relevant information. Below is an example of the
+    do include all of the relevant information. Here is an example of the
-    type of information to include from the screen output from
+    type of information to include from the <command>make</command> screen
-    <command>make</command>:</para>
+    output.</para>
 
 <screen><computeroutput>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
 -DLOCALEDIR=\"/mnt/lfs/usr/share/locale\"
@@ -112,16 +112,16 @@ make: *** [all-recursive-am] Error 2</computeroutput></screen>
 
 <screen><computeroutput>make [2]: *** [make] Error 1</computeroutput></screen>
 
-    <para>This is not enough information to properly diagnose the problem
+    <para>This is not enough information to diagnose the problem,
     because it only notes that something went wrong, not
     <emphasis>what</emphasis> went wrong. The entire section, as in the
     example above, is what should be saved because it includes the command
-    that was executed and the associated error message(s).</para>
+    that was executed and all the associated error messages.</para>
 
     <para>An excellent article about asking for help on the Internet is
     available online at <ulink
-    url="http://catb.org/~esr/faqs/smart-questions.html"/>. Read and
+    url="http://catb.org/~esr/faqs/smart-questions.html"/>. Read this document,
-    follow the hints in this document to increase the likelihood of getting
+    and follow the hints. Doing so will increase the likelihood of getting
     the help you need.</para>
 
   </sect2>

prologue/errata.xml

@@ -13,18 +13,18 @@
   <para>The software used to create an LFS system is constantly being updated
   and enhanced. Security warnings and bug fixes may become available after
   the LFS book has been released. To check whether the package versions or
-  instructions in this release of LFS need any modifications to accommodate
+  instructions in this release of LFS need any modifications&mdash;to repair
-  security vulnerabilities or other bug fixes, please visit
+  security vulnerabilities or to fix other bugs&mdash;please visit
   <ulink url="&errata;"/>
   before proceeding with your build. You should note any
-  changes shown and apply them to the relevant section of the book as you
+  changes shown and apply them to the relevant sections of the book as you
-  progress with building the LFS system.</para>
+  build the LFS system.</para>
 
   <para>In addition, the Linux From Scratch editors maintain a list of security
-  vulnerabilities discovered after a book was released. To check whether there
+  vulnerabilities discovered <emphasis>after</emphasis> a book has been released. To see
-  are any active security vulnerabilities, please visit
+  whether there  are any known security vulnerabilities, please visit
-  <ulink url="&secadv;"/> prior to proceeding with your build. You should note
+  <ulink url="&secadv;"/> before proceeding with your build. You should also continue
-  any advisories and perform the steps to fix any security vulnerabilities as
+  to consult the advisories, and fix any security vulnerabilities, even
-  you progress with building the LFS system.</para>
+  when the LFS system has been completely constructed.</para>
 
 </sect1>