Handled a few more TODO entries (and created a couple more).

5 files changed, 74 insertions, 64 deletions

diff --git a/TODO b/TODO
index f8fee54..f4e46f0 100644
--- a/TODO
+++ b/TODO
@@ -16,31 +16,12 @@ General
     in reference to how the admin might be misled into thinking that they are
     causing breakage...
 
-
-Chapter 3. Booting
-
-* Section 'mkinitrd'
-
-* /usr/share/mkinitrd_command_generator.sh
-
-  "Now that we've created out initrd" -> "Now that we've created our initrd"
-  "most of these warnings are issued by the use of LVM" << I think that at 
-    this point of the book, people will be scared off by the unfamiliar 
-    'LVM' and listing "/dev/raven/64root" as a root device may be confusing 
-    to people who expect something like "/dev/sda1". Better to discuss LVM 
-    later on.
-
-
 Chapter 4. Basic Shell Commands
 
 * Section 'Reading Documents'
 
   Perhaps split this with subsections for cat, more, and less?
 
-* In the section about LZMA, possibly title it "XZ / LZMA"
-  Since we are officially *.txz as our standard pkgtype.
-
-
 Chapter 6. X Windows
 
 * Section 'configuring the X server'
@@ -55,18 +36,6 @@ Chapter 6. X Windows
   * note that HAL is slated for deprecation and this might be handled by
     udev directly at some point in the future...
 
-
-Chapter 8. Users and Groups
-
-* Section 'Other User and Group Tools'
-
-  You could mention the tool here that is most sought after in IRC and 
-  forums: the "gpasswd" program which allows you to add a user to one 
-  additional group without touching on your current group management 
-  (remember that "usermod -G" will not retain your current group membership 
-  while "gpasswd -a" will).
-
-
 Chapter 10. Working with Filesystems
 
 * Section 'Network Filesystems' / 'NFS'
@@ -75,23 +44,7 @@ Chapter 10. Working with Filesystems
   allows you to find out exactly what NFS exports a remote server has made 
   available.
 
+Chapter 16. Basic Networking Commands
 
