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 33730ba1993f2ee6c6a26b7ed07787aa9b90b2db..38a3f7ab79ae56e447ff7ac7c18b31b769cfebee 100644 (file)
--- 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 f6905960201de219d06440289bb1c00697e530d6..e41d260f6b4477de6f121e2e02cb686f546955a0 100644 (file)
--- 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