Fixed make_bcc_file () to use contents of From: in draft, if draft_from masquerade...

[mmh] / man / conflict.man

diff --git a/man/conflict.man b/man/conflict.man
index 3bb683a..6cc6944 100644 (file)
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -7,15 +7,17 @@
 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 DESCRIPTION
 .B Conflict
 is a program that checks to see if the interface between
@@ -60,12 +62,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 +79,7 @@ mh\-alias(5)
 .SH "DEFAULTS"
 .nf
 .RB ` aliasfiles "' defaults to %etcdir%/MailAliases"
+.fi
 
 .SH CONTEXT
 None