summaryrefslogtreecommitdiff
path: root/debian/patches/31_eximmanpage.dpatch
blob: 207e5248641184fc389cde6b4a40576bab34a5ec (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
#! /bin/sh -e
## 31_newpatch.dpatch by  <ametzler@logic.univie.ac.at>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add info about rmail, mailq, etc. to exim(8).

if [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi
case "$1" in
       -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
       -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
	*)
		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
		exit 1;;
esac

exit 0
				    
@DPATCH@
diff -urNad 31.exim4.tmp/doc/exim.8 31.exim4/doc/exim.8
--- 31.exim4.tmp/doc/exim.8	Wed Dec 18 11:28:05 2002
+++ 31.exim4/doc/exim.8	Sat Mar  1 09:30:34 2003
@@ -3,6 +3,11 @@
 exim - a Mail Transfer Agent
 .SH SYNOPSIS
 .B exim [options] arguments ...
+.B mailq [options] arguments ...
+.B rsmtp [options] arguments ...
+.B rmail [options] arguments ...
+.B runq [options] arguments ...
+.B newaliases [options] arguments ...
 
 .SH DESCRIPTION
 Exim is a mail transport agent (MTA) developed at the University of Cambridge.
@@ -11,6 +16,27 @@
 line options. It has been automatically generated from the reference manual
 source, which is why the formatting is poor in some places.
 
+.SH SETTING OPTIONS BY PROGRAM NAME
+.TP 10
+\fBmailq\fR
+Behave as if the option \-bp were present before any other options.
+.TP
+\fBrsmtp\fR
+Behaves as if the option \-bS were present before any other options,
+for compatibility with Smail
+.TP
+\fBrmail\fR
+Behave as if the \-i and \-oee options were present before any other options,
+for compatibility with Smail.
+.TP
+\fBrunq\fR
+Behave as if the option \-q were present before any other options, for 
+compatibility with Smail.
+.TP
+\fBnewaliases\fR
+Behave as if the option \-bi were present before any other options, for
+compatibility with Sendmail.
+
 .SH OPTIONS
 .TP 10
 \fB--\fR
@@ -53,7 +79,7 @@
 When -oX is used on the command to start a listening daemon, the process id
 is not written to the normal pid file path. However, -oP can be used to
 specify a path on the command line if a pid file is required.
-.nem
+.ne
 
 .em
 The SIGHUP signal can be used to cause the daemon to re-exec itself. This
@@ -62,7 +88,7 @@
 whenever a new version of Exim is installed. It is not necessary to do this
 when other files that are referenced from the configuration (for example, alias
 files) are changed, because these are reread each time they are used.
-.nem
+.ne
 .TP
 \fB-bdf\fR
 This option has the same effect as -bd except that it never disconnects from
@@ -129,7 +155,7 @@
 .em
 Warning: You cannot test features of the configuration that rely on ident
 (RFC 1413) callouts, because these are not done when testing using -bh.
-.nem
+.ne
 
 Messages supplied during the testing session are discarded, and nothing is
 written to any of the real log files. There may be pauses when DNS (and other)
@@ -523,7 +549,7 @@
 White space between -f and the <address> is optional
 .em
 (that is, they can be given as two arguments or one combined argument).
-.nem
+.ne
 The sender of a locally-generated message can also be set (when permitted) by
 an initial `From ' line in the message -- see the description of -bm above
 -- but if -f is also present, it overrides `From '.
@@ -577,7 +603,7 @@
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the -MC option. It signifies that the server to
 which Exim is connected supports pipelining.
-.nem
+.ne
 .TP
 \fB-MCQ <process id> <pipe fd>\fR
 This option is not intended for use by external callers. It is used internally
@@ -734,7 +760,7 @@
 effect.
 .em
 This option overrides any setting of "queue_smtp_domains" or -odqs.
-.nem
+.ne
 .TP
 \fB-odqs\fR
 This option is a hybrid between -odb and -odq. A background delivery
@@ -789,7 +815,7 @@
 over TCP/IP). These options can be used by any caller in conjunction with the
 -bh, -bf, -bF, -bt, or -bv testing options. In other
 circumstances, they are ignored unless the caller is trusted.
-.nem
+.ne
 
 The -oMa option sets the sender host address. This may include a port number
 at the end, after a full stop (period). For example:
@@ -829,7 +855,7 @@
 input, the protocol is determined by whether EHLO or HELO is used, and
 is always either `local-esmtp' or `local-smtp'. For -bS (batch SMTP)
 however, the protocol can be set by -oMr.
-.nem
+.ne
 .TP
 \fB-oMs <host name>\fR
 See -oMa above for general remarks about the -oM options. The -oMs
@@ -857,7 +883,7 @@
 written. When -oX is used with -bd, or when -q with a time is used
 without -bd, this is the only way of causing Exim to write a pid file,
 because in those cases, the normal pid file is not used.
-.nem
+.ne
 .TP
 \fB-or <time>\fR
 This option sets a timeout value for incoming non-SMTP messages. If it is not
@@ -885,7 +911,7 @@
 optionally ports) on which the daemon is to listen. In this case, the data is
 in the same format as the value of "local_interfaces", and it overrides that
 option.
-.nem
+.ne
 .TP
 \fB-pd\fR
 This option applies when an embedded Perl interpreter is linked with Exim. It overrides the setting of the "perl_at_start" option,
@@ -997,7 +1023,7 @@
 .em
 When a daemon is started by -q with a time value, but without -db, no pid
 file is written unless one is explicitly requested by the -oP option.
-.nem
+.ne
 .TP
 \fB-qR<rsflags> <string>\fR
 This option is synonymous with -R. It is provided for Sendmail
@@ -1092,7 +1118,7 @@
 way and some the other. With only a few clients that need the legacy support, a
 convenient approach is to use a daemon for normal SMTP (with or without
 STARTTLS) and inetd with "-tls-on-connect-" for the legacy clients.
-.nem
+.ne
 .TP
 \fB-U\fR
 Sendmail uses this option for `initial message submission', and its
@@ -1114,3 +1140,24 @@
 It sets -x when calling the MTA from its "mail" command. Exim ignores this
 option.
 .TP
+
+.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/.
+
+.SH AUTHOR
+This manual page was provided with the upstream Exim source package. 
+It was enhanced for the Debian GNU/Linux system.