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

diff --git a/man/conflict.man b/man/conflict.man
index 01f7936..3bb683a 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -2,57 +2,80 @@
 .\" %nmhwarning%
 .\" $Id$
 .\"
-.\" include the -mh macro file
-.so %etcdir%/tmac.h
-.\"
-.TH CONFLICT %manext8% MH.6.8 [%nmhversion%]
+.TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 conflict \- search for alias/password conflicts
 .SH SYNOPSIS
-.in +.5i
-.ti -.5i
-%libdir%/conflict
-\%[\-search\ directory]
-.br
-\%[\-mail\ name]
-\%[aliasfiles...]
-\%[\-version]
-\%[\-help]
-.in -.5i
+.HP 5
+.B %libdir%/conflict
+.RB [ \-search
+.IR directory ]
+.RB [ \-mail
+.IR name ]
+.RI [ aliasfiles
+\&...]
+.RB [ \-version ]
+.RB [ \-help ] 
 .SH DESCRIPTION
-\fIConflict\fR is a program that checks to see if the interface between
-\fInmh\fR and transport system is in good shape
-
-\fIConflict\fR also checks for maildrops in %mailspool% which do not
+.B Conflict
+is a program that checks to see if the interface between
+.B nmh
+and the transport system is in good shape
+.PP
+.B Conflict
+also checks for maildrops in %mailspool% which do not
 belong to a valid user.  It assumes that no user name will start with
 `.', and thus ignores files in %mailspool% which begin with `.'.  It also
-checks for entries in the \fIgroup\fR\0(5) file which do not belong
+checks for entries in the
+.BR group (5)
+file which do not belong
 to a valid user, and for users who do not have a valid group number.
 In addition duplicate users and groups are noted.
-
-If the `\-mail\ name' switch is used, then the results will be sent
-to the specified \fIname\fR.  Otherwise, the results are sent to the
-standard output.
-
-The `\-search\ directory' switch can be used to search directories
+.PP
+If the
+.B \-mail
+.I name
+switch is used, then the results will be sent
+to the specified
+.IR name .
+Otherwise, the results are sent to the standard output.
+.PP
+The
+.B \-search
+.I directory
+switch can be used to search directories
 other than %mailspool% and to report anomalies in those directories.
-The `\-search\ directory' switch can appear more than one time in an
-invocation to \fIconflict\fR.
+The
+.B \-search
+.I directory
+switch can appear more than one time in an
+invocation to
+.BR conflict .
+.PP
+.B Conflict
+should be run under
+.BR cron (8),
+or whenever system accounting takes place.
 
-\fIConflict\fR should be run under  \fIcron\fR\0(8), or whenever system
-accounting takes place.
-.Fi
+.SH FILES
+.fc ^ ~
+.nf
+.ta \w'/usr/local/nmh/etc/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
-.Pr
+
+.SH "PROFILE COMPONENTS"
 None
-.Sa
+
+.SH "SEE ALSO"
 mh\-alias(5)
-.De
-`aliasfiles' defaults to %etcdir%/MailAliases
-.Co
+
+.SH "DEFAULTS"
+.nf
+.RB ` aliasfiles "' defaults to %etcdir%/MailAliases"
+
+.SH CONTEXT
 None
-.En