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

diff --git a/man/conflict.man b/man/conflict.man
index b01b469..fc2f8d7 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
@@ -14,7 +13,7 @@ conflict \- search for alias/password conflicts
 .RB [ \-mail
 .IR name ]
 .RB [ \-version ]
-.RB [ \-help ] 
+.RB [ \-help ]
 .RI [ aliasfiles
 \&...]
 .ad
@@ -62,7 +61,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
@@ -77,9 +76,7 @@ None
 mh\-alias(5)
 
 .SH "DEFAULTS"
-.nf
-.RB ` aliasfiles "' defaults to %etcdir%/MailAliases"
-.fi
+None
 
 .SH CONTEXT
 None