Merge remote-tracking branch 'origin' into xoauth

[nmh] / man / slocal.man

diff --git a/man/slocal.man b/man/slocal.man
index 10851e4036a381955bb1f83ebe4cf74edab34b10..53f9314a3ff2aaece3c86812b51fda0616270042 100644 (file)
--- a/man/slocal.man
+++ b/man/slocal.man
@@ -7,7 +7,7 @@ slocal \- asynchronously filter and deliver new mail
 .SH SYNOPSIS
 .HP 5
 .na
 .SH SYNOPSIS
 .HP 5
 .na

-.B %libdir%/slocal
+.B %nmhlibexecdir%/slocal

 .RB [ \-addr
 .IR address ]
 .RB [ \-info
 .RB [ \-addr
 .IR address ]
 .RB [ \-info


@@ -126,7 +126,7 @@ support a \&.forward file for directing incoming mail.
 You should include the line
 .PP
 .ce
 You should include the line
 .PP
 .ce

-\*(lq|\ %libdir%/slocal\ \-user\ username\*(rq
+\*(lq|\ %nmhlibexecdir%/slocal\ \-user\ username\*(rq

 .PP
 in your \&.forward file in your home directory.  This will cause
 your MTA to invoke
 .PP
 in your \&.forward file in your home directory.  This will cause
 your MTA to invoke


@@ -139,7 +139,7 @@ file controls how
 .B slocal
 filters and delivers
 incoming mail.  Each line of this file consists of five fields, separated
 .B slocal
 filters and delivers
 incoming mail.  Each line of this file consists of five fields, separated

-by white-space or comma.  Since double-quotes are honored, these
+by whitespace or comma.  Since double-quotes are honored, these

 characters may be included in a single argument by enclosing the entire
 argument in double-quotes.  A double-quote can be included by preceding it
 with a backslash.  Lines beginning with `#' and blank lines are ignored.
 characters may be included in a single argument by enclosing the entire
 argument in double-quotes.  A double-quote can be included by preceding it
 with a backslash.  Lines beginning with `#' and blank lines are ignored.


@@ -286,7 +286,7 @@ file cannot be found, or does not
 perform an action which delivers the message, then
 .B slocal
 will check for a global delivery file at
 perform an action which delivers the message, then
 .B slocal
 will check for a global delivery file at

-.IR %etcdir%/maildelivery .
+.IR %nmhetcdir%/maildelivery .

 This file is read according to the same rules.  This file must be
 owned by root and must be writable only by root.
 .PP
 This file is read according to the same rules.  This file must be
 owned by root and must be writable only by root.
 .PP


@@ -327,7 +327,7 @@ From      steve     destroy A       \-
 default   \-        file    ?       mailbox
 
 # always run rcvtty
 default   \-        file    ?       mailbox
 
 # always run rcvtty

-*         \-        pipe    R       %libdir%/rcvtty
+*         \-        pipe    R       %nmhlibexecdir%/rcvtty

 .fi
 .SS "Sub-process environment"
 When a process is invoked, its environment is: the user/group-ids are
 .fi
 .SS "Sub-process environment"
 When a process is invoked, its environment is: the user/group-ids are


@@ -364,10 +364,10 @@ quicker delivery into your maildrop.
 .SH FILES
 .fc ^ ~
 .nf
 .SH FILES
 .fc ^ ~
 .nf

-.ta \w'%etcdir%/ExtraBigFileName  'u
-^%etcdir%/mts.conf~^nmh mts configuration file
+.ta \w'%nmhetcdir%/ExtraBigFileName  'u
+^%nmhetcdir%/mts.conf~^nmh mts configuration file

 ^$HOME/\&.maildelivery~^The file controlling local delivery
 ^$HOME/\&.maildelivery~^The file controlling local delivery

-^%etcdir%/maildelivery~^Rather than the standard file
+^%nmhetcdir%/maildelivery~^Rather than the standard file

 ^%mailspool%/$USER~^The default maildrop
 .fi
 .SH "SEE ALSO"
 ^%mailspool%/$USER~^The default maildrop
 .fi
 .SH "SEE ALSO"