| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 3cbc5e6e624235f9ba40cfd5a2b18c11be371399 Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Tue, 2 Dec 2014 07:02:01 +0900 |
| 4 | Subject: [PATCH 2/3] From debian to fix man file |
| 5 | |
| 6 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| 7 | --- |
| 8 | man/procmail.man | 24 +++++++++++++++++------- |
| 9 | man/procmailrc.man | 2 +- |
| 10 | 2 files changed, 18 insertions(+), 8 deletions(-) |
| 11 | |
| 12 | diff --git a/man/procmail.man b/man/procmail.man |
| 13 | index 175043a..1274ce8 100644 |
| 14 | --- a/man/procmail.man |
| 15 | +++ b/man/procmail.man |
| 16 | @@ -44,11 +44,11 @@ at the end. |
| 17 | should be invoked automatically over the |
| 18 | .B @DOT_FORWARD@ |
| 19 | file mechanism as soon as mail arrives. Alternatively, when installed by |
| 20 | -a system administrator, it can be invoked from within the mailer immediately. |
| 21 | -When invoked, it first sets some environment variables to default values, |
| 22 | -reads the mail message from stdin until an EOF, separates the body from the |
| 23 | -header, and then, if no command line arguments are present, it starts to look |
| 24 | -for a file named |
| 25 | +a system administrator (and in the standard Red Hat Linux configuration), it |
| 26 | +can be invoked from within the mailer immediately. When invoked, it |
| 27 | +first sets some environment variables to default values, reads the mail message from |
| 28 | +stdin until an EOF, separates the body from the header, and then, if no command line |
| 29 | +arguments are present, it starts to look for a file named |
| 30 | .BR @PROCMAILRC@ . |
| 31 | According to the processing recipes in this file, |
| 32 | the mail message that just arrived gets distributed into the right folder |
| 33 | @@ -166,7 +166,8 @@ must be specified on the command line. After the rcfile, procmail will |
| 34 | accept an unlimited number of arguments.@ETCRCS_desc@ |
| 35 | For some advanced usage of this option you should look in the |
| 36 | .B EXAMPLES |
| 37 | -section below.@LMTPOPTdesc@.SH ARGUMENTS |
| 38 | +section below.@LMTPOPTdesc@ |
| 39 | +.SH ARGUMENTS |
| 40 | Any arguments containing an '=' are considered to be environment variable |
| 41 | assignments, they will |
| 42 | .I all |
| 43 | @@ -723,6 +724,15 @@ path.@FW_comment@ |
| 44 | .fi |
| 45 | .ad |
| 46 | .PP |
| 47 | +Some mailers (notably exim) do not currently accept the above syntax. |
| 48 | +In such case use this instead: |
| 49 | +.PP |
| 50 | +.na |
| 51 | +.nf |
| 52 | +|/usr/bin/procmail |
| 53 | +.fi |
| 54 | +.ad |
| 55 | +.PP |
| 56 | Procmail can also be invoked to postprocess an already filled system |
| 57 | mailbox. This can be useful if you don't want to or can't use a |
| 58 | $HOME/@DOT_FORWARD@ file (in which case the following script could |
| 59 | @@ -754,7 +764,7 @@ exit 0 |
| 60 | .SS "A sample small @PROCMAILRC@:" |
| 61 | .na |
| 62 | .nf |
| 63 | -PATH=/bin:/usr/bin:@BINDIR@ |
| 64 | +PATH=/usr/local/bin:/usr/bin:/bin |
| 65 | MAILDIR=$HOME/Mail #you'd better make sure it exists |
| 66 | DEFAULT=$MAILDIR/mbox #completely optional |
| 67 | LOGFILE=$MAILDIR/from #recommended |
| 68 | diff --git a/man/procmailrc.man b/man/procmailrc.man |
| 69 | index 472035f..7bf08dd 100644 |
| 70 | --- a/man/procmailrc.man |
| 71 | +++ b/man/procmailrc.man |
| 72 | @@ -779,7 +779,7 @@ one trailing newline will be stripped. |
| 73 | .PP |
| 74 | Some non-optimal and non-obvious regexps set MATCH to an incorrect |
| 75 | value. The regexp can be made to work by removing one or more unneeded |
| 76 | -'*', '+', or '?' operator on the left-hand side of the \e/ token. |
| 77 | +\&'*', '+', or '?' operator on the left-hand side of the \e/ token. |
| 78 | .SH MISCELLANEOUS |
| 79 | If the regular expression contains `\fB@TO_key@\fP' it will be substituted by |
| 80 | .na |
| 81 | -- |
| 82 | 1.8.4.2 |
| 83 | |