X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=man%2Fconflict.man;h=8a2afb7ad95d9f2893e44849e9d4a1a833b9f8cf;hb=fc25a4f840747685117a482f9a0cf6296224ea1a;hp=f6905960201de219d06440289bb1c00697e530d6;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/man/conflict.man b/man/conflict.man
index f690596..8a2afb7 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -1,7 +1,7 @@
+.TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .\"
 .\" %nmhwarning%
 .\"
-.TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 conflict \- search for alias/password conflicts
 .SH SYNOPSIS
@@ -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