From: Wietse Venema Date: Fri, 5 May 2023 05:00:00 +0000 (-0500) Subject: postfix-3.9-20230505 X-Git-Tag: v3.9.0~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a80705f3d5781453de47261dd498e2f183af10e3;p=thirdparty%2Fpostfix.git postfix-3.9-20230505 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index 00981aa30..d6754fe92 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -27115,8 +27115,21 @@ Apologies for any names omitted. 20230504 Documentation: clarified the relationships between - local_transport, virtual_mailbox_transport, relay_trainsport, + local_transport, virtual_mailbox_transport, relay_transport, default_transport, relay_host, sender_dependent_relayhost_maps, sender_dependent_default_transport_maps, and their precedences - when determining a delivery transport or next-hop destination. - Files: proto/postconf.5.html, proto/ADDRESS_REWRITING_README.html. + when determining a delivery transport or next-hop destination, + in ADDRESS_REWRITING_README and in the text that defines + individual configuration features. Files: proto/postconf.proto, + proto/ADDRESS_REWRITING_README.html. + +20230505 + + Documentation: clarified the differences between virtual + and local aliasing, in four places. Files: mantools/postlink, + proto/postconf.proto, proto/ADDRESS_REWRITING_README.html. + cleanup/cleanup.c, local/local.c, smtpd/smtpd.c. + + Usability: improved error message when master.cf specifies + a wild-card network listener (like "smtp inet ... smtpd") + while `inet_interfaces is empty. File: master/master_ent.c. diff --git a/postfix/README_FILES/ADDRESS_REWRITING_README b/postfix/README_FILES/ADDRESS_REWRITING_README index b7735f876..0cd7f6ec9 100644 --- a/postfix/README_FILES/ADDRESS_REWRITING_README +++ b/postfix/README_FILES/ADDRESS_REWRITING_README @@ -489,6 +489,9 @@ transform " Firstname.Lastname " back into UNIX login names, although it seems that local aliases may be a more appropriate vehicle. See the VIRTUAL_README document for an overview of methods to host virtual domains with Postfix. +Note: virtual aliasing (virtual_alias_maps) applies to all email deliveries, +unlike local aliasing (alias_maps) which applies only to local(8) delivery. + Virtual aliasing is disabled by default. To enable, edit the virtual_alias_maps parameter in the main.cf file and specify one or more lookup tables, separated by whitespace or commas. @@ -703,6 +706,9 @@ implement distribution lists, or to direct mail for standard aliases such as postmaster to real people. The table can also be used to map "Firstname.Lastname" addresses to login names. +Note: local aliasing (alias_maps) applies only to local(8) delivery, unlike +virtual aliasing (virtual_alias_maps) which applies to all email deliveries. + Alias lookups are enabled by default. The default configuration depends on the operating system environment, but it is typically one of the following: diff --git a/postfix/html/ADDRESS_REWRITING_README.html b/postfix/html/ADDRESS_REWRITING_README.html index d2e3a6132..49c955521 100644 --- a/postfix/html/ADDRESS_REWRITING_README.html +++ b/postfix/html/ADDRESS_REWRITING_README.html @@ -771,6 +771,10 @@ may be a more appropriate vehicle. See the VIRTUAL for an overview of methods to host virtual domains with Postfix.

+

Note: virtual aliasing (virtual_alias_maps) applies to all email +deliveries, unlike local aliasing (alias_maps) which applies only +to local(8) delivery.

+

Virtual aliasing is disabled by default. To enable, edit the virtual_alias_maps parameter in the main.cf file and specify one or more lookup tables, separated by whitespace or @@ -789,7 +793,7 @@ commas.

Addresses found in virtual alias maps are subjected to another -iteration of virtual aliasing, but are not subjected to canonical +iteration of virtual aliasing, but are not subjected to canonical mapping, in order to avoid loops.

For static mappings as shown above, lookup tables such as hash:, @@ -1056,6 +1060,10 @@ direct mail for standard aliases such as postmaster to real people. The table can also be used to map "Firstname.Lastname" addresses to login names.

+

Note: local aliasing (alias_maps) applies only to local(8) +delivery, unlike virtual aliasing (virtual_alias_maps) which applies +to all email deliveries.

+

Alias lookups are enabled by default. The default configuration depends on the operating system environment, but it is typically one of the following:

diff --git a/postfix/html/DATABASE_README.html b/postfix/html/DATABASE_README.html index e3b3c05b0..b6757e2d8 100644 --- a/postfix/html/DATABASE_README.html +++ b/postfix/html/DATABASE_README.html @@ -56,7 +56,7 @@ documentation: 

 /etc/postfix/main.cf:
-    alias_maps = hash:/etc/postfix/aliases            (local aliasing)
+    alias_maps = hash:/etc/postfix/aliases            (local aliasing)
     header_checks = regexp:/etc/postfix/header_checks (content filtering)
     transport_maps = hash:/etc/postfix/transport      (routing table)
     virtual_alias_maps = hash:/etc/postfix/virtual    (address rewriting)
diff --git a/postfix/html/canonical.5.html b/postfix/html/canonical.5.html
index 68b653256..75c25f166 100644
--- a/postfix/html/canonical.5.html
+++ b/postfix/html/canonical.5.html
@@ -56,7 +56,7 @@ CANONICAL(5)                                                      CANONICAL(5)
        systems.
 
        The canonical(5) mapping is not to be confused with virtual alias  sup-
-       port  or  with  local  aliasing.  To change the destination but not the
+       port  or  with  local  aliasing.  To change the destination but not the
        headers, use the virtual(5) or aliases(5) map instead.
 
 CASE FOLDING
@@ -261,7 +261,7 @@ CANONICAL(5)                                                      CANONICAL(5)
        cleanup(8), canonicalize and enqueue mail
        postmap(1), Postfix lookup table manager
        postconf(5), configuration parameters
-       virtual(5), virtual aliasing
+       virtual(5), virtual aliasing
 
 README FILES
        DATABASE_README, Postfix lookup table overview
diff --git a/postfix/html/cleanup.8.html b/postfix/html/cleanup.8.html
index 811b93031..f2450bc05 100644
--- a/postfix/html/cleanup.8.html
+++ b/postfix/html/cleanup.8.html
@@ -291,11 +291,11 @@ CLEANUP(8)                                                          CLEANUP(8)
 
        sender_bcc_maps (empty)
               Optional BCC (blind carbon-copy) address lookup tables,  indexed
-              by sender address.
+              by envelope sender address.
 
        recipient_bcc_maps (empty)
               Optional  BCC (blind carbon-copy) address lookup tables, indexed
-              by recipient address.
+              by envelope recipient address.
 
 ADDRESS TRANSFORMATION CONTROLS
        Address rewriting is delegated to the trivial-rewrite(8)  daemon.   The
@@ -343,17 +343,18 @@ CLEANUP(8)                                                          CLEANUP(8)
        Available in Postfix version 2.0 and later:
 
        virtual_alias_maps ($virtual_maps)
-              Optional  lookup  tables  that  alias specific mail addresses or
-              domains to other local or remote address.
+              Optional  lookup  tables  with  aliases  that apply to all email
+              deliveries, unlike alias_maps that apply only to local(8) deliv-
+              ery.
 
        Available in Postfix version 2.2 and later:
 
-       canonical_classes (envelope_sender, envelope_recipient,  header_sender,
+       canonical_classes  (envelope_sender, envelope_recipient, header_sender,
        header_recipient)
               What addresses are subject to canonical_maps address mapping.
 
        recipient_canonical_classes (envelope_recipient, header_recipient)
-              What addresses are subject to  recipient_canonical_maps  address
+              What  addresses  are subject to recipient_canonical_maps address
               mapping.
 
        sender_canonical_classes (envelope_sender, header_sender)
@@ -361,9 +362,11 @@ CLEANUP(8)                                                          CLEANUP(8)
               ping.
 
        remote_header_rewrite_domain (empty)
-              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 head-
+              ers.
 
 RESOURCE AND RATE CONTROLS
        duplicate_filter_limit (1000)
@@ -372,7 +375,7 @@ CLEANUP(8)                                                          CLEANUP(8)
               showq(8) queue displays.
 
        header_size_limit (102400)
-              The maximal amount of memory in  bytes  for  storing  a  message
+              The  maximal  amount  of  memory  in bytes for storing a message
               header.
 
        hopcount_limit (50)
@@ -380,17 +383,17 @@ CLEANUP(8)                                                          CLEANUP(8)
               in the primary message headers.
 
        in_flow_delay (1s)
-              Time to pause before accepting a new message, when  the  message
+              Time  to  pause before accepting a new message, when the message
               arrival rate exceeds the message delivery rate.
 
        message_size_limit (10240000)
-              The  maximal  size  in  bytes  of  a message, including envelope
+              The maximal size in  bytes  of  a  message,  including  envelope
               information.
 
        Available in Postfix version 2.0 and later:
 
        header_address_token_limit (10240)
-              The maximal number of address tokens are allowed in  an  address
+              The  maximal  number of address tokens are allowed in an address
               message header.
 
        mime_boundary_length_limit (2048)
@@ -406,7 +409,7 @@ CLEANUP(8)                                                          CLEANUP(8)
        Available in Postfix version 2.1 and later:
 
        virtual_alias_expansion_limit (1000)
-              The  maximal  number  of  addresses that virtual alias expansion
+              The maximal number of addresses  that  virtual  alias  expansion
               produces from each original recipient.
 
        virtual_alias_recursion_limit (1000)
@@ -415,50 +418,50 @@ CLEANUP(8)                                                          CLEANUP(8)
        Available in Postfix version 3.0 and later:
 
        virtual_alias_address_length_limit (1000)
-              The maximal length of  an  email  address  after  virtual  alias
+              The  maximal  length  of  an  email  address after virtual alias
               expansion.
 
 SMTPUTF8 CONTROLS
        Preliminary SMTPUTF8 support is introduced with Postfix 3.0.
 
        smtputf8_enable (yes)
-              Enable  preliminary SMTPUTF8 support for the protocols described
-              in RFC 6531..6533.
+              Enable preliminary SMTPUTF8 support for the protocols  described
+              in RFC 6531, RFC 6532, and RFC 6533.
 
        smtputf8_autodetect_classes (sendmail, verify)
-              Detect that a message requires SMTPUTF8 support for  the  speci-
+              Detect  that  a message requires SMTPUTF8 support for the speci-
               fied mail origin classes.
 
        Available in Postfix version 3.2 and later:
 
        enable_idna2003_compatibility (no)
-              Enable   'transitional'   compatibility   between  IDNA2003  and
-              IDNA2008, when converting UTF-8 domain names to/from  the  ASCII
+              Enable  'transitional'  compatibility   between   IDNA2003   and
+              IDNA2008,  when  converting UTF-8 domain names to/from the ASCII
               form that is used for DNS lookups.
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The  default  location of the Postfix main.cf and master.cf con-
+              The default location of the Postfix main.cf and  master.cf  con-
               figuration files.
 
        daemon_timeout (18000s)
-              How much time a Postfix daemon process  may  take  to  handle  a
+              How  much  time  a  Postfix  daemon process may take to handle a
               request before it is terminated by a built-in watchdog timer.
 
        delay_logging_resolution_limit (2)
-              The  maximal  number of digits after the decimal point when log-
+              The maximal number of digits after the decimal point  when  log-
               ging sub-second delay values.
 
        delay_warning_time (0h)
-              The time after which the sender receives a copy of  the  message
+              The  time  after which the sender receives a copy of the message
               headers of mail that is still queued.
 
        ipc_timeout (3600s)
-              The  time  limit  for  sending  or receiving information over an
+              The time limit for sending  or  receiving  information  over  an
               internal communication channel.
 
        max_idle (100s)
-              The maximum amount of time that an idle Postfix  daemon  process
+              The  maximum  amount of time that an idle Postfix daemon process
               waits for an incoming connection before terminating voluntarily.
 
        max_use (100)
@@ -469,7 +472,7 @@ CLEANUP(8)                                                          CLEANUP(8)
               The internet hostname of this mail system.
 
        myorigin ($myhostname)
-              The  domain  name that locally-posted mail appears to come from,
+              The domain name that locally-posted mail appears to  come  from,
               and that locally posted mail is delivered to.
 
        process_id (read-only)
@@ -482,21 +485,21 @@ CLEANUP(8)                                                          CLEANUP(8)
               The location of the Postfix top-level queue directory.
 
        soft_bounce (no)
-              Safety net to keep mail queued that would otherwise be  returned
+              Safety  net to keep mail queued that would otherwise be returned
               to the sender.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (see 'postconf -d' output)
-              A  prefix  that  is  prepended  to  the  process  name in syslog
+              A prefix that  is  prepended  to  the  process  name  in  syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
        Available in Postfix version 2.1 and later:
 
        enable_original_recipient (yes)
-              Enable support for  the  original  recipient  address  after  an
-              address  is  rewritten  to a different address (for example with
+              Enable  support  for  the  original  recipient  address after an
+              address is rewritten to a different address  (for  example  with
               aliasing or with canonical mapping).
 
        Available in Postfix 3.3 and later:
@@ -507,7 +510,7 @@ CLEANUP(8)                                                          CLEANUP(8)
        Available in Postfix 3.5 and later:
 
        info_log_address_format (external)
-              The email address form that will be used  in  non-debug  logging
+              The  email  address  form that will be used in non-debug logging
               (info, warning, etc.).
 
 FILES
diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html
index fce3d0425..056376fd6 100644
--- a/postfix/html/local.8.html
+++ b/postfix/html/local.8.html
@@ -382,7 +382,9 @@ LOCAL(8)                                                              LOCAL(8)
        tory, fallback_transport_maps, fallback_transport, and luser_relay.
 
        alias_maps (see 'postconf -d' output)
-              The alias databases that are used for local(8) delivery.
+              Optional  lookup tables with aliases that apply only to local(8)
+              delivery, unlike virtual_alias_maps  that  apply  to  all  email
+              deliveries.
 
        forward_path (see 'postconf -d' output)
               The  local(8)  delivery agent search list for finding a .forward
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index c5f0e1cce..7360f4077 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -612,8 +612,13 @@ Examples:
 (default: see "postconf -d" output)

 
 

-The alias databases that are used for local(8) delivery. See
-aliases(5) for syntax details.
+Optional lookup tables with aliases that apply only to local(8)
+delivery, unlike virtual_alias_maps that apply to all email deliveries.
+The table format and lookups are documented in aliases(5). For an
+overview of Postfix address manipulations see the ADDRESS_REWRITING_README
+document. 

+
+

 Specify zero or more "type:name" lookup tables, separated by
 whitespace or comma. Tables will be searched in the specified order
 until a match is found.
@@ -4133,6 +4138,8 @@ mail on. Specify "all" to receive mail on all network
 interfaces (default), and "loopback-only" to receive mail
 on loopback network interfaces only (Postfix version 2.2 and later).  The
 parameter also controls delivery of mail to user@[ip.address].
+Specify an empty value if Postfix does not receive mail over the network,
+or if all network listeners have an explicit IP address in master.cf.
 

 
 

@@ -21533,7 +21540,7 @@ This feature is available in Postfix 1.1 and later.
 
 

 The maximal length of an email address after virtual alias expansion.
-This stops virtual aliasing loops that increase the address length
+This stops virtual aliasing loops that increase the address length
 exponentially.
 

 
@@ -21612,8 +21619,9 @@ This feature is available in Postfix 2.1 and later.
 (default: $virtual_maps)

 
 

-Optional lookup tables that alias specific mail addresses or domains
-to other local or remote addresses.  The table format and lookups
+Optional lookup tables with aliases that apply to all email deliveries,
+unlike alias_maps that apply only to local(8) delivery.
+The table format and lookups
 are documented in virtual(5). For an overview of Postfix address
 manipulations see the ADDRESS_REWRITING_README document.
 

diff --git a/postfix/html/postfix-manuals.html b/postfix/html/postfix-manuals.html
index 7ddfa732d..e88e88ec4 100644
--- a/postfix/html/postfix-manuals.html
+++ b/postfix/html/postfix-manuals.html
@@ -147,7 +147,7 @@ the following convention:  

 
 
  •  transport(5), Postfix routing table 
 
-
  •  virtual(5), Postfix virtual aliasing 
+
  •  virtual(5), Postfix virtual aliasing 
 
 
 
diff --git a/postfix/html/postfix.1.html b/postfix/html/postfix.1.html
index 4654071fa..53ecfcea8 100644
--- a/postfix/html/postfix.1.html
+++ b/postfix/html/postfix.1.html
@@ -352,7 +352,7 @@ POSTFIX(1)                                                          POSTFIX(1)
        header_checks(5), body_checks(5), Postfix content inspection
        relocated(5), Users that have moved
        transport(5), Postfix routing table
-       virtual(5), Postfix virtual aliasing
+       virtual(5), Postfix virtual aliasing
 
        Table lookup mechanisms:
        cidr_table(5), Associate CIDR pattern with value
diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html
index b7ec136c3..7128d21a3 100644
--- a/postfix/html/smtpd.8.html
+++ b/postfix/html/smtpd.8.html
@@ -831,30 +831,31 @@ SMTPD(8)                                                              SMTPD(8)
               aliased to addresses in other local or remote domains.
 
        virtual_alias_maps ($virtual_maps)
-              Optional  lookup  tables  that  alias specific mail addresses or
-              domains to other local or remote addresses.
+              Optional  lookup  tables  with  aliases  that apply to all email
+              deliveries, unlike alias_maps that apply only to local(8) deliv-
+              ery.
 
        unknown_virtual_alias_reject_code (550)
-              The Postfix SMTP server reply  code  when  a  recipient  address
-              matches  $virtual_alias_domains,  and $virtual_alias_maps speci-
-              fies a list of lookup tables that does not match  the  recipient
+              The  Postfix  SMTP  server  reply  code when a recipient address
+              matches $virtual_alias_domains, and  $virtual_alias_maps  speci-
+              fies  a  list of lookup tables that does not match the recipient
               address.
 
        Parameters  concerning  known/unknown  recipients  in  virtual  mailbox
        domains:
 
        virtual_mailbox_domains ($virtual_mailbox_maps)
-              Postfix is the final  destination  for  the  specified  list  of
-              domains;  mail  is  delivered  via  the  $virtual_transport mail
+              Postfix  is  the  final  destination  for  the specified list of
+              domains; mail  is  delivered  via  the  $virtual_transport  mail
               delivery transport.
 
        virtual_mailbox_maps (empty)
-              Optional lookup tables with all valid addresses in  the  domains
+              Optional  lookup  tables with all valid addresses in the domains
               that match $virtual_mailbox_domains.
 
        unknown_virtual_mailbox_reject_code (550)
-              The  Postfix  SMTP  server  reply  code when a recipient address
-              matches  $virtual_mailbox_domains,   and   $virtual_mailbox_maps
+              The Postfix SMTP server reply  code  when  a  recipient  address
+              matches   $virtual_mailbox_domains,   and  $virtual_mailbox_maps
               specifies a list of lookup tables that does not match the recip-
               ient address.
 
@@ -863,7 +864,7 @@ SMTPD(8)                                                              SMTPD(8)
        control client request rates.
 
        line_length_limit (2048)
-              Upon  input,  long  lines  are chopped up into pieces of at most
+              Upon input, long lines are chopped up into  pieces  of  at  most
               this length; upon delivery, long lines are reconstructed.
 
        queue_minfree (0)
@@ -871,62 +872,62 @@ SMTPD(8)                                                              SMTPD(8)
               tem that is needed to receive mail.
 
        message_size_limit (10240000)
-              The  maximal  size  in  bytes  of  a message, including envelope
+              The maximal size in  bytes  of  a  message,  including  envelope
               information.
 
        smtpd_recipient_limit (1000)
-              The maximal number of recipients that the  Postfix  SMTP  server
+              The  maximal  number  of recipients that the Postfix SMTP server
               accepts per message delivery request.
 
        smtpd_timeout (normal: 300s, overload: 10s)
-              When  the  Postfix  SMTP  server  wants  to  send an SMTP server
-              response, how long the Postfix SMTP  server  will  wait  for  an
-              underlying  network  write  operation  to complete; and when the
-              Postfix SMTP server Postfix wants  to  receive  an  SMTP  client
-              request,  how  long  the  Postfix  SMTP  server will wait for an
+              When the Postfix SMTP  server  wants  to  send  an  SMTP  server
+              response,  how  long  the  Postfix  SMTP server will wait for an
+              underlying network write operation to  complete;  and  when  the
+              Postfix  SMTP  server  Postfix  wants  to receive an SMTP client
+              request, how long the Postfix  SMTP  server  will  wait  for  an
               underlying network read operation to complete.
 
        smtpd_history_flush_threshold (100)
-              The maximal number of lines in the Postfix SMTP  server  command
-              history  before it is flushed upon receipt of EHLO, RSET, or end
+              The  maximal  number of lines in the Postfix SMTP server command
+              history before it is flushed upon receipt of EHLO, RSET, or  end
               of DATA.
 
        Available in Postfix version 2.3 and later:
 
        smtpd_peername_lookup (yes)
-              Attempt to look up the remote SMTP client hostname,  and  verify
+              Attempt  to  look up the remote SMTP client hostname, and verify
               that the name matches the client IP address.
 
        The per SMTP client connection count and request rate limits are imple-
-       mented in co-operation with the anvil(8) service, and are available  in
+       mented  in co-operation with the anvil(8) service, and are available in
        Postfix version 2.2 and later.
 
        smtpd_client_connection_count_limit (50)
-              How  many simultaneous connections any client is allowed to make
+              How many simultaneous connections any client is allowed to  make
               to this service.
 
        smtpd_client_connection_rate_limit (0)
-              The maximal number of connection attempts any client is  allowed
+              The  maximal number of connection attempts any client is allowed
               to make to this service per time unit.
 
        smtpd_client_message_rate_limit (0)
-              The  maximal number of message delivery requests that any client
-              is allowed to make to this service per time unit, regardless  of
+              The maximal number of message delivery requests that any  client
+              is  allowed to make to this service per time unit, regardless of
               whether or not Postfix actually accepts those messages.
 
        smtpd_client_recipient_rate_limit (0)
-              The  maximal  number  of  recipient addresses that any client is
-              allowed to send to this service per  time  unit,  regardless  of
+              The maximal number of recipient addresses  that  any  client  is
+              allowed  to  send  to  this service per time unit, regardless of
               whether or not Postfix actually accepts those recipients.
 
        smtpd_client_event_limit_exceptions ($mynetworks)
-              Clients  that  are excluded from smtpd_client_*_count/rate_limit
+              Clients that are excluded  from  smtpd_client_*_count/rate_limit
               restrictions.
 
        Available in Postfix version 2.3 and later:
 
        smtpd_client_new_tls_session_rate_limit (0)
-              The maximal number of new (i.e., uncached) TLS sessions  that  a
+              The  maximal  number of new (i.e., uncached) TLS sessions that a
               remote SMTP client is allowed to negotiate with this service per
               time unit.
 
@@ -934,29 +935,29 @@ SMTPD(8)                                                              SMTPD(8)
 
        smtpd_per_record_deadline (normal: no, overload: yes)
               Change  the  behavior  of  the  smtpd_timeout  and  smtpd_start-
-              tls_timeout  time  limits,  from  a time limit per read or write
-              system call, to a time limit  to  send  or  receive  a  complete
-              record  (an  SMTP command line, SMTP response line, SMTP message
+              tls_timeout time limits, from a time limit  per  read  or  write
+              system  call,  to  a  time  limit  to send or receive a complete
+              record (an SMTP command line, SMTP response line,  SMTP  message
               content line, or TLS protocol message).
 
        Available in Postfix version 3.1 and later:
 
        smtpd_client_auth_rate_limit (0)
-              The maximal number of AUTH commands that any client  is  allowed
-              to  send to this service per time unit, regardless of whether or
+              The  maximal  number of AUTH commands that any client is allowed
+              to send to this service per time unit, regardless of whether  or
               not Postfix actually accepts those commands.
 
        Available in Postfix version 3.7 and later:
 
        smtpd_per_request_deadline (normal: no, overload: yes)
               Change  the  behavior  of  the  smtpd_timeout  and  smtpd_start-
-              tls_timeout  time limits, from a time limit per plaintext or TLS
-              read or write call, to a combined time  limit  for  receiving  a
-              complete  SMTP request and for sending a complete SMTP response.
+              tls_timeout time limits, from a time limit per plaintext or  TLS
+              read  or  write  call,  to a combined time limit for receiving a
+              complete SMTP request and for sending a complete SMTP  response.
 
        smtpd_min_data_rate (500)
-              The minimum plaintext data transfer  rate  in  bytes/second  for
-              DATA   and  BDAT  requests,  when  deadlines  are  enabled  with
+              The  minimum  plaintext  data  transfer rate in bytes/second for
+              DATA  and  BDAT  requests,  when  deadlines  are  enabled   with
               smtpd_per_request_deadline.
 
        header_from_format (standard)
@@ -965,63 +966,63 @@ SMTPD(8)                                                              SMTPD(8)
        Available in Postfix version 3.8 and later:
 
        smtpd_client_ipv4_prefix_length (32)
-              Aggregate smtpd_client_*_count and  smtpd_client_*_rate  statis-
+              Aggregate  smtpd_client_*_count  and smtpd_client_*_rate statis-
               tics by IPv4 network blocks with the specified network prefix.
 
        smtpd_client_ipv6_prefix_length (84)
-              Aggregate  smtpd_client_*_count  and smtpd_client_*_rate statis-
+              Aggregate smtpd_client_*_count and  smtpd_client_*_rate  statis-
               tics by IPv6 network blocks with the specified network prefix.
 
 TARPIT CONTROLS
-       When a remote SMTP client makes errors, the  Postfix  SMTP  server  can
-       insert  delays  before  responding. This can help to slow down run-away
-       software.  The behavior is controlled by an error counter  that  counts
+       When  a  remote  SMTP  client makes errors, the Postfix SMTP server can
+       insert delays before responding. This can help to  slow  down  run-away
+       software.   The  behavior is controlled by an error counter that counts
        the number of errors within an SMTP session that a client makes without
        delivering mail.
 
        smtpd_error_sleep_time (1s)
-              With Postfix version 2.1 and later:  the  SMTP  server  response
-              delay  after a client has made more than $smtpd_soft_error_limit
-              errors, and fewer than $smtpd_hard_error_limit  errors,  without
+              With  Postfix  version  2.1  and later: the SMTP server response
+              delay after a client has made more than  $smtpd_soft_error_limit
+              errors,  and  fewer than $smtpd_hard_error_limit errors, without
               delivering mail.
 
        smtpd_soft_error_limit (10)
-              The  number  of  errors  a remote SMTP client is allowed to make
-              without delivering mail before the  Postfix  SMTP  server  slows
+              The number of errors a remote SMTP client  is  allowed  to  make
+              without  delivering  mail  before  the Postfix SMTP server slows
               down all its responses.
 
        smtpd_hard_error_limit (normal: 20, overload: 1)
-              The  maximal number of errors a remote SMTP client is allowed to
+              The maximal number of errors a remote SMTP client is allowed  to
               make without delivering mail.
 
        smtpd_junk_command_limit (normal: 100, overload: 1)
-              The number of junk commands (NOOP, VRFY, ETRN or  RSET)  that  a
-              remote  SMTP  client  can  send  before  the Postfix SMTP server
+              The  number  of  junk commands (NOOP, VRFY, ETRN or RSET) that a
+              remote SMTP client can  send  before  the  Postfix  SMTP  server
               starts to increment the error counter with each junk command.
 
        Available in Postfix version 2.1 and later:
 
        smtpd_recipient_overshoot_limit (1000)
-              The number of recipients that a remote SMTP client can  send  in
+              The  number  of recipients that a remote SMTP client can send in
               excess  of  the  limit  specified  with  $smtpd_recipient_limit,
-              before the Postfix SMTP server increments the per-session  error
+              before  the Postfix SMTP server increments the per-session error
               count for each excess recipient.
 
 ACCESS POLICY DELEGATION CONTROLS
-       As  of version 2.1, Postfix can be configured to delegate access policy
-       decisions to an external server that runs  outside  Postfix.   See  the
+       As of version 2.1, Postfix can be configured to delegate access  policy
+       decisions  to  an  external  server that runs outside Postfix.  See the
        file SMTPD_POLICY_README for more information.
 
        smtpd_policy_service_max_idle (300s)
-              The  time after which an idle SMTPD policy service connection is
+              The time after which an idle SMTPD policy service connection  is
               closed.
 
        smtpd_policy_service_max_ttl (1000s)
-              The time after which an active SMTPD policy  service  connection
+              The  time  after which an active SMTPD policy service connection
               is closed.
 
        smtpd_policy_service_timeout (100s)
-              The  time limit for connecting to, writing to, or receiving from
+              The time limit for connecting to, writing to, or receiving  from
               a delegated SMTPD policy server.
 
        Available in Postfix version 3.0 and later:
@@ -1031,81 +1032,81 @@ SMTPD(8)                                                              SMTPD(8)
               The default action when an SMTPD policy service request fails.
 
        smtpd_policy_service_request_limit (0)
-              The maximal number of requests per SMTPD policy service  connec-
+              The  maximal number of requests per SMTPD policy service connec-
               tion, or zero (no limit).
 
        smtpd_policy_service_try_limit (2)
-              The  maximal  number of attempts to send an SMTPD policy service
+              The maximal number of attempts to send an SMTPD  policy  service
               request before giving up.
 
        smtpd_policy_service_retry_delay (1s)
-              The delay between attempts to resend a failed SMTPD policy  ser-
+              The  delay between attempts to resend a failed SMTPD policy ser-
               vice request.
 
        Available in Postfix version 3.1 and later:
 
        smtpd_policy_service_policy_context (empty)
-              Optional  information  that the Postfix SMTP server specifies in
-              the "policy_context"  attribute  of  a  policy  service  request
-              (originally,  to  share the same service endpoint among multiple
+              Optional information that the Postfix SMTP server  specifies  in
+              the  "policy_context"  attribute  of  a  policy  service request
+              (originally, to share the same service endpoint  among  multiple
               check_policy_service clients).
 
 ACCESS CONTROLS
-       The SMTPD_ACCESS_README document gives an introduction to all the  SMTP
+       The  SMTPD_ACCESS_README document gives an introduction to all the SMTP
        server access control features.
 
        smtpd_delay_reject (yes)
-              Wait    until    the   RCPT   TO   command   before   evaluating
+              Wait   until   the   RCPT   TO   command    before    evaluating
               $smtpd_client_restrictions,     $smtpd_helo_restrictions     and
               $smtpd_sender_restrictions,  or  wait  until  the  ETRN  command
-              before      evaluating      $smtpd_client_restrictions       and
+              before       evaluating      $smtpd_client_restrictions      and
               $smtpd_helo_restrictions.
 
        parent_domain_matches_subdomains (see 'postconf -d' output)
-              A  list of Postfix features where the pattern "example.com" also
-              matches subdomains  of  example.com,  instead  of  requiring  an
+              A list of Postfix features where the pattern "example.com"  also
+              matches  subdomains  of  example.com,  instead  of  requiring an
               explicit ".example.com" pattern.
 
        smtpd_client_restrictions (empty)
-              Optional  restrictions  that  the Postfix SMTP server applies in
+              Optional restrictions that the Postfix SMTP  server  applies  in
               the context of a client connection request.
 
        smtpd_helo_required (no)
-              Require that a remote SMTP client  introduces  itself  with  the
-              HELO  or  EHLO  command before sending the MAIL command or other
+              Require  that  a  remote  SMTP client introduces itself with the
+              HELO or EHLO command before sending the MAIL  command  or  other
               commands that require EHLO negotiation.
 
        smtpd_helo_restrictions (empty)
-              Optional restrictions that the Postfix SMTP  server  applies  in
+              Optional  restrictions  that  the Postfix SMTP server applies in
               the context of a client HELO command.
 
        smtpd_sender_restrictions (empty)
-              Optional  restrictions  that  the Postfix SMTP server applies in
+              Optional restrictions that the Postfix SMTP  server  applies  in
               the context of a client MAIL FROM command.
 
        smtpd_recipient_restrictions (see 'postconf -d' output)
-              Optional restrictions that the Postfix SMTP  server  applies  in
-              the    context    of   a   client   RCPT   TO   command,   after
+              Optional  restrictions  that  the Postfix SMTP server applies in
+              the   context   of   a   client   RCPT   TO    command,    after
               smtpd_relay_restrictions.
 
        smtpd_etrn_restrictions (empty)
-              Optional restrictions that the Postfix SMTP  server  applies  in
+              Optional  restrictions  that  the Postfix SMTP server applies in
               the context of a client ETRN command.
 
        allow_untrusted_routing (no)
-              Forward       mail       with      sender-specified      routing
-              (user[@%!]remote[@%!]site) from untrusted  clients  to  destina-
+              Forward      mail      with       sender-specified       routing
+              (user[@%!]remote[@%!]site)  from  untrusted  clients to destina-
               tions matching $relay_domains.
 
        smtpd_restriction_classes (empty)
               User-defined aliases for groups of access restrictions.
 
        smtpd_null_access_lookup_key (<>)
-              The  lookup  key  to be used in SMTP access(5) tables instead of
+              The lookup key to be used in SMTP access(5)  tables  instead  of
               the null sender address.
 
        permit_mx_backup_networks (empty)
-              Restrict the use of the permit_mx_backup SMTP access feature  to
+              Restrict  the use of the permit_mx_backup SMTP access feature to
               only domains whose primary MX hosts match the listed networks.
 
        Available in Postfix version 2.0 and later:
@@ -1115,19 +1116,19 @@ SMTPD(8)                                                              SMTPD(8)
               applies in the context of the SMTP DATA command.
 
        smtpd_expansion_filter (see 'postconf -d' output)
-              What characters are allowed in $name  expansions  of  RBL  reply
+              What  characters  are  allowed  in $name expansions of RBL reply
               templates.
 
        Available in Postfix version 2.1 and later:
 
        smtpd_reject_unlisted_sender (no)
-              Request  that  the Postfix SMTP server rejects mail from unknown
-              sender addresses, even when no  explicit  reject_unlisted_sender
+              Request that the Postfix SMTP server rejects mail  from  unknown
+              sender  addresses,  even when no explicit reject_unlisted_sender
               access restriction is specified.
 
        smtpd_reject_unlisted_recipient (yes)
-              Request  that  the  Postfix SMTP server rejects mail for unknown
-              recipient     addresses,     even     when      no      explicit
+              Request that the Postfix SMTP server rejects  mail  for  unknown
+              recipient      addresses,      even     when     no     explicit
               reject_unlisted_recipient access restriction is specified.
 
        Available in Postfix version 2.2 and later:
@@ -1141,17 +1142,17 @@ SMTPD(8)                                                              SMTPD(8)
        smtpd_relay_restrictions (permit_mynetworks, permit_sasl_authenticated,
        defer_unauth_destination)
               Access restrictions for mail relay control that the Postfix SMTP
-              server  applies  in  the  context of the RCPT TO command, before
+              server applies in the context of the  RCPT  TO  command,  before
               smtpd_recipient_restrictions.
 
 SENDER AND RECIPIENT ADDRESS VERIFICATION CONTROLS
-       Postfix version 2.1 introduces sender and recipient  address  verifica-
+       Postfix  version  2.1 introduces sender and recipient address verifica-
        tion.  This feature is implemented by sending probe email messages that
        are  not  actually  delivered.   This  feature  is  requested  via  the
-       reject_unverified_sender    and    reject_unverified_recipient   access
-       restrictions.  The status of verification probes is maintained  by  the
-       verify(8)  server.  See the file ADDRESS_VERIFICATION_README for infor-
-       mation about how to configure and operate the Postfix  sender/recipient
+       reject_unverified_sender   and    reject_unverified_recipient    access
+       restrictions.   The  status of verification probes is maintained by the
+       verify(8) server.  See the file ADDRESS_VERIFICATION_README for  infor-
+       mation  about how to configure and operate the Postfix sender/recipient
        address verification service.
 
        address_verify_poll_count (normal: 3, overload: 1)
@@ -1163,7 +1164,7 @@ SMTPD(8)                                                              SMTPD(8)
               fication request in progress.
 
        address_verify_sender ($double_bounce_sender)
-              The  sender address to use in address verification probes; prior
+              The sender address to use in address verification probes;  prior
               to Postfix 2.5 the default was "postmaster".
 
        unverified_sender_reject_code (450)
@@ -1171,18 +1172,18 @@ SMTPD(8)                                                              SMTPD(8)
               address is rejected by the reject_unverified_sender restriction.
 
        unverified_recipient_reject_code (450)
-              The numerical Postfix SMTP  server  response  when  a  recipient
-              address  is rejected by the reject_unverified_recipient restric-
+              The  numerical  Postfix  SMTP  server  response when a recipient
+              address is rejected by the reject_unverified_recipient  restric-
               tion.
 
        Available in Postfix version 2.6 and later:
 
        unverified_sender_defer_code (450)
-              The numerical Postfix SMTP server response code  when  a  sender
+              The  numerical  Postfix  SMTP server response code when a sender
               address probe fails due to a temporary error condition.
 
        unverified_recipient_defer_code (450)
-              The  numerical  Postfix  SMTP  server  response when a recipient
+              The numerical Postfix SMTP  server  response  when  a  recipient
               address probe fails due to a temporary error condition.
 
        unverified_sender_reject_reason (empty)
@@ -1194,17 +1195,17 @@ SMTPD(8)                                                              SMTPD(8)
               reject_unverified_recipient.
 
        unverified_sender_tempfail_action ($reject_tempfail_action)
-              The Postfix SMTP server's action  when  reject_unverified_sender
+              The  Postfix  SMTP server's action when reject_unverified_sender
               fails due to a temporary error condition.
 
        unverified_recipient_tempfail_action ($reject_tempfail_action)
-              The  Postfix SMTP server's action when reject_unverified_recipi-
+              The Postfix SMTP server's action when  reject_unverified_recipi-
               ent fails due to a temporary error condition.
 
        Available with Postfix 2.9 and later:
 
        address_verify_sender_ttl (0s)
-              The time  between  changes  in  the  time-dependent  portion  of
+              The  time  between  changes  in  the  time-dependent  portion of
               address verification probe sender addresses.
 
 ACCESS CONTROL RESPONSES
@@ -1216,36 +1217,36 @@ SMTPD(8)                                                              SMTPD(8)
               map "reject" action.
 
        defer_code (450)
-              The  numerical  Postfix  SMTP server response code when a remote
+              The numerical Postfix SMTP server response code  when  a  remote
               SMTP client request is rejected by the "defer" restriction.
 
        invalid_hostname_reject_code (501)
-              The numerical Postfix SMTP server response code when the  client
-              HELO   or   EHLO   command   parameter   is   rejected   by  the
+              The  numerical Postfix SMTP server response code when the client
+              HELO  or   EHLO   command   parameter   is   rejected   by   the
               reject_invalid_helo_hostname restriction.
 
        maps_rbl_reject_code (554)
-              The numerical Postfix SMTP server response code  when  a  remote
-              SMTP   client  request  is  blocked  by  the  reject_rbl_client,
+              The  numerical  Postfix  SMTP server response code when a remote
+              SMTP  client  request  is  blocked  by  the   reject_rbl_client,
               reject_rhsbl_client,                reject_rhsbl_reverse_client,
               reject_rhsbl_sender or reject_rhsbl_recipient restriction.
 
        non_fqdn_reject_code (504)
-              The  numerical  Postfix  SMTP  server  reply  code when a client
-              request  is  rejected  by   the   reject_non_fqdn_helo_hostname,
+              The numerical Postfix SMTP  server  reply  code  when  a  client
+              request   is   rejected  by  the  reject_non_fqdn_helo_hostname,
               reject_non_fqdn_sender or reject_non_fqdn_recipient restriction.
 
        plaintext_reject_code (450)
-              The numerical Postfix SMTP server response code when  a  request
+              The  numerical  Postfix SMTP server response code when a request
               is rejected by the reject_plaintext_session restriction.
 
        reject_code (554)
-              The  numerical  Postfix  SMTP server response code when a remote
+              The numerical Postfix SMTP server response code  when  a  remote
               SMTP client request is rejected by the "reject" restriction.
 
        relay_domains_reject_code (554)
-              The numerical Postfix SMTP server response code  when  a  client
-              request  is  rejected by the reject_unauth_destination recipient
+              The  numerical  Postfix  SMTP server response code when a client
+              request is rejected by the  reject_unauth_destination  recipient
               restriction.
 
        unknown_address_reject_code (450)
@@ -1253,24 +1254,24 @@ SMTPD(8)                                                              SMTPD(8)
               a sender or recipient address because its domain is unknown.
 
        unknown_client_reject_code (450)
-              The  numerical  Postfix  SMTP server response code when a client
-              without valid address  <=>  name  mapping  is  rejected  by  the
+              The numerical Postfix SMTP server response code  when  a  client
+              without  valid  address  <=>  name  mapping  is  rejected by the
               reject_unknown_client_hostname restriction.
 
        unknown_hostname_reject_code (450)
-              The  numerical  Postfix SMTP server response code when the host-
-              name specified with the HELO or EHLO command is rejected by  the
+              The numerical Postfix SMTP server response code when  the  host-
+              name  specified with the HELO or EHLO command is rejected by the
               reject_unknown_helo_hostname restriction.
 
        Available in Postfix version 2.0 and later:
 
        default_rbl_reply (see 'postconf -d' output)
-              The  default Postfix SMTP server response template for a request
+              The default Postfix SMTP server response template for a  request
               that is rejected by an RBL-based restriction.
 
        multi_recipient_bounce_reject_code (550)
-              The numerical Postfix SMTP server response code  when  a  remote
-              SMTP  client  request  is  blocked  by  the reject_multi_recipi-
+              The  numerical  Postfix  SMTP server response code when a remote
+              SMTP client  request  is  blocked  by  the  reject_multi_recipi-
               ent_bounce restriction.
 
        rbl_reply_maps (empty)
@@ -1280,52 +1281,52 @@ SMTPD(8)                                                              SMTPD(8)
 
        access_map_defer_code (450)
               The numerical Postfix SMTP server response code for an access(5)
-              map    "defer"    action,    including    "defer_if_permit"   or
+              map   "defer"    action,    including    "defer_if_permit"    or
               "defer_if_reject".
 
        reject_tempfail_action (defer_if_permit)
-              The Postfix SMTP server's action when a reject-type  restriction
+              The  Postfix SMTP server's action when a reject-type restriction
               fails due to a temporary error condition.
 
        unknown_helo_hostname_tempfail_action ($reject_tempfail_action)
-              The  Postfix SMTP server's action when reject_unknown_helo_host-
+              The Postfix SMTP server's action when  reject_unknown_helo_host-
               name fails due to a temporary error condition.
 
        unknown_address_tempfail_action ($reject_tempfail_action)
-              The      Postfix      SMTP      server's       action       when
-              reject_unknown_sender_domain  or reject_unknown_recipient_domain
+              The       Postfix       SMTP      server's      action      when
+              reject_unknown_sender_domain or  reject_unknown_recipient_domain
               fail due to a temporary error condition.
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The default location of the Postfix main.cf and  master.cf  con-
+              The  default  location of the Postfix main.cf and master.cf con-
               figuration files.
 
        daemon_timeout (18000s)
-              How  much  time  a  Postfix  daemon process may take to handle a
+              How much time a Postfix daemon process  may  take  to  handle  a
               request before it is terminated by a built-in watchdog timer.
 
        command_directory (see 'postconf -d' output)
               The location of all postfix administrative commands.
 
        double_bounce_sender (double-bounce)
-              The sender address of postmaster notifications that  are  gener-
+              The  sender  address of postmaster notifications that are gener-
               ated by the mail system.
 
        ipc_timeout (3600s)
-              The  time  limit  for  sending  or receiving information over an
+              The time limit for sending  or  receiving  information  over  an
               internal communication channel.
 
        mail_name (Postfix)
-              The mail system name that is displayed in Received: headers,  in
+              The  mail system name that is displayed in Received: headers, in
               the SMTP greeting banner, and in bounced mail.
 
        mail_owner (postfix)
-              The  UNIX  system  account  that owns the Postfix queue and most
+              The UNIX system account that owns the  Postfix  queue  and  most
               Postfix daemon processes.
 
        max_idle (100s)
-              The maximum amount of time that an idle Postfix  daemon  process
+              The  maximum  amount of time that an idle Postfix daemon process
               waits for an incoming connection before terminating voluntarily.
 
        max_use (100)
@@ -1336,11 +1337,11 @@ SMTPD(8)                                                              SMTPD(8)
               The internet hostname of this mail system.
 
        mynetworks (see 'postconf -d' output)
-              The  list of "trusted" remote SMTP clients that have more privi-
+              The list of "trusted" remote SMTP clients that have more  privi-
               leges than "strangers".
 
        myorigin ($myhostname)
-              The domain name that locally-posted mail appears to  come  from,
+              The  domain  name that locally-posted mail appears to come from,
               and that locally posted mail is delivered to.
 
        process_id (read-only)
@@ -1353,24 +1354,24 @@ SMTPD(8)                                                              SMTPD(8)
               The location of the Postfix top-level queue directory.
 
        recipient_delimiter (empty)
-              The  set of characters that can separate an email address local-
+              The set of characters that can separate an email address  local-
               part, user name, or a .forward file name from its extension.
 
        smtpd_banner ($myhostname ESMTP $mail_name)
-              The text that follows the 220 status code in the  SMTP  greeting
+              The  text  that follows the 220 status code in the SMTP greeting
               banner.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (see 'postconf -d' output)
-              A  prefix  that  is  prepended  to  the  process  name in syslog
+              A prefix that  is  prepended  to  the  process  name  in  syslog
               records, so that, for example, "smtpd" becomes "prefix/smtpd".
 
        Available in Postfix version 2.2 and later:
 
        smtpd_forbidden_commands (CONNECT GET POST regexp:{{/^[^A-Z]/ Bogus}})
-              List of commands that cause the Postfix SMTP server  to  immedi-
+              List  of  commands that cause the Postfix SMTP server to immedi-
               ately terminate the session with a 221 code.
 
        Available in Postfix version 2.5 and later:
@@ -1387,7 +1388,7 @@ SMTPD(8)                                                              SMTPD(8)
        Available in Postfix 3.4 and later:
 
        smtpd_reject_footer_maps (empty)
-              Lookup tables, indexed by the complete Postfix SMTP  server  4xx
+              Lookup  tables,  indexed by the complete Postfix SMTP server 4xx
               or 5xx response, with reject footer templates.
 
 SEE ALSO
diff --git a/postfix/html/virtual.5.html b/postfix/html/virtual.5.html
index 7e9061efa..5ef93279a 100644
--- a/postfix/html/virtual.5.html
+++ b/postfix/html/virtual.5.html
@@ -27,7 +27,7 @@ VIRTUAL(5)                                                          VIRTUAL(5)
        Virtual  aliasing  is  recursive; to terminate recursion for a specific
        address, alias that address to itself.
 
-       The main applications of virtual aliasing are:
+       The main applications of virtual aliasing are:
 
        o      To redirect mail for one address to one or more addresses.
 
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index f8d4bed0a..15a3f97f3 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -358,8 +358,12 @@ alias_database = hash:/etc/mail/aliases
 .ad
 .ft R
 .SH alias_maps (default: see "postconf \-d" output)
-The alias databases that are used for \fBlocal\fR(8) delivery. See
-\fBaliases\fR(5) for syntax details.
+Optional lookup tables with aliases that apply only to \fBlocal\fR(8)
+delivery, unlike virtual_alias_maps that apply to all email deliveries.
+The table format and lookups are documented in \fBaliases\fR(5). For an
+overview of Postfix address manipulations see the ADDRESS_REWRITING_README
+document.
+.PP
 Specify zero or more "type:name" lookup tables, separated by
 whitespace or comma. Tables will be searched in the specified order
 until a match is found.
@@ -2613,6 +2617,8 @@ mail on. Specify "all" to receive mail on all network
 interfaces (default), and "loopback\-only" to receive mail
 on loopback network interfaces only (Postfix version 2.2 and later).  The
 parameter also controls delivery of mail to user@[ip.address].
+Specify an empty value if Postfix does not receive mail over the network,
+or if all network listeners have an explicit IP address in master.cf.
 .PP
 Note 1: you need to stop and start Postfix when this parameter changes.
 .PP
@@ -15222,8 +15228,9 @@ from each original recipient.
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH virtual_alias_maps (default: $virtual_maps)
-Optional lookup tables that alias specific mail addresses or domains
-to other local or remote addresses.  The table format and lookups
+Optional lookup tables with aliases that apply to all email deliveries,
+unlike alias_maps that apply only to \fBlocal\fR(8) delivery.
+The table format and lookups
 are documented in \fBvirtual\fR(5). For an overview of Postfix address
 manipulations see the ADDRESS_REWRITING_README document.
 .PP
diff --git a/postfix/man/man8/cleanup.8 b/postfix/man/man8/cleanup.8
index 8c2cc0b9e..a60adafb6 100644
--- a/postfix/man/man8/cleanup.8
+++ b/postfix/man/man8/cleanup.8
@@ -278,10 +278,10 @@ that is received by the Postfix mail system.
 Available in Postfix version 2.1 and later:
 .IP "\fBsender_bcc_maps (empty)\fR"
 Optional BCC (blind carbon\-copy) address lookup tables, indexed
-by sender address.
+by envelope sender address.
 .IP "\fBrecipient_bcc_maps (empty)\fR"
 Optional BCC (blind carbon\-copy) address lookup tables, indexed by
-recipient address.
+envelope recipient address.
 .SH "ADDRESS TRANSFORMATION CONTROLS"
 .na
 .nf
@@ -321,8 +321,8 @@ remote domains.
 .PP
 Available in Postfix version 2.0 and later:
 .IP "\fBvirtual_alias_maps ($virtual_maps)\fR"
-Optional lookup tables that alias specific mail addresses or domains
-to other local or remote address.
+Optional lookup tables with aliases that apply to all email deliveries,
+unlike alias_maps that apply only to \fBlocal\fR(8) delivery.
 .PP
 Available in Postfix version 2.2 and later:
 .IP "\fBcanonical_classes (envelope_sender, envelope_recipient, header_sender, header_recipient)\fR"
@@ -334,9 +334,10 @@ mapping.
 What addresses are subject to sender_canonical_maps address
 mapping.
 .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 "RESOURCE AND RATE CONTROLS"
 .na
 .nf
@@ -387,7 +388,7 @@ The maximal length of an email address after virtual alias expansion.
 Preliminary SMTPUTF8 support is introduced with Postfix 3.0.
 .IP "\fBsmtputf8_enable (yes)\fR"
 Enable preliminary SMTPUTF8 support for the protocols described
-in RFC 6531..6533.
+in RFC 6531, RFC 6532, and RFC 6533.
 .IP "\fBsmtputf8_autodetect_classes (sendmail, verify)\fR"
 Detect that a message requires SMTPUTF8 support for the specified
 mail origin classes.
diff --git a/postfix/man/man8/local.8 b/postfix/man/man8/local.8
index ca9c6c8d8..63396deff 100644
--- a/postfix/man/man8/local.8
+++ b/postfix/man/man8/local.8
@@ -449,7 +449,8 @@ mailbox_transport, mailbox_command_maps, mailbox_command,
 home_mailbox, mail_spool_directory, fallback_transport_maps,
 fallback_transport, and luser_relay.
 .IP "\fBalias_maps (see 'postconf -d' output)\fR"
-The alias databases that are used for \fBlocal\fR(8) delivery.
+Optional lookup tables with aliases that apply only to \fBlocal\fR(8)
+delivery, unlike virtual_alias_maps that apply to all email deliveries.
 .IP "\fBforward_path (see 'postconf -d' output)\fR"
 The \fBlocal\fR(8) delivery agent search list for finding a .forward
 file with user\-specified delivery methods.
diff --git a/postfix/man/man8/smtpd.8 b/postfix/man/man8/smtpd.8
index 7519c53b4..e8cd9980c 100644
--- a/postfix/man/man8/smtpd.8
+++ b/postfix/man/man8/smtpd.8
@@ -735,8 +735,8 @@ Postfix is the final destination for the specified list of virtual
 alias domains, that is, domains for which all addresses are aliased
 to addresses in other local or remote domains.
 .IP "\fBvirtual_alias_maps ($virtual_maps)\fR"
-Optional lookup tables that alias specific mail addresses or domains
-to other local or remote addresses.
+Optional lookup tables with aliases that apply to all email deliveries,
+unlike alias_maps that apply only to \fBlocal\fR(8) delivery.
 .IP "\fBunknown_virtual_alias_reject_code (550)\fR"
 The Postfix SMTP server reply code when a recipient address matches
 $virtual_alias_domains, and $virtual_alias_maps specifies a list
diff --git a/postfix/mantools/postlink b/postfix/mantools/postlink
index 7185c757c..15e965f41 100755
--- a/postfix/mantools/postlink
+++ b/postfix/mantools/postlink
@@ -1221,6 +1221,8 @@ while (<>) {
     s/\b"*hold"* *queues*\b/$&<\/a>/g;
     s/\b("*hold"*),/$1<\/a>,/g;
     s/\b(postfix  *tls)\b/$1<\/a>/g;
+    s/\b(local\s*aliasing)\b/$1<\/a>/g;
+    s/\b(virtual\s*aliasing)\b/$1<\/a>/g;
 
     # Hyperlink map types.
 
diff --git a/postfix/proto/ADDRESS_REWRITING_README.html b/postfix/proto/ADDRESS_REWRITING_README.html
index 5cbde11a2..2ab6659ea 100644
--- a/postfix/proto/ADDRESS_REWRITING_README.html
+++ b/postfix/proto/ADDRESS_REWRITING_README.html
@@ -771,6 +771,10 @@ may be a more appropriate vehicle. See the VIRTUAL_README document
 for an overview of methods to host virtual domains with Postfix.
 
    
 
+
     Note: virtual aliasing (virtual_alias_maps) applies to all email
+deliveries, unlike local aliasing (alias_maps) which applies only
+to local(8) delivery.  
    
+
 
     Virtual aliasing is disabled by default. To enable, edit the
 virtual_alias_maps parameter in the main.cf file and
 specify one or more lookup tables, separated by whitespace or
@@ -1056,6 +1060,10 @@ direct mail for standard aliases such as postmaster to real people.
 The table can also be used to map "Firstname.Lastname" addresses
 to login names. 
    
 
+
     Note: local aliasing (alias_maps) applies only to local(8)
+delivery, unlike virtual aliasing (virtual_alias_maps) which applies
+to all email deliveries. 
    
+
 
     Alias lookups are enabled by default. The default configuration
 depends on the operating system environment, but it is typically
 one of the following: 
    
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 74c6c1801..21578242c 100644
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -489,8 +489,13 @@ alias_database = hash:/etc/mail/aliases
 %PARAM alias_maps see "postconf -d" output
 
 
    
-The alias databases that are used for local(8) delivery. See
-aliases(5) for syntax details.
+Optional lookup tables with aliases that apply only to local(8)
+delivery, unlike virtual_alias_maps that apply to all email deliveries.
+The table format and lookups are documented in aliases(5). For an
+overview of Postfix address manipulations see the ADDRESS_REWRITING_README
+document. 
    
+
+
    
 Specify zero or more "type:name" lookup tables, separated by
 whitespace or comma. Tables will be searched in the specified order
 until a match is found.
@@ -2012,6 +2017,8 @@ mail on. Specify "all" to receive mail on all network
 interfaces (default), and "loopback-only" to receive mail
 on loopback network interfaces only (Postfix version 2.2 and later).  The
 parameter also controls delivery of mail to user@[ip.address].
+Specify an empty value if Postfix does not receive mail over the network,
+or if all network listeners have an explicit IP address in master.cf.
 
    
 
 
    
@@ -7277,8 +7284,9 @@ This feature is available in Postfix 2.1 and later.
 %PARAM virtual_alias_maps $virtual_maps
 
 
    
-Optional lookup tables that alias specific mail addresses or domains
-to other local or remote addresses.  The table format and lookups
+Optional lookup tables with aliases that apply to all email deliveries,
+unlike alias_maps that apply only to local(8) delivery.
+The table format and lookups
 are documented in virtual(5). For an overview of Postfix address
 manipulations see the ADDRESS_REWRITING_README document.
 
    
diff --git a/postfix/proto/stop.double-history b/postfix/proto/stop.double-history
index c1026c8a0..5c4930204 100644
--- a/postfix/proto/stop.double-history
+++ b/postfix/proto/stop.double-history
@@ -40,3 +40,8 @@ proto  proto SASL_README html proto SQLITE_README html
  File smtp smtp h 
  manpage File postscreen postscreen c 
  Files postconf postconf h postconf postconf_dbms c 
+proto  proto ADDRESS_REWRITING_README html 
+ proto postconf proto proto ADDRESS_REWRITING_README html 
+ cleanup cleanup c local local c smtpd smtpd c 
+ cleanup cleanup c local local c smtpd smtpd c 
+ cleanup cleanup c local local c smtpd smtpd c 
diff --git a/postfix/src/cleanup/cleanup.c b/postfix/src/cleanup/cleanup.c
index 73cc03d57..9229778d3 100644
--- a/postfix/src/cleanup/cleanup.c
+++ b/postfix/src/cleanup/cleanup.c
@@ -254,10 +254,10 @@
 /*	Available in Postfix version 2.1 and later:
 /* .IP "\fBsender_bcc_maps (empty)\fR"
 /*	Optional BCC (blind carbon-copy) address lookup tables, indexed
-/*	by sender address.
+/*	by envelope sender address.
 /* .IP "\fBrecipient_bcc_maps (empty)\fR"
 /*	Optional BCC (blind carbon-copy) address lookup tables, indexed by
-/*	recipient address.
+/*	envelope recipient address.
 /* ADDRESS TRANSFORMATION CONTROLS
 /* .ad
 /* .fi
@@ -295,8 +295,8 @@
 /* .PP
 /*	Available in Postfix version 2.0 and later:
 /* .IP "\fBvirtual_alias_maps ($virtual_maps)\fR"
-/*	Optional lookup tables that alias specific mail addresses or domains
-/*	to other local or remote address.
+/*	Optional lookup tables with aliases that apply to all email deliveries,
+/*	unlike alias_maps that apply only to \fBlocal\fR(8) delivery.
 /* .PP
 /*	Available in Postfix version 2.2 and later:
 /* .IP "\fBcanonical_classes (envelope_sender, envelope_recipient, header_sender, header_recipient)\fR"
@@ -308,9 +308,10 @@
 /*	What addresses are subject to sender_canonical_maps address
 /*	mapping.
 /* .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.
 /* RESOURCE AND RATE CONTROLS
 /* .ad
 /* .fi
@@ -357,7 +358,7 @@
 /*	Preliminary SMTPUTF8 support is introduced with Postfix 3.0.
 /* .IP "\fBsmtputf8_enable (yes)\fR"
 /*	Enable preliminary SMTPUTF8 support for the protocols described
-/*	in RFC 6531..6533.
+/*	in RFC 6531, RFC 6532, and RFC 6533.
 /* .IP "\fBsmtputf8_autodetect_classes (sendmail, verify)\fR"
 /*	Detect that a message requires SMTPUTF8 support for the specified
 /*	mail origin classes.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index a9da79829..02078e7bf 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20230504"
+#define MAIL_RELEASE_DATE	"20230505"
 #define MAIL_VERSION_NUMBER	"3.9"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/local/local.c b/postfix/src/local/local.c
index 32bdea77e..7d5f4fda9 100644
--- a/postfix/src/local/local.c
+++ b/postfix/src/local/local.c
@@ -413,7 +413,8 @@
 /*	home_mailbox, mail_spool_directory, fallback_transport_maps,
 /*	fallback_transport, and luser_relay.
 /* .IP "\fBalias_maps (see 'postconf -d' output)\fR"
-/*	The alias databases that are used for \fBlocal\fR(8) delivery.
+/*	Optional lookup tables with aliases that apply only to \fBlocal\fR(8)
+/*	delivery, unlike virtual_alias_maps that apply to all email deliveries.
 /* .IP "\fBforward_path (see 'postconf -d' output)\fR"
 /*	The \fBlocal\fR(8) delivery agent search list for finding a .forward
 /*	file with user-specified delivery methods.
diff --git a/postfix/src/master/master_ent.c b/postfix/src/master/master_ent.c
index 5edc30872..1fb99cf10 100644
--- a/postfix/src/master/master_ent.c
+++ b/postfix/src/master/master_ent.c
@@ -367,10 +367,17 @@ MASTER_SERV *get_master_ent()
 	    inet_addr_list_uniq(MASTER_INET_ADDRLIST(serv));
 	    serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
 	} else {
-	    MASTER_INET_ADDRLIST(serv) =
-		strcasecmp(saved_interfaces, INET_INTERFACES_ALL) ?
-		own_inet_addr_list() :		/* virtual */
-		wildcard_inet_addr_list();	/* wild-card */
+	    if (strcasecmp(saved_interfaces, INET_INTERFACES_ALL) == 0) {
+		MASTER_INET_ADDRLIST(serv) = wildcard_inet_addr_list();
+		/* Errors, and no interface found, are fatal. */
+	    } else {
+		MASTER_INET_ADDRLIST(serv) = own_inet_addr_list();
+		/* Errors are fatal, but inet_interfaces can be empty. */
+		if (MASTER_INET_ADDRLIST(serv)->used == 0)
+		    fatal_with_context("service definition requires valid"
+				       " host name or address, or non-empty"
+				       " %s setting", VAR_INET_INTERFACES);
+	    }
 	    inet_addr_list_uniq(MASTER_INET_ADDRLIST(serv));
 	    serv->listen_fd_count = MASTER_INET_ADDRLIST(serv)->used;
 	}
diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index 2276e65f6..ac800db42 100644
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -691,8 +691,8 @@
 /*	alias domains, that is, domains for which all addresses are aliased
 /*	to addresses in other local or remote domains.
 /* .IP "\fBvirtual_alias_maps ($virtual_maps)\fR"
-/*	Optional lookup tables that alias specific mail addresses or domains
-/*	to other local or remote addresses.
+/*	Optional lookup tables with aliases that apply to all email deliveries,
+/*	unlike alias_maps that apply only to \fBlocal\fR(8) delivery.
 /* .IP "\fBunknown_virtual_alias_reject_code (550)\fR"
 /*	The Postfix SMTP server reply code when a recipient address matches
 /*	$virtual_alias_domains, and $virtual_alias_maps specifies a list