From 316af24d0481c2119838c1408eaba33ad32beb42 Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Tue, 31 Dec 2002 22:05:09 +0000
Subject: [PATCH] updated man patch so it'll format man pages on screens with
 more than 80 columns

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2253 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 5 +++++
 chapter04/man-patch.xml | 1 -
 chapter06/man-exp.xml   | 4 +++-
 entities/man.ent        | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index efede721f..e967e0592 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -22,6 +22,7 @@
 <listitem><para>libtool-1.4.3</para></listitem>
 <listitem><para>linux-2.4.20</para></listitem>
 <listitem><para>make-3.80</para></listitem>
+<listitem><para>man-1.5k-2.patch</para></listitem>
 <listitem><para>man-pages-1.53</para></listitem>
 <listitem><para>modutils-2.4.22</para></listitem>
 <listitem><para>ncurses-5.3</para></listitem>
@@ -48,6 +49,10 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>December 31st, 2002 [gerard]: Chapter 06 - Man: Updated the
+patch so man pages are formatted properly on screens with more than 80
+columns.</para></listitem>
+
 <listitem><para>December 31st, 2002 [gerard]: Chapter 06 - Linux: Added
 <emphasis>make mandocs</emphasis> to create man pages and copy them to
 <filename
diff --git a/chapter04/man-patch.xml b/chapter04/man-patch.xml
index f3fb810a0..53ab1106b 100644
--- a/chapter04/man-patch.xml
+++ b/chapter04/man-patch.xml
@@ -1,3 +1,2 @@
 Man Patch (&man-patch-version;) - &man-patch-size;:
-<ulink url="&ftp;/man-&man-patch-version;.patch"/>
 <ulink url="&http;/man-&man-patch-version;.patch"/>
diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml
index b5e88a17a..b858cb824 100644
--- a/chapter06/man-exp.xml
+++ b/chapter06/man-exp.xml
@@ -13,7 +13,9 @@ This patch comments out one of the files in the <filename>man.conf</filename>
 file (MANPATH /usr/man) because it will create redundant results when using
 programs like <userinput>whatis</userinput>. It also adds the
 <emphasis>-R</emphasis> option to the <emphasis>PAGER</emphasis> variable so
-man pages are displayed properly.</para>
+man pages are displayed properly. Lastly, the patch fixes the problem where
+man pages are not formatted with more than 80 columns when used with the
+recent groff versions.</para>
 
 </sect2>
 
diff --git a/entities/man.ent b/entities/man.ent
index 6eba4f90e..f501db361 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -14,7 +14,7 @@
 <!ENTITY man-depversion "1.5i2">
 <!ENTITY man-contversion "1.5k">
 <!ENTITY man-size "189 KB">
-<!ENTITY man-patch-version "1.5k">
+<!ENTITY man-patch-version "1.5k-2">
 <!ENTITY man-patch-size "1 KB">
 <!ENTITY man-dir "man-&man-version;">
 <!ENTITY man-package "man-&man-version;.tar.bz2">