| From 3cbc5e6e624235f9ba40cfd5a2b18c11be371399 Mon Sep 17 00:00:00 2001 |
| From: Li xin <lixin.fnst@cn.fujitsu.com> |
| Date: Tue, 2 Dec 2014 07:02:01 +0900 |
| Subject: [PATCH 2/3] From debian to fix man file |
| |
| Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| --- |
| man/procmail.man | 24 +++++++++++++++++------- |
| man/procmailrc.man | 2 +- |
| 2 files changed, 18 insertions(+), 8 deletions(-) |
| |
| diff --git a/man/procmail.man b/man/procmail.man |
| index 175043a..1274ce8 100644 |
| --- a/man/procmail.man |
| +++ b/man/procmail.man |
| @@ -44,11 +44,11 @@ at the end. |
| should be invoked automatically over the |
| .B @DOT_FORWARD@ |
| file mechanism as soon as mail arrives. Alternatively, when installed by |
| -a system administrator, it can be invoked from within the mailer immediately. |
| -When invoked, it first sets some environment variables to default values, |
| -reads the mail message from stdin until an EOF, separates the body from the |
| -header, and then, if no command line arguments are present, it starts to look |
| -for a file named |
| +a system administrator (and in the standard Red Hat Linux configuration), it |
| +can be invoked from within the mailer immediately. When invoked, it |
| +first sets some environment variables to default values, reads the mail message from |
| +stdin until an EOF, separates the body from the header, and then, if no command line |
| +arguments are present, it starts to look for a file named |
| .BR @PROCMAILRC@ . |
| According to the processing recipes in this file, |
| the mail message that just arrived gets distributed into the right folder |
| @@ -166,7 +166,8 @@ must be specified on the command line. After the rcfile, procmail will |
| accept an unlimited number of arguments.@ETCRCS_desc@ |
| For some advanced usage of this option you should look in the |
| .B EXAMPLES |
| -section below.@LMTPOPTdesc@.SH ARGUMENTS |
| +section below.@LMTPOPTdesc@ |
| +.SH ARGUMENTS |
| Any arguments containing an '=' are considered to be environment variable |
| assignments, they will |
| .I all |
| @@ -723,6 +724,15 @@ path.@FW_comment@ |
| .fi |
| .ad |
| .PP |
| +Some mailers (notably exim) do not currently accept the above syntax. |
| +In such case use this instead: |
| +.PP |
| +.na |
| +.nf |
| +|/usr/bin/procmail |
| +.fi |
| +.ad |
| +.PP |
| Procmail can also be invoked to postprocess an already filled system |
| mailbox. This can be useful if you don't want to or can't use a |
| $HOME/@DOT_FORWARD@ file (in which case the following script could |
| @@ -754,7 +764,7 @@ exit 0 |
| .SS "A sample small @PROCMAILRC@:" |
| .na |
| .nf |
| -PATH=/bin:/usr/bin:@BINDIR@ |
| +PATH=/usr/local/bin:/usr/bin:/bin |
| MAILDIR=$HOME/Mail #you'd better make sure it exists |
| DEFAULT=$MAILDIR/mbox #completely optional |
| LOGFILE=$MAILDIR/from #recommended |
| diff --git a/man/procmailrc.man b/man/procmailrc.man |
| index 472035f..7bf08dd 100644 |
| --- a/man/procmailrc.man |
| +++ b/man/procmailrc.man |
| @@ -779,7 +779,7 @@ one trailing newline will be stripped. |
| .PP |
| Some non-optimal and non-obvious regexps set MATCH to an incorrect |
| value. The regexp can be made to work by removing one or more unneeded |
| -'*', '+', or '?' operator on the left-hand side of the \e/ token. |
| +\&'*', '+', or '?' operator on the left-hand side of the \e/ token. |
| .SH MISCELLANEOUS |
| If the regular expression contains `\fB@TO_key@\fP' it will be substituted by |
| .na |
| -- |
| 1.8.4.2 |
| |