From cc440d3bdbf8bda0fb75105561276ef1f976f88a Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Thu, 7 Aug 2014 20:15:54 +0000
Subject: [PATCH] Merged trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10681 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml |  8 ++++----
 chapter01/changelog.xml     | 32 ++++++++++++++++++++++++++++++++
 chapter06/procps.xml        |  4 ++--
 chapter06/vim.xml           | 31 +++++++++++--------------------
 4 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 7ceacb41f..a78c4be66 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -169,7 +169,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Tar, Vim</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2161,7 +2161,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
+         <seg>Acl, Attr, Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
          Grep, Inetutils, Make, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -2305,8 +2305,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-         Ncurses, and Sed</seg>
+         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, GCC, Glibc,
+         Grep, Make, Ncurses, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 090c88442..ef4c694f0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,25 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-08-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merged LFS SVN-20140805.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-08-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Reversed change to Vim's docs location, so that
+          Vim can find its help files.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-08-03</para>
       <itemizedlist>
@@ -44,6 +63,19 @@
       </itemizedlist>
     </listitem>
 
+    <listitem>
+      <para>2014-08-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update text about upgrades. Fixes
+          <ulink url="&lfs-ticket-root;3645">#3645</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add a fix to gcc identified upstream.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-08-02</para>
       <itemizedlist>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index f0dbec3cf..170697668 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -55,8 +55,8 @@
       <varlistentry>
         <term><parameter>--disable-kill</parameter></term>
         <listitem>
-          <para>This switch disables building the kill command that
-          was installed in the util-linux package.</para>
+          <para>This switch disables building the <command>kill</command>
+          command that will be installed by the Util-linux package.</para>
         </listitem>
       </varlistentry>
     </variablelist>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index edadde175..5d1e512fc 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -83,24 +83,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the make option:</title>
-
-      <varlistentry>
-        <term><parameter>HELPSUBLOC=/usr/share/doc/vim-&vim-version;</parameter></term>
-        <listitem>
-          <para>Tells Vim to install its documentation into
-          <filename class="directory">/usr/share/doc/vim-&vim-version;</filename>
-          instead of 
-          <filename class="directory">/usr/share/&vim-docdir;/doc</filename>,
-          for better consistency with the documentation location for other
-          packages.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen><userinput remap="install">make install</userinput></screen>
 
     <para>Many users are used to using <command>vi</command> instead of
     <command>vim</command>. To allow execution of <command>vim</command>
@@ -113,6 +96,14 @@ for L in  /usr/share/man/{,*/}man1/vim.1; do
     ln -sv vim.1 $(dirname $L)/vi.1
 done</userinput></screen>
 
+    <para>By default, Vim's documentation is installed in <filename
+    class="directory">/usr/share/vim</filename>. The following symlink
+    allows the documentation to be accessed via <filename
+    class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
+    it consistent with the location of documentation for other packages:</para>
+
+<screen><userinput remap="install">ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
+
     <para>If an X Window System is going to be installed on the LFS
     system, it may be necessary to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
@@ -195,13 +186,13 @@ set spell</literal></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
+      <segtitle>Installed directory</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/doc/vim-&vim-version;, /usr/share/vim</seg>
+        <seg>/usr/share/vim</seg>
       </seglistitem>
     </segmentedlist>