From 75360e381600d61a389f71e31d4ed46fdc24ffeb Mon Sep 17 00:00:00 2001 From: David Levine Date: Sun, 24 Jun 2012 19:03:05 -0500 Subject: [PATCH] Added status to conflict(8) man page to note that it is deprecated. --- docs/pending-release-notes | 1 + man/conflict.man | 2 ++ 2 files changed, 3 insertions(+) diff --git a/docs/pending-release-notes b/docs/pending-release-notes index 33730ba..38a3f7a 100644 --- a/docs/pending-release-notes +++ b/docs/pending-release-notes @@ -32,3 +32,4 @@ OBSOLETE/DEPRECATED FEATURES and will be removed in the next release. It supports the SMTP XQUE verb, which is obsolete according to http://smtpfilter.sourceforge.net/esmtp.html +- conflict(8) is deprecated and will be removed from the next release. diff --git a/man/conflict.man b/man/conflict.man index f690596..e41d260 100644 --- a/man/conflict.man +++ b/man/conflict.man @@ -17,6 +17,8 @@ conflict \- search for alias/password conflicts .RI [ aliasfiles \&...] .ad +.SH STATUS +.B Conflict is deprecated and will be removed from the next nmh release. .SH DESCRIPTION .B Conflict is a program that checks to see if the interface between -- 1.7.10.4