Merging upstream version 3.9.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 30 insertions, 12 deletions

diff --git a/man/man1/smtp-source.1 b/man/man1/smtp-source.1
index 014ee10..238bc28 100644
--- a/man/man1/smtp-source.1
+++ b/man/man1/smtp-source.1
@@ -48,7 +48,7 @@ when the listen queue is full.
 Don't disconnect after sending a message; send the next
 message over the same connection.
 .IP "\fB\-f \fIfrom\fR"
-Use the specified sender address (default: <foo@myhostname>).
+Use the specified sender address (default: <foo@my\-hostname>).
 .IP "\fB\-F \fIfile\fR"
 Send the pre\-formatted message header and body in the
 specified \fIfile\fR, while prepending '.' before lines that
@@ -60,31 +60,49 @@ include message headers.
 Speak LMTP rather than SMTP.
 .IP "\fB\-m \fImessage_count\fR"
 Send the specified number of messages (default: 1).
-.IP "\fB\-M \fImyhostname\fR"
+.IP "\fB\-M \fImy\-hostname\fR"
 Use the specified hostname or [address] in the HELO command
 and in the default sender and recipient addresses, instead
 of the machine hostname.
 .IP "\fB\-N\fR"
-Prepend a non\-repeating sequence number to each recipient
-address. This avoids the artificial 100% hit rate in the
-resolve and rewrite client caches and exercises the
-trivial\-rewrite daemon, better approximating Postfix
-performance under real\-life work\-loads.
+Generate each recipient address by appending a number (a
+per\-process recipient counter) to the recipient address
+localpart specified with the \fB\-t\fR option.
+
+Note: to use the number as an address extension, specify
+an explicit address delimiter at the end of the recipient
+localpart, as in "\fB\-t localpart+@domain\fR" or "\fB\-t
+localpart+\fR", where "\fB+\fR" is a Postfix recipient
+address delimiter.
+
+Benefits:
+.RS
+.IP \(bu
+A non\-constant recipient address avoids an unrealistic 100%
+cache hit rate in clients of the Postfix trivial\-rewrite
+service, better approximating performance under real\-life
+work\-loads.
+.IP \(bu
+A fixed recipient address local\-part with a non\-constant
+address extension avoids the need to configure a large
+number of valid recipient addresses in the receiving Postfix
+server.
+.RE
 .IP \fB\-o\fR
 Old mode: don't send HELO, and don't send message headers.
 .IP "\fB\-r \fIrecipient_count\fR"
-Send the specified number of recipients per transaction (default: 1).
-Recipient names are generated by prepending a number to the
-recipient address.
+Send the specified number of recipients per transaction
+(default: 1), and generate recipient addresses as described
+under the \fB\-N\fR option.
 .IP "\fB\-R \fIinterval\fR"
-Wait for a random period of time 0 <= n <= interval between messages.
+Wait a random time (0 <= n <= \fIinterval\fR) between messages.
 Suspending one thread does not affect other delivery threads.
 .IP "\fB\-s \fIsession_count\fR"
 Run the specified number of SMTP sessions in parallel (default: 1).
 .IP "\fB\-S \fIsubject\fR"
 Send mail with the named subject line (default: none).
 .IP "\fB\-t \fIto\fR"
-Use the specified recipient address (default: <foo@myhostname>).
+Use the specified recipient address (default: <foo@my\-hostname>).
 .IP "\fB\-T \fIwindowsize\fR"
 Override the default TCP window size. To work around
 broken TCP window scaling implementations, specify a