Merging upstream version 3.9.0.

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

1 files changed, 10 insertions, 7 deletions

diff --git a/man/man8/trivial-rewrite.8 b/man/man8/trivial-rewrite.8
index e41da71..f2c39fb 100644
--- a/man/man8/trivial-rewrite.8
+++ b/man/man8/trivial-rewrite.8
@@ -142,9 +142,10 @@ Enable the rewriting of "site!user" into "user@site".
 .PP
 Available in Postfix 2.2 and later:
 .IP "\fBremote_header_rewrite_domain (empty)\fR"
-Don't rewrite message headers from remote clients at all when
-this parameter is empty; otherwise, rewrite message headers and
-append the specified domain name to incomplete addresses.
+Rewrite or add message headers in mail from remote clients if
+the remote_header_rewrite_domain parameter value is non\-empty,
+updating incomplete addresses with the domain specified in the
+remote_header_rewrite_domain parameter, and adding missing headers.
 .SH "ROUTING CONTROLS"
 .na
 .nf
@@ -163,10 +164,12 @@ The default mail delivery transport and next\-hop destination for
 final delivery to domains listed with $virtual_mailbox_domains.
 .IP "\fBrelay_transport (relay)\fR"
 The default mail delivery transport and next\-hop destination for
-remote delivery to domains listed with $relay_domains.
+the relay domain address class: recipient domains that match
+$relay_domains.
 .IP "\fBdefault_transport (smtp)\fR"
 The default mail delivery transport and next\-hop destination for
-destinations that do not match $mydestination, $inet_interfaces,
+the default domain class: recipient domains that do not match
+$mydestination, $inet_interfaces,
 $proxy_interfaces, $virtual_alias_domains, $virtual_mailbox_domains,
 or $relay_domains.
 .IP "\fBparent_domain_matches_subdomains (see 'postconf -d' output)\fR"
@@ -174,8 +177,8 @@ A list of Postfix features where the pattern "example.com" also
 matches subdomains of example.com,
 instead of requiring an explicit ".example.com" pattern.
 .IP "\fBrelayhost (empty)\fR"
-The next\-hop destination(s) for non\-local mail; overrides non\-local
-domains in recipient addresses.
+The next\-hop destination(s) for non\-local mail; takes precedence
+over non\-local domains in recipient addresses.
 .IP "\fBtransport_maps (empty)\fR"
 Optional lookup tables with mappings from recipient address to
 (message delivery transport, next\-hop destination).