Merge lfs-svn. Use filename tag instead of command one for networkd man pages.

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

10 files changed, 53 insertions, 44 deletions

diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 117f9c48b..c58cf6184 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -52,7 +52,7 @@
     <para>There are a couple of tests that incorrectly link to the 
     wrong version of the flex library, so we temporarily work around
     the problem.  Also, using the -j4 make option speeds up the tests, even on
-    systems with only one processor due to internal delays in individual
+    systems with only one processor, due to internal delays in individual
     tests.  To test the results, issue:</para>
 
 <screen><userinput remap="test">sed -i "s:./configure:LEXLIB=/usr/lib/libfl.a &amp;:" t/lex-{clean,depend}-cxx.sh
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 12f063c1b..72e36e32a 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -54,16 +54,9 @@
             --with-installed-readline</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the new configure option:</title>
 
       <varlistentry>
-        <term><parameter>--htmldir</parameter></term>
-        <listitem>
-          <para>This option designates the directory into which HTML formatted
-          documentation will be installed.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
         <term><parameter>--with-installed-readline</parameter></term>
         <listitem>
           <para>This option tells Bash to use the <filename
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index dc3904c9e..e0aefee3f 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,8 +64,8 @@ Ask your system administrator to create more.</computeroutput></screen>
 <screen><userinput remap="pre">rm -fv etc/standards.info
 sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
-    <para>Add an upstream patch to use gcc's link time optimization (LTO) 
-    the default:</para>
+    <para>Add an upstream patch to use GCC's link time optimization (LTO) 
+    by default:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-patch;</userinput></screen>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 8ad7040a9..725bc21f8 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -41,7 +41,7 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
 
-    <para>First, skip running three regression tests that require bison.</para>
+    <para>First, skip running three regression tests that require Bison:</para>
 
 <screen><userinput remap="pre">sed -i -e '/test-bison/d' tests/Makefile.in</userinput></screen>
 
diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml
index 17dfe8677..2fa742a9b 100644
--- a/chapter06/gmp.xml
+++ b/chapter06/gmp.xml
@@ -52,7 +52,8 @@
 
     <para>Prepare GMP for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-cxx</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --enable-cxx \
+    --docdir=/usr/share/doc/gmp-&gmp-version;</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>
@@ -64,11 +65,20 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--docdir=/usr/share/doc-gmp&gmp-version;</parameter></term>
+        <listitem>
+          <para>This variable specifies the correct place for the
+          documentation.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para>Compile the package and generate the HTML documentation:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make
+make html</userinput></screen>
 
     <important>
       <para>The test suite for GMP in this section is considered critical.
@@ -84,15 +94,10 @@
 
 <screen><userinput remap="test">awk '/tests passed/{total+=$2} ; END{print total}' gmp-check-log</userinput></screen>
 
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-    <para>If desired, install the documentation:</para>
+    <para>Install the package and its documentation:</para>
 
-<screen><userinput remap="install">mkdir -v /usr/share/doc/gmp-&gmp-version;
-cp    -v doc/{isa_abi_headache,configuration} doc/*.html \
-         /usr/share/doc/gmp-&gmp-version;</userinput></screen>
+<screen><userinput remap="install">make install
+make install-html</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 639d04da9..7cb9b6b5b 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -41,7 +41,7 @@
     <title>Installation of Inetutils</title>
 
     <para>Create a definition to allow the <command>ifconfig</command> program
-    to build properly.</para>
+    to build properly:</para>
 
 <screen><userinput remap="pre">echo '#define PATH_PROCNET_DEV "/proc/net/dev"' &gt;&gt; ifconfig/system/linux.h </userinput></screen>
 
diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml
index 63e9d0017..ca0e3e805 100644
--- a/chapter06/libcap.xml
+++ b/chapter06/libcap.xml
@@ -54,6 +54,20 @@
 <screen><userinput remap="install">make RAISE_SETFCAP=no prefix=/usr install
 chmod -v 755 /usr/lib/libcap.so</userinput></screen>
 
+    <variablelist>
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>RAISE_SETFCAP=no</parameter></term>
+        <listitem>
+          <para>This parameter skips trying to use <command>setcap</command>
+          on itself. This avoids an installation error if the kernel or file
+          system does not support extended capabilities.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
     <para>The shared library needs to be moved to
     <filename class="directory">/lib</filename>, and as a result the
     <filename class="extension">.so</filename> file in
diff --git a/chapter06/man-pages.xml b/chapter06/man-pages.xml
index 11256800c..3d2c52046 100644
--- a/chapter06/man-pages.xml
+++ b/chapter06/man-pages.xml
@@ -23,7 +23,7 @@
   <sect2 role="package">
     <title/>
 
-    <para>The Man-pages package contains over 1,900 man pages.</para>
+    <para>The Man-pages package contains over 2,200 man pages.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
diff --git a/chapter06/mpc.xml b/chapter06/mpc.xml
index 511ec7cfe..a8b8818dc 100644
--- a/chapter06/mpc.xml
+++ b/chapter06/mpc.xml
@@ -44,19 +44,21 @@
 
     <para>Prepare MPC for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/mpc-&mpc-version;</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para>Compile the package and generate the HTML documentation:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make
+make html</userinput></screen>
 
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and its documentation:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+make install-html</userinput></screen>
 
   </sect2>
 
@@ -66,9 +68,11 @@
 
     <segmentedlist>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>libmpc.{a,so}</seg>
+        <seg>/usr/share/doc/mpc-&mpc-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index a9fc5d869..6d75bd4e6 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -50,31 +50,24 @@
       <varlistentry>
         <term><parameter>--htmldir</parameter></term>
         <listitem>
-          <para>This sets the directory where the HTML documentation will be
-          installed to.</para>
+          <para>This sets the installation directory for the HTML documentation.</para>
         </listitem>
       </varlistentry>
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para>Compile the package and generate the HTML documentation:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>Generate the HTML documentation:</para>
-
-<screen><userinput remap="make">make html</userinput></screen>
+<screen><userinput remap="make">make
+make html</userinput></screen>
 
     <para>To test the results, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-    <para>Install the HTML documentation:</para>
+    <para>Install the package and its documentation:</para>
 
-<screen><userinput remap="install">make -C doc install-html</userinput></screen>
+<screen><userinput remap="install">make install
+make -C doc install-html</userinput></screen>
 
   </sect2>