X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=man%2Fconflict.man8;h=dc05548f444779b75be1b6afaacabd3c4026e734;hp=fc2f8d7912329ba9e3e1e04f105b7dfedfc2e4fa;hb=4b5944268ea0da7bb30598a27857304758ea9b44;hpb=5aaedc4256d58afe2481d667afdcb5162a914ba9

diff --git a/man/conflict.man8 b/man/conflict.man8
index fc2f8d7..dc05548 100644
--- a/man/conflict.man8
+++ b/man/conflict.man8
@@ -62,11 +62,10 @@ or whenever system accounting takes place.
 .fc ^ ~
 .nf
 .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
+^%mailspool%/~^Directory of mail drops
 .fi
 
 .SH "PROFILE COMPONENTS"