* Upgrade to man-1.5p

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

4 files changed, 8 insertions, 18 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7b1af6992..0089db63d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -33,7 +33,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>Libtool 1.5.10</para></listitem>
 <listitem><para>Linux 2.6.10</para></listitem>
 <listitem><para>Linux-libc-headers 2.6.10.0</para></listitem>
-<listitem><para>Man 1.5o1</para></listitem>
+<listitem><para>Man 1.5p</para></listitem>
 <listitem><para>Man-pages 2.01</para></listitem>
 <listitem><para>Module-init-tools 3.1</para></listitem>
 <listitem><para>Perl 5.8.6</para></listitem>
@@ -63,6 +63,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>Removed:</para>
 <itemizedlist>
 <listitem><para>bash-3.0-display_wrap-1.patch</para></listitem>
+<listitem><para>man-1.5o1-80cols-1.patch</para></listitem>
 <listitem><para>Sysklogd 1.4.1</para></listitem>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
 <listitem><para>texinfo-4.7-segfault-1.patch</para></listitem>
@@ -71,6 +72,8 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>January 9, 2005 [matt]: Upgraded to man-1.5p</para></listitem>
+
 <listitem><para>January 9, 2005 [matt]: Upgraded to texinfo-4.8</para></listitem>
 
 <listitem><para>January 9, 2005 [matt]: Upgraded to util-linux-2.12p</para></listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 982d8b1ed..f1c16e657 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -105,13 +105,6 @@ needed to build an LFS system:</para>
 </varlistentry>
 
 <varlistentry>
-<term>Man 80-Columns Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;man-&man-version;-80cols-1.patch"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Mktemp Tempfile Patch - 3 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index ebe598976..d242759b3 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -28,21 +28,15 @@ Glibc, Grep, Make, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Man</title>
 
-<para>Three adjustments need to be made to the sources of Man.</para>
+<para>Two adjustments need to be made to the sources of Man.</para>
 
-<para>The first is a patch which allows Man to work better with recent
-releases of Groff. In particular, man pages will now display using the
-full terminal width instead of being limited to 80 characters:</para>
-
-<screen><userinput>patch -Np1 -i ../man-&man-version;-80cols-1.patch</userinput></screen>
-
-<para>The second is a sed substitution to add the
+<para>The first is a sed substitution to add the
 <parameter>-R</parameter> switch to the <envar>PAGER</envar>
 variable so that escape sequences are properly handled by Less:</para>
 
 <screen><userinput>sed -i 's@-is@&amp;R@g' configure</userinput></screen>
 
-<para>The third is also a sed substitution to comment out the
+<para>The second is also a sed substitution to comment out the
 <quote>MANPATH /usr/man</quote> line in the
 <filename>man.conf</filename> file to prevent redundant results when
 using programs such as <command>whatis</command>:</para>
diff --git a/general.ent b/general.ent
index c9240cc80..6f049197f 100644
--- a/general.ent
+++ b/general.ent
@@ -51,7 +51,7 @@
 <!ENTITY linux-libc-headers-version "2.6.10.0">
 <!ENTITY m4-version "1.4.2">
 <!ENTITY make-version "3.80">
-<!ENTITY man-version "1.5o1">
+<!ENTITY man-version "1.5p">
 <!ENTITY man-pages-version "2.01">
 <!ENTITY mktemp-version "1.5">
 <!ENTITY module-init-tools-version "3.1">