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

[nmh] / docs / pending-release-notes

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index f153a77..38a3f7a 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -4,12 +4,13 @@ Things to add to the release notes for the next full release:
 NEW FEATURES
 ------------
 
-- All nmh programs will now warn about multiple profile entries for the
-  same component.  In previous versions, all but the first were
-  silently ignored.
+- All nmh programs will now warn about multiple profile entries for
+  the same non-null, non-comment component.  In previous versions, all
+  but the first were silently ignored.
 - mhmail now supports all post(8) options, and optionally can use
   send(1) with all of its options.  Its formerly undocumented -resent
-  switch has been documented.  And it has new -send/-nosend switches.
+  switch has been documented.  And it has new -attach, -header-field,
+  and -send/-nosend switches.
 
 ----------------------------
 OBSOLETE/DEPRECATED FEATURES
@@ -31,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.