Merge branch 'master' of rlworkman.net:slackbook

6 files changed, 18 insertions, 13 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/img/cups-01.png b/img/cups-01.png
new file mode 100644
index 0000000..035163c
--- /dev/null
+++ b/img/cups-01.png
diff --git a/img/make-menuconfig-w.png b/img/make-menuconfig-w.png
new file mode 100644
index 0000000..8481429
--- /dev/null
+++ b/img/make-menuconfig-w.png
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>