Merge branch 'master' of rlworkman.net:slackbook

5 files changed, 27 insertions, 22 deletions

diff --git a/TODO b/TODO
index 4e522d8..8e3fd48 100644
--- a/TODO
+++ b/TODO
@@ -19,8 +19,10 @@ General
 Chapter 2. Installation
 
 * Section 'Booting the Installer'
+  - Does this need to be reworked? Feels kinda kludgy and amateur.
+    - seems fine to me (rworkman)
 
-  Does this need to be reworked? Feels kinda kludgy and amateur.
+* Need to mention gdisk (for GPT parts) in the partitioning section
 
 * At the tail end we might wish to tell the user about adduser and
   inform him that he can skip ahead to chapter 9 briefly if he needs
diff --git a/chapter_01.xml b/chapter_01.xml
index c1e2bef..9736ed7 100644
--- a/chapter_01.xml
+++ b/chapter_01.xml
@@ -27,7 +27,7 @@ as well.
 
 <para>
 There are a great number of differences between Slackware and other
-main-stream distributions such as Red Hat, Debian, and Ubuntu.  Perhaps
+mainstream distributions such as Red Hat, Debian, and Ubuntu.  Perhaps
 the greatest difference is the lack of "hand-holding" that Slackware
 will do for the administrator.  Many of those other distributions ship
 with custom graphical configuration tools for all manner of services.  In 
diff --git a/chapter_02.xml b/chapter_02.xml
index f022358..f723612 100644
--- a/chapter_02.xml
+++ b/chapter_02.xml
@@ -7,7 +7,7 @@
 
 <para>
 Slackware's installation is a bit more simplistic than that of most
-other Linux distributions, and is very reminiscent of installing one of the
+other Linux distributions and is very reminiscent of installing one of the
 varieties of BSD operating systems.  If you're familiar with those, you
 should feel right at home.  If you've never installed Slackware or used
 a distribution that makes use of a non-graphical installer, you may
@@ -124,16 +124,18 @@ slackware login: <userinput>root</userinput>
 
 <para>
 Unlike other Linux distributions which boot you directly into a
-dedicated installer program, Slackware's installer gives you a limited
-Linux distribution contained in your system's RAM from the word go. This 
+dedicated installer program, Slackware's installer drops you into a 
+limited Linux distribution loaded into your system's RAM.  This 
 limited distribution is then used to run all the installation programs
 manually, or can be used in emergencies to fix a broken system that
 fails to boot. Now that you're logged in as root (there is no password
 within the installer) it's time to start setting up your disks. At this
-point, you may setup software RAID or LVM support if you wish, but
+point, you may setup software RAID or LVM support if you wish or even
+an encrypted root partition, but
 those topics are outside of the scope of this book. I encourage you to
-refer to the excellent <filename>README_RAID.TXT</filename> and
-<filename>README_LVM.TXT</filename> files on your CD if you desire to
+refer to the excellent <filename>README_RAID.TXT</filename>,
+<filename>README_LVM.TXT</filename>, and
+<filename>README_CRYPT.TXT</filename> files on your CD if you desire to
 setup your system with these advanced tools. Most users won't have any
 need to do so and should proceed directly to partitioning.
 </para>
diff --git a/chapter_06.xml b/chapter_06.xml
index a2d0426..785f4da 100644
--- a/chapter_06.xml
+++ b/chapter_06.xml
@@ -7,7 +7,7 @@
 
 <para>
 Slackware systems often run hundreds or thousands of programs, each of
-which is refered to as a process. Managing these processes is an
+which is referred to as a process. Managing these processes is an
 important part of system administration. So how exactly do we handle
 all of these seperate processes?
 </para>
@@ -60,7 +60,7 @@ argument.
   102 ?        00:00:02 kblockd/0
   105 ?        00:01:19 kacpid
   106 ?        00:00:01 kacpi_notify
-... many more lines ommitted ...
+... many more lines omitted ...
 </screen>
 
 <para>
