r7627 - in trunk/BOOK: . chapter01 chapter06

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Thu May 25 07:01:02 PDT 2006


Author: jhuntwork
Date: 2006-05-25 08:01:00 -0600 (Thu, 25 May 2006)
New Revision: 7627

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter06/diffutils.xml
   trunk/BOOK/chapter06/shadow.xml
   trunk/BOOK/general.ent
Log:
Fixed generation of diff's man page, fixes #1800.
Thanks Randy McMurchy for the report and Ken Moffat for the fix.
Also, some slight wording adjustments on the Shadow page.


Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml	2006-05-25 13:56:13 UTC (rev 7626)
+++ trunk/BOOK/chapter01/changelog.xml	2006-05-25 14:01:00 UTC (rev 7627)
@@ -37,6 +37,17 @@
 -->
 
     <listitem>
+      <para>May 25, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Fixed generation of diff's man page.
+	  Thanks Randy McMurchy for the report and Ken Moffat for the fix.
+	  Fixes #1800.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 22, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/chapter06/diffutils.xml
===================================================================
--- trunk/BOOK/chapter06/diffutils.xml	2006-05-25 13:56:13 UTC (rev 7626)
+++ trunk/BOOK/chapter06/diffutils.xml	2006-05-25 14:01:00 UTC (rev 7627)
@@ -41,6 +41,14 @@
 
 <screen><userinput>patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen>
 
+    <para>The above patch will cause the Diffutils build system to attempt to
+    rebuild the <filename>diff.1</filename> man page using the unavailable
+    program <command>help2man</command>. The result is an unreadable man page for
+    <command>diff</command>. We can avoid this by updating the timestamp on
+    the file <filename>man/diff.1</filename>:</para>
+
+<screen><userinput>touch man/diff.1</userinput></screen>
+
     <para>Prepare Diffutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>

Modified: trunk/BOOK/chapter06/shadow.xml
===================================================================
--- trunk/BOOK/chapter06/shadow.xml	2006-05-25 13:56:13 UTC (rev 7626)
+++ trunk/BOOK/chapter06/shadow.xml	2006-05-25 14:01:00 UTC (rev 7627)
@@ -131,8 +131,7 @@
     etc/login.defs > /etc/login.defs</userinput></screen>
 
     <note>
-      <para>If you built Shadow with Cracklib support, insert the following into
-      the <command>sed</command> given below:</para>
+     <para>If you built Shadow with Cracklib support, run the following:</para>
 
 <screen><literal>sed -i 's at DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</literal></screen>
     </note>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-25 13:56:13 UTC (rev 7626)
+++ trunk/BOOK/general.ent	2006-05-25 14:01:00 UTC (rev 7627)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060522">
-<!ENTITY releasedate "May 22, 2006">
+<!ENTITY version "SVN-20060525">
+<!ENTITY releasedate "May 25, 2006">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 




More information about the lfs-book mailing list