projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added -clobber switch to mhstore(1) [Bug #11160].
[mmh]
/
man
/
conflict.man
diff --git
a/man/conflict.man
b/man/conflict.man
index
b01b469
..
e41d260
100644
(file)
--- a/
man/conflict.man
+++ b/
man/conflict.man
@@
-1,6
+1,5
@@
.\"
.\" %nmhwarning%
.\"
.\" %nmhwarning%
-.\" $Id$
.\"
.TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
.SH NAME
.\"
.TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
.SH NAME
@@
-18,6
+17,8
@@
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
.B Conflict
is a program that checks to see if the interface between
.SH DESCRIPTION
.B Conflict
is a program that checks to see if the interface between
@@
-62,7
+63,7
@@
or whenever system accounting takes place.
.SH FILES
.fc ^ ~
.nf
.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
^%etcdir%/mts.conf~^nmh mts configuration file
^/etc/passwd~^List of users
^/etc/group~^List of groups