@@ -84,7 +84,7 @@ root         4  0.0  0.0      0     0 ?        S    Apr05   0:00 [ksoftirqd/0]
 root         7  0.0  0.0      0     0 ?        S    Apr05   0:11 [events/0]
 root         9  0.0  0.0      0     0 ?        S    Apr05   0:01 [work_on_cpu/0]
 root        11  0.0  0.0      0     0 ?        S    Apr05   0:00 [khelper]
-... many more lines ommitted ....
+... many more lines omitted ....
 </screen>
 
 <para>
@@ -101,7 +101,7 @@ parent of a child process also ends the child. We do this with the
 </para>
 
 <screen><prompt>darkstar:~$ </prompt><userinput>ps -ejH</userinput>
-... many lines ommitted ...
+... many lines omitted ...
  3660  3660  3660 tty1     00:00:00   bash
 29947 29947  3660 tty1     00:00:00     startx
 29963 29947  3660 tty1     00:00:00       xinit
@@ -111,7 +111,7 @@ parent of a child process also ends the child. We do this with the
 29988 29972  3660 tty1     00:00:04           xfce4-session
 29997 29972  3660 tty1     00:00:16             xfwm4
 29999 29972  3660 tty1     00:00:02             Thunar
-... many more lines ommitted ...
+... many more lines omitted ...
 </screen>
 
 <para>
@@ -158,7 +158,7 @@ In order to signal a process, we first need to know it's PID. You can
 get this easily with <application>ps</application> as we discused. In
 order to send different signals to a running process, you simply pass
 the signal number and <arg>-s</arg> as an argument.  The <arg>-l</arg>
-argument lists all the signals you can chose and their number. You can
+argument lists all the signals you can choose and their number. You can
 also send signals by their name with <arg>-s</arg>.
 </para>
 
@@ -167,7 +167,7 @@ also send signals by their name with <arg>-s</arg>.
  5) SIGTRAP	 6) SIGABRT	 7) SIGBUS	 8) SIGFPE
  9) SIGKILL	10) SIGUSR1	11) SIGSEGV	12) SIGUSR2
 13) SIGPIPE	14) SIGALRM	15) SIGTERM	16) SIGSTKFLT
-... many more lines ommitted ...
+... many more lines omitted ...
 <prompt>darkstar:~$ </prompt><userinput>kill 1234 # SIGTERM</userinput>
 <prompt>darkstar:~$ </prompt><userinput>kill -s 9 1234 # SIGKILL</userinput>
 <prompt>darkstar:~$ </prompt><userinput>kill -s 1 1234 # SIGHUP</userinput>
@@ -308,9 +308,9 @@ paste the following commented text at the top of your own cron entries.
 By default, Slackware includes a number of entries and comments in
 root's crontab. These entries make it easier to setup periodic system
 tasks by creating a number of directories in <filename>/etc</filename>
-corrosponding to how often the tasks should run. Any script placed
+corresponding to how often the tasks should run. Any script placed
 within these directories will be run hourly, daily, weekly, or monthly.
-The names should be self-explainatory:
+The names should be self-explanatory:
 <filename>/etc/cron.hourly</filename>,
 <filename>/etc/cron.daily</filename>,
 <filename>/etc/cron.weekly</filename>, and
diff --git a/preface.xml b/preface.xml
index a60f05e..7b3aba8 100644
--- a/preface.xml
+++ b/preface.xml
@@ -21,11 +21,12 @@
 <para>
 Slackware Linux may be one of the oldest surviving Linux distributions 
 but that does not mean it has to be left behind.  While Slackware does 
-aim to maintain it's traditional UNIX roots and values, there is no 
-escaping "progress".  Subsystems change, Window Managers come and go and 
-new ways are devised to manage the complexities of a modern OS.
-While we do resist change for changes sake, it's inevitable that as 
-things evolve documentation becomes stale and books are no exception.
+aim to maintain its traditional UNIX roots and values, there is no 
+escaping "progress".  Subsystems change, window managers come and go and 
+new ways are devised to manage the complexities of a modern operating
+system.
+While we do resist change for change's sake, it's inevitable that as 
+things evolve documentation becomes stale &mdash; books are no exception.
 </para>
 
 </section>