From: David Levine <levinedl@acm.org>
Date: Mon, 25 Jun 2012 00:03:05 +0000 (-0500)
Subject: Added status to conflict(8) man page to note that it is deprecated.
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=75360e381600d61a389f71e31d4ed46fdc24ffeb;p=mmh

Added status to conflict(8) man page to note that it is deprecated.
---

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