Changeset cc440d3b for chapter06

Timestamp:

08/07/2014 08:15:54 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

b14926b

Parents:

bff5fef

Message:

Merged trunk.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10681 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• procps.xml (modified) (1 diff)
• vim.xml (modified) (4 diffs)

chapter06/procps.xml

@@ -56 +56 @@
         <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>

chapter06/vim.xml

@@ -84 +84 @@
     <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
@@ -113 +96 @@
     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
@@ -196 +187 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directories</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
@@ -202 +193 @@
        (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>