Description: We ship the binary as exim4 instead of exim, fix manpage accordingly. Author: Marc Haber , Andreas Metzler Last-Update: 2019-10-17 Forwarded: not-needed (upstream uses the "exim" name) --- a/doc/exim.8 +++ b/doc/exim.8 @@ -1,9 +1,9 @@ -.TH EXIM 8 +.TH EXIM4 8 .SH NAME -exim \- a Mail Transfer Agent +exim4 \- a Mail Transfer Agent .SH SYNOPSIS .nf -.B exim [options] arguments ... +.B exim4 [options] arguments ... .B mailq [options] arguments ... .B rsmtp [options] arguments ... .B rmail [options] arguments ... @@ -40,7 +40,7 @@ local message on the standard input, wit recipients) is assumed. Thus, for example, if Exim is installed in \fI/usr/sbin\fP, you can send a message from the command line like this: .sp - /usr/sbin/exim -i + /usr/sbin/exim4 -i CTRL-D .sp @@ -125,8 +125,8 @@ ports, on multiple ports, and only on sp .sp When a listening daemon is started without the use of \fB\-oX\fP (that is, without overriding the normal -configuration), it writes its process id to a file called exim\-daemon.pid -in Exim's spool directory. This location can be overridden by setting +configuration), it writes its process id to a file called +/run/exim4/exim.pid. This location can be overridden by setting PID_FILE_PATH in Local/Makefile. The file is written while Exim is still running as root. .sp @@ -180,7 +180,7 @@ available to admin users. This option operates like \fB\-be\fP except that it must be followed by the name of a file. For example: .sp - exim \-bem /tmp/testmessage + exim4 \-bem /tmp/testmessage .sp The file is read as a message (as if receiving a locally\-submitted non\-SMTP message) before any of the test expansions are done. Thus, message\-specific @@ -206,7 +206,7 @@ If you want to test a system filter file can use both \fB\-bF\fP and \fB\-bf\fP on the same command, in order to test a system filter and a user filter in the same run. For example: .sp - exim \-bF /system/filter \-bf /user/filter ' user@domain - exim \-f "" user@domain + exim4 \-f '<>' user@domain + exim4 \-f "" user@domain .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 @@ -1315,12 +1315,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 - exim \-bs \-oMa 10.9.8.7.1234 + exim4 \-bs \-oMa 10.9.8.7.1234 .sp An alternative syntax is to enclose the IP address in square brackets, followed by a colon and the port number: .sp - exim \-bs \-oMa [10.9.8.7]:1234 + exim4 \-bs \-oMa [10.9.8.7]:1234 .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 @@ -1526,22 +1526,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 - exim \-q 0t5C6f\-0000c8\-00 + exim4 \-q 0t5C6f\-0000c8\-00 .sp Messages that arrived earlier than 0t5C6f\-0000c8\-00 are not inspected. If a second message id is given, messages whose ids are lexically greater than it are also skipped. If the same id is given twice, for example, .sp - exim \-q 0t5C6f\-0000c8\-00 0t5C6f\-0000c8\-00 + exim4 \-q 0t5C6f\-0000c8\-00 0t5C6f\-0000c8\-00 .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 @@ -1557,7 +1557,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 - /usr/exim/bin/exim \-bd \-q30m + /usr/sbin/exim4 \-bd \-q30m .sp Such a daemon listens for incoming SMTP calls, and also starts a queue runner process every 30 minutes. @@ -1588,7 +1588,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 - exim \-q25m \-R @special.domain.example + exim4 \-q25m \-R @special.domain.example .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 @@ -1704,6 +1704,26 @@ under most shells. .sp . .SH "SEE ALSO" +.BR exicyclog (8), +.BR exigrep (8), +.BR exim_checkaccess (8), +.BR exim_convert4r4 (8), +.BR exim_db (8), +.BR exim_dbmbuild (8), +.BR exim_lock (8), +.BR eximon (8), +.BR exinext (8), +.BR exiqgrep (8), +.BR exiqsumm (8), +.BR exiwhat (8), +.BR update\-exim4.conf (8), +.BR update\-exim4defaults (8), +/usr/share/doc/exim4\-base/, +/usr/share/doc/exim4\-base/README.Debian.[gz|html]. .rs .sp The full Exim specification, the Exim book, and the Exim wiki. + +.SH AUTHOR +This manual page was provided with the upstream Exim source package. +It was enhanced for the Debian GNU/Linux system.