diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 1997-02-17 04:38:39 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 1997-02-17 04:38:39 +0000 |
| commit | db2cdc170df42f155fa63012fdaf0b7b9fc73ce9 (patch) | |
| tree | a1d4f3882f2055152b26c36c64324f202f4db9ae /fetchmail.man | |
| parent | 1bf8bb4b2751ef3d4007221cbe0e9bc39de34117 (diff) | |
| download | fetchmail-db2cdc170df42f155fa63012fdaf0b7b9fc73ce9.tar.gz fetchmail-db2cdc170df42f155fa63012fdaf0b7b9fc73ce9.tar.bz2 fetchmail-db2cdc170df42f155fa63012fdaf0b7b9fc73ce9.zip | |
Lose the `received' option; we now say `no envelope'.
svn path=/trunk/; revision=893
Diffstat (limited to 'fetchmail.man')
| -rw-r--r-- | fetchmail.man | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fetchmail.man b/fetchmail.man index 13e94071..fcd5c350 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -607,14 +607,13 @@ Legal user options are rewrite stripcr dns - received no keep no flush no fetchall no rewrite no stripcr no dns - no received + no envelope limit batchlimit fetchlimit @@ -623,7 +622,7 @@ Legal user options are All options correspond to the obvious command-line arguments except the following: `aka', `is', `to', `dns'/`no dns', `password', \&`preconnect', `localdomains', `stripcr'/`no stripcr' and -\&`received/no received'. +\&`no received'. .PP The `is' or `to' keywords associate the following local (client) name(s) (or server-name to client-name mappings separated by =) with @@ -670,9 +669,12 @@ name matches a declared local doman, that address is passed through to the listener or MDA unaltered (local-name mappings are \fInot\fR applied). .PP -If you are using `localdomains', you may also need to specify -\&`no received', which disables \fIfetchmail\fR's normal attempt -to deduce an envelope address from the Received line. +If you are using `localdomains', you may also need to specify \&`no +envelope', which disables \fIfetchmail\fR's normal attempt to deduce +an envelope address from the Received line or X-Envelope-To header or +whatever header has been previously set by `envelope'. If you set `no +envelope' in the defaults entry it is possible to undo that in +individual entries by using `envelope <string>'. .PP The \fBpassword\fR option requires a string argument, which is the password to be used with the entry's server. |