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

diff --git a/man/conflict.man b/man/conflict.man
index 3bb683a..e41d260 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -1,21 +1,24 @@
 .\"
 .\" %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 ]
 .RB [ \-mail
 .IR name ]
-.RI [ aliasfiles
-\&...]
 .RB [ \-version ]
 .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,12 +63,13 @@ 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
 ^%bindir%/mhmail~^Program to send mail
 ^%mailspool%/~^Directory of mail drop
+.fi
 
 .SH "PROFILE COMPONENTS"
 None
@@ -76,6 +80,7 @@ mh\-alias(5)
 .SH "DEFAULTS"
 .nf
 .RB ` aliasfiles "' defaults to %etcdir%/MailAliases"
+.fi
 
 .SH CONTEXT
 None