-Chapter 11. vi
-
-* Table 11.2. vi Cheat Sheet
-
-  You should really add "dw" (delete a word - and store it in the 
-  copybuffer)  "yw" (copy a word to the copy buffer), "yy" (copy a line to 
-  the copy buffer) and "p" (paste the content of the copybuffer at the 
-  cursor's location)
-
-
-Chapter 15. Basic Networking Commands
-
-* Section 'Web Browsers'
-
-  Should we include curl along with the others?
-
-* Section 'NNTP Clients'
+* Additional tools to discuss: finger, host, dig, pine, mutt, nail
 
-  Should we even have this section?  At this time, I'm leaning towards 'no'.
diff --git a/chapter_03.xml b/chapter_03.xml
index b04ef48..14c9847 100644
--- a/chapter_03.xml
+++ b/chapter_03.xml
@@ -190,7 +190,7 @@ KERNEL_VERSION="$(uname -r)"
 #KEYMAP="us"
 MODULE_LIST="ext3:ext4:jfs"
 #LUKSDEV="/dev/hda1"
-ROOTDEV="/dev/raven/64root"
+ROOTDEV="/dev/sda1
 ROOTFS="ext4"
 #RESUMEDEV="/dev/hda2"
 #RAID="0"
@@ -209,6 +209,22 @@ A proper initrd file will be constructed and installed for you without
 you having to remember all those obscure arguments.
 </para>
 
+<para>
+If you're unsure what options to specify in the configuration file or
+on the command-line, there is one final option. Slackware includes a
+nifty little utility that can tell what options are required for your
+currently running kernel
+<application>/usr/share/mkinitrd/mkinitrd_command_generator.sh</application>.
+When you run this script, it will generate a command line for
+<application>mkinitrd</application> that should work
+for your computer, but you may wish to check everything anyway.
+</para>
+
+<screen><prompt>darkstar:~# </prompt><userinput>/usr/share/mkinitrd/mkinitrd_command_generator.sh</userinput>
+mkinitrd -c -k 2.6.33.4 -f ext3 -r /dev/sda3 -m \
+  usbhid:ehci-hcd:uhci-hcd:ext3 -o /boot/initrd.gz
+</screen>
+
 </section>
 
 <section>
@@ -341,7 +357,7 @@ Microsoft Windows.
 ... global section ommitted ....
 # Linux bootable partition config begins
 image = /boot/vmlinuz-generic-2.6.29.4
-  root = /dev/raven/64root
+  root = /dev/sda1
   initrd = /boot/initrd.gz
   label = Slackware64
   read-only
@@ -377,22 +393,16 @@ not be installed, and those changes will not be reflected.
 
 <screen><prompt>darkstar:~# </prompt><userinput>lilo</userinput>
 Warning: LBA32 addressing assumed
-Warning: '/proc/partitions' does not match '/dev' directory structure.
-    Name change: '/dev/dm-0' -> '/dev/raven/swap'
-Warning: Name change: '/dev/dm-1' -> '/dev/raven/root'
-Warning: Name change: '/dev/dm-2' -> '/dev/raven/home'
-Warning: Name change: '/dev/dm-3' -> '/dev/raven/src'
-Warning: Name change: '/dev/dm-4' -> '/dev/raven/64root'
 Added Slackware *
 Added Backup
 6 warnings were issued.
 </screen>
 
 <para>
-Don't be scared by many of the warnings you may see when running
-<application>lilo</application>.  In my case, most of these warnings are
-issued by the use of LVM.  Unless you see a fatal error, things should
-be just fine.
+Don't be too scared by many of the warnings you may see when running
+<application>lilo</application>. Unless you see a fatal error, things
+should be just fine. In particular, the LBA32 addressing warning is
+commonplace.
 </para>
 
 </section>
diff --git a/chapter_04.xml b/chapter_04.xml
index 96cb46c..827b92f 100644
--- a/chapter_04.xml
+++ b/chapter_04.xml
@@ -430,7 +430,7 @@ other alternatives.
 </section>
 
 <section>
-<title>LZMA</title>
+<title>XZ / LZMA</title>
 
 <para>
 The latest compression utility added to Slackware is
diff --git a/chapter_09.xml b/chapter_09.xml
index a2bb4e9..c2866e0 100644
--- a/chapter_09.xml
+++ b/chapter_09.xml
@@ -180,6 +180,29 @@ encrypted password to a value that can't be matched.
 </para>
 
 <para>
+The easiest way for modifying a user's information is the
+<application>usermod</application>(8) utility which is capable of
+modifying everything from group membership to home directories. A full
+listing of its features won't be given here, so check the man page.
+<application>usermod</application> is perhaps the best tool to use for
+modifying a user's group members.  The <arg>-s</arg> and <arg>-G</arg>
+arguments accomplish this.
+</para>
+
+<screen><prompt>darkstar:~# </prompt><userinput>usermod -a -G wheel alan</userinput>
+<prompt>darkstar:~# </prompt><userinput>usermod -G wheel alan</userinput>
+</screen>
+
+<para>
+It important to note the differences in the two commands above.  The
+first command adds the user "alan" to the "wheel" group without
+modifying any other groups "alan" belongs to. The second command also
+makes "alan" a member of the "wheel" group, but also removes the user's
+membership from any other groups, something you will very rarely want
+to do!
+</para>
+
+<para>
 Another useful tool is <application>chsh</application>(1) which changes a
 user's default shell. Like <application>passwd</application>, normal
 users can only change their own shell, but the root user can change
diff --git a/chapter_12.xml b/chapter_12.xml
index 7a507f0..e69fd1e 100644
--- a/chapter_12.xml
+++ b/chapter_12.xml
@@ -275,11 +275,35 @@ you begin to feel comfortable.
     </row>
     <row>
       <entry>dd</entry>
-      <entry>Remove a line</entry>
+      <entry>Remove a line (and store it in the copy buffer)</entry>
     </row>
     <row>
       <entry>5dd</entry>
-      <entry>Remove 5 lines</entry>
+      <entry>Remove 5 lines (and store them in the copy buffer)</entry>
+    </row>
+    <row>
+      <entry>dw</entry>
+      <entry>Remove a single word (and store it in the copy buffer)</entry>
+    </row>
+    <row>
+      <entry>5dw</entry>
+      <entry>Remove five words (and store them in the copy buffer)</entry>
+    </row>
+    <row>
+      <entry>yw</entry>
+      <entry>Yank (copy) a single word (and store it in the copy buffer)</entry>
+    </row>
+    <row>
+      <entry>5yw</entry>
+      <entry>Yank five words (and store them in the copy buffer)</entry>
+    </row>
+    <row>
+      <entry>p</entry>
+      <entry>Paste the contents of the copy buffer at the cursor's location</entry>
+    </row>
+    <row>
+      <entry>P</entry>
+      <entry>Paste the contents of the copy buffer above the cursor's location</entry>
     </row>
     <row>
       <entry>r</entry>