X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=man%2Fslocal.man;h=cc822f0e3a20e80854422b3880d85b5a428c8167;hp=306a08bc000f6410acce7d3697d350bee05d435a;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=3d7993e40a34f52e2b6394c2f64ef0111ab886f7

diff --git a/man/slocal.man b/man/slocal.man
index 306a08b..cc822f0 100644
--- a/man/slocal.man
+++ b/man/slocal.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH SLOCAL %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
@@ -120,44 +119,22 @@ is taking, as well as check for syntax errors in your
 file.
 
 .SS "Message Transfer Agents"
-If your MTA is
+Most modern MTAs including
 .BR sendmail ,
-you should include the line
+.BR postfix
+and
+.BR exim
+support a \&.forward file for directing incoming mail.
+You should include the line
 .PP
 .RS 5
 \*(lq|\ %libdir%/slocal\ \-user\ username\*(rq
 .RE
 .PP
 in your \&.forward file in your home directory.  This will cause
-.B sendmail
-to invoke
+your MTA to invoke
 .B slocal
 on your behalf when a message arrives.
-.PP
-If your MTA is
-.BR MMDF-I ,
-you should (symbolically) link
-.B %libdir%/slocal
-to the file
-.B bin/rcvmail
-in your home directory.  This will
-cause
-.B MMDF-I
-to invoke
-.B slocal
-on your behalf with the correct
-.RI \*(lq "address\ info\ sender" \*(rq
-arguments.
-.PP
-If your MTA is
-.BR MMDF-II ,
-then you should not use
-.B slocal.
-An equivalent functionality is already provided by
-.BR MMDF-II ;
-see
-.BR maildelivery (5)
-for details.
 
 .SS "The Maildelivery File"
 The
@@ -213,9 +190,10 @@ Matching is case-insensitive, but does not use regular expressions.
 The action to take to deliver the message.  When a message is delivered,
 a \*(lqDelivery\-Date:\ date\*(rq header is added which indicates the date
 and time that message was delivered.
-.TP \w'qpipezorztzzz'u
+.TP 4
 .I destroy
 This action always succeeds.
+.TP 4
 .IR file ", " mbox ", or " >
 Append the message to the file named by
 .IR string .
@@ -223,12 +201,12 @@ The message is
 appended to the file in mbox (uucp) format.  This is the format used by most
 other mail clients (such as mailx, elm).  If the message can be appended to
 the file, then this action succeeds.
-.TP \w'qpipezorztzzz'u
+.TP 4
 .I mmdf
 Identical to
 .IR file ,
 but always appends the message using the MMDF mailbox format.
-.TP \w'qpipezorztzzz'u
+.TP 4
 .IR pipe " or " |
 Pipe the message as the standard input to the command named by
 .IR string ,
@@ -237,7 +215,7 @@ using the Bourne shell
 to interpret the string.
 Prior to giving the string to the shell, it is expanded with the following
 built-in variables:
-.RS \w'qpipezorztzzz'u
+.RS
 .TP \w'zzreplyztozaaa'u
 $(sender)
 the out-of-band sender information
@@ -254,8 +232,7 @@ either the \*(lqReply\-To:\*(rq or \*(lqFrom:\*(rq field of the message
 $(info)
 the out-of-band information specified
 .RE
-.PP
-.TP \w'qpipezorztzzz'u
+.TP 4
 .IR qpipe " or " ^
 Similar to
 .IR pipe ,
@@ -263,7 +240,7 @@ but executes the command
 directly, after built-in variable expansion, without assistance from
 the shell.  This action can be used to avoid quoting special characters
 which your shell might interpret.
-.TP \w'qpipezorztzzz'u
+.TP 4
 .IR folder " or " +
 Store the message in the
 .B nmh
@@ -356,7 +333,7 @@ From      steve     destroy A       \-
 default   \-        file    ?       mailbox
 
 # always run rcvtty
-*         \-        pipe    R       /nmh/lib/rcvtty
+*         \-        pipe    R       %libdir%/rcvtty
 .fi
 
 .SS "Sub-process environment"
@@ -395,7 +372,7 @@ quicker delivery into your maildrop.
 .SH FILES
 .fc ^ ~
 .nf
-.ta \w'/usr/local/nmh/etc/ExtraBigFileName  'u
+.ta \w'%etcdir%/ExtraBigFileName  'u
 ^%etcdir%/mts.conf~^nmh mts configuration file
 ^$HOME/\&.maildelivery~^The file controlling local delivery
 ^%etcdir%/maildelivery~^Rather than the standard file