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

chapter01/changelog.xml

@@ -35,6 +35,34 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-06-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added command explanation to Libcap page.
+          Fixes <ulink url="&lfs-ticket-root;3619">#3619</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Corrected the home page for Patch.
+          Fixes <ulink url="&lfs-ticket-root;3621">#3621</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Various text updates.
+          Fixes <ulink url="&lfs-ticket-root;3622">#3622</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Changed GMP instructions to generate and install
+          HTML documentation from the Makefile rather than manually copying
+          files, and added doc installation instructions for MPC.
+          Fixes <ulink url="&lfs-ticket-root;3618">#3618</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Removed unneeded command explanation from Bash page.
+          Thanks to Philippe Delavalade for pointing this out.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-06-23</para>
       <itemizedlist>

chapter03/introduction.xml

@@ -56,7 +56,7 @@
 <screen role="nodump"><userinput>wget -i wget-list -P $LFS/sources</userinput></screen>
 
   <para>Additionally, starting with LFS-7.0, there is a separate file,
-  <ulink url="../md5sums">md5sums</ulink>, can be used to verify that all
+  <ulink url="../md5sums">md5sums</ulink>, which can be used to verify that all
   the correct packages are available before proceeding.  Place that file in
   <filename class="directory">$LFS/sources</filename> and run:</para>
 

chapter05/perl.xml

@@ -61,7 +61,7 @@
     <para>Although Perl comes with a test suite, it would be better to wait
     until it is installed in the next chapter.</para>
 
-    <para>Only a few of the utilities and libraries, need to be installed at this
+    <para>Only a few of the utilities and libraries need to be installed at this
     time:</para>
 
 <screen><userinput remap="install">cp -v perl cpan/podlators/pod2man /tools/bin

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

chapter06/bash.xml

@@ -54,15 +54,8 @@
             --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>

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>
 

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>
 

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>
 

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>
 

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

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>

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>
 

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>
 

chapter07/network.xml

@@ -36,9 +36,9 @@
     <filename class="extension">.netdev</filename> and
     <filename class="extension">.network</filename> files. For detailed
     explanation about contents of the mentioned
-    configuration files, consult <command>systemd-link(5)</command>,
-    <command>systemd-netdev(5)</command> and
-    <command>systemd-network(5)</command> manual pages.</para>
+    configuration files, consult <filename>systemd-link(5)</filename>,
+    <filename>systemd-netdev(5)</filename> and
+    <filename>systemd-network(5)</filename> manual pages.</para>
 
     <note><para>Udev may assign network card interface names based
     on system physical characteristics such as enp2s1. If you are

chapter08/kernel.xml

@@ -139,7 +139,7 @@ File systems  --->
     located in <xref linkend="ch-scripts-udev"/> and in the kernel
     documentation in the <filename
     class="directory">linux-&linux-version;/Documentation</filename> directory.
-    Also, <filename>modprobe.conf(5)</filename> may be of interest.</para>
+    Also, <filename>modprobe.d(5)</filename> may be of interest.</para>
 
     <para>Install the modules, if the kernel configuration uses them:</para>
 

packages.ent

@@ -476,7 +476,7 @@
 <!ENTITY patch-size "660 KB">
 <!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.xz">
 <!ENTITY patch-md5 "e9ae5393426d3ad783a300a338c09b72">
-<!ENTITY patch-home "&savannah;/projects/patch/">
+<!ENTITY patch-home "http://savannah.gnu.org/projects/patch/">
 <!ENTITY patch-ch5-du "3.4 MB">
 <!ENTITY patch-ch5-sbu "0.1 SBU">
 <!ENTITY patch-ch6-du "3.4 MB">