accordingly.
Author: Marc Haber <mh+debian-packages@zugschlus.de>,
Andreas Metzler <ametzler@bebt.de>
-Last-Update: 2014-05-29
+Last-Update: 2017-01-31
Forwarded: not-needed (upstream uses the "exim" name)
--- a/doc/exim.8
.sp
When an IPv6 address is given, it is converted into canonical form. In the case
of the second example above, the value of \fI$sender_host_address\fP after
-@@ -411,7 +411,7 @@ main configuration options to be written
+@@ -412,7 +412,7 @@ main configuration options to be written
of one or more specific options can be requested by giving their names as
arguments, for example:
.sp
.sp
However, any option setting that is preceded by the word "hide" in the
configuration file is not shown in full, except to an admin user. For other
-@@ -435,7 +435,7 @@ written directly into the spool director
+@@ -440,7 +440,7 @@ written directly into the spool director
.sp
If \fB\-bP\fP is followed by a name preceded by +, for example,
.sp
.sp
it searches for a matching named list of any type (domain, host, address, or
local part) and outputs what it finds.
-@@ -444,7 +444,7 @@ If one of the words \fBrouter\fP, \fBtra
+@@ -449,7 +449,7 @@ If one of the words \fBrouter\fP, \fBtra
followed by the name of an appropriate driver instance, the option settings for
that driver are output. For example:
.sp
.sp
The generic driver options are output first, followed by the driver's private
options. A list of the names of drivers of a particular type can be obtained by
-@@ -523,7 +523,7 @@ This option is for testing retry rules,
+@@ -532,7 +532,7 @@ This option is for testing retry rules,
arguments. It causes Exim to look for a retry rule that matches the values
and to write it to the standard output. For example:
.sp
Retry rule: *.comp.mus.example F,2h,15m; F,4d,30m;
.sp
The first
-@@ -536,7 +536,7 @@ rule is found that matches the host, one
+@@ -545,7 +545,7 @@ rule is found that matches the host, one
sought. Finally, an argument that is the name of a specific delivery error, as
used in setting up retry rules, can be given. For example:
.sp
Retry rule: *@haydn.comp.mus.example quota_3d F,1h,15m
.TP 10
\fB\-brw\fP
-@@ -639,7 +639,7 @@ doing such tests.
+@@ -648,7 +648,7 @@ doing such tests.
.TP 10
\fB\-bV\fP
This option causes Exim to write the current version number, compilation
It also lists the DBM library that is being used, the optional modules (such as
specific lookup types), the drivers that are included in the binary, and the
name of the run time configuration file that is in use.
-@@ -667,7 +667,7 @@ If no arguments are given, Exim runs in
+@@ -676,7 +676,7 @@ If no arguments are given, Exim runs in
right angle bracket for addresses to be verified.
.sp
Unlike the \fB\-be\fP test option, you cannot arrange for Exim to use the
security issues.
.sp
Verification differs from address testing (the \fB\-bt\fP option) in that routers
-@@ -780,14 +780,14 @@ command line item. \fB\-D\fP can be used
+@@ -789,14 +789,14 @@ command line item. \fB\-D\fP can be used
string, in which case the equals sign is optional. These two commands are
synonymous:
.sp
+ exim4 '\-D ABC = something' ...
.sp
\fB\-D\fP may be repeated up to 10 times on a command line.
- .TP 10
-@@ -916,8 +916,8 @@ never provoke a bounce. An empty sender
+ Only macro names up to 22 letters long can be set.
+@@ -926,8 +926,8 @@ never provoke a bounce. An empty sender
string, or as a pair of angle brackets with nothing between them, as in these
examples of shell commands:
.sp
.sp
In addition, the use of \fB\-f\fP is not restricted when testing a filter file
with \fB\-bf\fP or when testing or verifying addresses using the \fB\-bt\fP or
-@@ -1271,12 +1271,12 @@ other circumstances, they are ignored un
+@@ -1292,12 +1292,12 @@ other circumstances, they are ignored un
The \fB\-oMa\fP option sets the sender host address. This may include a port
number at the end, after a full stop (period). For example:
.sp
.sp
The IP address is placed in the \fI$sender_host_address\fP variable, and the
port, if present, in \fI$sender_host_port\fP. If both \fB\-oMa\fP and \fB\-bh\fP
-@@ -1474,13 +1474,13 @@ When scanning the queue, Exim can be mad
+@@ -1502,22 +1502,22 @@ If other commandline options specify an
+ will specify a queue to operate on.
+ For example:
+ .sp
+- exim \-bp \-qGquarantine
++ exim4 \-bp \-qGquarantine
+ mailq \-qGquarantine
+- exim \-qGoffpeak \-Rf @special.domain.example
++ exim4 \-qGoffpeak \-Rf @special.domain.example
+ .TP 10
+ \fB\-q\fP<\fIqflags\fP> <\fIstart id\fP> <\fIend id\fP>
+ When scanning the queue, Exim can be made to skip over messages whose ids are
lexically less than a given value by following the \fB\-q\fP option with a
starting message id. For example:
.sp
.sp
just one delivery process is started, for that message. This differs from
\fB\-M\fP in that retry data is respected, and it also differs from \fB\-Mc\fP in
-@@ -1496,7 +1496,7 @@ starting a queue runner process at inter
+@@ -1533,7 +1533,7 @@ starting a queue runner process at inter
single daemon process handles both functions. A common way of starting up a
combined daemon at system boot time is to use a command such as
.sp
.sp
Such a daemon listens for incoming SMTP calls, and also starts a queue runner
process every 30 minutes.
-@@ -1527,7 +1527,7 @@ regular expression; otherwise it is a li
+@@ -1564,7 +1564,7 @@ regular expression; otherwise it is a li
If you want to do periodic queue runs for messages with specific recipients,
you can combine \fB\-R\fP with \fB\-q\fP and a time value. For example:
.sp
.sp
This example does a queue run for messages with recipients in the given domain
every 25 minutes. Any additional flags that are specified with \fB\-q\fP are
-@@ -1637,6 +1637,26 @@ to the named file. It is ignored by Exi
+@@ -1680,6 +1680,26 @@ under most shells.
.sp
.
.SH "SEE ALSO"
HCoop / hcoop / debian / exim4.git / blobdiff