aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter06/diffutils.xml8
-rw-r--r--chapter06/shadow.xml3
-rw-r--r--general.ent4
4 files changed, 22 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 15cff052b..df58d95fc 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -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>
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 3c55e77b6..855c7d418 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -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>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 626335673..cb606490b 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -131,8 +131,7 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen>
etc/login.defs &gt; /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@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</literal></screen>
</note>
diff --git a/general.ent b/general.ent
index 90c227a11..fa91dbb83 100644
--- a/general.ent
+++ b/general.ent
@@ -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}]" -->