X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fconflict.man;h=e41d260f6b4477de6f121e2e02cb686f546955a0;hb=fc15b3f63b8e802f8d6dbc36fd35c0e400313a91;hp=b01b4696e51078c4b60e791d8a0d17d00158cc1a;hpb=3d7993e40a34f52e2b6394c2f64ef0111ab886f7;p=mmh

diff --git a/man/conflict.man b/man/conflict.man
index b01b469..e41d260 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
@@ -18,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
@@ -62,7 +63,7 @@ or whenever system accounting takes place.
 .SH FILES
 .fc ^ ~
 .nf
-.ta \w'/usr/local/nmh/etc/ExtraBigFileName  'u
+.ta \w'%etcdir%/ExtraBigFileName  'u
 ^%etcdir%/mts.conf~^nmh mts configuration file
 ^/etc/passwd~^List of users
 ^/etc/group~^List of groups