From 1d6f2048dd0c87a2fc426d9df2e18f6b556a7e1e Mon Sep 17 00:00:00 2001
From: Chris Staub <chris@linuxfromscratch.org>
Date: Mon, 21 Jul 2014 09:08:33 +0000
Subject: [PATCH] Updates to package installation lists

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10642 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml   | 11 +++++++++++
 chapter06/e2fsprogs.xml   |  2 +-
 chapter06/flex.xml        |  2 +-
 chapter06/gdbm.xml        |  2 +-
 chapter06/gperf.xml       |  2 +-
 chapter06/intltool.xml    |  2 +-
 chapter06/kmod.xml        |  2 +-
 chapter06/libpipeline.xml |  2 +-
 chapter06/procps.xml      |  2 +-
 chapter06/vim.xml         |  4 ++--
 10 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index cedbc583f..f47b681d4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,17 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-07-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Text fixes - removed mention of
+          /usr/{doc,info,man} symlinks that are no longer created, and made
+          minor updates to several packages' installed file lists.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-07-19</para>
       <itemizedlist>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 2bdfaf0cd..7212860f1 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -171,7 +171,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs,e2freefrag,
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 725bc21f8..b856e67d9 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -84,7 +84,7 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>flex, flex++ (link to flex), and lex (link to flex)</seg>
diff --git a/chapter06/gdbm.xml b/chapter06/gdbm.xml
index a5dacdbcc..a4b36f18f 100644
--- a/chapter06/gdbm.xml
+++ b/chapter06/gdbm.xml
@@ -79,7 +79,7 @@
     <title>Contents of GDBM</title>
 
     <segmentedlist>
-      <segtitle>Installed program</segtitle>
+      <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
diff --git a/chapter06/gperf.xml b/chapter06/gperf.xml
index 92dd637c7..244342c1e 100644
--- a/chapter06/gperf.xml
+++ b/chapter06/gperf.xml
@@ -62,7 +62,7 @@
     <title>Contents of Gperf</title>
 
     <segmentedlist>
-      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed program</segtitle>
 
       <seglistitem>
         <seg>gperf</seg>
diff --git a/chapter06/intltool.xml b/chapter06/intltool.xml
index 4eea82d0b..fb170ea8e 100644
--- a/chapter06/intltool.xml
+++ b/chapter06/intltool.xml
@@ -64,7 +64,7 @@ install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N
     <title>Contents of Intltool</title>
 
     <segmentedlist>
-      <segtitle>Installed program</segtitle>
+      <segtitle>Installed programs</segtitle>
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index c463b405e..d7231aa7c 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -97,7 +97,7 @@ ln -sv kmod /bin/lsmod</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed library</segtitle>
 
       <seglistitem>
         <seg>depmod (link to kmod), insmod (link to kmod), kmod, 
diff --git a/chapter06/libpipeline.xml b/chapter06/libpipeline.xml
index d9ecf4e55..117b57158 100644
--- a/chapter06/libpipeline.xml
+++ b/chapter06/libpipeline.xml
@@ -76,7 +76,7 @@
     <title>Contents of Libpipeline</title>
 
     <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed library</segtitle>
 
       <seglistitem>
         <seg>libpipeline.so</seg>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 3dbafd4d7..f0dbec3cf 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -128,7 +128,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</useri
       <varlistentry id="pidof">
         <term><command>pidof</command></term>
         <listitem>
-          <para>Looks up processes based on their name and other attributes</para>
+          <para>Reports the PIDs of the given programs</para>
           <indexterm zone="ch-system-procps pidof">
             <primary sortas="b-pidof">pidof</primary>
           </indexterm>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 7fe7b7505..840440cac 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -195,13 +195,13 @@ set spell</literal></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
        <seg> ex (link to vim), rview (link to vim), rvim (link to vim), vi
        (link to vim), view (link to vim), vim, vimdiff (link to vim), vimtutor,
        and xxd</seg>
-        <seg>/usr/share/vim</seg>
+        <seg>/usr/share/doc/vim-&vim-version;, /usr/share/vim</seg>
       </seglistitem>
     </segmentedlist>