X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fconflict.man;h=e41d260f6b4477de6f121e2e02cb686f546955a0;hb=26ac907a39f8711907707d53050c2f950a47242f;hp=2be7dabac5c64d800095ad6686986ef92a124c1b;hpb=55c80a0ae8453ef6c3e0fcd0fac30644945d0ef2;p=mmh

diff --git a/man/conflict.man b/man/conflict.man
index 2be7dab..e41d260 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -1,12 +1,12 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 conflict \- search for alias/password conflicts
 .SH SYNOPSIS
 .HP 5
+.na
 .B %libdir%/conflict
 .RB [ \-search
 .IR directory ]
@@ -16,6 +16,9 @@ conflict \- search for alias/password conflicts
 .RB [ \-help ] 
 .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
@@ -60,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