Added note that suffixes were removed from filenames of temporary files.

[nmh] / man / conflict.man

diff --git a/man/conflict.man b/man/conflict.man
index b06e56cc5c23acc0b8b7bda301793c1632be26b8..8f00bda88cb39a69818649b6cd336d48f69c2f6f 100644 (file)
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -1,4 +1,4 @@
-.TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
+.TH CONFLICT %manext8% "June 24, 2012" "%nmhversion%"

 .\"
 .\" %nmhwarning%
 .\"
 .\"
 .\" %nmhwarning%
 .\"


@@ -17,9 +17,9 @@ conflict \- search for alias/password conflicts
 .RI [ aliasfiles
 \&...]
 .ad
 .RI [ aliasfiles
 \&...]
 .ad

-.SH STATUS
-.B Conflict is deprecated and will be removed from the next nmh release.

 .SH DESCRIPTION
 .SH DESCRIPTION

+.B "Conflict is deprecated and will be removed from the next nmh release."
+.PP

 .B Conflict
 is a program that checks to see if the interface between
 .B nmh
 .B Conflict
 is a program that checks to see if the interface between
 .B nmh


@@ -30,7 +30,7 @@ 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
 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

-.BR group (5)
+.IR 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.
 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.


@@ -57,7 +57,7 @@ invocation to
 .PP
 .B Conflict
 should be run under
 .PP
 .B Conflict
 should be run under

-.BR cron (8),
+.IR cron (8),

 or whenever system accounting takes place.
 .SH FILES
 .fc ^ ~
 or whenever system accounting takes place.
 .SH FILES
 .fc ^ ~


@@ -72,7 +72,7 @@ or whenever system accounting takes place.
 .SH "PROFILE COMPONENTS"
 None
 .SH "SEE ALSO"
 .SH "PROFILE COMPONENTS"
 None
 .SH "SEE ALSO"

-mh\-alias(5)
+.IR mh\-alias (5)

 .SH "DEFAULTS"
 .nf
 .RB ` aliasfiles "' defaults to %etcdir%/MailAliases"
 .SH "DEFAULTS"
 .nf
 .RB ` aliasfiles "' defaults to %etcdir%/MailAliases"