aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/alfsdiscuss.xml6
-rw-r--r--chapter01/changelog.xml31
-rw-r--r--chapter01/contactinfo.xml2
-rw-r--r--chapter01/lfsannounce.xml4
-rw-r--r--chapter01/lfsdiscuss.xml4
-rw-r--r--chapter01/lfssecurity.xml2
-rw-r--r--chapter01/maillists.xml18
-rw-r--r--chapter01/othermodes.xml12
-rw-r--r--chapter01/subscribe.xml2
-rw-r--r--chapter01/unsubscribe.xml1
10 files changed, 42 insertions, 40 deletions
diff --git a/chapter01/alfsdiscuss.xml b/chapter01/alfsdiscuss.xml
index 4994c945f..e7f5ffa7c 100644
--- a/chapter01/alfsdiscuss.xml
+++ b/chapter01/alfsdiscuss.xml
@@ -2,11 +2,11 @@
<title>alfs-discuss</title>
<para>
-The alfs-discuss list discusses the development of ALFS which stands for
-Automated LinuxFromScratch. The goal of this project is to develop an
+The alfs-discuss list discusses the development of ALFS, which stands for
+Automated Linux From Scratch. The goal of this project is to develop an
installation tool that can install an LFS system automatically for you.
It's main goal is to speed up compilation by taking away your need to
-manually enter the commands to configure, compile and install packages.
+manually enter the commands to configure, compile, and install packages.
</para>
</sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 80a7e9941..cae962a7a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -2,8 +2,9 @@
<title>Changelog</title>
<para>
-If, for example, a change is listed for chapter 5 it (usually) means the
-same change has been made in the chapters for the other architectures.
+If, for example, a change is listed for chapter 5, it (usually) means the
+same change has been made in the corresponding chapter for the other
+architectures.
</para>
<para>
@@ -23,12 +24,12 @@ page recommends cfdisk over fdisk because it's more stable.
<listitem><para>
Chapter 4: Changed the wording to make it more general as ext2 no
-longer is the only used file system. Reiser for example is often used
+longer is the only used file system. Reiserfs, for example, is often used
too now.
</para></listitem>
<listitem><para>
-Chapter 5: Added static mawk, texinfo and partially gettext to faciliate
+Chapter 5: Added static mawk, texinfo, and partially gettext to faciliate
the move of Glibc from Chapter 5 to Chapter 6.
</para></listitem>
@@ -37,8 +38,8 @@ Chapter 5: Added Makedev to chapter 5. We don't create the device files
here, only copy the MAKEDEV script and make a temp copy which will be
used to create device files. This second file (MAKEDEV-temp) doesn't
contain user names and group names but only user id's and group id's. We
-need a few device files to get Glibc installed, but before GLibc is
-installed user and group names are not recognized yet; only the numeric
+need a few device files to get Glibc installed, but, before Glibc is
+installed, user and group names are not recognized yet, only the numeric
id's. This requires a slightly modified MAKEDEV script which will be
generated by patching the original one. This patching is done here in
chapter 5. Also, fixed the explanations on both makedev installations.
@@ -50,7 +51,7 @@ su'ed to) user root.
</para></listitem>
<listitem><para>
-Chapter 5: Simplified ln commands
+Chapter 5: Simplified ln commands.
</para></listitem>
<listitem><para>
@@ -73,22 +74,22 @@ Chapter 5: Beautified the static link process for mawk.
</para></listitem>
<listitem><para>
-Chapter 5+6: Upgraded from gcc-2.95.2 to gcc-2.95.2.1
+Chapter 5+6: Upgraded gcc-2.95.2 to gcc-2.95.2.1.
</para></listitem>
<listitem><para>
-Chapter 5+6: Moved Glibc from chapter 5 to chapter 6
+Chapter 5+6: Moved Glibc from chapter 5 to chapter 6.
</para></listitem>
<listitem><para>
-Chapter 6: Changed libexecdir=/usr/bin in fileutils to libexecdir=/bin
+Chapter 6: Changed libexecdir=/usr/bin in fileutils to libexecdir=/bin.
</para></listitem>
<listitem><para>
-Chapter 6: Updated Glibc installation instructions. 'configparms' file
+Chapter 6: Updated Glibc installation instructions. The 'configparms' file
creation has been deleted. No need to pick a compiler (either distro's
native or the /usr/local/gcc2952/bin/gcc one); we're in chroot
-now so we'll use the one we have
+now so we'll use the one we have.
</para></listitem>
<listitem><para>
@@ -113,7 +114,7 @@ installation.
</para></listitem>
<listitem><para>
-Chapter 6: When entering chroot the $TERM variable inside chroot is set
+Chapter 6: When entering chroot, the $TERM variable inside chroot is set
properly. This is accomplished by: chroot ... -i HOME=/root TERM=$TERM ...
</para></listitem>
@@ -124,12 +125,12 @@ into one line.
<listitem><para>
Chapter 6: Changed all "rm file &amp;&amp; ln -s dest file" into
-"ln -sf file" (in glibc, bzip2 and gzip installation).
+"ln -sf file" (in glibc, bzip2 and gzip installations).
</para></listitem>
<listitem><para>
Chapter 7: Fixed the delays in the killproc function in the functions
-script. Now after kill, first check PIDs, then sleep 2 if needed. More
+script. Now, after kill, first check PIDs, then sleep 2 if needed. More
details can be read in the comments in the script itself.
</para></listitem>
diff --git a/chapter01/contactinfo.xml b/chapter01/contactinfo.xml
index 172eb2092..f5a6e875c 100644
--- a/chapter01/contactinfo.xml
+++ b/chapter01/contactinfo.xml
@@ -4,7 +4,7 @@
<para>
Direct all your emails to the
<ulink url="mailto:lfs-discuss@linuxfromscratch.org">lfs-discuss
-</ulink> mailinglist preferably.
+</ulink> mailing list preferably.
</para>
<para>
diff --git a/chapter01/lfsannounce.xml b/chapter01/lfsannounce.xml
index c82c623a1..92ad5b4e2 100644
--- a/chapter01/lfsannounce.xml
+++ b/chapter01/lfsannounce.xml
@@ -5,8 +5,8 @@
The lfs-announce list is a moderated list. You can subscribe to it, but
you can't post any messages to this list. This list is used to announce
new stable releases. If you want to be informed about development
-releases as well then you'll have to join the lfs-discuss list. If
-you're already on the lfs-discuss list there's little use subscribing to
+releases as well, then you'll have to join the lfs-discuss list. If
+you're already on the lfs-discuss list, there's little use subscribing to
this list as well because everything that is posted to the lfs-announce
list will be posted to the lfs-discuss list as well.
</para>
diff --git a/chapter01/lfsdiscuss.xml b/chapter01/lfsdiscuss.xml
index 7fb452038..38ee5262b 100644
--- a/chapter01/lfsdiscuss.xml
+++ b/chapter01/lfsdiscuss.xml
@@ -2,9 +2,9 @@
<title>lfs-discuss</title>
<para>
-The lfs-discuss mailinglist discusses matters strictly related to the
+The lfs-discuss mailing list discusses matters strictly related to the
LFS-BOOK. If you have problems with the book, want to report a bug or
-two or have suggestions to improve the book, use this mailinglist.
+two, or have suggestions to improve the book, use this mailing list.
</para>
<para>
diff --git a/chapter01/lfssecurity.xml b/chapter01/lfssecurity.xml
index 99cb72756..00babb719 100644
--- a/chapter01/lfssecurity.xml
+++ b/chapter01/lfssecurity.xml
@@ -2,7 +2,7 @@
<title>lfs-security</title>
<para>
-The lfs-security mailinglist discusses security related matters. If you
+The lfs-security mailing list discusses security-related matters. If you
have security concerns or have heard about a package used by LFS that
has known security problems, you can address that on this list.
</para>
diff --git a/chapter01/maillists.xml b/chapter01/maillists.xml
index 9d0f3a1ae..612253761 100644
--- a/chapter01/maillists.xml
+++ b/chapter01/maillists.xml
@@ -1,9 +1,9 @@
<sect1 id="ch01-maillists">
-<title>Mailinglists and archives</title>
+<title>Mailing lists and archives</title>
<para>
-The linuxfromscratch.org server is hosting the following public accessible
-mailinglists:
+The linuxfromscratch.org server is hosting the following publicly accessible
+mailing lists:
</para>
<itemizedlist>
@@ -13,7 +13,7 @@ mailinglists:
</para></listitem>
<listitem><para>
- lfs-apps
+ lfs-apps
</para></listitem>
<listitem><para>
@@ -25,23 +25,23 @@ mailinglists:
</para></listitem>
<listitem><para>
- alfs-discuss
+ alfs-discuss
</para></listitem>
<listitem><para>
- alfs-docs
+ alfs-docs
</para></listitem>
<listitem><para>
- alfs-ipc
+ alfs-ipc
</para></listitem>
<listitem><para>
- alfs-profile
+ alfs-profile
</para></listitem>
<listitem><para>
- alfs-backend
+ alfs-backend
</para></listitem>
</itemizedlist>
diff --git a/chapter01/othermodes.xml b/chapter01/othermodes.xml
index a5b5b9b2b..13a2a1ffd 100644
--- a/chapter01/othermodes.xml
+++ b/chapter01/othermodes.xml
@@ -9,7 +9,7 @@ the appropriate commands in the subject headers of the message.
</para>
<para>
-As the name implies the <emphasis>Set command</emphasis> tells you what
+As the name implies, the <emphasis>Set command</emphasis> tells you what
to write to set a mode. The <emphasis>Unset command</emphasis> tells
you what to write to unset a mode.
</para>
@@ -17,7 +17,7 @@ you what to write to unset a mode.
<para>
Replace listname in the example subject headers with the listname to which
you want to apply the mode to. If you want to set more than one mode (to
-the same list or multiple lists) with one email you can do so by writing
+the same list or multiple lists) with one email, you can do so by writing
junk in the subject header like "hello" and then put the commands in the
body of the message instead.
</para>
@@ -34,16 +34,16 @@ Unset command: <emphasis>unset listname digest</emphasis>
<para>
All lists have the digest mode available and you can set yourself to
-digest mode, after you subscribe to a list. Being in digest mode will
+digest mode after you subscribe to a list. Being in digest mode will
cause you to stop receiving individual messages as they are posted to
the list and instead you will receive one email daily containing all
-the messages posted to the list that day.
+the messages posted to the list during that day.
</para>
<para>
There is a second digest mode called digest2. When you are set to this
mode you will receive the daily digests but you will also continue to
-receive the individual messages to the lists are they are posted. To
+receive the individual messages to the lists as they are posted. To
set yourself to this mode write <emphasis>digest2</emphasis> instead of
<emphasis>digest</emphasis> in the subject header.
</para>
@@ -60,7 +60,7 @@ Unset command: <emphasis>unset listname vacation</emphasis>
<para>
If you are going to be away for a while or wish to stop receiving
-messages from the lists but you don't want to unsubscribe you can set
+messages from the lists but you don't want to unsubscribe, you can set
yourself to vacation mode. This has the same effect as unsubscribing
yourself, but you don't have to go through the unsubscribe process and
then later through the subscribe process again.
diff --git a/chapter01/subscribe.xml b/chapter01/subscribe.xml
index 984b6450b..8a6eb670e 100644
--- a/chapter01/subscribe.xml
+++ b/chapter01/subscribe.xml
@@ -2,7 +2,7 @@
<title>How to subscribe?</title>
<para>
-You can subscribe to any of the above mentioned mailinglists by sending
+You can subscribe to any of the above-mentioned mailinglists by sending
an email to <ulink url="mailto:listar@linuxfromscratch.org">
listar@linuxfromscratch.org</ulink> and write <emphasis>subscribe
listname</emphasis> as the subject header of the message.
diff --git a/chapter01/unsubscribe.xml b/chapter01/unsubscribe.xml
index d999ef029..3588e0d68 100644
--- a/chapter01/unsubscribe.xml
+++ b/chapter01/unsubscribe.xml
@@ -24,6 +24,7 @@ Subject: hello
unsubscribe lfs-discuss
unsubscribe lfs-apps
unsubscribe alfs-discuss
+
</literallayout></blockquote>
<para>