Merged r5716 and r5783 to testing.

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

chapter01/changelog.xml

@@ -84,6 +84,10 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 8th, 2005 [archaic]: Added a command to prevent
+module-init-tools from rewriting it's man page (which relies on
+docbook2man).</para></listitem>
+
 <listitem><para>Jun 1st, 2005 [manuel]: Changed patches root to
 lfs/svn/testing/</para></listitem>
 

chapter06/module-init-tools.xml

@@ -29,17 +29,20 @@ Coreutils, Diffutils, Flex, GCC, Glibc, Grep, M4, Make, and Sed</seg></seglistit
 <sect2 role="installation">
 <title>Installation of Module-Init-Tools</title>
 
+<para>Module-Init-Tools attempts to rewrite its
+<filename>modprobe.conf</filename> man page during the build process. This is
+unnecessary and also relies on <command>docbook2man</command> &mdash; which is not
+installed in LFS. Run the following command to avoid this:</para>
+
+<screen><userinput>touch modprobe.conf.5</userinput></screen>
+
 <para>Prepare Module-Init-Tools for compilation:</para>
 
 <screen><userinput>./configure --prefix="" --enable-zlib</userinput></screen>
 
 <para>Compile the package:</para>
 
-<screen><userinput>make DOCBOOKTOMAN=""</userinput></screen>
-
-<!-- Edit me -->
-<para>The <envar>DOCBOOKTOMAN</envar> option allows the compile process to
-complete without regenerating the man pages.</para>
+<screen><userinput>make</userinput></screen>
 
 <para>To test the results, issue:
 <userinput>make check</userinput>.</para>

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "TESTING-20050601">
-<!ENTITY releasedate "June 1, 2005">
+<!ENTITY version "TESTING-20050608">
+<!ENTITY releasedate "June 8, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">