From: Wietse Venema Date: Sat, 5 Feb 2005 05:00:00 +0000 (-0500) Subject: postfix-2.2-20050205 X-Git-Tag: v2.2.0-RC1~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80c6ec771a2db3e183625c5da6fcd4c0a0dcac3a;p=thirdparty%2Fpostfix.git postfix-2.2-20050205 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index 55b9ddd09..f92beeb9b 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -10253,9 +10253,20 @@ Apologies for any names omitted. Cleanup: sendmail no longer ignores null command-line recipients. File: sendmail/sendmail.c. - Cleanup: "postfix start" background checks moved back - to the foreground so they can be stopped more easily. - File: conf/postfix-script. + Cleanup: "postfix start" background checks moved back to + the foreground so they can be stopped more easily. File: + conf/postfix-script. + +20050204 + + Feature: REPLACE command in header/body_checks (implemented + as a combination of PREPEND and IGNORE) by Bastiaan Bakker. + File: cleanup/cleanup_message.c. + + Cleanup: linted the manual pages for consistency in the + way manuals are referenced, and in the presentation of + command examples. Files: mantools/manlint, mantools/fixman, + mantools/postconf2man. Open problems: diff --git a/postfix/README_FILES/DATABASE_README b/postfix/README_FILES/DATABASE_README index 5273d7879..ef86f651c 100644 --- a/postfix/README_FILES/DATABASE_README +++ b/postfix/README_FILES/DATABASE_README @@ -244,7 +244,7 @@ To find out what database types your Postfix system supports, use the "ppooss in tcp_table(5). The lookup table name is "tcp:host:port" where "host" specifies a symbolic hostname or a numeric IP address, and "port" specifies a symbolic service name or a numeric port number. This - protocol is not available in Postfix version 2.1. + protocol is not available up to and including Postfix version 2.2. uunniixx (read-only) A limited way to query the UNIX authentication database. The following tables are implemented: diff --git a/postfix/README_FILES/INSTALL b/postfix/README_FILES/INSTALL index 1d959023c..94bea9196 100644 --- a/postfix/README_FILES/INSTALL +++ b/postfix/README_FILES/INSTALL @@ -95,7 +95,7 @@ At some point in time, a version of Postfix was supported on: OSF1.V3 - OSF1.V5 (Digital UNIX) Reliant UNIX 5.x Rhapsody 5.x - SunOS 4.1.4 (April 2004) + SunOS 4.1.4 (February 2005) SunOS 5.4 - 5.9 (Solaris 2.4..9) Ultrix 4.x (well, that was long ago) diff --git a/postfix/README_FILES/IPV6_README b/postfix/README_FILES/IPV6_README index ee03468f9..8b2f5ee97 100644 --- a/postfix/README_FILES/IPV6_README +++ b/postfix/README_FILES/IPV6_README @@ -4,14 +4,19 @@ PPoossttffiixx IIPPvv66 SSuuppppoorrtt IInnttrroodduuccttiioonn -Postfix 2.2 introduces support for the IPv6 (IP version 6) protocol, whose main -feature of interest is that it uses 128-bit IP addresses instead of the 32-bit -addresses used by IPv4. +Postfix 2.2 introduces support for the IPv6 (IP version 6) protocol. IPv6 +support older Postfix versions was available as an add-on patch. The section +"Compatibility with Postfix <2.2 IPv6 support" below discusses the differences +between these implementations. -With this, Postfix can use the same SMTP protocol over IPv6 as it already uses -over the older IPv4 network, and Postfix can do AAAA record lookups in the DNS -in addition to the older A records. Information about IPv6 can be found at -http://www.ipv6.org/. +The main feature of interest is that IPv6 uses 128-bit IP addresses instead of +the 32-bit addresses used by IPv4. It can therefore accomodate a much larger +number of hosts and networks without ugly kluges such as NAT. A side benefit of +the much larger address space is that it makes network scanning unpractical. + +Postfix uses the same SMTP protocol over IPv6 as it already uses over the older +IPv4 network, and does AAAA record lookups in the DNS in addition to the older +A records. Information about IPv6 can be found at http://www.ipv6.org/. This document provides information on the following topics: @@ -46,13 +51,15 @@ introduces an important change in address syntax notation in match lists such as mynetworks or debug_peer_list. Postfix IPv6 address syntax is a little tricky, because there are a few places -where you must enclose IPv6 address inside [] characters, and a few places -where you must not. It is a good idea to use [] only in the few places where +where you must enclose an IPv6 address inside "[]" characters, and a few places +where you must not. It is a good idea to use "[]" only in the few places where you have to. Check out the postconf(5) manual whenever you do IPv6 related configuration work with Postfix. - * The new inet_protocols parameter specifies what IP protocols Postfix will - use. This parameter also controls what DNS lookups Postfix will do. + * The first new parameter is called inet_protocols. This specifies what + protocols Postfix will use when it makes or accepts network connections, + and also controls what DNS lookups Postfix will use when it makes network + connections. /etc/postfix/main.cf: # You must stop/start Postfix after changing this parameter. @@ -106,13 +113,13 @@ configuration work with Postfix. If you did specify the mynetworks parameter value in main.cf, you need update the mynetworks value to include the IPv6 networks the system is in. - Be sure to specify IPv6 address information inside [], like this: + Be sure to specify IPv6 address information inside "[]", like this: /etc/postfix/main.cf: mynetworks = ...IPv4 networks... [::1]/128 [2001:240:5c7::]/64 ... NNOOTTEE:: wwhheenn ccoonnffiigguurriinngg PPoossttffiixx mmaattcchh lliissttss ssuucchh aass mmyynneettwwoorrkkss oorr -ddeebbuugg__ppeeeerr__lliisstt,, yyoouu mmuusstt ssppeecciiffyy IIPPvv66 aaddddrreessss iinnffoorrmmaattiioonn iinnssiiddee [[]] iinn tthhee +ddeebbuugg__ppeeeerr__lliisstt,, yyoouu mmuusstt ssppeecciiffyy IIPPvv66 aaddddrreessss iinnffoorrmmaattiioonn iinnssiiddee ""[[]]"" iinn tthhee mmaaiinn..ccff ppaarraammeetteerr vvaalluuee aanndd iinn ffiilleess ssppeecciiffiieedd wwiitthh aa ""//ffiillee//nnaammee"" ppaatttteerrnn.. IIPPvv66 aaddddrreesssseess ccoonnttaaiinn tthhee ""::"" cchhaarraacctteerr,, aanndd wwoouulldd ootthheerrwwiissee bbee ccoonnffuusseedd wwiitthh aa ""ttyyppee::ttaabbllee"" ppaatttteerrnn.. @@ -130,9 +137,9 @@ KKnnoowwnn LLiimmiittaattiioonnss setting "mynetworks_style = class" has the same effect as the setting "mynetworks_style = subnet". - * On Tru64Unix, Postfix can't figure out the local subnet mask and always - assumes a /128 network. This is a problem only with "mynetworks_style = - subnet" and no explicit mynetworks setting in main.cf. + * On Tru64Unix and AIX, Postfix can't figure out the local subnet mask and + always assumes a /128 network. This is a problem only with + "mynetworks_style = subnet" and no explicit mynetworks setting in main.cf. CCoommppaattiibbiilliittyy wwiitthh PPoossttffiixx <<22..22 IIPPvv66 ssuuppppoorrtt @@ -199,7 +206,7 @@ Getting Postfix IPv6 working on other platforms involves the following steps: * Test if Postfix can figure out its interface information. After compiling Postfix in the usual manner, step into the src/util - directory and type "make inet_addr_local". Running this file by hand should + directory and type "mmaakkee iinneett__aaddddrr__llooccaall". Running this file by hand should produce all the interface addresses and network masks, for example: % make diff --git a/postfix/README_FILES/OVERVIEW b/postfix/README_FILES/OVERVIEW index 9c604c85e..0c3e55beb 100644 --- a/postfix/README_FILES/OVERVIEW +++ b/postfix/README_FILES/OVERVIEW @@ -205,8 +205,8 @@ queues. * The anvil(8) server implements client connection and request rate limiting for all smtpd(8) servers. The TUNING_README document provides guidance for - dealing with mis-behaving SMTP clients. The anvil(8) service is not - included with Postfix version 2.1 or earlier. + dealing with mis-behaving SMTP clients. The anvil(8) service is available + in Postfix version 2.2 and later. Network -> smtpd(8) <-> anvil(8) @@ -301,7 +301,7 @@ queues. o Maintain the pseudo-random number generator (PRNG) that is used to seed the TLS engines in Postfix smtp(8) client or smtpd(8) server processes. - The state of this PRNG is saved periodically to a file, and is read + The state of this PRNG is periodically saved to a file, and is read when tlsmgr(8) starts up. o Maintain the optional Postfix smtp(8) client or smtpd(8) server caches diff --git a/postfix/README_FILES/TLS_README b/postfix/README_FILES/TLS_README index 15feb304d..6e1b10da7 100644 --- a/postfix/README_FILES/TLS_README +++ b/postfix/README_FILES/TLS_README @@ -10,41 +10,20 @@ thousands of lines of OpenSSL library code. Assuming that OpenSSL is written as carefully as Wietse's own code, every 1000 lines introduce one additional bug into Postfix. -IInnttrroodduuccttiioonn +WWhhaatt PPoossttffiixx TTLLSS ssuuppppoorrtt ddooeess ffoorr yyoouu -This document requires Postfix version 2.2 or later. +Transport Layer Security (TLS, formerly called SSL) provides certificate-based +authentication and encrypted sessions. An encrypted session protects the +information that is transmitted with SMTP mail or with SASL authentication. -Postfix may be built with Transport Layer Security (TLS, formerly called SSL) -protocol support as described in RFC 3207. This provides certificate-based -authentication, and encrypted sessions. An encrypted session protects the -information that is transmitted with SMTP mail or with SASL authentication. The -main elements of the Postfix TLS architecture are: - - * The smtpd(8) server implements the SMTP over TLS server side. - - * The smtp(8) client implements the SMTP over TLS client side. - - * The tlsmgr(8) server maintains the pseudo-random number generator (PRNG) - that seeds the TLS engines in the smtpd(8) server and smtp(8) client - processes, and maintains the TLS session cache files with TLS session keys. - -The following diagram shows the relationship between these architecture -elements. - - <---seed--- ---seed---> -Network-> smtpd(8) tlsmgr(8) smtp(8) ->Network - <-session-> <-session-> - - / | \ - | - / \ - - smtpd PRNG smtp - session state session - cache file cache +Postfix version 2.2 introduces support for TLS as described in RFC 3207. TLS +Support for older Postfix versions was available as an add-on patch. The +section "Compatibility with Postfix < 2.2 TLS support" below discusses the +differences between these implementations. Topics covered in this document: + * How Postfix TLS support works * Building Postfix with TLS support * SMTP Server specific settings * SMTP Client specific settings @@ -57,6 +36,32 @@ And last but not least, for the impatient: * Getting started, quick and dirty +HHooww PPoossttffiixx TTLLSS ssuuppppoorrtt wwoorrkkss + +The diagram below shows the main elements of the Postfix TLS architecture and +their relationships. Colored boxes with numbered names represent Postfix daemon +programs. Other colored boxes represent storage elements. + + * The smtpd(8) server implements the SMTP over TLS server side. + + * The smtp(8) client implements the SMTP over TLS client side. + + * The tlsmgr(8) server maintains the pseudo-random number generator (PRNG) + that seeds the TLS engines in the smtpd(8) server and smtp(8) client + processes, and maintains the TLS session key cache files. + + <---seed--- ---seed---> +Network-> smtpd(8) tlsmgr(8) smtp(8) ->Network + <-session-> <-session-> + + / | \ + | + / \ + + smtpd PRNG smtp + session state session + key cache file key cache + BBuuiillddiinngg PPoossttffiixx wwiitthh TTLLSS ssuuppppoorrtt To build Postfix with TLS support, first we need to generate the make(1) files @@ -984,19 +989,19 @@ CCoommppaattiibbiilliittyy wwiitthh PPoossttffiixx <<2 Postfix version 2.2 TLS support is based on the Postfix/TLS patch by Lutz Jänicke, but differs in a few minor ways. - * main.cf: Use bbttrreeee instead of ssddbbmm for TLS session cache databases. + * main.cf: Specify "btree" instead of "sdbm" for TLS session cache databases. TLS session cache databases are now accessed only by the tlsmgr(8) process, - so there are no more concurrency issues. Although Postfix has an ssddbbmm - client, the ssddbbmm library (1000 lines of code) is not included with Postfix. + so there are no more concurrency issues. Although Postfix has an sdbm + client, the sdbm library (1000 lines of code) is not included with Postfix. TLS session caches can use any database that can store objects of several kbytes or more, and that implements the sequence operation. In most cases, - bbttrreeee databases should be adequate. + btree databases should be adequate. - NOTE: You cannot use ddbbmm databases. TLS session objects are too large. + NOTE: You cannot use dbm databases. TLS session objects are too large. - * master.cf: Specify uunniixx instead of ffiiffoo as the tlsmgr service type. + * master.cf: Specify "unix" instead of "fifo" as the tlsmgr service type. The smtp(8) and smtpd(8) processes now use a client-server protocol in order to access the tlsmgr(8) pseudo-random number generation (PRNG) pool, diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 9090e046c..50668fbbd 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -7,6 +7,12 @@ snapshot release). Patches are issued for the official release and change the patchlevel and the release date. Patches are never issued for snapshot releases. +Major changes with snapshot Postfix-2.2-20050205 +================================================ + +REPLACE action in header_checks and body_checks. See header_checks(5) +for details. + Incompatible changes with snapshot Postfix-2.2-20050203 ======================================================= diff --git a/postfix/auxiliary/qshape/qshape.pl b/postfix/auxiliary/qshape/qshape.pl index 94b86d5e3..e1788e2a6 100644 --- a/postfix/auxiliary/qshape/qshape.pl +++ b/postfix/auxiliary/qshape/qshape.pl @@ -81,7 +81,7 @@ # absolute path for each queue subdirectory even if you want the # default incoming and active queue distribution. # SEE ALSO -# mailq(1) List all messages in the queue. +# mailq(1), List all messages in the queue. # QSHAPE_README Examples and background material. # FILES # $config_directory/main.cf, Postfix installation parameters. diff --git a/postfix/conf/access b/postfix/conf/access index 48f5532ef..a424ea598 100644 --- a/postfix/conf/access +++ b/postfix/conf/access @@ -1,7 +1,7 @@ # ACCESS(5) ACCESS(5) # # NAME -# access - format of Postfix access table +# access - Postfix access table format # # SYNOPSIS # postmap /etc/postfix/access @@ -11,15 +11,15 @@ # postmap -q - /etc/postfix/access tcp_table(5). The lookup table name is "tcp:host:port" where "host" specifies a symbolic hostname or a numeric IP address, and "port" specifies a symbolic service name or a numeric port -number. This protocol is not available in Postfix version 2.1. - +number. This protocol is not available up to and including Postfix +version 2.2.
unix (read-only)
diff --git a/postfix/html/INSTALL.html b/postfix/html/INSTALL.html index 916d82f8f..185fb37b6 100644 --- a/postfix/html/INSTALL.html +++ b/postfix/html/INSTALL.html @@ -156,7 +156,7 @@ OPENSTEP 4.x
OSF1.V3 - OSF1.V5 (Digital UNIX)
Reliant UNIX 5.x
Rhapsody 5.x
-SunOS 4.1.4 (April 2004)
+SunOS 4.1.4 (February 2005)
SunOS 5.4 - 5.9 (Solaris 2.4..9)
Ultrix 4.x (well, that was long ago)

diff --git a/postfix/html/IPV6_README.html b/postfix/html/IPV6_README.html index 91b41f397..1c97d1288 100644 --- a/postfix/html/IPV6_README.html +++ b/postfix/html/IPV6_README.html @@ -21,13 +21,21 @@ IPv6 Support

Introduction

Postfix 2.2 introduces support for the IPv6 (IP version 6) -protocol, whose main feature of interest is that it uses 128-bit -IP addresses instead of the 32-bit addresses used by IPv4.

- -

With this, Postfix can use the same SMTP protocol over IPv6 as -it already uses over the older IPv4 network, and Postfix can do -AAAA record lookups in the DNS in addition to the older A records. -Information about IPv6 can be found at http://www.ipv6.org/.

+protocol. IPv6 support older Postfix versions was available as an +add-on patch. The section "Compatibility with +Postfix <2.2 IPv6 support" below discusses the differences +between these implementations.

+ +

The main feature of interest is that IPv6 uses 128-bit IP +addresses instead of the 32-bit addresses used by IPv4. It can +therefore accomodate a much larger number of hosts and networks +without ugly kluges such as NAT. A side benefit of the much larger +address space is that it makes network scanning unpractical.

+ +

Postfix uses the same SMTP protocol over IPv6 as it already +uses over the older IPv4 network, and does AAAA record lookups in +the DNS in addition to the older A records. Information about IPv6 +can be found at http://www.ipv6.org/.

This document provides information on the following topics:

@@ -76,21 +84,22 @@ IPv6 support to other environments.

Postfix IPv6 support introduces two new main.cf configuration parameters, and introduces an important change in address syntax -notation in match lists such as mynetworks or -debug_peer_list.

+notation in match lists such as mynetworks or +debug_peer_list.

Postfix IPv6 address syntax is a little tricky, because there -are a few places where you must enclose IPv6 address inside -[] characters, and a few places where you must not. It is -a good idea to use [] only in the few places where you +are a few places where you must enclose an IPv6 address inside +"[]" characters, and a few places where you must not. It is +a good idea to use "[]" only in the few places where you have to. Check out the postconf(5) manual whenever you do IPv6 related configuration work with Postfix.

Note 1: you must stop and start Postfix after changing the -inet_protocols configuration parameter.

+inet_protocols configuration parameter.

Note 2: if you see error messages like the following, then you're running Linux and need to turn on IPv6 in the kernel: see @@ -134,15 +143,15 @@ postconf: warning: inet_protocols:

Note 3: on older Linux and Solaris systems, the setting -"inet_protocols = ipv6" will not prevent Postfix from +"inet_protocols = ipv6" will not prevent Postfix from accepting IPv4 connections. Postfix will present the client IP addresses in IPv6 format, though. In all other cases, Postfix always presents IPv4 client IP addresses in the traditional dotted quad IPv4 format.

-

  • The other new parameter is smtp_bind_address6. +

  • The other new parameter is smtp_bind_address6. This sets the local interface address for outgoing IPv6 SMTP -connections, just like the smtp_bind_address parameter +connections, just like the smtp_bind_address parameter does for IPv4:

    @@ -152,8 +161,8 @@ does for IPv4:

    -

  • If you left the value of the mynetworks parameter at its -default (i.e. no mynetworks setting in main.cf) Postfix will figure +

  • If you left the value of the mynetworks parameter at its +default (i.e. no mynetworks setting in main.cf) Postfix will figure out by itself what its network addresses are. This is what a typical setting looks like:

    @@ -164,10 +173,10 @@ setting looks like:

    -

    If you did specify the mynetworks parameter value in -main.cf, you need update the mynetworks value to include +

    If you did specify the mynetworks parameter value in +main.cf, you need update the mynetworks value to include the IPv6 networks the system is in. Be sure to specify IPv6 address -information inside [], like this:

    +information inside "[]", like this: 

    @@ -179,8 +188,8 @@ information inside [], like this: 
    
 
 
 
      NOTE: when configuring Postfix match lists such as
-mynetworks or debug_peer_list, you must specify
-IPv6 address information inside [] in the main.cf parameter
+mynetworks or debug_peer_list, you must specify
+IPv6 address information inside "[]" in the main.cf parameter
 value and in files specified with a "/file/name" pattern.
 IPv6 addresses contain the ":" character, and would otherwise be
 confused with a "type:table" pattern.   
    
@@ -197,13 +206,14 @@ blackhole list) lookups for IPv6 client IP addresses; currently
 there are no blacklists that cover the IPv6 address space. 
    
 
 
  •  
     IPv6 does not have class A, B, C, etc. networks. With IPv6
-networks, the setting "mynetworks_style = class" has the
-same effect as the setting "mynetworks_style = subnet".
+networks, the setting "mynetworks_style = class" has the
+same effect as the setting "mynetworks_style = subnet".
 
    
 
-
  •  
     On Tru64Unix, Postfix can't figure out the local subnet mask
+
  •  
     On Tru64Unix and AIX, Postfix can't figure out the local
+subnet mask
 and always assumes a /128 network. This is a problem only with
-"mynetworks_style = subnet" and no explicit mynetworks
+"mynetworks_style = subnet" and no explicit mynetworks
 setting in main.cf. 
    
 
 
@@ -216,28 +226,28 @@ by Dean Strik and others, but differs in a few minor ways. 
    
 
 
      
 
-
    •  
       main.cf: The inet_interfaces parameter does not support
-the notation  "ipv6:all" or "ipv4:all". Use the
-inet_protocols parameter instead. 
      
+
    •  
       main.cf: The inet_interfaces parameter does not support
+the notation  "ipv6:all" or "ipv4:all". Use the
+inet_protocols parameter instead. 
      
 
-
    •  
       main.cf: Specify "inet_protocols = all" or
-"inet_protocols = ipv4, ipv6" in order to enable both IPv4
+
    •  
       main.cf: Specify "inet_protocols = all" or
+"inet_protocols = ipv4, ipv6" in order to enable both IPv4
 and IPv6 support. 
      
 
-
    •  
       main.cf: The inet_protocols parameter also controls
+
    •  
       main.cf: The inet_protocols parameter also controls
 what DNS lookups Postfix will attempt to make when delivering or
 receiving mail. 
      
 
-
    •  
       main.cf: Specify "inet_interfaces = loopback-only"
+
    •  
       main.cf: Specify "inet_interfaces = loopback-only"
 to listen on loopback network interfaces only. 
      
 
-
    •  
       The lmtp_bind_address and lmtp_bind_address6
+
    •  
       The lmtp_bind_address and lmtp_bind_address6
 features were omitted. The Postfix LMTP client will be absorbed
 into the SMTP client, so there is no reason to keep adding features
 to the LMTP client. 
      
 
 
    •  
       The SMTP server now requires that IPv6 addresses in SMTP
-commands are specified as [ipv6:ipv6address], as
+commands are specified as [ipv6:ipv6address], as
 described in RFC 2821. 
      
 
 
    •  
       The IPv6 network address matching code was rewritten from
@@ -258,9 +268,9 @@ following steps: 
      
 Postfix needs this information to avoid mailer loops and to find out
 if mail for user@[ipaddress] is a local or remote destination. 
      
 
-
       If your system has the getifaddrs() routine then add
+
       If your system has the getifaddrs() routine then add
 the following to your platform-specific section in
-src/util/sys_defs.h:  
      
+src/util/sys_defs.h:  
      
 
 
      
 
      @@ -271,9 +281,9 @@ the following to your platform-specific section in
 
      
 
      
 
-
       Otherwise, if your system has the SIOCGLIF ioctl()
-command in /usr/include/*/*.h, add the following to your
-platform-specific section in src/util/sys_defs.h: 
      
+
       Otherwise, if your system has the SIOCGLIF ioctl()
+command in /usr/include/*/*.h, add the following to your
+platform-specific section in src/util/sys_defs.h: 
      
 
 
      
 
      @@ -286,9 +296,9 @@ platform-specific section in src/util/sys_defs.h: 
      
 
 
       Otherwise, Postfix will have to use the old SIOCGIF commands
 and get along with reduced IPv6 functionality (it won't be able to
-figure out your IPv6 netmasks, which are needed for "mynetworks_style
-= subnet". Add this to your platform-specific section in
-src/util/sys_defs.h: 
      
+figure out your IPv6 netmasks, which are needed for "mynetworks_style
+= subnet". Add this to your platform-specific section in
+src/util/sys_defs.h: 
      
 
 
      
 
      @@ -301,7 +311,7 @@ figure out your IPv6 netmasks, which are needed for "make inet_addr_local".
+src/util directory and type "make inet_addr_local".
 Running this file by hand should produce all the interface addresses
 and network masks, for example: 
      
 
diff --git a/postfix/html/OVERVIEW.html b/postfix/html/OVERVIEW.html
index 0462854fa..84ba4badd 100644
--- a/postfix/html/OVERVIEW.html
+++ b/postfix/html/OVERVIEW.html
@@ -449,7 +449,7 @@ postfix-script(1)  
 request rate
 limiting for all       smtpd(8) servers.  The TUNING_README document
 provides guidance for dealing with mis-behaving SMTP clients. The
-anvil(8) service is not included with Postfix version 2.1 or earlier.
+anvil(8) service is available in Postfix version 2.2 and later.
 
      
 
 
@@ -592,7 +592,7 @@ client or smtpd(8) server. This process has two dutie
 
 
    •  
       Maintain the pseudo-random number generator (PRNG) that
 is used to seed the TLS engines in Postfix smtp(8) client or smtpd(8)
-server processes.  The state of this PRNG is saved periodically to
+server processes.  The state of this PRNG is periodically saved to
 a file, and is read when tlsmgr(8) starts up. 
      
 
 
    •  
       Maintain the optional Postfix smtp(8) client or smtpd(8)
diff --git a/postfix/html/TLS_README.html b/postfix/html/TLS_README.html
index 2f8e2bdd8..1bb15cf60 100644
--- a/postfix/html/TLS_README.html
+++ b/postfix/html/TLS_README.html
@@ -27,16 +27,55 @@ code.  Assuming that OpenSSL is written as carefully as Wietse's
 own code, every 1000 lines introduce one additional bug into
 Postfix.  
      
 
-
       Introduction 
      
+
       What Postfix TLS support does for you 
      
 
-
       This document requires Postfix version 2.2 or later. 
      
-
-
       Postfix may be built with Transport Layer Security (TLS, formerly
-called SSL) protocol support as described in RFC 3207. This provides
-certificate-based authentication, and encrypted sessions.  An
+
       Transport Layer Security (TLS, formerly called SSL) provides
+certificate-based authentication and encrypted sessions.  An
 encrypted session protects the information that is transmitted with
-SMTP mail or with SASL authentication.  The main elements of the
-Postfix TLS architecture are:  
      
+SMTP mail or with SASL authentication.
+
+
       Postfix version 2.2 introduces support for TLS as described in
+RFC 3207.  TLS Support for older Postfix versions was available as
+an add-on patch.  The section "Compatibility with
+Postfix < 2.2 TLS support" below discusses the differences
+between these implementations.  
      
+
+
       Topics covered in this document: 
      
+
+
+
+
       And last but not least, for the impatient: 
      
+
+
+
+
      How Postfix TLS support works
      
+
+
       The diagram below shows the main elements of the Postfix TLS
+architecture and their relationships.  Colored boxes with numbered
+names represent Postfix daemon programs. Other colored boxes
+represent storage elements. 
      
 
 
        
 
@@ -48,14 +87,11 @@ side. 
        
 
 
      •  
         The tlsmgr(8) server maintains the pseudo-random number
 generator (PRNG) that seeds the TLS engines in the smtpd(8) server
-and smtp(8) client processes, and maintains the TLS session cache
-files with TLS session keys. 
        
+and smtp(8) client processes, and maintains the TLS session key
+cache files. 
        
 
 
      
 
-
       The following diagram shows the relationship between these
-architecture elements. 
      
-
 
      • 
 
 
       Network->    
       tlsmgr(8) 
       
          
 
    
-smtpd
       session
       cache     session
       key cache     PRNG
       state 
      file     smtp
       session
       cache 
+align="center" bgcolor="#f0f0ff"> smtp
       session
       key cache
+
 
   
 
 
 
-
       Topics covered in this document: 
      
-
-
-
-
       And last but not least, for the impatient: 
      
-
-
-
 
      Building Postfix with TLS support
      
 
 
       To build Postfix with TLS support, first we need to generate
@@ -1407,22 +1416,22 @@ patch by Lutz Jänicke, but differs in a few minor ways. 
      
 
 
        
 
-
      •  
         main.cf: Use btree instead of sdbm for TLS
+
      •  
         main.cf: Specify "btree" instead of "sdbm" for TLS
 session cache databases. 
        
 
 
         TLS session cache databases are now accessed only by the
 tlsmgr(8) process, so there are no more concurrency issues. Although
-Postfix has an sdbm client, the sdbm library (1000
+Postfix has an sdbm client, the sdbm library (1000
 lines of code) is not included with Postfix. 
        
 
 
         TLS session caches can use any database that can store objects
 of several kbytes or more, and that implements the sequence operation.
-In most cases, btree databases should be adequate.  
        
+In most cases, btree databases should be adequate.  
        
 
-
         NOTE:  You cannot use dbm databases. TLS session objects
+
         NOTE:  You cannot use dbm databases. TLS session objects
 are too large. 
        
 
-
      •  
         master.cf: Specify unix instead of fifo as
+
      •  
         master.cf: Specify "unix" instead of "fifo" as
 the tlsmgr service type. 
        
 
 
         The smtp(8) and smtpd(8) processes now use a client-server
diff --git a/postfix/html/access.5.html b/postfix/html/access.5.html
index b22042fff..7d111a974 100644
--- a/postfix/html/access.5.html
+++ b/postfix/html/access.5.html
@@ -7,7 +7,7 @@
 ACCESS(5)                                               ACCESS(5)
 
 NAME
-       access - format of Postfix access table
+       access - Postfix access table format
 
 SYNOPSIS
        postmap /etc/postfix/access
@@ -17,15 +17,15 @@ ACCESS(5)                                               ACCESS(5)
        postmap -q - /etc/postfix/access <inputfile
 
 DESCRIPTION
-       The  optional access table directs the Postfix SMTP server
-       to selectively  reject  or  accept  mail.  Access  can  be
+       The  optional  access(5)  table  directs  the Postfix SMTP
+       server to selectively reject or accept mail. Access can be
        allowed  or  denied for specific host names, domain names,
        networks, host addresses or mail addresses.
 
        For an example, see the EXAMPLE section at the end of this
        manual page.
 
-       Normally,  the  access  table  is specified as a text file
+       Normally,  the access(5) table is specified as a text file
        that serves as  input  to  the  postmap(1)  command.   The
        result,  an  indexed file in dbm or db format, is used for
        fast searching by the mail  system.  Execute  the  command
@@ -131,7 +131,7 @@ ACCESS(5)                                               ACCESS(5)
               enclosed with "[]" characters.
 
               NOTE  2:  use the cidr lookup table type to specify
-              network/netmask  patterns.  See  cidr_table(5)  for
+              network/netmask  patterns.  See  cidr_table(5)  for
               details.
 
        net:work:addr:ess
@@ -159,7 +159,7 @@ ACCESS(5)                                               ACCESS(5)
               enclosed with "[]" characters.
 
               NOTE  3:  use the cidr lookup table type to specify
-              network/netmask  patterns.  See  cidr_table(5)  for
+              network/netmask  patterns.  See  cidr_table(5)  for
               details.
 
               IPv6 support is available in Postfix 2.2 and later.
@@ -230,7 +230,7 @@ ACCESS(5)                                               ACCESS(5)
               After the message is queued, send the  entire  mes-
               sage through the specified external content filter.
               The transport:destination syntax  is  described  in
-              the  transport(5)  manual  page.   More information
+              the  transport(5)  manual  page.   More information
               about external content filters is  in  the  Postfix
               FILTER_README file.
 
@@ -315,8 +315,8 @@ ACCESS(5)                                               ACCESS(5)
        This section describes how the table lookups  change  when
        lookups are directed to a TCP-based server. For a descrip-
        tion  of  the  TCP  client/server  lookup  protocol,   see
-       tcp_table(5).   This  feature  is not available in Postfix
-       version 2.1.
+       tcp_table(5).   This  feature  is  not available up to and
+       including Postfix version 2.2.
 
        Each lookup operation uses the entire query  string  once.
        Depending  on  the  application,  that string is an entire
diff --git a/postfix/html/aliases.5.html b/postfix/html/aliases.5.html
index a3b2c84f7..3a13f7cb1 100644
--- a/postfix/html/aliases.5.html
+++ b/postfix/html/aliases.5.html
@@ -7,17 +7,17 @@
 ALIASES(5)                                             ALIASES(5)
 
 NAME
-       aliases - format of the Postfix alias database
+       aliases - Postfix local alias database format
 
 SYNOPSIS
        newaliases
 
 DESCRIPTION
-       The  aliases  table  provides  a  system-wide mechanism to
+       The  aliases(5)  table provides a system-wide mechanism to
        redirect mail for local recipients. The  redirections  are
        processed by the Postfix local(8) delivery agent.
 
-       Normally,  the  aliases  table is specified as a text file
+       Normally, the aliases(5) table is specified as a text file
        that serves as input  to  the  postalias(1)  command.  The
        result,  an  indexed file in dbm or db format, is used for
        fast lookup  by  the  mail  system.  Execute  the  command
@@ -31,7 +31,7 @@ ALIASES(5)                                             ALIASES(5)
        Users can control delivery of their own mail by setting up
        .forward files in their home directory.  Lines in per-user
        .forward files have the same syntax as the right-hand side
-       of aliases entries.
+       of aliases(5) entries.
 
        The format of the alias database input file is as follows:
 
@@ -120,7 +120,7 @@ ALIASES(5)                                             ALIASES(5)
 CONFIGURATION PARAMETERS
        The following main.cf parameters are especially  relevant.
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        alias_database
               List of alias databases that  are  updated  by  the
diff --git a/postfix/html/anvil.8.html b/postfix/html/anvil.8.html
index 230934bf2..f2262690f 100644
--- a/postfix/html/anvil.8.html
+++ b/postfix/html/anvil.8.html
@@ -13,30 +13,30 @@ ANVIL(8)                                                 ANVIL(8)
        anvil [generic Postfix daemon options]
 
 DESCRIPTION
-       The  Postfix  anvil server maintains short-term statistics
-       to defend against clients that hammer a server with either
-       too  many  simultaneous sessions, or with too many succes-
-       sive requests within a configurable time  interval.   This
-       server  is  designed  to  run under control by the Postfix
-       master server.
+       The  Postfix  anvil(8) server maintains short-term statis-
+       tics to defend against clients that hammer a  server  with
+       either  too  many  simultaneous sessions, or with too many
+       successive requests within a configurable  time  interval.
+       This  server is designed to run under control by the Post-
+       fix master(8) server.
 
-       The anvil server maintains no persistent  database.  Stan-
-       dard library utilities do not meet Postfix performance and
-       robustness requirements.
+       The anvil(8)  server  maintains  no  persistent  database.
+       Standard library utilities do not meet Postfix performance
+       and robustness requirements.
 
 CONNECTION COUNT/RATE LIMITING
        When a remote client  connects,  a  connection  count  (or
        rate)  limited server should send the following request to
-       the anvil server:
+       the anvil(8) server:
 
            request=connect
            ident=string
 
        This registers a new connection for the (service,  client)
-       combination specified with ident. The anvil server answers
-       with the number of simultaneous connections and the number
-       of  connections  per  unit time for that (service, client)
-       combination:
+       combination  specified  with  ident.  The  anvil(8) server
+       answers with the number of  simultaneous  connections  and
+       the number of connections per unit time for that (service,
+       client) combination:
 
            status=0
            count=number
@@ -49,119 +49,115 @@ ANVIL(8)                                                 ANVIL(8)
 
        When  a  remote client disconnects, a connection count (or
        rate) limited server should send the following request  to
-       the anvil server:
+       the anvil(8) server:
 
            request=disconnect
            ident=string
 
        This  registers  a  disconnect  event  for  the  (service,
-       client) combination specified with ident. The anvil server
-       replies with:
+       client) combination specified  with  ident.  The  anvil(8)
+       server replies with:
 
            status=0
 
 MESSAGE RATE LIMITING
        When  a  remote client sends a message delivery request, a
        message rate limited  server  should  send  the  following
-       request to the anvil server:
+       request to the anvil(8) server:
 
            request=message
            ident=string
 
        This  registers  a  message delivery request for the (ser-
-       vice, client) combination specified with ident. The  anvil
-       server   answers  with  the  number  of  message  delivery
-       requests per unit time for that (service, client) combina-
-       tion:
+       vice,  client)  combination  specified  with  ident.   The
+       anvil(8)  server answers with the number of message deliv-
+       ery requests per unit time for that (service, client) com-
+       bination:
 
            status=0
            rate=number
 
-       In  order  prevent the anvil server from discarding client
-       request rates too early or too late, a message  rate  lim-
-       ited   service  should  also  register  connect/disconnect
+       In  order  to  prevent the anvil(8) server from discarding
+       client request rates too early or too late, a message rate
+       limited  service  should  also register connect/disconnect
        events.
 
-       This feature is available in Postfix 2.2 and later.
-
 RECIPIENT RATE LIMITING
        When a remote client sends a recipient address, a  recipi-
        ent  rate limited server should send the following request
-       to the anvil server:
+       to the anvil(8) server:
 
            request=recipient
            ident=string
 
-       This registers  a  recipient  address  for  the  (service,
-       client) combination specified with ident. The anvil server
-       answers with the number of recipient  addresses  per  unit
-       time for that (service, client) combination:
+       This registers  a  recipient  request  for  the  (service,
+       client)  combination  specified  with  ident. The anvil(8)
+       server answers with the number of recipient addresses  per
+       unit time for that (service, client) combination:
 
            status=0
            rate=number
 
-       In  order  prevent the anvil server from discarding client
-       request rates too early or too late, a recipient rate lim-
-       ited   service  should  also  register  connect/disconnect
-       events.
-
-       This feature is available in Postfix 2.2 and later.
+       In  order  to  prevent the anvil(8) server from discarding
+       client request rates too early or too  late,  a  recipient
+       rate  limited service should also register connect/discon-
+       nect events.
 
 SECURITY
-       The anvil server does not talk to the network or to  local
-       users, and can run chrooted at fixed low privilege.
+       The anvil(8) server does not talk to  the  network  or  to
+       local  users, and can run chrooted at fixed low privilege.
 
-       The  anvil server maintains an in-memory table with infor-
-       mation about recent clients  of  a  connection  count  (or
-       rate)  limited  service.  Although state is kept only tem-
+       The anvil(8) server  maintains  an  in-memory  table  with
+       information about recent clients of a connection count (or
+       rate) limited service.  Although state is kept  only  tem-
        porarily, this may require a lot of memory on systems that
-       handle  connections  from  many remote clients.  To reduce
-       memory usage, reduce the time unit  over  which  state  is
+       handle connections from many remote  clients.   To  reduce
+       memory  usage,  reduce  the  time unit over which state is
        kept.
 
 DIAGNOSTICS
        Problems and transactions are logged to syslogd(8).
 
        Upon exit, and every anvil_status_update_time seconds, the
-       server logs the maximal count and  rate  values  measured,
-       together  with  (service, client) information and the time
-       of day associated with those events.  In  order  to  avoid
-       unnecessary  overhead, no measurements are done for activ-
+       server  logs  the  maximal count and rate values measured,
+       together with (service, client) information and  the  time
+       of  day  associated  with those events.  In order to avoid
+       unnecessary overhead, no measurements are done for  activ-
        ity that isn't concurrency limited or rate limited.
 
 BUGS
-       Systems behind  network  address  translating  routers  or
+       Systems  behind  network  address  translating  routers or
        proxies appear to have the same client address and can run
        into connection count and/or rate limits falsely.
 
        In this preliminary implementation, a count (or rate) lim-
-       ited  server can have only one remote client at a time. If
-       a server reports multiple simultaneous  clients,  all  but
+       ited server can have only one remote client at a time.  If
+       a  server  reports  multiple simultaneous clients, all but
        the last reported client are ignored.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked up automatically as anvil(8)
-       processes run for only a limited amount of time.  Use  the
+       Changes to main.cf are picked up automatically as anvil(8)
+       processes  run  for only a limited amount of time. Use the
        command "postfix reload" to speed up a change.
 
-       The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       The text below provides  only  a  parameter  summary.  See
+       postconf(5) for more details including examples.
 
        anvil_rate_time_unit (60s)
-              The time unit over which  client  connection  rates
+              The  time  unit  over which client connection rates
               and other rates are calculated.
 
        anvil_status_update_time (600s)
-              How  frequently  the  anvil(8)  connection and rate
+              How frequently the  anvil(8)  connection  and  rate
               limiting server logs peak usage information.
 
        config_directory (see 'postconf -d' output)
-              The default location of  the  Postfix  main.cf  and
+              The  default  location  of  the Postfix main.cf and
               master.cf configuration files.
 
        daemon_timeout (18000s)
-              How  much time a Postfix daemon process may take to
-              handle a request  before  it  is  terminated  by  a
+              How much time a Postfix daemon process may take  to
+              handle  a  request  before  it  is  terminated by a
               built-in watchdog timer.
 
        ipc_timeout (3600s)
@@ -169,27 +165,27 @@ ANVIL(8)                                                 ANVIL(8)
               over an internal communication channel.
 
        max_idle (100s)
-              The maximum amount of time  that  an  idle  Postfix
-              daemon  process  waits for the next service request
+              The  maximum  amount  of  time that an idle Postfix
+              daemon process waits for the next  service  request
               before exiting.
 
        max_use (100)
-              The maximal number of connection requests before  a
+              The  maximal number of connection requests before a
               Postfix daemon process terminates.
 
        process_id (read-only)
-              The  process ID of a Postfix command or daemon pro-
+              The process ID of a Postfix command or daemon  pro-
               cess.
 
        process_name (read-only)
-              The process name of a  Postfix  command  or  daemon
+              The  process  name  of  a Postfix command or daemon
               process.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The  mail system name that is prepended to the pro-
+              The mail system name that is prepended to the  pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -202,11 +198,11 @@ ANVIL(8)                                                 ANVIL(8)
        TUNING_README, performance tuning
 
 LICENSE
-       The Secure Mailer license must be  distributed  with  this
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 HISTORY
-       The anvil service was introduced with Postfix 2.1.
+       The anvil service is available in Postfix 2.2 and later.
 
 AUTHOR(S)
        Wietse Venema
diff --git a/postfix/html/bounce.8.html b/postfix/html/bounce.8.html
index 91c72787f..118a9add8 100644
--- a/postfix/html/bounce.8.html
+++ b/postfix/html/bounce.8.html
@@ -13,7 +13,7 @@ BOUNCE(8)                                               BOUNCE(8)
        bounce [generic Postfix daemon options]
 
 DESCRIPTION
-       The  bounce  daemon  maintains  per-message log files with
+       The  bounce(8) daemon maintains per-message log files with
        non-delivery status information. Each log  file  is  named
        after  the  queue file that it corresponds to, and is kept
        in a queue subdirectory named after the  service  name  in
@@ -21,7 +21,8 @@ BOUNCE(8)                                               BOUNCE(8)
        program expects to be run from the master(8) process  man-
        ager.
 
-       The bounce daemon processes two types of service requests:
+       The  bounce(8)  daemon  processes  two  types  of  service
+       requests:
 
        o      Append a recipient (non-)delivery status record  to
               a per-message log file.
@@ -51,19 +52,19 @@ BOUNCE(8)                                               BOUNCE(8)
 
 CONFIGURATION PARAMETERS
        Changes  to  main.cf  are  picked  up  automatically,   as
-       bounce(8) processes run for only a limited amount of time.
+       bounce(8) processes run for only a limited amount of time.
        Use the command "postfix reload" to speed up a change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        2bounce_notice_recipient (postmaster)
               The  recipient of undeliverable mail that cannot be
               returned to the sender.
 
        backwards_bounce_logfile_compatibility (yes)
-              Produce additional bounce(8) logfile  records  that
-              can be read by older Postfix versions.
+              Produce additional bounce(8) logfile  records  that
+              can be read by Postfix versions before 2.0.
 
        bounce_notice_recipient (postmaster)
               The  recipient of postmaster notifications with the
@@ -91,11 +92,11 @@ BOUNCE(8)                                               BOUNCE(8)
 
        deliver_lock_attempts (20)
               The maximal number of attempts to acquire an exclu-
-              sive lock on a mailbox file or bounce(8) logfile.
+              sive lock on a mailbox file or bounce(8) logfile.
 
        deliver_lock_delay (1s)
               The  time  between attempts to acquire an exclusive
-              lock on a mailbox file or bounce(8) logfile.
+              lock on a mailbox file or bounce(8) logfile.
 
        ipc_timeout (3600s)
               The time limit for sending or receiving information
diff --git a/postfix/html/canonical.5.html b/postfix/html/canonical.5.html
index 54106f599..62c373586 100644
--- a/postfix/html/canonical.5.html
+++ b/postfix/html/canonical.5.html
@@ -7,7 +7,7 @@
 CANONICAL(5)                                         CANONICAL(5)
 
 NAME
-       canonical - format of Postfix canonical table
+       canonical - Postfix canonical table format
 
 SYNOPSIS
        postmap /etc/postfix/canonical
@@ -17,15 +17,16 @@ CANONICAL(5)                                         CANONICAL(5)
        postmap -q - /etc/postfix/canonical <inputfile
 
 DESCRIPTION
-       The  optional canonical table specifies an address mapping
-       for local and non-local addresses. The mapping is used  by
-       the  cleanup(8) daemon.  The address mapping is recursive.
+       The  optional canonical(5) table specifies an address map-
+       ping for local and non-local  addresses.  The  mapping  is
+       used  by  the  cleanup(8)  daemon.  The address mapping is
+       recursive.
 
-       Normally, the canonical table is specified as a text  file
-       that  serves  as  input  to  the  postmap(1) command.  The
+       Normally, the canonical(5) table is specified  as  a  text
+       file  that serves as input to the postmap(1) command.  The
        result, an indexed file in dbm or db format, is  used  for
        fast  searching  by  the  mail system. Execute the command
-       postmap /etc/postfix/canonical in  order  to  rebuild  the
+       "postmap /etc/postfix/canonical" in order to  rebuild  the
        indexed file after changing the text file.
 
        When  the  table  is provided via other means such as NIS,
@@ -39,123 +40,125 @@ CANONICAL(5)                                         CANONICAL(5)
        way  as  described below under "REGULAR EXPRESSION TABLES"
        and "TCP-BASED TABLES".
 
-       By default the  canonical  mapping  affects  both  message
+       By default the canonical(5) mapping affects  both  message
        header  addresses  (i.e. addresses that appear inside mes-
        sages) and message envelope addresses  (for  example,  the
        addresses  that are used in SMTP protocol commands). Think
        Sendmail rule set S3, if you  like.   This  is  controlled
        with the canonical_classes parameter.
 
-       Typically,  one  would  use the canonical table to replace
+       Typically, one would use the canonical(5) table to replace
        login  names  by  Firstname.Lastname,  or  to   clean   up
        addresses produced by legacy mail systems.
 
-       The  canonical  mapping is not to be confused with virtual
-       domain support. Use the virtual(5) map for that purpose.
+       The  canonical(5)  mapping is not to be confused with vir-
+       tual domain support. Use the virtual(5) map for that  pur-
+       pose.
 
-       The canonical mapping is not to  be  confused  with  local
+       The  canonical(5) mapping is not to be confused with local
        aliasing.  Use the aliases(5) map for that purpose.
 
 TABLE FORMAT
-       The input format for the postmap(1) command is as follows:
+       make#   The input format for the postmap(1) command is  as
+       follows:
 
        pattern result
-              When pattern matches a mail address, replace it  by
+              When  pattern matches a mail address, replace it by
               the corresponding result.
 
        blank lines and comments
-              Empty  lines and whitespace-only lines are ignored,
-              as are lines whose first  non-whitespace  character
+              Empty lines and whitespace-only lines are  ignored,
+              as  are  lines whose first non-whitespace character
               is a `#'.
 
        multi-line text
-              A  logical  line starts with non-whitespace text. A
-              line that starts with whitespace continues a  logi-
+              A logical line starts with non-whitespace  text.  A
+              line  that starts with whitespace continues a logi-
               cal line.
 
        With lookups from indexed files such as DB or DBM, or from
-       networked tables such as NIS, LDAP or  SQL,  patterns  are
+       networked  tables  such  as NIS, LDAP or SQL, patterns are
        tried in the order as listed below:
 
        user@domain address
-              user@domain  is  replaced by address. This form has
+              user@domain is replaced by address. This  form  has
               the highest precedence.
 
-              This is useful to clean up  addresses  produced  by
-              legacy  mail  systems.  It can also be used to pro-
-              duce Firstname.Lastname style  addresses,  but  see
+              This  is  useful  to clean up addresses produced by
+              legacy mail systems.  It can also be used  to  pro-
+              duce  Firstname.Lastname  style  addresses, but see
               below for a simpler solution.
 
        user address
               user@site is replaced by address when site is equal
-              to $myorigin, when site is  listed  in  $mydestina-
-              tion,  or  when it is listed in $inet_interfaces or
+              to  $myorigin,  when  site is listed in $mydestina-
+              tion, or when it is listed in  $inet_interfaces  or
               $proxy_interfaces.
 
-              This form is useful for replacing  login  names  by
+              This  form  is  useful for replacing login names by
               Firstname.Lastname.
 
        @domain address
-              Every  address  in  domain  is replaced by address.
+              Every address in domain  is  replaced  by  address.
               This form has the lowest precedence.
 
-       In all the above forms, when address has the form  @other-
+       In  all the above forms, when address has the form @other-
        domain, the result is the same user in otherdomain.
 
 ADDRESS EXTENSION
        When a mail address localpart contains the optional recip-
-       ient delimiter (e.g., user+foo@domain), the  lookup  order
+       ient  delimiter  (e.g., user+foo@domain), the lookup order
        becomes: user+foo@domain, user@domain, user+foo, user, and
        @domain.
 
-       The  propagate_unmatched_extensions   parameter   controls
-       whether  an  unmatched  address extension (+foo) is propa-
+       The   propagate_unmatched_extensions   parameter  controls
+       whether an unmatched address extension  (+foo)  is  propa-
        gated to the result of table lookup.
 
 REGULAR EXPRESSION TABLES
-       This section describes how the table lookups  change  when
+       This  section  describes how the table lookups change when
        the table is given in the form of regular expressions. For
-       a description of regular expression lookup  table  syntax,
+       a  description  of regular expression lookup table syntax,
        see regexp_table(5) or pcre_table(5).
 
-       Each  pattern  is  a regular expression that is applied to
+       Each pattern is a regular expression that  is  applied  to
        the entire address being looked up. Thus, user@domain mail
-       addresses  are  not  broken up into their user and @domain
+       addresses are not broken up into their  user  and  @domain
        constituent parts, nor is user+foo broken up into user and
        foo.
 
-       Patterns  are  applied  in  the  order as specified in the
-       table, until a pattern is found that  matches  the  search
+       Patterns are applied in the  order  as  specified  in  the
+       table,  until  a  pattern is found that matches the search
        string.
 
-       Results  are  the  same as with indexed file lookups, with
-       the additional feature that parenthesized substrings  from
+       Results are the same as with indexed  file  lookups,  with
+       the  additional feature that parenthesized substrings from
        the pattern can be interpolated as $1, $2 and so on.
 
 TCP-BASED TABLES
-       This  section  describes how the table lookups change when
+       This section describes how the table lookups  change  when
        lookups are directed to a TCP-based server. For a descrip-
-       tion   of  the  TCP  client/server  lookup  protocol,  see
-       tcp_table(5).  This feature is not  available  in  Postfix
-       version 2.1.
+       tion  of  the  TCP  client/server  lookup  protocol,   see
+       tcp_table(5).   This  feature  is  not available up to and
+       including Postfix version 2.2.
 
        Each lookup operation uses the entire address once.  Thus,
-       user@domain mail addresses are not broken  up  into  their
+       user@domain  mail  addresses  are not broken up into their
        user and @domain constituent parts, nor is user+foo broken
        up into user and foo.
 
        Results are the same as with indexed file lookups.
 
 BUGS
-       The table format does not understand quoting  conventions.
+       The  table format does not understand quoting conventions.
 
 CONFIGURATION PARAMETERS
-       The  following main.cf parameters are especially relevant.
-       The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       The following main.cf parameters are especially  relevant.
+       The  text  below  provides  only  a parameter summary. See
+       postconf(5) for more details including examples.
 
        canonical_classes
-              What  addresses  are  subject  to canonical address
+              What addresses are  subject  to  canonical  address
               mapping.
 
        canonical_maps
@@ -170,16 +173,16 @@ CANONICAL(5)                                         CANONICAL(5)
               header sender addresses.
 
        propagate_unmatched_extensions
-              A list of address rewriting  or  forwarding  mecha-
-              nisms  that propagate an address extension from the
-              original address to the result.   Specify  zero  or
-              more  of  canonical,  virtual,  alias,  forward, or
+              A  list  of  address rewriting or forwarding mecha-
+              nisms that propagate an address extension from  the
+              original  address  to  the result.  Specify zero or
+              more of  canonical,  virtual,  alias,  forward,  or
               include.
 
        Other parameters of interest:
 
        inet_interfaces
-              The network interface addresses  that  this  system
+              The  network  interface  addresses that this system
               receives mail on.  You need to stop and start Post-
               fix when this parameter changes.
 
@@ -189,20 +192,20 @@ CANONICAL(5)                                         CANONICAL(5)
               tor.
 
        masquerade_classes
-              List of address classes  subject  to  masquerading:
-              zero  or  more of envelope_sender, envelope_recipi-
+              List  of  address  classes subject to masquerading:
+              zero or more of  envelope_sender,  envelope_recipi-
               ent, header_sender, header_recipient.
 
        masquerade_domains
-              List of domains that hide  their  subdomain  struc-
+              List  of  domains  that hide their subdomain struc-
               ture.
 
        masquerade_exceptions
-              List  of user names that are not subject to address
+              List of user names that are not subject to  address
               masquerading.
 
        mydestination
-              List of domains that  this  mail  system  considers
+              List  of  domains  that  this mail system considers
               local.
 
        myorigin
@@ -223,7 +226,7 @@ CANONICAL(5)                                         CANONICAL(5)
        ADDRESS_REWRITING_README, address rewriting guide
 
 LICENSE
-       The Secure Mailer license must be  distributed  with  this
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/cidr_table.5.html b/postfix/html/cidr_table.5.html
index 799786d44..b2a630941 100644
--- a/postfix/html/cidr_table.5.html
+++ b/postfix/html/cidr_table.5.html
@@ -21,9 +21,9 @@ CIDR_TABLE(5)                                       CIDR_TABLE(5)
        Inter-Domain Routing) form.
 
        To find out what types of lookup tables your Postfix  sys-
-       tem supports use the postconf -m command.
+       tem supports use the "postconf -m" command.
 
-       To   test  lookup  tables,  use  the  postmap  command  as
+       To  test  lookup  tables,  use the "postmap -q" command as
        described in the SYNOPSIS above.
 
 TABLE FORMAT
@@ -81,8 +81,8 @@ CIDR_TABLE(5)                                       CIDR_TABLE(5)
 
 SEE ALSO
        postmap(1), Postfix lookup table manager
-       regexp_table(5) format of regular expression tables
-       pcre_table(5) format of PCRE tables
+       regexp_table(5), format of regular expression tables
+       pcre_table(5), format of PCRE tables
 
 README FILES
        DATABASE_README, Postfix lookup table overview
diff --git a/postfix/html/cleanup.8.html b/postfix/html/cleanup.8.html
index 5c566ab12..b6b385270 100644
--- a/postfix/html/cleanup.8.html
+++ b/postfix/html/cleanup.8.html
@@ -13,12 +13,12 @@ CLEANUP(8)                                             CLEANUP(8)
        cleanup [generic Postfix daemon options]
 
 DESCRIPTION
-       The cleanup daemon processes inbound mail, inserts it into
-       the incoming mail queue, and informs the queue manager  of
-       its arrival.
+       The  cleanup(8)  daemon processes inbound mail, inserts it
+       into the incoming mail queue, and informs the  queue  man-
+       ager of its arrival.
 
-       The cleanup daemon always performs the following transfor-
-       mations:
+       The cleanup(8) daemon always performs the following trans-
+       formations:
 
        o      Insert missing message  headers:  (Resent-)  From:,
               To:, Message-Id:, and Date:.
@@ -47,12 +47,12 @@ CLEANUP(8)                                             CLEANUP(8)
        o      Optionally, expand envelope recipients according to
               information  found in the virtual(5) lookup tables.
 
-       The cleanup daemon performs sanity checks on  the  content
-       of  each  message.  When it finds a problem, by default it
-       returns a diagnostic status to the client, and  leaves  it
-       up  to the client to deal with the problem. Alternatively,
-       the client can request the cleanup daemon  to  bounce  the
-       message back to the sender in case of trouble.
+       The cleanup(8) daemon performs sanity checks on  the  con-
+       tent  of each message. When it finds a problem, by default
+       it returns a diagnostic status to the client,  and  leaves
+       it  up  to  the  client to deal with the problem. Alterna-
+       tively, the client can request the  cleanup(8)  daemon  to
+       bounce  the message back to the sender in case of trouble.
 
 STANDARDS
        RFC 822 (ARPA Internet Text Messages)
@@ -63,57 +63,57 @@ CLEANUP(8)                                             CLEANUP(8)
        Problems and transactions are logged to syslogd(8).
 
 BUGS
-       Table-driven  rewriting  rules  make it hard to express if
+       Table-driven rewriting rules make it hard  to  express  if
        then else and other logical relationships.
 
 CONFIGURATION PARAMETERS
-       Changes  to  main.cf  are  picked  up  automatically,   as
-       cleanup(8)  processes  run  for  only  a limited amount of
-       time. Use the command  "postfix  reload"  to  speed  up  a
+       Changes   to  main.cf  are  picked  up  automatically,  as
+       cleanup(8) processes run for  only  a  limited  amount  of
+       time.  Use  the  command  "postfix  reload"  to speed up a
        change.
 
-       The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       The text below provides  only  a  parameter  summary.  See
+       postconf(5) for more details including examples.
 
 COMPATIBILITY CONTROLS
        undisclosed_recipients_header   (To:   undisclosed-recipi-
        ents:;)
-              Message header that the Postfix  cleanup(8)  server
-              inserts  when a message contains no To: or Cc: mes-
+              Message  header  that the Postfix cleanup(8) server
+              inserts when a message contains no To: or Cc:  mes-
               sage header.
 
        Available in Postfix version 2.1 and later:
 
 BUILT-IN CONTENT FILTERING CONTROLS
-       Postfix built-in content filtering  is  meant  to  stop  a
-       flood  of  worms  or  viruses. It is not a general content
+       Postfix  built-in  content  filtering  is  meant to stop a
+       flood of worms or viruses. It is  not  a  general  content
        filter.
 
        body_checks (empty)
-              Optional lookup tables for  content  inspection  as
-              specified in the body_checks(5) manual page.
+              Optional  lookup  tables  for content inspection as
+              specified in the body_checks(5) manual page.
 
        header_checks (empty)
-              Optional  lookup  tables  for content inspection of
-              primary non-MIME message headers, as  specified  in
-              the header_checks(5) manual page.
+              Optional lookup tables for  content  inspection  of
+              primary  non-MIME  message headers, as specified in
+              the header_checks(5) manual page.
 
        Available in Postfix version 2.0 and later:
 
        body_checks_size_limit (51200)
               How much text in a message body segment (or attach-
-              ment, if you prefer to use that term) is  subjected
+              ment,  if you prefer to use that term) is subjected
               to body_checks inspection.
 
        mime_header_checks ($header_checks)
-              Optional  lookup  tables  for content inspection of
-              MIME related message headers, as described  in  the
-              header_checks(5) manual page.
+              Optional lookup tables for  content  inspection  of
+              MIME  related  message headers, as described in the
+              header_checks(5) manual page.
 
        nested_header_checks ($header_checks)
-              Optional  lookup  tables  for content inspection of
-              non-MIME message headers in attached  messages,  as
-              described in the header_checks(5) manual page.
+              Optional lookup tables for  content  inspection  of
+              non-MIME  message  headers in attached messages, as
+              described in the header_checks(5) manual page.
 
 MIME PROCESSING CONTROLS
        Available in Postfix version 2.0 and later:
@@ -130,19 +130,19 @@ CLEANUP(8)                                             CLEANUP(8)
               will handle.
 
        strict_8bitmime (no)
-              Enable  both  strict_7bit_headers  and strict_8bit-
+              Enable both  strict_7bit_headers  and  strict_8bit-
               mime_body.
 
        strict_7bit_headers (no)
               Reject mail with 8-bit text in message headers.
 
        strict_8bitmime_body (no)
-              Reject 8-bit message body text without  8-bit  MIME
+              Reject  8-bit  message body text without 8-bit MIME
               content encoding information.
 
        strict_mime_encoding_domain (no)
               Reject mail with invalid Content-Transfer-Encoding:
-              information for the message/* or  multipart/*  MIME
+              information  for  the message/* or multipart/* MIME
               content types.
 
 AUTOMATIC BCC RECIPIENT CONTROLS
@@ -150,31 +150,31 @@ CLEANUP(8)                                             CLEANUP(8)
        mail enters the mail system:
 
        always_bcc (empty)
-              Optional address  that  receives  a  "blind  carbon
+              Optional  address  that  receives  a  "blind carbon
               copy" of each message that is received by the Post-
               fix mail system.
 
        Available in Postfix version 2.1 and later:
 
        sender_bcc_maps (empty)
-              Optional BCC  (blind  carbon-copy)  address  lookup
+              Optional  BCC  (blind  carbon-copy)  address lookup
               tables, indexed by sender address.
 
        recipient_bcc_maps (empty)
-              Optional  BCC  (blind  carbon-copy)  address lookup
+              Optional BCC  (blind  carbon-copy)  address  lookup
               tables, indexed by recipient address.
 
 ADDRESS TRANSFORMATION CONTROLS
-       Address rewriting is delegated to  the  trivial-rewrite(8)
-       daemon.   The  cleanup(8)  server  implements table driven
+       Address  rewriting  is delegated to the trivial-rewrite(8)
+       daemon.  The cleanup(8)  server  implements  table  driven
        address mapping.
 
        empty_address_recipient (MAILER-DAEMON)
-              The  recipient  of  mail  addressed  to  the   null
+              The   recipient  of  mail  addressed  to  the  null
               address.
 
        canonical_maps (empty)
-              Optional  address mapping lookup tables for message
+              Optional address mapping lookup tables for  message
               headers and envelopes.
 
        recipient_canonical_maps (empty)
@@ -185,49 +185,49 @@ CLEANUP(8)                                             CLEANUP(8)
               Optional address mapping lookup tables for envelope
               and header sender addresses.
 
-       masquerade_classes    (envelope_sender,     header_sender,
+       masquerade_classes     (envelope_sender,    header_sender,
        header_recipient)
               What addresses are subject to address masquerading.
 
        masquerade_domains (empty)
-              Optional  list of domains whose subdomain structure
+              Optional list of domains whose subdomain  structure
               will be stripped off in email addresses.
 
        masquerade_exceptions (empty)
-              Optional list of user names that are not  subjected
-              to  address  masquerading,  even when their address
+              Optional  list of user names that are not subjected
+              to address masquerading, even  when  their  address
               matches $masquerade_domains.
 
        propagate_unmatched_extensions (canonical, virtual)
-              What address lookup tables copy an  address  exten-
+              What  address  lookup tables copy an address exten-
               sion from the lookup key to the lookup result.
 
        Available before Postfix version 2.0:
 
        virtual_maps (empty)
               Optional lookup tables with a) names of domains for
-              which all addresses are  aliased  to  addresses  in
-              other  local  or  remote  domains, and b) addresses
-              that are aliased to addresses  in  other  local  or
+              which  all  addresses  are  aliased to addresses in
+              other local or remote  domains,  and  b)  addresses
+              that  are  aliased  to  addresses in other local or
               remote domains.
 
        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
+              Optional lookup tables  that  alias  specific  mail
+              addresses  or  domains  to  other  local  or remote
               address.
 
        Available in Postfix version 2.2 and later:
 
-       canonical_classes   (envelope_sender,  envelope_recipient,
+       canonical_classes  (envelope_sender,   envelope_recipient,
        header_sender, header_recipient)
-              What   addresses   are  subject  to  canonical_maps
+              What  addresses  are  subject   to   canonical_maps
               address mapping.
 
        recipient_canonical_classes           (envelope_recipient,
        header_recipient)
-              What addresses  are  subject  to  recipient_canoni-
+              What  addresses  are  subject  to recipient_canoni-
               cal_maps address mapping.
 
        sender_canonical_classes (envelope_sender, header_sender)
@@ -235,16 +235,16 @@ CLEANUP(8)                                             CLEANUP(8)
               address mapping.
 
        remote_header_rewrite_domain (empty)
-              Don't rewrite message headers from  remote  clients
-              at  all  when  this  parameter is empty; otherwise,
+              Don't  rewrite  message headers from remote clients
+              at all when this  parameter  is  empty;  otherwise,
               rewrite remote message headers and append the spec-
               ified domain name to incomplete addresses.
 
 RESOURCE AND RATE CONTROLS
        duplicate_filter_limit (1000)
-              The  maximal  number of addresses remembered by the
-              address duplicate filter  for  aliases(5)  or  vir-
-              tual(5) alias expansion, or for showq(8) queue dis-
+              The maximal number of addresses remembered  by  the
+              address  duplicate  filter  for  aliases(5) or vir-
+              tual(5) alias expansion, or for showq(8) queue dis-
               plays.
 
        header_size_limit (102400)
@@ -252,16 +252,16 @@ CLEANUP(8)                                             CLEANUP(8)
               message header.
 
        hopcount_limit (50)
-              The  maximal  number  of Received:  message headers
+              The maximal number of  Received:   message  headers
               that is allowed in the primary message headers.
 
        in_flow_delay (1s)
-              Time to pause before accepting a new message,  when
+              Time  to pause before accepting a new message, when
               the message arrival rate exceeds the message deliv-
               ery rate.
 
        message_size_limit (10240000)
-              The maximal size in bytes of a  message,  including
+              The  maximal  size in bytes of a message, including
               envelope information.
 
        Available in Postfix version 2.0 and later:
@@ -279,31 +279,31 @@ CLEANUP(8)                                             CLEANUP(8)
               will handle.
 
        queue_file_attribute_count_limit (100)
-              The maximal number of (name=value) attributes  that
+              The  maximal number of (name=value) attributes that
               may be stored in a Postfix queue file.
 
        Available in Postfix version 2.1 and later:
 
        virtual_alias_expansion_limit (1000)
-              The  maximal number of addresses that virtual alias
+              The maximal number of addresses that virtual  alias
               expansion produces from each original recipient.
 
        virtual_alias_recursion_limit (1000)
-              The maximal nesting depth of virtual  alias  expan-
+              The  maximal  nesting depth of virtual alias expan-
               sion.
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The  default  location  of  the Postfix main.cf and
+              The default location of  the  Postfix  main.cf  and
               master.cf configuration files.
 
        daemon_timeout (18000s)
-              How much time a Postfix daemon process may take  to
-              handle  a  request  before  it  is  terminated by 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_warning_time (0h)
-              The time after which the sender receives  the  mes-
+              The  time  after which the sender receives the mes-
               sage headers of mail that is still queued.
 
        ipc_timeout (3600s)
@@ -311,12 +311,12 @@ CLEANUP(8)                                             CLEANUP(8)
               over an internal communication channel.
 
        max_idle (100s)
-              The maximum amount of time  that  an  idle  Postfix
-              daemon  process  waits for the next service request
+              The  maximum  amount  of  time that an idle Postfix
+              daemon process waits for the next  service  request
               before exiting.
 
        max_use (100)
-              The maximal number of connection requests before  a
+              The  maximal number of connection requests before a
               Postfix daemon process terminates.
 
        myhostname (see 'postconf -d' output)
@@ -324,19 +324,19 @@ CLEANUP(8)                                             CLEANUP(8)
 
        myorigin ($myhostname)
               The domain name that locally-posted mail appears to
-              come from, and that locally posted mail  is  deliv-
+              come  from,  and that locally posted mail is deliv-
               ered to.
 
        process_id (read-only)
-              The  process ID of a Postfix command or daemon pro-
+              The process ID of a Postfix command or daemon  pro-
               cess.
 
        process_name (read-only)
-              The process name of a  Postfix  command  or  daemon
+              The  process  name  of  a Postfix command or daemon
               process.
 
        queue_directory (see 'postconf -d' output)
-              The  location of the Postfix top-level queue direc-
+              The location of the Postfix top-level queue  direc-
               tory.
 
        soft_bounce (no)
@@ -347,14 +347,14 @@ CLEANUP(8)                                             CLEANUP(8)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The  mail system name that is prepended to the pro-
+              The mail system name that is prepended to the  pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
        Available in Postfix version 2.1 and later:
 
        enable_original_recipient (yes)
-              Enable   support   for  the  X-Original-To  message
+              Enable  support  for  the   X-Original-To   message
               header.
 
 FILES
@@ -377,7 +377,7 @@ CLEANUP(8)                                             CLEANUP(8)
        ADDRESS_REWRITING_README Postfix address manipulation
 
 LICENSE
-       The  Secure  Mailer  license must be distributed with this
+       The Secure Mailer license must be  distributed  with  this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/discard.8.html b/postfix/html/discard.8.html
index fe54b33bc..f1ca1d45f 100644
--- a/postfix/html/discard.8.html
+++ b/postfix/html/discard.8.html
@@ -13,27 +13,27 @@ DISCARD(8)                                             DISCARD(8)
        discard [generic Postfix daemon options]
 
 DESCRIPTION
-       The  Postfix  discard  delivery  agent  processes delivery
+       The  Postfix  discard(8) delivery agent processes delivery
        requests from the queue manager. Each request specifies  a
        queue  file,  a sender address, a domain or host name that
        is treated as the reason  for  discarding  the  mail,  and
        recipient  information.   This  program  expects to be run
        from the master(8) process manager.
 
-       The discard delivery agent pretends to deliver all recipi-
-       ents  in  the delivery request, logs the "next-hop" domain
-       or host information as the reason for discarding the mail,
-       updates the queue file and marks recipients as finished or
-       informs the queue manager that delivery  should  be  tried
-       again at a later time.
+       The discard(8) delivery  agent  pretends  to  deliver  all
+       recipients  in  the  delivery request, logs the "next-hop"
+       domain or host information as the  reason  for  discarding
+       the  mail,  updates the queue file and marks recipients as
+       finished or informs the queue manager that delivery should
+       be tried again at a later time.
 
        Delivery status reports are sent to the trace(8) daemon as
        appropriate.
 
 SECURITY
-       The discard mailer is not security-sensitive. It does  not
-       talk  to the network, and can be run chrooted at fixed low
-       privilege.
+       The discard(8) mailer is not security-sensitive.  It  does
+       not  talk to the network, and can be run chrooted at fixed
+       low privilege.
 
 STANDARDS
        None.
@@ -46,12 +46,12 @@ DISCARD(8)                                             DISCARD(8)
        ble.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked  up  automatically  as  dis-
-       card(8)  processes  run for only a limited amount of time.
+       Changes to main.cf are picked  up  automatically  as  dis-
+       card(8)  processes  run for only a limited amount of time.
        Use the command "postfix reload" to speed up a change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        config_directory (see 'postconf -d' output)
               The  default  location  of  the Postfix main.cf and
diff --git a/postfix/html/error.8.html b/postfix/html/error.8.html
index 50b5fd231..4386649fc 100644
--- a/postfix/html/error.8.html
+++ b/postfix/html/error.8.html
@@ -13,14 +13,14 @@ ERROR(8)                                                 ERROR(8)
        error [generic Postfix daemon options]
 
 DESCRIPTION
-       The   Postfix  error  delivery  agent  processes  delivery
+       The  Postfix  error(8)  delivery  agent processes delivery
        requests from the queue manager. Each request specifies  a
        queue  file,  a sender address, a domain or host name that
        is treated as the reason for non-delivery,  and  recipient
        information.  This program expects to be run from the mas-
        ter(8) process manager.
 
-       The error delivery agent bounces  all  recipients  in  the
+       The error(8) delivery agent bounces all recipients in  the
        delivery  request  using  the  "next-hop"  domain  or host
        information as the reason for  non-delivery,  updates  the
        queue file and marks recipients as finished or informs the
@@ -31,7 +31,7 @@ ERROR(8)                                                 ERROR(8)
        defer(8) or trace(8) daemon as appropriate.
 
 SECURITY
-       The error mailer is not security-sensitive.  It  does  not
+       The error(8) mailer is not security-sensitive. It does not
        talk  to the network, and can be run chrooted at fixed low
        privilege.
 
@@ -46,12 +46,12 @@ ERROR(8)                                                 ERROR(8)
        ble.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked up automatically as error(8)
+       Changes to main.cf are picked up automatically as error(8)
        processes  run  for only a limited amount of time. Use the
        command "postfix reload" to speed up a change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        2bounce_notice_recipient (postmaster)
               The  recipient of undeliverable mail that cannot be
diff --git a/postfix/html/flush.8.html b/postfix/html/flush.8.html
index b353ac1f2..72dd6b01b 100644
--- a/postfix/html/flush.8.html
+++ b/postfix/html/flush.8.html
@@ -13,7 +13,7 @@ FLUSH(8)                                                 FLUSH(8)
        flush [generic Postfix daemon options]
 
 DESCRIPTION
-       The  flush  server  maintains a record of deferred mail by
+       The flush(8) server maintains a record of deferred mail by
        destination.  This information is used to improve the per-
        formance of the SMTP ETRN request, and of its command-line
        equivalent, "sendmail -qR" or "postqueue -f".   This  pro-
@@ -34,7 +34,7 @@ FLUSH(8)                                                 FLUSH(8)
        This server implements the following requests:
 
        add sitename queueid
-              Inform the fast flush server that the message  with
+              Inform the flush(8) server that  the  message  with
               the  specified queue ID is queued for the specified
               destination.
 
@@ -56,10 +56,10 @@ FLUSH(8)                                                 FLUSH(8)
        purge  Do a refresh for all per-destination logfiles.
 
 SECURITY
-       The  fast  flush server is not security-sensitive. It does
-       not talk to the network, and it does  not  talk  to  local
-       users.   The  fast  flush server can run chrooted at fixed
-       low privilege.
+       The flush(8) server is not security-sensitive. It does not
+       talk to the network, and it does not talk to local  users.
+       The fast flush server can run chrooted at fixed low privi-
+       lege.
 
 DIAGNOSTICS
        Problems and transactions are logged to syslogd(8).
@@ -73,7 +73,7 @@ FLUSH(8)                                                 FLUSH(8)
        setting in the master.cf configuration file.
 
        Upon  receipt of a request to deliver mail for an eligible
-       destination, the flush server  requests  delivery  of  all
+       destination, the flush(8) server requests delivery of  all
        messages  that  are  listed in that destination's logfile,
        regardless of the recipients of those  messages.  This  is
        not an issue for mail that is sent to a relay_domains des-
@@ -81,12 +81,12 @@ FLUSH(8)                                                 FLUSH(8)
        in one domain.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked up automatically as flush(8)
+       Changes to main.cf are picked up automatically as flush(8)
        processes run for only a limited amount of time.  Use  the
        command "postfix reload" to speed up a change.
 
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        config_directory (see 'postconf -d' output)
               The default location of  the  Postfix  main.cf  and
diff --git a/postfix/html/header_checks.5.html b/postfix/html/header_checks.5.html
index 581164174..1723ef678 100644
--- a/postfix/html/header_checks.5.html
+++ b/postfix/html/header_checks.5.html
@@ -73,7 +73,7 @@ HEADER_CHECKS(5)                                 HEADER_CHECKS(5)
        lookup tables. Usually the best  performance  is  obtained
        with pcre (Perl Compatible Regular Expression) tables, but
        the slower regexp (POSIX regular expressions)  support  is
-       more  widely  available.   Use  the command postconf -m to
+       more  widely  available.  Use the command "postconf -m" to
        find out what lookup table types your Postfix system  sup-
        ports.
 
@@ -126,8 +126,8 @@ HEADER_CHECKS(5)                                 HEADER_CHECKS(5)
 TEXT SUBSTITUTION
        Substitution of substrings  from  the  matched  expression
        into  the action string is possible using the conventional
-       Perl syntax ($1, $2, etc.).   The  macros  in  the  result
-       string  may  need  to  be  written as ${n} or $(n) if they
+       Perl syntax ($1, $2, etc.).   The  macros  in  the  result
+       string  may  need  to  be  written as ${n} or $(n) if they
        aren't followed by whitespace.
 
        Note: since negated patterns (those preceded by !)  return
@@ -202,12 +202,18 @@ HEADER_CHECKS(5)                                 HEADER_CHECKS(5)
               Prepend  one  line  with  the  specified  text  and
               inspect the next input line.
 
-              Note: the  prepended  text  is  output  immediately
-              before the input that triggered the PREPEND action.
-              A body action cannot prepend a message header.
+              Notes:
 
-              Note: this action cannot be used to prepend  multi-
-              line text.
+              o      The prepended text is output on  a  separate
+                     line,  immediately  before  the  input  that
+                     triggered the PREPEND action.
+
+              o      When prepending text before a message header
+                     line,  the  prepended text must begin with a
+                     valid message header label.
+
+              o      This action cannot be used to prepend multi-
+                     line text.
 
               This feature is available in Postfix 2.1 and later.
 
@@ -224,6 +230,16 @@ HEADER_CHECKS(5)                                 HEADER_CHECKS(5)
 
               This feature is available in Postfix 2.1 and later.
 
+       REPLACE text...
+              Replace  the  current  line with the specified text
+              and inspect the next input line.
+
+              Note: when replacing a  message  header  line,  the
+              replacement  text  must  begin  with a valid header
+              label.
+
+              This feature is available in Postfix 2.2 and later.
+
        REJECT optional text...
               Reject  the  entire  message.  Reply  with optional
               text... when the optional text is specified, other-
diff --git a/postfix/html/lmtp.8.html b/postfix/html/lmtp.8.html
index 8045dc0b7..dd93ad5f1 100644
--- a/postfix/html/lmtp.8.html
+++ b/postfix/html/lmtp.8.html
@@ -77,12 +77,12 @@ LMTP(8)                                                   LMTP(8)
        and of other trouble.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked up automatically, as lmtp(8)
+       Changes to main.cf are picked up automatically, as lmtp(8)
        processes  run  for only a limited amount of time. Use the
        command "postfix reload" to speed up a change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
 COMPATIBILITY CONTROLS
        lmtp_skip_quit_response (no)
diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html
index 125e39a71..d1e0b9631 100644
--- a/postfix/html/local.8.html
+++ b/postfix/html/local.8.html
@@ -13,18 +13,18 @@ LOCAL(8)                                                 LOCAL(8)
        local [generic Postfix daemon options]
 
 DESCRIPTION
-       The  local  daemon  processes  delivery  requests from the
+       The  local(8)  daemon processes delivery requests from the
        Postfix queue manager to deliver mail to local recipients.
        Each  delivery  request  specifies  a queue file, a sender
        address, a domain or host to deliver to, and one  or  more
        recipients.   This program expects to be run from the mas-
        ter(8) process manager.
 
-       The local daemon updates queue files and marks  recipients
-       as finished, or it informs the queue manager that delivery
-       should be tried again at a  later  time.  Delivery  status
-       reports  are  sent  to the bounce(8), defer(8) or trace(8)
-       daemon as appropriate.
+       The local(8) daemon updates queue files and marks  recipi-
+       ents  as  finished,  or  it informs the queue manager that
+       delivery should be tried again at a later  time.  Delivery
+       status  reports  are  sent  to  the bounce(8), defer(8) or
+       trace(8) daemon as appropriate.
 
 SYSTEM-WIDE AND USER-LEVEL ALIASING
        The system administrator can set up one  or  more  system-
@@ -120,10 +120,10 @@ LOCAL(8)                                                 LOCAL(8)
        message transport for recipients that are not found in the
        UNIX passwd database.
 
-       In the case of UNIX-style mailbox delivery, the local dae-
-       mon prepends a "From sender time_stamp" envelope header to
-       each  message,  prepends an X-Original-To: header with the
-       recipient  address  as  given  to  Postfix,  prepends   an
+       In  the  case of UNIX-style mailbox delivery, the local(8)
+       daemon prepends a "From sender time_stamp" envelope header
+       to  each  message,  prepends an X-Original-To: header with
+       the recipient address as given  to  Postfix,  prepends  an
        optional  Delivered-To:  header  with  the  final envelope
        recipient address, prepends a Return-Path: header with the
        envelope  sender  address, prepends a > character to lines
@@ -240,9 +240,9 @@ LOCAL(8)                                                 LOCAL(8)
 
        The current working directory is the mail queue directory.
 
-       The local daemon prepends a "From sender time_stamp" enve-
-       lope header to each message,  prepends  an  X-Original-To:
-       header  with  the  recipient  address as given to Postfix,
+       The  local(8)  daemon  prepends a "From sender time_stamp"
+       envelope header to each message, prepends  an  X-Original-
+       To: header with the recipient address as given to Postfix,
        prepends an optional Delivered-To: header with  the  final
        recipient envelope address, prepends a Return-Path: header
        with the sender envelope address,  and  appends  no  empty
@@ -258,10 +258,10 @@ LOCAL(8)                                                 LOCAL(8)
        delivery  to  external  files. The default setting (alias,
        forward) forbids file destinations in :include: files.
 
-       In the case of UNIX-style mailbox delivery, the local dae-
-       mon prepends a "From sender time_stamp" envelope header to
-       each message, prepends an X-Original-To: header  with  the
-       recipient   address  as  given  to  Postfix,  prepends  an
+       In the case of UNIX-style mailbox delivery,  the  local(8)
+       daemon prepends a "From sender time_stamp" envelope header
+       to each message, prepends an  X-Original-To:  header  with
+       the  recipient  address  as  given to Postfix, prepends an
        optional Delivered-To: header  with  the  final  recipient
        envelope  address,  prepends a > character to lines begin-
        ning with "From ", and appends an empty line.   The  enve-
@@ -289,14 +289,15 @@ LOCAL(8)                                                 LOCAL(8)
        ward+foo or in ~name/.forward, to the mailbox owned by the
        user name, or it is sent back as undeliverable.
 
-       In all cases the local daemon prepends an optional `Deliv-
-       ered-To: header line with the final recipient address.
+       In all cases the  local(8)  daemon  prepends  an  optional
+       `Delivered-To:   header  line  with  the  final  recipient
+       address.
 
 DELIVERY RIGHTS
-       Deliveries  to  external  files  and external commands are
+       Deliveries to external files  and  external  commands  are
        made with the rights of the receiving user on whose behalf
-       the  delivery  is made.  In the absence of a user context,
-       the local daemon uses the owner rights  of  the  :include:
+       the delivery is made.  In the absence of a  user  context,
+       the local(8) daemon uses the owner rights of the :include:
        file or alias database.  When those files are owned by the
        superuser, delivery is made with the rights specified with
        the default_privs configuration parameter.
@@ -305,49 +306,49 @@ LOCAL(8)                                                 LOCAL(8)
        RFC 822 (ARPA Internet Text Messages)
 
 DIAGNOSTICS
-       Problems  and transactions are logged to syslogd(8).  Cor-
-       rupted message files are marked so that the queue  manager
+       Problems and transactions are logged to syslogd(8).   Cor-
+       rupted  message files are marked so that the queue manager
        can move them to the corrupt queue afterwards.
 
-       Depending  on the setting of the notify_classes parameter,
-       the postmaster is notified of bounces and of  other  trou-
+       Depending on the setting of the notify_classes  parameter,
+       the  postmaster  is notified of bounces and of other trou-
        ble.
 
 SECURITY
        The local(8) delivery agent needs a dual personality 1) to
        access the private Postfix queue and IPC mechanisms, 2) to
-       impersonate  the recipient and deliver to recipient-speci-
-       fied files or commands. It is  therefore  security  sensi-
+       impersonate the recipient and deliver to  recipient-speci-
+       fied  files  or  commands. It is therefore security sensi-
        tive.
 
-       The  local(8)  delivery agent disallows regular expression
-       substitution of $1 etc. in alias_maps, because that  would
+       The local(8) delivery agent disallows  regular  expression
+       substitution  of $1 etc. in alias_maps, because that would
        open a security hole.
 
-       The  local(8) delivery agent will silently ignore requests
-       to use the proxymap(8) server within  alias_maps.  Instead
-       it  will  open the table directly.  Before Postfix version
-       2.2, the local(8) delivery agent  will  terminate  with  a
+       The local(8) delivery agent will silently ignore  requests
+       to  use  the proxymap(8) server within alias_maps. Instead
+       it will open the table directly.  Before  Postfix  version
+       2.2,  the  local(8)  delivery  agent will terminate with a
        fatal error.
 
 BUGS
-       For  security  reasons,  the  message  delivery  status of
-       external commands or of external  files  is  never  check-
+       For security  reasons,  the  message  delivery  status  of
+       external  commands  or  of  external files is never check-
        pointed to file. As a result, the program may occasionally
        deliver more than once to a command or external file. Bet-
        ter safe than sorry.
 
-       Mutually-recursive  aliases  or  ~/.forward  files are not
-       detected early.  The resulting  mail  forwarding  loop  is
+       Mutually-recursive aliases or  ~/.forward  files  are  not
+       detected  early.   The  resulting  mail forwarding loop is
        broken by the use of the Delivered-To: message header.
 
 CONFIGURATION PARAMETERS
-       Changes   to  main.cf  are  picked  up  automatically,  as
-       local(8) processes run for only a limited amount of  time.
+       Changes  to  main.cf  are  picked  up  automatically,   as
+       local(8)  processes run for only a limited amount of time.
        Use the command "postfix reload" to speed up a change.
 
-       The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       The text below provides  only  a  parameter  summary.  See
+       postconf(5) for more details including examples.
 
 COMPATIBILITY CONTROLS
        biff (yes)
@@ -356,86 +357,86 @@ LOCAL(8)                                                 LOCAL(8)
        expand_owner_alias (no)
               When delivering to an alias "aliasname" that has an
               "owner-aliasname" companion alias, set the envelope
-              sender address to  the  expansion  of  the  "owner-
+              sender  address  to  the  expansion  of the "owner-
               aliasname" alias.
 
        owner_request_special (yes)
-              Give  special treatment to owner-listname and list-
-              name-request address localparts: don't  split  such
-              addresses  when  the  recipient_delimiter is set to
+              Give special treatment to owner-listname and  list-
+              name-request  address  localparts: don't split such
+              addresses when the recipient_delimiter  is  set  to
               "-".
 
        sun_mailtool_compatibility (no)
               Obsolete SUN mailtool compatibility feature.
 
 DELIVERY METHOD CONTROLS
-       The precedence of local(8) delivery methods from  high  to
-       low  is: aliases, .forward files, mailbox_transport, mail-
+       The  precedence  of local(8) delivery methods from high to
+       low is: aliases, .forward files, mailbox_transport,  mail-
        box_command_maps,      mailbox_command,      home_mailbox,
-       mail_spool_directory,  fallback_transport and luser_relay.
+       mail_spool_directory, fallback_transport and  luser_relay.
 
        alias_maps (see 'postconf -d' output)
-              The alias databases  that  are  used  for  local(8)
+              The  alias  databases  that  are  used for local(8)
               delivery.
 
        forward_path (see 'postconf -d' output)
-              The local(8) delivery agent search list for finding
-              a .forward file with user-specified delivery  meth-
+              The local(8) delivery agent search list for finding
+              a  .forward file with user-specified delivery meth-
               ods.
 
        mailbox_transport (empty)
-              Optional   message   delivery  transport  that  the
-              local(8) delivery  agent  should  use  for  mailbox
-              delivery  to  all  local recipients, whether or not
+              Optional  message  delivery  transport   that   the
+              local(8)  delivery  agent  should  use  for mailbox
+              delivery to all local recipients,  whether  or  not
               they are found in the UNIX passwd database.
 
        mailbox_command_maps (empty)
-              Optional lookup tables with per-recipient  external
-              commands to use for local(8) mailbox delivery.
+              Optional  lookup tables with per-recipient external
+              commands to use for local(8) mailbox delivery.
 
        mailbox_command (empty)
-              Optional  external command that the local(8) deliv-
+              Optional external command that the local(8)  deliv-
               ery agent should use for mailbox delivery.
 
        home_mailbox (empty)
-              Optional pathname of a mailbox file relative  to  a
-              local(8) user's home directory.
+              Optional  pathname  of a mailbox file relative to a
+              local(8) user's home directory.
 
        mail_spool_directory (see 'postconf -d' output)
-              The  directory  where local(8) UNIX-style mailboxes
+              The directory where local(8)  UNIX-style  mailboxes
               are kept.
 
        fallback_transport (empty)
-              Optional  message  delivery  transport   that   the
-              local(8)  delivery  agent should use for names that
-              are not found in the aliases(5) database or in  the
+              Optional   message   delivery  transport  that  the
+              local(8) delivery agent should use for  names  that
+              are  not found in the aliases(5) database or in the
               UNIX passwd database.
 
        luser_relay (empty)
-              Optional catch-all destination for unknown local(8)
+              Optional catch-all destination for unknown local(8)
               recipients.
 
        Available in Postfix version 2.2 and later:
 
        command_execution_directory (empty)
-              The local(8) delivery agent working  directory  for
+              The  local(8)  delivery agent working directory for
               delivery to external command.
 
 MAILBOX LOCKING CONTROLS
        deliver_lock_attempts (20)
               The maximal number of attempts to acquire an exclu-
-              sive lock on a mailbox file or bounce(8) logfile.
+              sive lock on a mailbox file or bounce(8) logfile.
 
        deliver_lock_delay (1s)
-              The time between attempts to acquire  an  exclusive
-              lock on a mailbox file or bounce(8) logfile.
+              The  time  between attempts to acquire an exclusive
+              lock on a mailbox file or bounce(8) logfile.
 
        stale_lock_time (500s)
-              The  time  after  which  a  stale exclusive mailbox
+              The time after  which  a  stale  exclusive  mailbox
               lockfile is removed.
 
        mailbox_delivery_lock (see 'postconf -d' output)
-              How to lock a UNIX-style  local(8)  mailbox  before
+              How  to  lock  a UNIX-style local(8) mailbox before
               attempting delivery.
 
 RESOURCE AND RATE CONTROLS
@@ -443,17 +444,17 @@ LOCAL(8)                                                 LOCAL(8)
               Time limit for delivery to external commands.
 
        duplicate_filter_limit (1000)
-              The  maximal  number of addresses remembered by the
-              address duplicate filter  for  aliases(5)  or  vir-
-              tual(5) alias expansion, or for showq(8) queue dis-
+              The maximal number of addresses remembered  by  the
+              address  duplicate  filter  for  aliases(5) or vir-
+              tual(5) alias expansion, or for showq(8) queue dis-
               plays.
 
        local_destination_concurrency_limit (2)
-              The maximal number of parallel deliveries  via  the
+              The  maximal  number of parallel deliveries via the
               local mail delivery transport to the same recipient
-              (when "local_destination_recipient_limit =  1")  or
-              the  maximal  number  of parallel deliveries to the
-              same local domain (when  "local_destination_recipi-
+              (when  "local_destination_recipient_limit  = 1") or
+              the maximal number of parallel  deliveries  to  the
+              same  local domain (when "local_destination_recipi-
               ent_limit > 1").
 
        local_destination_recipient_limit (1)
@@ -461,50 +462,50 @@ LOCAL(8)                                                 LOCAL(8)
               ery via the local mail delivery transport.
 
        mailbox_size_limit (51200000)
-              The maximal size of any local(8) individual mailbox
+              The maximal size of any local(8) individual mailbox
               or maildir file, or zero (no limit).
 
 SECURITY CONTROLS
        allow_mail_to_commands (alias, forward)
-              Restrict  local(8)  mail  delivery to external com-
+              Restrict local(8) mail delivery  to  external  com-
               mands.
 
        allow_mail_to_files (alias, forward)
-              Restrict local(8) mail delivery to external  files.
+              Restrict  local(8) mail delivery to external files.
 
        command_expansion_filter (see 'postconf -d' output)
-              Restrict  the characters that the local(8) delivery
-              agent allows in $name expansions  of  $mailbox_com-
+              Restrict the characters that the local(8)  delivery
+              agent  allows  in $name expansions of $mailbox_com-
               mand.
 
        default_privs (nobody)
-              The  default  rights  used by the local(8) delivery
+              The default rights used by  the  local(8)  delivery
               agent for delivery to external file or command.
 
        forward_expansion_filter (see 'postconf -d' output)
-              Restrict the characters that the local(8)  delivery
-              agent  allows in $name expansions of $forward_path.
+              Restrict  the characters that the local(8) delivery
+              agent allows in $name expansions of  $forward_path.
 
        Available in Postfix version 2.2 and later:
 
        execution_directory_expansion_filter  (see  'postconf  -d'
        output)
-              Restrict the characters that the local(8)  delivery
+              Restrict  the characters that the local(8) delivery
               agent allows in $name expansions of $command_execu-
               tion_directory.
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The default location of  the  Postfix  main.cf  and
+              The  default  location  of  the Postfix main.cf and
               master.cf configuration files.
 
        daemon_timeout (18000s)
-              How  much time a Postfix daemon process may take to
-              handle a request  before  it  is  terminated  by  a
+              How much time a Postfix daemon process may take  to
+              handle  a  request  before  it  is  terminated by a
               built-in watchdog timer.
 
        export_environment (see 'postconf -d' output)
-              The  list  of  environment variables that a Postfix
+              The list of environment variables  that  a  Postfix
               process will export to non-Postfix processes.
 
        ipc_timeout (3600s)
@@ -512,37 +513,37 @@ LOCAL(8)                                                 LOCAL(8)
               over an internal communication channel.
 
        local_command_shell (empty)
-              Optional  shell  program  for  local(8) delivery to
+              Optional shell program  for  local(8)  delivery  to
               non-Postfix command.
 
        max_idle (100s)
-              The maximum amount of time  that  an  idle  Postfix
-              daemon  process  waits for the next service request
+              The  maximum  amount  of  time that an idle Postfix
+              daemon process waits for the next  service  request
               before exiting.
 
        max_use (100)
-              The maximal number of connection requests before  a
+              The  maximal number of connection requests before a
               Postfix daemon process terminates.
 
        prepend_delivered_header (command, file, forward)
-              The  message  delivery  contexts  where the Postfix
-              local(8) delivery agent  prepends  a  Delivered-To:
+              The message delivery  contexts  where  the  Postfix
+              local(8)  delivery  agent  prepends a Delivered-To:
               message header.
 
        process_id (read-only)
-              The  process ID of a Postfix command or daemon pro-
+              The process ID of a Postfix command or daemon  pro-
               cess.
 
        process_name (read-only)
-              The process name of a  Postfix  command  or  daemon
+              The  process  name  of  a Postfix command or daemon
               process.
 
        propagate_unmatched_extensions (canonical, virtual)
-              What  address  lookup tables copy an address exten-
+              What address lookup tables copy an  address  exten-
               sion from the lookup key to the lookup result.
 
        queue_directory (see 'postconf -d' output)
-              The location of the Postfix top-level queue  direc-
+              The  location of the Postfix top-level queue direc-
               tory.
 
        recipient_delimiter (empty)
@@ -550,14 +551,14 @@ LOCAL(8)                                                 LOCAL(8)
               sions (user+foo).
 
        require_home_directory (no)
-              Whether or not a local(8) recipient's  home  direc-
-              tory  must exist before mail delivery is attempted.
+              Whether  or  not a local(8) recipient's home direc-
+              tory must exist before mail delivery is  attempted.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The mail system name that is prepended to the  pro-
+              The  mail system name that is prepended to the pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -578,14 +579,14 @@ LOCAL(8)                                                 LOCAL(8)
        syslogd(8), system logging
 
 LICENSE
-       The Secure Mailer license must be  distributed  with  this
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 HISTORY
        The Delivered-To: message header appears in the qmail sys-
        tem by Daniel Bernstein.
 
-       The maildir structure  appears  in  the  qmail  system  by
+       The  maildir  structure  appears  in  the  qmail system by
        Daniel Bernstein.
 
 AUTHOR(S)
diff --git a/postfix/html/master.5.html b/postfix/html/master.5.html
index d12f852e6..744144ab9 100644
--- a/postfix/html/master.5.html
+++ b/postfix/html/master.5.html
@@ -122,7 +122,7 @@ MASTER(5)                                               MASTER(5)
               main.cf file).
 
               Chroot  should  not  be  used  with  the  local(8),
-              pipe(8),    spawn(8),   and   virtual(8)   daemons.
+              pipe(8),    spawn(8),   and   virtual(8)   daemons.
               Although the proxymap(8) server can  run  chrooted,
               doing so defeats most of the purpose of having that
               service in the first place.
diff --git a/postfix/html/master.8.html b/postfix/html/master.8.html
index 8b4ad00d0..ae4e08622 100644
--- a/postfix/html/master.8.html
+++ b/postfix/html/master.8.html
@@ -13,43 +13,44 @@ MASTER(8)                                               MASTER(8)
        master [-Dtv] [-c config_dir] [-e exit_time]
 
 DESCRIPTION
-       The  master daemon is the resident process that runs Post-
-       fix daemons on demand: daemons to send or receive messages
-       via  the  network,  daemons  to deliver mail locally, etc.
-       These daemons are created on demand up to  a  configurable
-       maximum number per service.
+       The  master(8)  daemon  is  the resident process that runs
+       Postfix daemons on demand: daemons to send or receive mes-
+       sages  via  the  network, daemons to deliver mail locally,
+       etc.  These daemons are created on demand up to a  config-
+       urable maximum number per service.
 
        Postfix  daemons terminate voluntarily, either after being
        idle for a configurable amount of time,  or  after  having
        serviced  a configurable number of requests. Exceptions to
-       this rule are the resident queue manager and the  resident
-       address verification server.
+       this rule are the resident queue manager, address  verifi-
+       cation server, and the TLS session cache and pseudo-random
+       number server.
 
-       The  behavior  of  the  master daemon is controlled by the
-       master.cf configuration file, as described in master(5).
+       The behavior of the master(8) daemon is controlled by  the
+       master.cf configuration file, as described in master(5).
 
        Options:
 
        -c config_dir
-              Read the main.cf and master.cf configuration  files
-              in  the named directory instead of the default con-
+              Read  the main.cf and master.cf configuration files
+              in the named directory instead of the default  con-
               figuration directory.  This also overrides the con-
-              figuration  files  for  other  Postfix  daemon pro-
+              figuration files  for  other  Postfix  daemon  pro-
               cesses.
 
        -e exit_time
-              Terminate the master process after  exit_time  sec-
-              onds.  Child  processes  terminate  at their conve-
+              Terminate  the  master process after exit_time sec-
+              onds. Child processes  terminate  at  their  conve-
               nience.
 
-       -D     After initialization, run a debugger on the  master
-              process.  The  debugging  command is specified with
+       -D     After  initialization, run a debugger on the master
+              process. The debugging command  is  specified  with
               the debugger_command in the main.cf global configu-
               ration file.
 
-       -t     Test  mode. Return a zero exit status when the mas-
-              ter.pid lock file does not exist or when that  file
-              is  not  locked.   This is evidence that the master
+       -t     Test mode. Return a zero exit status when the  mas-
+              ter.pid  lock file does not exist or when that file
+              is not locked.  This is evidence that the master(8)
               daemon is not running.
 
        -v     Enable verbose logging for debugging purposes. This
@@ -58,21 +59,21 @@ MASTER(8)                                               MASTER(8)
 
        Signals:
 
-       SIGHUP Upon receipt of a HUP signal (e.g.,  after  postfix
-              reload), the master process re-reads its configura-
-              tion files. If a service has been removed from  the
-              master.cf  file,  its  running processes are termi-
-              nated immediately.   Otherwise,  running  processes
-              are  allowed to terminate as soon as is convenient,
-              so that changes in  configuration  settings  affect
+       SIGHUP Upon  receipt of a HUP signal (e.g., after "postfix
+              reload"), the master process re-reads its  configu-
+              ration  files.  If  a service has been removed from
+              the master.cf file, its running processes are  ter-
+              minated  immediately.  Otherwise, running processes
+              are allowed to terminate as soon as is  convenient,
+              so  that  changes  in configuration settings affect
               only new service requests.
 
        SIGTERM
-              Upon  receipt of a TERM signal (e.g., after postfix
-              abort), the master process passes the signal on  to
+              Upon receipt of a TERM signal (e.g., after "postfix
+              abort"), the master process passes the signal on to
               its child processes and terminates.  This is useful
-              for an emergency shutdown. Normally one would  ter-
-              minate  only  the  master  (postfix stop) and allow
+              for  an emergency shutdown. Normally one would ter-
+              minate only the master ("postfix stop")  and  allow
               running processes to finish what they are doing.
 
 DIAGNOSTICS
@@ -81,43 +82,43 @@ MASTER(8)                                               MASTER(8)
 ENVIRONMENT
        MAIL_DEBUG
               After initialization, start a debugger as specified
-              with  the  debugger_command configuration parameter
+              with the debugger_command  configuration  parameter
               in the main.cf configuration file.
 
        MAIL_CONFIG
               Directory with Postfix configuration files.
 
 CONFIGURATION PARAMETERS
-       Unlike most Postfix daemon processes, the master(8) server
+       Unlike most Postfix daemon processes, the master(8) server
        does not automatically pick up changes to main.cf. Changes
-       to master.cf are never picked up automatically.   Use  the
-       postfix reload command after a configuration change.
+       to  master.cf  are never picked up automatically.  Use the
+       "postfix reload" command after a configuration change.
 
 RESOURCE AND RATE CONTROLS
        default_process_limit (100)
-              The  default  maximal  number of Postfix child pro-
+              The default maximal number of  Postfix  child  pro-
               cesses that provide a given service.
 
        max_idle (100s)
-              The maximum amount of time  that  an  idle  Postfix
-              daemon  process  waits for the next service request
+              The  maximum  amount  of  time that an idle Postfix
+              daemon process waits for the next  service  request
               before exiting.
 
        max_use (100)
-              The maximal number of connection requests before  a
+              The  maximal number of connection requests before a
               Postfix daemon process terminates.
 
        service_throttle_time (60s)
-              How long the Postfix master(8) waits before forking
+              How long the Postfix master(8) waits before forking
               a server that appears to be malfunctioning.
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The default location of  the  Postfix  main.cf  and
+              The  default  location  of  the Postfix main.cf and
               master.cf configuration files.
 
        daemon_directory (see 'postconf -d' output)
-              The  directory  with  Postfix  support programs and
+              The directory with  Postfix  support  programs  and
               daemon programs.
 
        debugger_command (empty)
@@ -129,12 +130,12 @@ MASTER(8)                                               MASTER(8)
               tem receives mail on.
 
        inet_protocols (ipv4)
-              The Internet protocols Postfix will attempt to  use
+              The  Internet protocols Postfix will attempt to use
               when making or accepting connections.
 
        import_environment (see 'postconf -d' output)
-              The  list  of environment parameters that a Postfix
-              process will import from a non-Postfix parent  pro-
+              The list of environment parameters that  a  Postfix
+              process  will import from a non-Postfix parent pro-
               cess.
 
        mail_owner (postfix)
@@ -142,22 +143,22 @@ MASTER(8)                                               MASTER(8)
               and most Postfix daemon processes.
 
        process_id (read-only)
-              The process ID of a Postfix command or daemon  pro-
+              The  process ID of a Postfix command or daemon pro-
               cess.
 
        process_name (read-only)
-              The  process  name  of  a Postfix command or daemon
+              The process name of a  Postfix  command  or  daemon
               process.
 
        queue_directory (see 'postconf -d' output)
-              The location of the Postfix top-level queue  direc-
+              The  location of the Postfix top-level queue direc-
               tory.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The  mail system name that is prepended to the pro-
+              The mail system name that is prepended to the  pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -174,7 +175,7 @@ MASTER(8)                                               MASTER(8)
        syslogd(8), system logging
 
 LICENSE
-       The  Secure  Mailer  license must be distributed with this
+       The Secure Mailer license must be  distributed  with  this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/nisplus_table.5.html b/postfix/html/nisplus_table.5.html
index e258e4fa3..b6519bc49 100644
--- a/postfix/html/nisplus_table.5.html
+++ b/postfix/html/nisplus_table.5.html
@@ -22,8 +22,8 @@ NISPLUS_TABLE(5)                                 NISPLUS_TABLE(5)
        To find out what types of lookup tables your Postfix  sys-
        tem supports use the "postconf -m" command.
 
-       To  test  Postfix NIS+ lookup tables, use the postmap com-
-       mand as described in the SYNOPSIS above.
+       To  test  Postfix NIS+ lookup tables, use the "postmap -q"
+       command as described in the SYNOPSIS above.
 
 QUERY SYNTAX
        Most of the NIS+ query is specified via the NIS+ map name.
diff --git a/postfix/html/oqmgr.8.html b/postfix/html/oqmgr.8.html
index 68709fead..8a66f0881 100644
--- a/postfix/html/oqmgr.8.html
+++ b/postfix/html/oqmgr.8.html
@@ -13,22 +13,23 @@ OQMGR(8)                                                 OQMGR(8)
        oqmgr [generic Postfix daemon options]
 
 DESCRIPTION
-       The  oqmgr  daemon awaits the arrival of incoming mail and
-       arranges for its delivery via Postfix delivery  processes.
-       The actual mail routing strategy is delegated to the triv-
-       ial-rewrite(8) daemon.  This program  expects  to  be  run
-       from the master(8) process manager.
+       The  oqmgr(8)  daemon  awaits the arrival of incoming mail
+       and arranges for its delivery via  Postfix  delivery  pro-
+       cesses.   The actual mail routing strategy is delegated to
+       the trivial-rewrite(8) daemon.  This program expects to be
+       run from the master(8) process manager.
 
        Mail  addressed  to  the  local  double-bounce  address is
        logged and discarded.  This stops potential  loops  caused
        by undeliverable bounce notifications.
 
 MAIL QUEUES
-       The oqmgr daemon maintains the following queues:
+       The oqmgr(8) daemon maintains the following queues:
 
        incoming
               Inbound mail from the network, or mail picked up by
-              the local pickup agent from the maildrop directory.
+              the local pickup(8) agent from the maildrop  direc-
+              tory.
 
        active Messages  that  the  queue  manager  has opened for
               delivery. Only a  limited  number  of  messages  is
@@ -49,8 +50,8 @@ OQMGR(8)                                                 OQMGR(8)
               until someone sets them free.
 
 DELIVERY STATUS REPORTS
-       The oqmgr daemon keeps an eye on per-message delivery sta-
-       tus reports in  the  following  directories.  Each  status
+       The  oqmgr(8)  daemon keeps an eye on per-message delivery
+       status reports in the following directories.  Each  status
        report file has the same name as the corresponding message
        file:
 
@@ -67,22 +68,23 @@ OQMGR(8)                                                 OQMGR(8)
               mand.  These files are maintained by  the  trace(8)
               daemon.
 
-       The  oqmgr daemon is responsible for asking the bounce(8),
-       defer(8) or trace(8) daemons to send delivery reports.
+       The   oqmgr(8)   daemon  is  responsible  for  asking  the
+       bounce(8), defer(8) or trace(8) daemons to  send  delivery
+       reports.
 
 STRATEGIES
-       The queue manager implements a variety of  strategies  for
+       The  queue  manager implements a variety of strategies for
        either opening queue files (input) or for message delivery
        (output).
 
        leaky bucket
-              This strategy limits the number of messages in  the
-              active  queue  and  prevents the queue manager from
+              This  strategy limits the number of messages in the
+              active queue and prevents the  queue  manager  from
               running out of memory under heavy load.
 
        fairness
-              When the active queue has room, the  queue  manager
-              takes  one  message from the incoming queue and one
+              When  the  active queue has room, the queue manager
+              takes one message from the incoming queue  and  one
               from the deferred queue. This prevents a large mail
               backlog from blocking the delivery of new mail.
 
@@ -93,36 +95,36 @@ OQMGR(8)                                                 OQMGR(8)
 
        round robin
               The queue manager sorts delivery requests by desti-
-              nation.  Round-robin selection prevents one  desti-
+              nation.   Round-robin selection prevents one desti-
               nation from dominating deliveries to other destina-
               tions.
 
        exponential backoff
               Mail  that  cannot  be  delivered  upon  the  first
-              attempt  is  deferred.   The  time interval between
+              attempt is deferred.   The  time  interval  between
               delivery attempts is doubled after each attempt.
 
        destination status cache
-              The  queue  manager  avoids  unnecessary   delivery
-              attempts  by  maintaining  a  short-term, in-memory
+              The   queue  manager  avoids  unnecessary  delivery
+              attempts by  maintaining  a  short-term,  in-memory
               list of unreachable destinations.
 
 TRIGGERS
        On an idle system, the queue manager waits for the arrival
-       of  trigger  events,  or it waits for a timer to go off. A
-       trigger is a one-byte message.  Depending on  the  message
-       received,  the queue manager performs one of the following
-       actions (the message is followed by the symbolic  constant
+       of trigger events, or it waits for a timer to  go  off.  A
+       trigger  is  a one-byte message.  Depending on the message
+       received, the queue manager performs one of the  following
+       actions  (the message is followed by the symbolic constant
        used internally by the software):
 
        D (QMGR_REQ_SCAN_DEFERRED)
-              Start  a  deferred queue scan.  If a deferred queue
-              scan is already in  progress,  that  scan  will  be
+              Start a deferred queue scan.  If a  deferred  queue
+              scan  is  already  in  progress,  that scan will be
               restarted as soon as it finishes.
 
        I (QMGR_REQ_SCAN_INCOMING)
-              Start  an incoming queue scan. If an incoming queue
-              scan is already in  progress,  that  scan  will  be
+              Start an incoming queue scan. If an incoming  queue
+              scan  is  already  in  progress,  that scan will be
               restarted as soon as it finishes.
 
        A (QMGR_REQ_SCAN_ALL)
@@ -130,68 +132,68 @@ OQMGR(8)                                                 OQMGR(8)
               affects the next deferred queue scan.
 
        F (QMGR_REQ_FLUSH_DEAD)
-              Purge all information  about  dead  transports  and
+              Purge  all  information  about  dead transports and
               destinations.
 
        W (TRIGGER_REQ_WAKEUP)
-              Wakeup  call,  This is used by the master server to
-              instantiate servers that should not  go  away  for-
-              ever.  The  action  is  to  start an incoming queue
+              Wakeup call, This is used by the master  server  to
+              instantiate  servers  that  should not go away for-
+              ever. The action is  to  start  an  incoming  queue
               scan.
 
-       The oqmgr daemon reads an entire buffer worth of triggers.
-       Multiple  identical  trigger  requests  are collapsed into
-       one, and trigger requests are sorted so that A and F  pre-
-       cede  D  and  I.  Thus, in order to force a deferred queue
+       The  oqmgr(8) daemon reads an entire buffer worth of trig-
+       gers.  Multiple identical trigger requests  are  collapsed
+       into  one, and trigger requests are sorted so that A and F
+       precede D and I. Thus, in order to force a deferred  queue
        run, one would request A F D; in order to notify the queue
        manager of the arrival of new mail one would request I.
 
 STANDARDS
-       None.  The oqmgr daemon does not interact with the outside
-       world.
+       None. The oqmgr(8) daemon does not interact with the  out-
+       side world.
 
 SECURITY
-       The oqmgr daemon is not security sensitive. It reads  sin-
-       gle-character  messages  from  untrusted  local users, and
-       thus may be susceptible to denial of service attacks.  The
-       oqmgr  daemon  does  not talk to the outside world, and it
-       can be run at fixed low privilege in a  chrooted  environ-
+       The  oqmgr(8)  daemon  is not security sensitive. It reads
+       single-character messages from untrusted local users,  and
+       thus  may be susceptible to denial of service attacks. The
+       oqmgr(8) daemon does not talk to the outside world, and it
+       can  be  run at fixed low privilege in a chrooted environ-
        ment.
 
 DIAGNOSTICS
-       Problems and transactions are logged to the syslog daemon.
-       Corrupted message files are saved to the corrupt queue for
-       further inspection.
+       Problems and transactions are logged to the syslog(8) dae-
+       mon.   Corrupted  message  files  are saved to the corrupt
+       queue for further inspection.
 
-       Depending  on the setting of the notify_classes parameter,
-       the postmaster is notified of bounces and of  other  trou-
+       Depending on the setting of the notify_classes  parameter,
+       the  postmaster  is notified of bounces and of other trou-
        ble.
 
 BUGS
-       A  single  queue  manager  process has to compete for disk
-       access with multiple front-end processes such as smtpd.  A
-       sudden  burst  of  inbound mail can negatively impact out-
-       bound delivery rates.
+       A single queue manager process has  to  compete  for  disk
+       access   with   multiple   front-end   processes  such  as
+       cleanup(8). A sudden burst of inbound mail can  negatively
+       impact outbound delivery rates.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are not  picked  up  automatically,  as
-       oqmgr(8) is a persistent process. Use the command "postfix
+       Changes  to  main.cf  are  not picked up automatically, as
+       oqmgr(8) is a persistent process. Use the command "postfix
        reload" after a configuration change.
 
-       The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       The  text  below  provides  only  a parameter summary. See
+       postconf(5) for more details including examples.
 
-       In  the text below, transport is the first field in a mas-
+       In the text below, transport is the first field in a  mas-
        ter.cf entry.
 
 COMPATIBILITY CONTROLS
        allow_min_user (no)
-              Allow a recipient address to have `-' as the  first
+              Allow  a recipient address to have `-' as the first
               character.
 
 ACTIVE QUEUE CONTROLS
        qmgr_clog_warn_time (300s)
-              The  minimal delay between warnings that a specific
+              The minimal delay between warnings that a  specific
               destination  is  clogging  up  the  Postfix  active
               queue.
 
@@ -199,23 +201,23 @@ OQMGR(8)                                                 OQMGR(8)
               The maximal number of messages in the active queue.
 
        qmgr_message_recipient_limit (20000)
-              The maximal number of recipients held in memory  by
-              the  Postfix queue manager, and the maximal size of
+              The  maximal number of recipients held in memory by
+              the Postfix queue manager, and the maximal size  of
               the size of the short-term, in-memory "dead" desti-
               nation status cache.
 
 DELIVERY CONCURRENCY CONTROLS
        qmgr_fudge_factor (100)
-              Obsolete   feature:   the  percentage  of  delivery
-              resources that a busy mail system will use  up  for
+              Obsolete  feature:  the  percentage   of   delivery
+              resources  that  a busy mail system will use up for
               delivery of a large mailing  list message.
 
        initial_destination_concurrency (5)
-              The  initial  per-destination concurrency level for
+              The initial per-destination concurrency  level  for
               parallel delivery to the same destination.
 
        default_destination_concurrency_limit (20)
-              The default maximal number of  parallel  deliveries
+              The  default  maximal number of parallel deliveries
               to the same destination.
 
        transport_destination_concurrency_limit
@@ -223,7 +225,7 @@ OQMGR(8)                                                 OQMGR(8)
 
 RECIPIENT SCHEDULING CONTROLS
        default_destination_recipient_limit (50)
-              The default maximal number of recipients  per  mes-
+              The  default  maximal number of recipients per mes-
               sage delivery.
 
        transport_destination_recipient_limit
@@ -231,49 +233,49 @@ OQMGR(8)                                                 OQMGR(8)
 
 OTHER RESOURCE AND RATE CONTROLS
        minimal_backoff_time (1000s)
-              The minimal time  between  attempts  to  deliver  a
+              The  minimal  time  between  attempts  to deliver a
               deferred message.
 
        maximal_backoff_time (4000s)
-              The  maximal  time  between  attempts  to deliver a
+              The maximal time  between  attempts  to  deliver  a
               deferred message.
 
        maximal_queue_lifetime (5d)
-              The maximal time a message is queued before  it  is
+              The  maximal  time a message is queued before it is
               sent back as undeliverable.
 
        queue_run_delay (1000s)
-              The  time between deferred queue scans by the queue
+              The time between deferred queue scans by the  queue
               manager.
 
        transport_retry_time (60s)
               The time between attempts by the Postfix queue man-
-              ager  to  contact a malfunctioning message delivery
+              ager to contact a malfunctioning  message  delivery
               transport.
 
        Available in Postfix version 2.1 and later:
 
        bounce_queue_lifetime (5d)
-              The maximal time a bounce message is queued  before
+              The  maximal time a bounce message is queued before
               it is considered undeliverable.
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The  default  location  of  the Postfix main.cf and
+              The default location of  the  Postfix  main.cf  and
               master.cf configuration files.
 
        daemon_timeout (18000s)
-              How much time a Postfix daemon process may take  to
-              handle  a  request  before  it  is  terminated by a
+              How  much time a Postfix daemon process may take to
+              handle a request  before  it  is  terminated  by  a
               built-in watchdog timer.
 
        defer_transports (empty)
               The  names  of  message  delivery  transports  that
-              should  not  be  delivered to unless someone issues
+              should not be delivered to  unless  someone  issues
               "sendmail -q" or equivalent.
 
        helpful_warnings (yes)
-              Log warnings about problematic  configuration  set-
+              Log  warnings  about problematic configuration set-
               tings, and provide helpful suggestions.
 
        ipc_timeout (3600s)
@@ -281,22 +283,22 @@ OQMGR(8)                                                 OQMGR(8)
               over an internal communication channel.
 
        process_id (read-only)
-              The process ID of a Postfix command or daemon  pro-
+              The  process ID of a Postfix command or daemon pro-
               cess.
 
        process_name (read-only)
-              The  process  name  of  a Postfix command or daemon
+              The process name of a  Postfix  command  or  daemon
               process.
 
        queue_directory (see 'postconf -d' output)
-              The location of the Postfix top-level queue  direc-
+              The  location of the Postfix top-level queue direc-
               tory.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The  mail system name that is prepended to the pro-
+              The mail system name that is prepended to the  pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -314,13 +316,13 @@ OQMGR(8)                                                 OQMGR(8)
        postconf(5), configuration parameters
        master(5), generic daemon options
        master(8), process manager
-       syslogd(8) system logging
+       syslogd(8), system logging
 
 README FILES
        QSHAPE_README, Postfix queue analysis
 
 LICENSE
-       The Secure Mailer license must be  distributed  with  this
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/pcre_table.5.html b/postfix/html/pcre_table.5.html
index fa65607f6..7e409040f 100644
--- a/postfix/html/pcre_table.5.html
+++ b/postfix/html/pcre_table.5.html
@@ -25,9 +25,9 @@ PCRE_TABLE(5)                                       PCRE_TABLE(5)
        is found the corresponding result is returned.
 
        To find out what types of lookup tables your Postfix  sys-
-       tem supports use the postconf -m command.
+       tem supports use the "postconf -m" command.
 
-       To  test  lookup  tables,  use  the postmap -fq command as
+       To  test  lookup  tables, use the "postmap -fq" command as
        described in the SYNOPSIS above.
 
 TABLE FORMAT
diff --git a/postfix/html/pickup.8.html b/postfix/html/pickup.8.html
index 76d623da0..f90b33ee6 100644
--- a/postfix/html/pickup.8.html
+++ b/postfix/html/pickup.8.html
@@ -13,21 +13,21 @@ PICKUP(8)                                               PICKUP(8)
        pickup [generic Postfix daemon options]
 
 DESCRIPTION
-       The  pickup  daemon waits for hints that new mail has been
-       dropped into the maildrop directory, and feeds it into the
-       cleanup(8)  daemon.  Ill-formatted files are deleted with-
-       out notifying the originator.  This program expects to  be
-       run from the master(8) process manager.
+       The  pickup(8)  daemon  waits  for hints that new mail has
+       been dropped into the maildrop  directory,  and  feeds  it
+       into  the  cleanup(8)  daemon.   Ill-formatted  files  are
+       deleted without notifying the  originator.   This  program
+       expects to be run from the master(8) process manager.
 
 STANDARDS
-       None. The pickup daemon does not interact with the outside
-       world.
+       None. The pickup(8) daemon does not interact with the out-
+       side world.
 
 SECURITY
-       The pickup daemon is  moderately  security  sensitive.  It
+       The pickup(8) daemon is moderately security sensitive.  It
        runs  with  fixed  low privilege and can run in a chrooted
        environment.  However, the program reads files from poten-
-       tially  hostile  users.   The pickup daemon opens no files
+       tially hostile users.  The pickup(8) daemon opens no files
        for writing, is careful about  what  files  it  opens  for
        reading, and does not actually touch any data that is sent
        to its public service endpoint.
@@ -36,20 +36,20 @@ PICKUP(8)                                               PICKUP(8)
        Problems and transactions are logged to syslogd(8).
 
 BUGS
-       The pickup daemon copies mail from file to the  cleanup(8)
-       daemon.   It could avoid message copying overhead by send-
-       ing a file descriptor instead of file data, but  then  the
-       already  complex cleanup(8) daemon would have to deal with
-       unfiltered user data.
+       The  pickup(8)  daemon  copies  mail  from  file  to   the
+       cleanup(8)  daemon.   It could avoid message copying over-
+       head by sending a file descriptor instead  of  file  data,
+       but  then the already complex cleanup(8) daemon would have
+       to deal with unfiltered user data.
 
 CONFIGURATION PARAMETERS
-       As the pickup(8) daemon is a relatively long-running  pro-
+       As the pickup(8) daemon is a relatively long-running  pro-
        cess, up to an hour may pass before a main.cf change takes
        effect.  Use the command "postfix reload" command to speed
        up a change.
 
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
 CONTENT INSPECTION CONTROLS
        content_filter (empty)
diff --git a/postfix/html/pipe.8.html b/postfix/html/pipe.8.html
index 59628546c..72d37f9f8 100644
--- a/postfix/html/pipe.8.html
+++ b/postfix/html/pipe.8.html
@@ -13,21 +13,21 @@ PIPE(8)                                                   PIPE(8)
        pipe [generic Postfix daemon options] command_attributes...
 
 DESCRIPTION
-       The  pipe daemon processes requests from the Postfix queue
-       manager to deliver messages to  external  commands.   This
-       program  expects to be run from the master(8) process man-
-       ager.
+       The  pipe(8)  daemon  processes  requests from the Postfix
+       queue manager to deliver messages  to  external  commands.
+       This  program expects to be run from the master(8) process
+       manager.
 
        Message  attributes  such  as  sender  address,  recipient
        address  and  next-hop  host name can be specified as com-
        mand-line macros that are  expanded  before  the  external
        command is executed.
 
-       The  pipe  daemon updates queue files and marks recipients
-       as finished, or it informs the queue manager that delivery
-       should  be  tried  again  at a later time. Delivery status
-       reports are sent to the bounce(8),  defer(8)  or  trace(8)
-       daemon as appropriate.
+       The  pipe(8)  daemon updates queue files and marks recipi-
+       ents as finished, or it informs  the  queue  manager  that
+       delivery  should  be tried again at a later time. Delivery
+       status reports are sent  to  the  bounce(8),  defer(8)  or
+       trace(8) daemon as appropriate.
 
 SINGLE-RECIPIENT DELIVERY
        Some external commands cannot handle more than one recipi-
@@ -106,22 +106,22 @@ PIPE(8)                                                   PIPE(8)
 
                      The  result  is  compatible with the address
                      parsing of command-line  recipients  by  the
-                     Postfix sendmail mail submission command.
+                     Postfix sendmail(1) mail submission command.
 
-                     The  q  flag  affects only entire addresses,
+                     The q flag affects  only  entire  addresses,
                      not the partial address information from the
-                     $user,  $extension  or $mailbox command-line
+                     $user, $extension or  $mailbox  command-line
                      macros.
 
               u      Fold  the  command-line  $recipient  address
-                     localpart  (text  to  the left of the right-
-                     most @ character) to lower  case.   This  is
+                     localpart (text to the left  of  the  right-
+                     most  @  character)  to lower case.  This is
                      recommended for delivery via UUCP.
 
               .      Prepend "." to lines starting with ".". This
                      is needed by, for example, BSMTP software.
 
-              >      Prepend ">" to lines starting with "From  ".
+              >      Prepend  ">" to lines starting with "From ".
                      This is expected by, for example, UUCP soft-
                      ware.
 
@@ -133,200 +133,200 @@ PIPE(8)                                                   PIPE(8)
 
        user=username:groupname
               The external command is executed with the rights of
-              the specified username.  The  software  refuses  to
-              execute  commands with root privileges, or with the
-              privileges of the mail system owner.  If  groupname
-              is  specified,  the  corresponding group ID is used
+              the  specified  username.   The software refuses to
+              execute commands with root privileges, or with  the
+              privileges  of  the mail system owner. If groupname
+              is specified, the corresponding group  ID  is  used
               instead of the group ID of username.
 
        argv=command... (required)
-              The command to be executed. This must be  specified
+              The  command to be executed. This must be specified
               as the last command attribute.  The command is exe-
               cuted  directly,  i.e.  without  interpretation  of
-              shell  meta  characters  by  a shell command inter-
+              shell meta characters by  a  shell  command  inter-
               preter.
 
               In  the  command  argument  vector,  the  following
               macros are recognized and replaced with correspond-
-              ing information  from  the  Postfix  queue  manager
+              ing  information  from  the  Postfix  queue manager
               delivery request.
 
-              In  addition  to  the form ${name}, the forms $name
-              and $(name) are also recognized.  Specify $$  where
+              In addition to the form ${name},  the  forms  $name
+              and  $(name) are also recognized.  Specify $$ where
               a single $ is wanted.
 
               ${client_address}
                      This macro expands to the remote client net-
                      work address.
 
-                     This is available in Postfix 2.2 and  later.
+                     This  is available in Postfix 2.2 and later.
 
               ${client_helo}
                      This macro expands to the remote client HELO
                      command parameter.
 
-                     This is available in Postfix 2.2 and  later.
+                     This  is available in Postfix 2.2 and later.
 
               ${client_hostname}
-                     This  macro  expands  to  the  remote client
+                     This macro  expands  to  the  remote  client
                      hostname.
 
-                     This is available in Postfix 2.2 and  later.
+                     This  is available in Postfix 2.2 and later.
 
               ${client_protocol}
                      This macro expands to the remote client pro-
                      tocol.
 
-                     This is available in Postfix 2.2 and  later.
+                     This  is available in Postfix 2.2 and later.
 
               ${extension}
-                     This  macro expands to the extension part of
-                     a recipient address.  For example,  with  an
+                     This macro expands to the extension part  of
+                     a  recipient  address.  For example, with an
                      address  user+foo@domain  the  extension  is
                      foo.
 
-                     A  command-line   argument   that   contains
-                     ${extension}  expands  into as many command-
+                     A   command-line   argument   that  contains
+                     ${extension} expands into as  many  command-
                      line arguments as there are recipients.
 
-                     This information is modified by the  u  flag
+                     This  information  is modified by the u flag
                      for case folding.
 
               ${mailbox}
-                     This  macro  expands  to  the complete local
-                     part of a recipient address.   For  example,
-                     with  an address user+foo@domain the mailbox
+                     This macro expands  to  the  complete  local
+                     part  of  a recipient address.  For example,
+                     with an address user+foo@domain the  mailbox
                      is user+foo.
 
-                     A  command-line   argument   that   contains
+                     A   command-line   argument   that  contains
                      ${mailbox} expands into as many command-line
                      arguments as there are recipients.
 
-                     This information is modified by the  u  flag
+                     This  information  is modified by the u flag
                      for case folding.
 
               ${nexthop}
                      This macro expands to the next-hop hostname.
 
-                     This information is modified by the  h  flag
+                     This  information  is modified by the h flag
                      for case folding.
 
               ${recipient}
                      This macro expands to the complete recipient
                      address.
 
-                     A  command-line   argument   that   contains
-                     ${recipient}  expands  into as many command-
+                     A   command-line   argument   that  contains
+                     ${recipient} expands into as  many  command-
                      line arguments as there are recipients.
 
-                     This information  is  modified  by  the  hqu
+                     This  information  is  modified  by  the hqu
                      flags for quoting and case folding.
 
               ${sasl_method}
-                     This  macro  expands to the SASL authentica-
-                     tion mechanism used during the reception  of
-                     the  message.  An  empty string is passed if
-                     the message has been received  without  SASL
+                     This macro expands to the  SASL  authentica-
+                     tion  mechanism used during the reception of
+                     the message. An empty string  is  passed  if
+                     the  message  has been received without SASL
                      authentication.
 
-                     This  is available in Postfix 2.2 and later.
+                     This is available in Postfix 2.2 and  later.
 
               ${sasl_sender}
-                     This macro expands to the SASL  sender  name
-                     (i.e.  the  original  submitter  as  per RFC
-                     2554) used during the reception of the  mes-
+                     This  macro  expands to the SASL sender name
+                     (i.e. the  original  submitter  as  per  RFC
+                     2554)  used during the reception of the mes-
                      sage.
 
-                     This  is available in Postfix 2.2 and later.
+                     This is available in Postfix 2.2 and  later.
 
               ${sasl_username}
-                     This macro expands to  the  SASL  user  name
+                     This  macro  expands  to  the SASL user name
                      used during the reception of the message. An
-                     empty string is passed if  the  message  has
+                     empty  string  is  passed if the message has
                      been received without SASL authentication.
 
-                     This  is available in Postfix 2.2 and later.
+                     This is available in Postfix 2.2 and  later.
 
               ${sender}
-                     This macro expands to  the  envelope  sender
+                     This  macro  expands  to the envelope sender
                      address.
 
-                     This  information  is modified by the q flag
+                     This information is modified by the  q  flag
                      for quoting.
 
               ${size}
-                     This macro expands to Postfix's idea of  the
-                     message  size,  which is an approximation of
+                     This  macro expands to Postfix's idea of the
+                     message size, which is an  approximation  of
                      the size of the message as delivered.
 
               ${user}
                      This macro expands to the username part of a
-                     recipient  address.   For  example,  with an
+                     recipient address.   For  example,  with  an
                      address user+foo@domain the username part is
                      user.
 
-                     A   command-line   argument   that  contains
-                     ${user} expands into  as  many  command-line
+                     A  command-line   argument   that   contains
+                     ${user}  expands  into  as many command-line
                      arguments as there are recipients.
 
-                     This  information  is modified by the u flag
+                     This information is modified by the  u  flag
                      for case folding.
 
 DIAGNOSTICS
-       Command exit status codes are expected to follow the  con-
+       Command  exit status codes are expected to follow the con-
        ventions defined in <sysexits.h>.
 
-       Problems  and transactions are logged to syslogd(8).  Cor-
-       rupted message files are marked so that the queue  manager
+       Problems and transactions are logged to syslogd(8).   Cor-
+       rupted  message files are marked so that the queue manager
        can move them to the corrupt queue for further inspection.
 
 SECURITY
-       This program needs a dual personality  1)  to  access  the
-       private  Postfix  queue and IPC mechanisms, and 2) to exe-
+       This  program  needs  a  dual personality 1) to access the
+       private Postfix queue and IPC mechanisms, and 2)  to  exe-
        cute external commands as the specified user. It is there-
        fore security sensitive.
 
 CONFIGURATION PARAMETERS
-       Changes  to main.cf are picked up automatically as pipe(8)
-       processes run for only a limited amount of time.  Use  the
+       Changes to main.cf are picked up automatically as  pipe(8)
+       processes  run  for only a limited amount of time. Use the
        command "postfix reload" to speed up a change.
 
-       The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       The text below provides  only  a  parameter  summary.  See
+       postconf(5) for more details including examples.
 
 RESOURCE AND RATE CONTROLS
-       In the text below, transport is the first field in a  mas-
+       In  the text below, transport is the first field in a mas-
        ter.cf entry.
 
        transport_destination_concurrency_limit ($default_destina-
        tion_concurrency_limit)
               Limit the number of parallel deliveries to the same
-              destination, for delivery via the named  transport.
+              destination,  for delivery via the named transport.
               The limit is enforced by the Postfix queue manager.
 
        transport_destination_recipient_limit   ($default_destina-
        tion_recipient_limit)
-              Limit the number of recipients per  message  deliv-
-              ery,  for  delivery  via  the named transport.  The
+              Limit  the  number of recipients per message deliv-
+              ery, for delivery via  the  named  transport.   The
               limit is enforced by the Postfix queue manager.
 
        transport_time_limit ($command_time_limit)
-              Limit the time for delivery  to  external  command,
+              Limit  the  time  for delivery to external command,
               for delivery via the named transport.  The limit is
               enforced by the pipe delivery agent.
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The default location of  the  Postfix  main.cf  and
+              The  default  location  of  the Postfix main.cf and
               master.cf configuration files.
 
        daemon_timeout (18000s)
-              How  much time a Postfix daemon process may take to
-              handle a request  before  it  is  terminated  by  a
+              How much time a Postfix daemon process may take  to
+              handle  a  request  before  it  is  terminated by a
               built-in watchdog timer.
 
        export_environment (see 'postconf -d' output)
-              The  list  of  environment variables that a Postfix
+              The list of environment variables  that  a  Postfix
               process will export to non-Postfix processes.
 
        ipc_timeout (3600s)
@@ -338,24 +338,24 @@ PIPE(8)                                                   PIPE(8)
               and most Postfix daemon processes.
 
        max_idle (100s)
-              The maximum amount of time  that  an  idle  Postfix
-              daemon  process  waits for the next service request
+              The  maximum  amount  of  time that an idle Postfix
+              daemon process waits for the next  service  request
               before exiting.
 
        max_use (100)
-              The maximal number of connection requests before  a
+              The  maximal number of connection requests before a
               Postfix daemon process terminates.
 
        process_id (read-only)
-              The  process ID of a Postfix command or daemon pro-
+              The process ID of a Postfix command or daemon  pro-
               cess.
 
        process_name (read-only)
-              The process name of a  Postfix  command  or  daemon
+              The  process  name  of  a Postfix command or daemon
               process.
 
        queue_directory (see 'postconf -d' output)
-              The  location of the Postfix top-level queue direc-
+              The location of the Postfix top-level queue  direc-
               tory.
 
        recipient_delimiter (empty)
@@ -366,7 +366,7 @@ PIPE(8)                                                   PIPE(8)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The  mail system name that is prepended to the pro-
+              The mail system name that is prepended to the  pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -379,7 +379,7 @@ PIPE(8)                                                   PIPE(8)
        syslogd(8), system logging
 
 LICENSE
-       The  Secure  Mailer  license must be distributed with this
+       The Secure Mailer license must be  distributed  with  this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/postalias.1.html b/postfix/html/postalias.1.html
index e77a653f7..90714e197 100644
--- a/postfix/html/postalias.1.html
+++ b/postfix/html/postalias.1.html
@@ -14,11 +14,11 @@ POSTALIAS(1)                                         POSTALIAS(1)
                [file_type:]file_name ...
 
 DESCRIPTION
-       The postalias command creates or queries one or more Post-
-       fix alias databases, or updates an existing one. The input
-       and output file formats are expected to be compatible with
-       Sendmail version 8, and are expected to  be  suitable  for
-       the use as NIS alias maps.
+       The  postalias(1)  command  creates or queries one or more
+       Postfix alias databases, or updates an existing  one.  The
+       input  and output file formats are expected to be compati-
+       ble with Sendmail version 8, and are expected to be  suit-
+       able for the use as NIS alias maps.
 
        If the result files do not exist they will be created with
        the same group and other read permissions  as  the  source
@@ -53,21 +53,21 @@ POSTALIAS(1)                                         POSTALIAS(1)
 
        -i     Incremental  mode. Read entries from standard input
               and  do  not  truncate  an  existing  database.  By
-              default,  postalias creates a new database from the
-              entries in file_name.
+              default,  postalias(1)  creates a new database from
+              the entries in file_name.
 
        -N     Include the terminating null character that  termi-
-              nates  lookup  keys and values. By default, Postfix
-              does whatever is the default for the host operating
-              system.
+              nates  lookup  keys and values. By default, postal-
+              ias(1) does whatever is the default  for  the  host
+              operating system.
 
        -n     Don't  include  the terminating null character that
               terminates lookup  keys  and  values.  By  default,
-              Postfix  does  whatever is the default for the host
-              operating system.
+              postalias(1)  does  whatever is the default for the
+              host operating system.
 
        -o     Do not release root privileges  when  processing  a
-              non-root  input  file.  By default, postalias drops
+              non-root input file. By default, postalias(1) drops
               root privileges and runs as the source  file  owner
               instead.
 
@@ -112,9 +112,9 @@ POSTALIAS(1)                                         POSTALIAS(1)
               The  database type. To find out what types are sup-
               ported, use the "postconf -m" command.
 
-              The postalias command can query any supported  file
-              type,  but  it  can  create only the following file
-              types:
+              The postalias(1) command can  query  any  supported
+              file  type,  but  it  can create only the following
+              file types:
 
               btree  The  output   is   a   btree   file,   named
                      file_name.db.   This is available on systems
@@ -154,9 +154,9 @@ POSTALIAS(1)                                         POSTALIAS(1)
        detected.  Duplicate  entries  are skipped and are flagged
        with a warning.
 
-       postalias terminates with zero exit status in case of suc-
-       cess (including successful postalias -q lookup) and termi-
-       nates with non-zero exit status in case of failure.
+       postalias(1) terminates with zero exit status in  case  of
+       success  (including  successful "postalias -q" lookup) and
+       terminates with non-zero exit status in case of failure.
 
 ENVIRONMENT
        MAIL_CONFIG
@@ -170,10 +170,10 @@ POSTALIAS(1)                                         POSTALIAS(1)
        to this program.
 
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        alias_database (see 'postconf -d' output)
-              The alias databases for local(8) delivery that  are
+              The alias databases for local(8) delivery that  are
               updated with "newaliases" or with "sendmail -bi".
 
        config_directory (see 'postconf -d' output)
@@ -189,8 +189,8 @@ POSTALIAS(1)                                         POSTALIAS(1)
               read Berkeley DB hash or btree tables.
 
        default_database_type (see 'postconf -d' output)
-              The default database type for use in newaliases(1),
-              postalias(1) and postmap(1) commands.
+              The default database type for use in newaliases(1),
+              postalias(1) and postmap(1) commands.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
diff --git a/postfix/html/postcat.1.html b/postfix/html/postcat.1.html
index 0ace8d9e5..78e1efbe5 100644
--- a/postfix/html/postcat.1.html
+++ b/postfix/html/postcat.1.html
@@ -13,9 +13,9 @@ POSTCAT(1)                                             POSTCAT(1)
        postcat [-oqv] [-c config_dir] [files...]
 
 DESCRIPTION
-       The postcat command prints the contents of the named files
-       in human-readable form. The files are expected  to  be  in
-       Postfix  queue  file  format. If no files are specified on
+       The  postcat(1)  command  prints the contents of the named
+       files in human-readable form. The files are expected to be
+       in Postfix queue file format. If no files are specified on
        the command line, the program reads from standard input.
 
        Options:
@@ -48,7 +48,7 @@ POSTCAT(1)                                             POSTCAT(1)
        to this program.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        config_directory (see 'postconf -d' output)
               The  default  location  of  the Postfix main.cf and
diff --git a/postfix/html/postconf.1.html b/postfix/html/postconf.1.html
index a735f34d6..d96b5446b 100644
--- a/postfix/html/postconf.1.html
+++ b/postfix/html/postconf.1.html
@@ -15,10 +15,10 @@ POSTCONF(1)                                           POSTCONF(1)
        postconf [-ev] [-c config_dir] [parameter=value ...]
 
 DESCRIPTION
-       The  postconf command prints the actual value of parameter
-       (all known parameters by default) one parameter per  line,
-       changes  its  value, or prints other information about the
-       Postfix mail system.
+       The postconf(1) command prints the actual value of parame-
+       ter (all known parameters by default)  one  parameter  per
+       line, changes its value, or prints other information about
+       the Postfix mail system.
 
        Options:
 
@@ -130,7 +130,7 @@ POSTCONF(1)                                           POSTCONF(1)
 
               tcp (read-only)
                      Perform lookups using a simple request-reply
-                     protocol that is described in  tcp_table(5).
+                     protocol that is described in  tcp_table(5).
                      This  feature  is  not included with Postfix
                      2.1.
 
@@ -143,13 +143,13 @@ POSTCONF(1)                                           POSTCONF(1)
                              The  table  is  the  UNIX   password
                              database.  The  key is a login name.
                              The result is a password file  entry
-                             in passwd(5) format.
+                             in passwd(5) format.
 
                      unix:group.byname
                              The   table   is   the   UNIX  group
                              database. The key is a  group  name.
                              The  result is a group file entry in
-                             group(5) format.
+                             group(5) format.
 
        Other table types may exist depending on how  Postfix  was
        built.
@@ -174,7 +174,7 @@ POSTCONF(1)                                           POSTCONF(1)
        to this program.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        config_directory (see 'postconf -d' output)
               The  default  location  of  the Postfix main.cf and
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index 6430c32f1..9454410d4 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -64,7 +64,7 @@ not matter. 
        
 
         The remainder of this document is a description of all Postfix
 configuration parameters. Default values are shown after the
 parameter name in parentheses, and can be looked up with the
-postconf -d command. 
        
+"postconf -d" command. 
        
 
 
         Note: this is not an invitation to make changes to Postfix
 configuration parameters. Unnecessary changes are likely to impair
@@ -666,8 +666,7 @@ logs peak usage information.
 
        
 
 
        
-This feature is implemented by the anvil(8) service which is not
-part of the stable Postfix 2.1 release.
+This feature is available in Postfix 2.2 and later.
 
        
 
 
        
@@ -868,7 +867,7 @@ pattern.  
        
 
 
        
 Produce additional bounce(8) logfile records that can be read by
-older Postfix versions. The current and more extensible "name =
+Postfix versions before 2.0. The current and more extensible "name =
 value" format is needed in order to implement more sophisticated
 functionality.
 
        
@@ -952,7 +951,7 @@ notification with the UNIX command "biff y".
 
        
 For compatibility reasons this feature is on by default.  On systems
 with lots of interactive users, the biff service can be a performance
-drain.  Specify "biff = no" to disable.
+drain.  Specify "biff = no" in main.cf to disable.
 
        
 
 
@@ -1060,7 +1059,7 @@ version 5.0.
 
        
 
 
        
-Specify "broken_sasl_auth_clients = yes" to have Postfix advertise
+Specify "broken_sasl_auth_clients = yes" to have Postfix advertise
 AUTH support in a non-standard way.
 
        
 
@@ -1258,6 +1257,37 @@ requires that the directory is listed with the connection_cache_service
+(default: scache)
        
+
+
         The name of the scache(8) connection cache service.  This service
+maintains a limited pool of cached sessions.  
        
+
+
+
        
+
+
        connection_cache_status_update_time
+(default: 600s)
        
+
+
         How frequently the scache(8) server logs usage statistics with
+connection cache hit and miss rates for logical destinations and for
+physical endpoints. 
        
+
+
+
        
+
+
        connection_cache_ttl_limit
+(default: 2s)
        
+
+
         The maximal time-to-live value that the connection cache server
+allows. Requests that specify a larger TTL will be stored with the
+maximum allowed TTL. The purpose of this additional control is to
+protect the infrastructure against careless people. The cache TTL
+is already bounded by $max_idle.  
        
+
+
 
        
 
 
        content_filter
@@ -1590,7 +1620,7 @@ The template is subject to exactly one level of $name substitution:
 
 
        $client_name
        
 
-
        The client hostname or "unknown". 
        
+
        The client hostname or "unknown". 
        
 
 
        $helo_name
        
 
@@ -1971,9 +2001,9 @@ created locally as the result of configuration or software error.
 
 
         Report mail delivery errors to the address specified with the
 non-standard Errors-To: message header, instead of the envelope
-sender address.  This support is disabled by default with Postfix
-2.1 and later, and is always turned on with older Postfix versions.
-
        
+sender address (this feature is removed with Postfix 2.2, is
+turned off by default with Postfix 2.1, and is always turned on
+with older Postfix versions).  
        
 
 
 
@@ -2083,7 +2113,7 @@ Example:
 
 
        
 The maximal number of recipient addresses that Postfix will extract
-from message headers when mail is submitted with "sendmail -t".
+from message headers when mail is submitted with "sendmail -t".
 
        
 
 
        
@@ -2117,12 +2147,12 @@ is unavailable. 
        
 
 
          
 
-
        •  In main.cf specify "relay_transport = relay",
+
        •  In main.cf specify "relay_transport = relay",
 
-
        •  In master.cf specify "-o fallback_relay =" at the
-end of the relay entry.
+
        •  In master.cf specify "-o fallback_relay =" (i.e., empty) at
+the end of the relay entry.
 
-
        •  In transport maps, specify "relay:nexthop..."
+
        •  In transport maps, specify "relay:nexthop..."
 as the right-hand side for backup or primary MX domain entries.
 
 
        
@@ -2168,7 +2198,8 @@ lookup table is matched when the domain or its parent domain appears
 as lookup key.  
        
 
 
        
-Specify "fast_flush_domains =" to disable the feature altogether.
+Specify "fast_flush_domains =" (i.e., empty) to disable the feature
+altogether.
 
        
 
 
@@ -2492,7 +2523,7 @@ the Postfix SMTP client defers delivery and tries again after some
 delay.  This behavior is required by the SMTP standard.  
        
 
 
        
-Specify "ignore_mx_lookup_error = yes" to force a DNS A record
+Specify "ignore_mx_lookup_error = yes" to force a DNS A record
 lookup instead. This violates the SMTP standard and can result in
 mis-delivery of mail.
 
        
@@ -2545,8 +2576,8 @@ turned on by default (it's disabled on SCO UNIX due to an SCO bug).
 
        
 
 
        
-With the default 100 SMTP server process limit, "in_flow_delay
-= 1s" limits the mail inflow to 100 messages per second above the
+With the default 100 SMTP server process limit, "in_flow_delay
+= 1s" limits the mail inflow to 100 messages per second above the
 number of messages delivered per second.
 
        
 
@@ -2561,10 +2592,11 @@ Specify 0 to disable the feature. Valid delays are 0..10.
 (default: all)
        
 
 
         The network interface addresses that this mail system receives
-mail on.  By default, the software claims all active interfaces on
-the machine; with Postfix 2.2 and later, specify "loopback-only"
-to select only local interfaces.  The parameter also controls
-delivery of mail to user@[ip.address].  
        
+mail on. Specify "all" to receive mail on all network
+interfaces (default), and "loopback-only" to receive mail
+on loopback network interfaces only (Postfix 2.2 and later).  The
+parameter also controls delivery of mail to user@[ip.address].
+
        
 
 
        
 Note: you need to stop and start Postfix when this parameter changes.
@@ -2585,8 +2617,8 @@ for IPv6. 
        
 
 
        
 A better solution for multi-homed firewalls is to leave inet_interfaces
-at the default value
-and instead use explicit IP addresses in master.cf. This preserves SMTP
+at the default value and instead use explicit IP addresses in
+the master.cf SMTP server definitions.  This preserves the SMTP client's
 loop detection, by ensuring that each side of the firewall knows that the
 other IP address is still the same host. Setting $inet_interfaces to a
 single IPv4 and/or IPV6 address is primarily useful with virtual
@@ -2605,8 +2637,9 @@ Examples:
 
 
         inet_interfaces = all (DEFAULT)
-inet_interfaces = loopback-only
+inet_interfaces = loopback-only (Postfix 2.2 and later)
 inet_interfaces = 127.0.0.1
+inet_interfaces = 127.0.0.1, [::1] (Postfix 2.2 and later)
 inet_interfaces = 192.168.1.2, 127.0.0.1
 
        
 
@@ -2617,9 +2650,9 @@ Examples:
 (default: ipv4)
        
 
 
         The Internet protocols Postfix will attempt to use when making
-or accepting connections. Specify one or more of "ipv4" or "ipv6",
-separated by whitespace or commas. The form "all" is equivalent to
-"ipv4, ipv6". 
        
+or accepting connections. Specify one or more of "ipv4"
+or "ipv6", separated by whitespace or commas. The form
+"all" is equivalent to "ipv4, ipv6". 
        
 
 
         This feature is available in Postfix version 2.2 and later. 
        
 
@@ -3203,7 +3236,7 @@ default. 
        
 client IP address matches any network or network address listed in
 $mynetworks. This setting will not prevent remote mail header
 address rewriting when mail from a remote client is forwarded by
-a neighboring system.  
        
+a neighboring system.  
 
 
         permit_sasl_authenticated 
        
 
@@ -3301,7 +3334,7 @@ delivery agent for local delivery. You need to update the
 
 
      • You redefine the local delivery agent in master.cf.
 
-
      •  You redefine the "local_transport" setting in main.cf.
+
      • You redefine the "local_transport" setting in main.cf.
 
 
      • You use the "luser_relay", "mailbox_transport", or "fallback_transport"
 feature of the Postfix local(8) delivery agent.
@@ -3426,7 +3459,7 @@ Note: luser_relay works only for the P
 
 
        
 NOTE: if you use this feature for accounts not in the UNIX password
-file, then you must specify "local_recipient_maps =" (i.e. empty)
+file, then you must specify "local_recipient_maps =" (i.e. empty)
 in the main.cf file, otherwise the Postfix SMTP server will reject mail
 for non-UNIX accounts with "User unknown in local recipient table".
 
        
@@ -5008,7 +5041,7 @@ Example:
 
 
        
 The numerical Postfix SMTP server response code when a remote SMTP
-client request is rejected by the "reject" restriction.
+client request is rejected by the "reject" restriction.
 
        
 
 
        
@@ -5301,7 +5334,8 @@ address localpart as per RFC 822<
 operators remain visible. This behavior is safe but it is also
 technically incorrect.  
        
 
-
         If you specify "resolve_dequoted_address = no", then the Postfix
+
         If you specify "resolve_dequoted_address = no", then
+the Postfix
 resolver will not know about additional @ etc. operators in the
 address localpart. This opens opportunities for obscure mail relay
 attacks with user@domain@domain addresses when Postfix provides
@@ -5495,37 +5529,6 @@ The default time unit is s (seconds).
 
        
 
 
-
-
-
        session_cache_service
-(default: scache)
        
-
-
         The name of the scache(8) connection cache service.  This service
-maintains a limited pool of cached sessions.  
        
-
-
-
        
-
-
        session_cache_status_update_time
-(default: 600s)
        
-
-
         How frequently the scache(8) server logs usage statistics with
-connection cache hit and miss rates for logical destinations and for
-physical endpoints. 
        
-
-
-
        
-
-
        session_cache_ttl_limit
-(default: 2s)
        
-
-
         The maximal time-to-live value that the connection cache server
-allows. Requests that specify a larger TTL will be stored with the
-maximum allowed TTL. The purpose of this additional control is to
-protect the infrastructure against careless people. The cache TTL
-is already bounded by $max_idle.  
        
-
-
 
        
 
 
        setgid_group
@@ -5534,7 +5537,8 @@ is already bounded by $max_idle.  
        
 
        
 The group ownership of set-gid Postfix commands and of group-writable
 Postfix directories. When this parameter value is changed you need
-to re-run "post-install set-permissions".
+to re-run "postfix set-permissions" (with Postfix 2.0 and
+earlier: "/etc/postfix/post-install set-permissions".
 
        
 
 
@@ -7173,16 +7177,15 @@ rejected requests (default: 554).
 
 
        Pause for the specified number of seconds and proceed with
 the next restriction in the list, if any. This may stop zombie
-mail when used as:  
        
+mail when used as:
 
-
        
 
         /etc/postfix/main.cf:
     smtpd_client_restrictions =
         sleep 1, reject_unauth_pipelining
     smtpd_delay_reject = no
 
        
-
        
+This feature is available in Postfix 2.3. 
 
 
        warn_if_reject
        
 
@@ -7339,7 +7342,7 @@ dedicated servers. 
        
 
 
         Note 1: this mode implies "smtpd_tls_auth_only = yes". 
        
 
-
         Note 2: when invoked via "sendmail -bs", Postfix will never offer
+
         Note 2: when invoked via "sendmail -bs", Postfix will never offer
 STARTTLS due to insufficient privileges to access the server private
 key. This is intended behavior. 
        
 
@@ -8802,7 +8805,7 @@ purpose. 
        
 
         Opportunistic mode: announce STARTTLS support to SMTP clients,
 but do not require that clients use TLS encryption. 
        
 
-
         Note: when invoked via "sendmail -bs", Postfix will never offer
+
         Note: when invoked via "sendmail -bs", Postfix will never offer
 STARTTLS due to insufficient privileges to access the server private
 key. This is intended behavior. 
        
 
@@ -8957,7 +8960,7 @@ FROM and RCPT TO addresses.
 
 
        
 Obsolete SUN mailtool compatibility feature. Instead, use
-"mailbox_delivery_lock = dotlock".
+"mailbox_delivery_lock = dotlock".
 
        
 
 
@@ -9693,7 +9696,7 @@ and virtual_alias_maps. 
        
 
 
        
 The minimum user ID value that the virtual(8) delivery agent accepts
-as a result from $virtual_uid_maps table lookup.  Returned
+as a result from $virtual_uid_maps table lookup.  Returned
 values less than this will be rejected, and the message will be
 deferred.
 
        
diff --git a/postfix/html/postdrop.1.html b/postfix/html/postdrop.1.html
index 5226950aa..1e6461b32 100644
--- a/postfix/html/postdrop.1.html
+++ b/postfix/html/postdrop.1.html
@@ -13,8 +13,8 @@ POSTDROP(1)                                           POSTDROP(1)
        postdrop [-rv] [-c config_dir]
 
 DESCRIPTION
-       The postdrop command creates a file in the maildrop direc-
-       tory and copies its standard input to the file.
+       The  postdrop(1)  command  creates  a file in the maildrop
+       directory and copies its standard input to the file.
 
        Options:
 
@@ -61,7 +61,7 @@ POSTDROP(1)                                           POSTDROP(1)
 CONFIGURATION PARAMETERS
        The  following  main.cf parameters are especially relevant
        to this program.  The text below provides only a parameter
-       summary.  See postconf(5) for more details including exam-
+       summary.  See postconf(5) for more details including exam-
        ples.
 
        alternate_config_directories (empty)
@@ -93,15 +93,15 @@ POSTDROP(1)                                           POSTDROP(1)
 
        trigger_timeout (10s)
               The  time  limit for sending a trigger to a Postfix
-              daemon (for example, the pickup(8) or qmgr(8)  dae-
+              daemon (for example, the pickup(8) or qmgr(8)  dae-
               mon).
 
        Available in Postfix version 2.2 and later:
 
        authorized_submit_users (static:anyone)
               List  of  users  who  are authorized to submit mail
-              with the sendmail(1) command (and with  the  privi-
-              leged postdrop(1) helper command).
+              with the sendmail(1) command (and with  the  privi-
+              leged postdrop(1) helper command).
 
 FILES
        /var/spool/postfix/maildrop, maildrop queue
diff --git a/postfix/html/postfix-manuals.html b/postfix/html/postfix-manuals.html
index 0c957a508..24868b943 100644
--- a/postfix/html/postfix-manuals.html
+++ b/postfix/html/postfix-manuals.html
@@ -82,6 +82,8 @@ the following convention:  
        
 
 
      •  postcat(1), examine Postfix queue file 
 
+
      •  postconf(1), Postfix configuration utility 
+
 
      •  postkick(1), trigger Postfix daemon 
 
 
      •  postlock(1), Postfix-compatible locking 
diff --git a/postfix/html/postfix.1.html b/postfix/html/postfix.1.html
index 977ff9988..1dee2171d 100644
--- a/postfix/html/postfix.1.html
+++ b/postfix/html/postfix.1.html
@@ -14,14 +14,14 @@ POSTFIX(1)                                             POSTFIX(1)
 
 DESCRIPTION
        This  command  is  reserved  for  the superuser. To submit
-       mail, use the Postfix sendmail command.
+       mail, use the Postfix sendmail(1) command.
 
-       The postfix command controls the operation of the  Postfix
-       mail  system: start or stop the master daemon, do a health
-       check, and other maintenance.
+       The postfix(1) command controls the operation of the Post-
+       fix  mail system: start or stop the master(8) daemon, do a
+       health check, and other maintenance.
 
-       The postfix command sets up a standardized environment and
-       runs  the  postfix-script  shell  script  to do the actual
+       The postfix(1) command sets up a standardized  environment
+       and  runs the postfix-script shell script to do the actual
        work.
 
        The following commands are implemented:
@@ -99,7 +99,7 @@ POSTFIX(1)                                             POSTFIX(1)
               verbose.
 
 ENVIRONMENT
-       The postfix  command  exports  the  following  environment
+       The postfix(1) command exports the  following  environment
        variables before executing the postfix-script file:
 
        MAIL_CONFIG
@@ -144,15 +144,15 @@ POSTFIX(1)                                             POSTFIX(1)
 
        sendmail_path (see 'postconf -d' output)
               A Sendmail compatibility feature that specifies the
-              location of the Postfix sendmail(1) command.
+              location of the Postfix sendmail(1) command.
 
        newaliases_path (see 'postconf -d' output)
               Sendmail compatibility feature that  specifies  the
-              location of the newaliases(1) command.
+              location of the newaliases(1) command.
 
        mailq_path (see 'postconf -d' output)
               Sendmail compatibility feature that specifies where
-              the Postfix mailq(1) command is installed.
+              the Postfix mailq(1) command is installed.
 
        html_directory (see 'postconf -d' output)
               The location of Postfix HTML  files  that  describe
@@ -197,6 +197,7 @@ POSTFIX(1)                                             POSTFIX(1)
        Commands:
        postalias(1), create/update/query alias database
        postcat(1), examine Postfix queue file
+       postconf(1), Postfix configuration utility
        postkick(1), trigger Postfix daemon
        postlock(1), Postfix-compatible locking
        postlog(1), Postfix-compatible logging
diff --git a/postfix/html/postkick.1.html b/postfix/html/postkick.1.html
index 83d181e9d..4ac51811f 100644
--- a/postfix/html/postkick.1.html
+++ b/postfix/html/postkick.1.html
@@ -13,10 +13,10 @@ POSTKICK(1)                                           POSTKICK(1)
        postkick [-c config_dir] [-v] class service request
 
 DESCRIPTION
-       The  postkick  command sends request to the specified ser-
-       vice over a local transport channel.  This  command  makes
-       Postfix  private  IPC  accessible for use in, for example,
-       shell scripts.
+       The  postkick(1)  command  sends  request to the specified
+       service over a  local  transport  channel.   This  command
+       makes Postfix private IPC accessible for use in, for exam-
+       ple, shell scripts.
 
        Options:
 
@@ -57,7 +57,7 @@ POSTKICK(1)                                           POSTKICK(1)
 CONFIGURATION PARAMETERS
        The  following  main.cf parameters are especially relevant
        to this program.  The text below provides only a parameter
-       summary.  See postconf(5) for more details including exam-
+       summary.  See postconf(5) for more details including exam-
        ples.
 
        config_directory (see 'postconf -d' output)
@@ -65,7 +65,7 @@ POSTKICK(1)                                           POSTKICK(1)
               master.cf configuration files.
 
        application_event_drain_time (100s)
-              How  long  the  postkick(1)  command  waits  for  a
+              How  long  the  postkick(1)  command  waits  for  a
               request to enter the server's input  buffer  before
               giving up.
 
diff --git a/postfix/html/postlock.1.html b/postfix/html/postlock.1.html
index 5b0806336..ff4d616ff 100644
--- a/postfix/html/postlock.1.html
+++ b/postfix/html/postlock.1.html
@@ -14,9 +14,9 @@ POSTLOCK(1)                                           POSTLOCK(1)
                [-v] file command...
 
 DESCRIPTION
-       The  postlock command locks file for exclusive access, and
-       executes command. The locking method  is  compatible  with
-       the Postfix UNIX-style local delivery agent.
+       The  postlock(1)  command locks file for exclusive access,
+       and executes command. The  locking  method  is  compatible
+       with the Postfix UNIX-style local delivery agent.
 
        Options:
 
@@ -46,9 +46,9 @@ POSTLOCK(1)                                           POSTLOCK(1)
               command interpreter.
 
 DIAGNOSTICS
-       The  result status is 75 (EX_TEMPFAIL) when postlock could
-       not perform the requested operation.  Otherwise, the  exit
-       status is the exit status from the command.
+       The  result  status  is  75 (EX_TEMPFAIL) when postlock(1)
+       could not perform the requested operation.  Otherwise, the
+       exit status is the exit status from the command.
 
 BUGS
        With  remote  file  systems, the ability to acquire a lock
@@ -65,24 +65,24 @@ POSTLOCK(1)                                           POSTLOCK(1)
 CONFIGURATION PARAMETERS
        The  following  main.cf parameters are especially relevant
        to this program.  The text below provides only a parameter
-       summary.  See postconf(5) for more details including exam-
+       summary.  See postconf(5) for more details including exam-
        ples.
 
 LOCKING CONTROLS
        deliver_lock_attempts (20)
               The maximal number of attempts to acquire an exclu-
-              sive lock on a mailbox file or bounce(8) logfile.
+              sive lock on a mailbox file or bounce(8) logfile.
 
        deliver_lock_delay (1s)
               The  time  between attempts to acquire an exclusive
-              lock on a mailbox file or bounce(8) logfile.
+              lock on a mailbox file or bounce(8) logfile.
 
        stale_lock_time (500s)
               The time after  which  a  stale  exclusive  mailbox
               lockfile is removed.
 
        mailbox_delivery_lock (see 'postconf -d' output)
-              How  to  lock  a UNIX-style local(8) mailbox before
+              How  to  lock  a UNIX-style local(8) mailbox before
               attempting delivery.
 
 RESOURCE AND RATE CONTROLS
diff --git a/postfix/html/postlog.1.html b/postfix/html/postlog.1.html
index 35664f08d..c443e7983 100644
--- a/postfix/html/postlog.1.html
+++ b/postfix/html/postlog.1.html
@@ -14,38 +14,38 @@ POSTLOG(1)                                             POSTLOG(1)
                [-p priority] [-t tag] [text...]
 
 DESCRIPTION
-       The  postlog  command implements a Postfix-compatible log-
-       ging interface for use in, for example, shell scripts.
+       The  postlog(1)  command  implements  a Postfix-compatible
+       logging interface for use in, for example, shell  scripts.
 
-       By default, postlog logs the text  given  on  the  command
+       By  default, postlog(1) logs the text given on the command
        line as one record. If no text is specified on the command
-       line, postlog reads from  standard  input  and  logs  each
+       line,  postlog(1)  reads from standard input and logs each
        input line as one record.
 
-       Logging  is  sent  to  syslogd(8); when the standard error
-       stream is connected to a terminal, logging is  sent  there
+       Logging is sent to syslogd(8);  when  the  standard  error
+       stream  is  connected to a terminal, logging is sent there
        as well.
 
        The following options are implemented:
 
        -c config_dir
-              Read  the  main.cf  configuration file in the named
+              Read the main.cf configuration file  in  the  named
               directory  instead  of  the  default  configuration
               directory.
 
        -i     Include the process ID in the logging tag.
 
        -p priority
-              Specifies  the  logging  severity:  info (default),
+              Specifies the  logging  severity:  info  (default),
               warn, error, fatal, or panic.
 
        -t tag Specifies the logging tag, that is, the identifying
-              name  that appears at the beginning of each logging
-              record. A default tag is used when none  is  speci-
+              name that appears at the beginning of each  logging
+              record.  A  default tag is used when none is speci-
               fied.
 
        -v     Enable verbose logging for debugging purposes. Mul-
-              tiple -v options  make  the  software  increasingly
+              tiple  -v  options  make  the software increasingly
               verbose.
 
 ENVIRONMENT
@@ -53,21 +53,21 @@ POSTLOG(1)                                             POSTLOG(1)
               Directory with the main.cf file.
 
 CONFIGURATION PARAMETERS
-       The  following  main.cf parameters are especially relevant
+       The following main.cf parameters are  especially  relevant
        to this program.
 
-       The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       The  text  below  provides  only  a parameter summary. See
+       postconf(5) for more details including examples.
 
        config_directory (see 'postconf -d' output)
-              The  default  location  of  the Postfix main.cf and
+              The default location of  the  Postfix  main.cf  and
               master.cf configuration files.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The mail system name that is prepended to the  pro-
+              The  mail system name that is prepended to the pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -76,7 +76,7 @@ POSTLOG(1)                                             POSTLOG(1)
        syslogd(8), syslog daemon
 
 LICENSE
-       The Secure Mailer license must be  distributed  with  this
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/postmap.1.html b/postfix/html/postmap.1.html
index 9ab01983e..7fbf32935 100644
--- a/postfix/html/postmap.1.html
+++ b/postfix/html/postmap.1.html
@@ -14,18 +14,19 @@ POSTMAP(1)                                             POSTMAP(1)
                [file_type:]file_name ...
 
 DESCRIPTION
-       The postmap command creates or queries one or more Postfix
-       lookup tables, or updates an existing one. The  input  and
-       output file formats are expected to be compatible with:
+       The  postmap(1)  command  creates  or  queries one or more
+       Postfix lookup tables, or updates  an  existing  one.  The
+       input  and output file formats are expected to be compati-
+       ble with:
 
            makemap file_type file_name < file_name
 
        If the result files do not exist they will be created with
-       the same group and other read permissions  as  the  source
+       the  same  group  and other read permissions as the source
        file.
 
-       While  the table update is in progress, signal delivery is
-       postponed, and an exclusive, advisory, lock is  placed  on
+       While the table update is in progress, signal delivery  is
+       postponed,  and  an exclusive, advisory, lock is placed on
        the entire table, in order to avoid surprises in spectator
        programs.
 
@@ -36,143 +37,143 @@ POSTMAP(1)                                             POSTMAP(1)
 
                    key whitespace value
 
-       o      Empty lines and whitespace-only lines are  ignored,
-              as  are  lines whose first non-whitespace character
+       o      Empty  lines and whitespace-only lines are ignored,
+              as are lines whose first  non-whitespace  character
               is a `#'.
 
-       o      A logical line starts with non-whitespace  text.  A
-              line  that starts with whitespace continues a logi-
+       o      A  logical  line starts with non-whitespace text. A
+              line that starts with whitespace continues a  logi-
               cal line.
 
-       The key and value are processed as is,  except  that  sur-
-       rounding  white space is stripped off. Unlike with Postfix
-       alias databases, quotes cannot be used to  protect  lookup
-       keys  that  contain  special  characters  such  as  `#' or
+       The  key  and  value are processed as is, except that sur-
+       rounding white space is stripped off. Unlike with  Postfix
+       alias  databases,  quotes cannot be used to protect lookup
+       keys that  contain  special  characters  such  as  `#'  or
        whitespace. The key is mapped to lowercase to make mapping
        lookups case insensitive.
 
 COMMAND-LINE ARGUMENTS
        -c config_dir
-              Read  the  main.cf  configuration file in the named
+              Read the main.cf configuration file  in  the  named
               directory  instead  of  the  default  configuration
               directory.
 
-       -d key Search  the  specified  maps for key and remove one
-              entry per map.  The exit status is  zero  when  the
+       -d key Search the specified maps for key  and  remove  one
+              entry  per  map.   The exit status is zero when the
               requested information was found.
 
               If a key value of - is specified, the program reads
               key values from the standard input stream. The exit
-              status  is  zero when at least one of the requested
+              status is zero when at least one of  the  requested
               keys was found.
 
        -f     Do not fold the lookup key to lower case while cre-
               ating or querying a map.
 
-       -i     Incremental  mode. Read entries from standard input
+       -i     Incremental mode. Read entries from standard  input
               and  do  not  truncate  an  existing  database.  By
-              default,  postmap  creates  a new database from the
+              default, postmap(1) creates a new database from the
               entries in file_name.
 
-       -N     Include the terminating null character that  termi-
-              nates  lookup  keys and values. By default, Postfix
-              does whatever is the default for the host operating
-              system.
+       -N     Include  the terminating null character that termi-
+              nates  lookup  keys   and   values.   By   default,
+              postmap(1)  does  whatever  is  the default for the
+              host operating system.
 
-       -n     Don't  include  the terminating null character that
-              terminates lookup  keys  and  values.  By  default,
-              Postfix  does  whatever is the default for the host
-              operating system.
+       -n     Don't include the terminating null  character  that
+              terminates  lookup  keys  and  values.  By default,
+              postmap(1) does whatever is  the  default  for  the
+              host operating system.
 
-       -o     Do not release root privileges  when  processing  a
-              non-root input file. By default, postmap drops root
-              privileges  and  runs  as  the  source  file  owner
+       -o     Do  not  release  root privileges when processing a
+              non-root input file. By default,  postmap(1)  drops
+              root  privileges  and runs as the source file owner
               instead.
 
        -p     Do not inherit the file access permissions from the
               input file when creating a new file.  Instead, cre-
-              ate  a  new  file  with  default access permissions
+              ate a new  file  with  default  access  permissions
               (mode 0644).
 
-       -q key Search the specified maps for  key  and  write  the
-              first  value  found  to the standard output stream.
+       -q key Search  the  specified  maps  for key and write the
+              first value found to the  standard  output  stream.
               The exit status is zero when the requested informa-
               tion was found.
 
               If a key value of - is specified, the program reads
-              key values  from  the  standard  input  stream  and
-              writes  one  line  of key value output for each key
-              that was found. The exit status  is  zero  when  at
+              key  values  from  the  standard  input  stream and
+              writes one line of key value output  for  each  key
+              that  was  found.  The  exit status is zero when at
               least one of the requested keys was found.
 
        -r     When  updating  a  table,  do  not  complain  about
               attempts to update existing entries, and make those
               updates anyway.
 
-       -s     Retrieve  all database elements, and write one line
-              of key value output for each element. The  elements
-              are  printed in database order, which is not neces-
-              sarily the same as the original input order.   This
-              feature  is  available  in  Postfix version 2.2 and
+       -s     Retrieve all database elements, and write one  line
+              of  key value output for each element. The elements
+              are printed in database order, which is not  neces-
+              sarily  the same as the original input order.  This
+              feature is available in  Postfix  version  2.2  and
               later, and is not available for all database types.
 
        -v     Enable verbose logging for debugging purposes. Mul-
-              tiple -v options  make  the  software  increasingly
+              tiple  -v  options  make  the software increasingly
               verbose.
 
        -w     When  updating  a  table,  do  not  complain  about
-              attempts to update  existing  entries,  and  ignore
+              attempts  to  update  existing  entries, and ignore
               those attempts.
 
        Arguments:
 
        file_type
-              The  database type. To find out what types are sup-
+              The database type. To find out what types are  sup-
               ported, use the "postconf -m" command.
 
-              The postmap command can query  any  supported  file
-              type,  but  it  can  create only the following file
+              The postmap(1) command can query any supported file
+              type, but it can create  only  the  following  file
               types:
 
-              btree  The output  file  is  a  btree  file,  named
-                     file_name.db.   This is available on systems
+              btree  The  output  file  is  a  btree  file, named
+                     file_name.db.  This is available on  systems
                      with support for db databases.
 
               cdb    The  output  consists  of  one  file,  named
                      file_name.cdb.  This is available on systems
                      with support for cdb databases.
 
-              dbm    The output  consists  of  two  files,  named
-                     file_name.pag  and  file_name.dir.   This is
-                     available on systems with  support  for  dbm
+              dbm    The  output  consists  of  two  files, named
+                     file_name.pag and  file_name.dir.   This  is
+                     available  on  systems  with support for dbm
                      databases.
 
-              hash   The  output  file  is  a  hashed file, named
-                     file_name.db.  This is available on  systems
+              hash   The output file  is  a  hashed  file,  named
+                     file_name.db.   This is available on systems
                      with support for db databases.
 
-              sdbm   The  output  consists  of  two  files, named
-                     file_name.pag and  file_name.dir.   This  is
-                     available  on  systems with support for sdbm
+              sdbm   The output  consists  of  two  files,  named
+                     file_name.pag  and  file_name.dir.   This is
+                     available on systems with support  for  sdbm
                      databases.
 
-              When no file_type is specified, the  software  uses
-              the     database    type    specified    via    the
+              When  no  file_type is specified, the software uses
+              the    database    type    specified    via     the
               default_database_type configuration parameter.
 
        file_name
-              The name of  the  lookup  table  source  file  when
+              The  name  of  the  lookup  table  source file when
               rebuilding a database.
 
 DIAGNOSTICS
-       Problems  are  logged  to the standard error stream and to
-       syslogd(8).   No  output  means  that  no  problems   were
-       detected.  Duplicate  entries  are skipped and are flagged
+       Problems are logged to the standard error  stream  and  to
+       syslogd(8).    No  output  means  that  no  problems  were
+       detected. Duplicate entries are skipped  and  are  flagged
        with a warning.
 
-       postmap terminates with zero exit status in case  of  suc-
-       cess  (including  successful postmap -q lookup) and termi-
-       nates with non-zero exit status in case of failure.
+       postmap(1)  terminates  with  zero  exit status in case of
+       success (including successful  "postmap  -q"  lookup)  and
+       terminates with non-zero exit status in case of failure.
 
 ENVIRONMENT
        MAIL_CONFIG
@@ -182,32 +183,32 @@ POSTMAP(1)                                             POSTMAP(1)
               Enable verbose logging for debugging purposes.
 
 CONFIGURATION PARAMETERS
-       The following main.cf parameters are  especially  relevant
+       The  following  main.cf parameters are especially relevant
        to this program.  The text below provides only a parameter
-       summary. See postconf(5) for more details including  exam-
+       summary.  See postconf(5) for more details including exam-
        ples.
 
        berkeley_db_create_buffer_size (16777216)
-              The  per-table  I/O  buffer  size for programs that
+              The per-table I/O buffer  size  for  programs  that
               create Berkeley DB hash or btree tables.
 
        berkeley_db_read_buffer_size (131072)
-              The per-table I/O buffer  size  for  programs  that
+              The  per-table  I/O  buffer  size for programs that
               read Berkeley DB hash or btree tables.
 
        config_directory (see 'postconf -d' output)
-              The  default  location  of  the Postfix main.cf and
+              The default location of  the  Postfix  main.cf  and
               master.cf configuration files.
 
        default_database_type (see 'postconf -d' output)
-              The default database type for use in newaliases(1),
-              postalias(1) and postmap(1) commands.
+              The default database type for use in newaliases(1),
+              postalias(1) and postmap(1) commands.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The  mail system name that is prepended to the pro-
+              The mail system name that is prepended to the  pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -221,7 +222,7 @@ POSTMAP(1)                                             POSTMAP(1)
        DATABASE_README, Postfix lookup table overview
 
 LICENSE
-       The Secure Mailer license must be  distributed  with  this
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/postqueue.1.html b/postfix/html/postqueue.1.html
index 46ff22d76..554ce65cc 100644
--- a/postfix/html/postqueue.1.html
+++ b/postfix/html/postqueue.1.html
@@ -15,12 +15,12 @@ POSTQUEUE(1)                                         POSTQUEUE(1)
        postqueue [-c config_dir] -s site
 
 DESCRIPTION
-       The  postqueue  program implements the Postfix user inter-
-       face for queue management. It implements  operations  that
-       are  traditionally  available via the sendmail(1) command.
-       See the postsuper(1) command  for  queue  operations  that
-       require  super-user  privileges such as deleting a message
-       from the queue or changing the status of a message.
+       The  postqueue(1)  command  implements  the  Postfix  user
+       interface for queue management. It  implements  operations
+       that  are traditionally available via the sendmail(1) com-
+       mand.  See the postsuper(1) command for  queue  operations
+       that require super-user privileges such as deleting a mes-
+       sage from the queue or changing the status of a message.
 
        The following options are recognized:
 
@@ -33,8 +33,9 @@ POSTQUEUE(1)                                         POSTQUEUE(1)
        -f     Flush  the  queue:  attempt  to  deliver all queued
               mail.
 
-              This option implements the traditional sendmail  -q
-              command,  by contacting the Postfix qmgr(8) daemon.
+              This option implements  the  traditional  "sendmail
+              -q" command, by contacting the Postfix qmgr(8) dae-
+              mon.
 
               Warning:  flushing  undeliverable  mail  frequently
               will  result  in  poor  delivery performance of all
@@ -69,9 +70,9 @@ POSTQUEUE(1)                                         POSTQUEUE(1)
               See  flush(8)  for more information about the "fast
               flush" service.
 
-              This option  implements  the  traditional  sendmail
-              -qRsite command, by contacting the Postfix flush(8)
-              daemon.
+              This option implements  the  traditional  "sendmail
+              -qRsite"   command,   by   contacting  the  Postfix
+              flush(8) daemon.
 
        -v     Enable verbose logging for debugging purposes. Mul-
               tiple  -v  options  make  the software increasingly
@@ -100,7 +101,7 @@ POSTQUEUE(1)                                         POSTQUEUE(1)
 CONFIGURATION PARAMETERS
        The  following  main.cf parameters are especially relevant
        to this program.  The text below provides only a parameter
-       summary.  See postconf(5) for more details including exam-
+       summary.  See postconf(5) for more details including exam-
        ples.
 
        alternate_config_directories (empty)
@@ -141,7 +142,7 @@ POSTQUEUE(1)                                         POSTQUEUE(1)
 
        trigger_timeout (10s)
               The time limit for sending a trigger to  a  Postfix
-              daemon  (for example, the pickup(8) or qmgr(8) dae-
+              daemon  (for example, the pickup(8) or qmgr(8) dae-
               mon).
 
        Available in Postfix version 2.2 and later:
diff --git a/postfix/html/postsuper.1.html b/postfix/html/postsuper.1.html
index 38197a935..810204c5b 100644
--- a/postfix/html/postsuper.1.html
+++ b/postfix/html/postsuper.1.html
@@ -15,195 +15,198 @@ POSTSUPER(1)                                         POSTSUPER(1)
                [-r queue_id] [directory ...]
 
 DESCRIPTION
-       The postsuper command does maintenance jobs on the Postfix
-       queue. Use of the command is restricted to the  superuser.
-       See  the  postqueue  command for unprivileged queue opera-
-       tions such as listing or flushing the mail queue.
-
-       By default, postsuper performs  the  operations  requested
-       with  the  -s  and  -p command-line options on all Postfix
+       The  postsuper(1)  command  does  maintenance  jobs on the
+       Postfix queue. Use of the command  is  restricted  to  the
+       superuser.   See the postqueue(1) command for unprivileged
+       queue operations such as  listing  or  flushing  the  mail
+       queue.
+
+       By default, postsuper(1) performs the operations requested
+       with the -s and -p command-line  options  on  all  Postfix
        queue directories - this includes the incoming, active and
-       deferred  directories  with  mail  files  and  the bounce,
+       deferred directories  with  mail  files  and  the  bounce,
        defer, trace and flush directories with log files.
 
        Options:
 
        -c config_dir
-              The main.cf configuration  file  is  in  the  named
+              The  main.cf  configuration  file  is  in the named
               directory  instead  of  the  default  configuration
-              directory. See  also  the  MAIL_CONFIG  environment
+              directory.  See  also  the  MAIL_CONFIG environment
               setting below.
 
        -d queue_id
               Delete one message with the named queue ID from the
-              named  mail  queue(s)  (default:  hold,   incoming,
+              named   mail  queue(s)  (default:  hold,  incoming,
               active and deferred).  If a queue_id of - is speci-
-              fied, the program reads  queue  IDs  from  standard
-              input.  For  example, to delete all mail from or to
-              user@example.com:
-
-              mailq | tail +2 | awk  'BEGIN { RS = "" } \
-                  / user@example\.com$/ { print $1 } \
+              fied,  the  program  reads  queue IDs from standard
+              input. For example, to delete all mail with exactly
+              one recipient user@example.com:
+
+              mailq | tail +2 | awk  'BEGIN { RS = "" }
+                  # $7=sender, $8=recipient1, $9=recipient2
+                  { if ($8 == "user@example.com" && $9 == "")
+                    print $1 }
               ' | tr -d '*!' | postsuper -d -
 
               Specify -d ALL to remove all messages; for example,
-              specify  -d  ALL  deferred  to  delete  mail in the
-              deferred queue.  As a safety measure, the word  ALL
+              specify -d ALL  deferred  to  delete  mail  in  the
+              deferred  queue.  As a safety measure, the word ALL
               must be specified in upper case.
 
-              Warning:  Postfix queue IDs are reused.  There is a
-              very small possibility that postsuper  deletes  the
-              wrong  message  file  when it is executed while the
+              Warning: Postfix queue IDs are reused.  There is  a
+              very  small  possibility that postsuper deletes the
+              wrong message file when it is  executed  while  the
               Postfix mail system is delivering mail.
 
               The scenario is as follows:
 
-              1)     The Postfix queue manager deletes  the  mes-
-                     sage  that  postsuper  is  asked  to delete,
+              1)     The  Postfix  queue manager deletes the mes-
+                     sage that postsuper(1) is asked  to  delete,
                      because Postfix is finished with the message
-                     (it  is  delivered, or it is returned to the
+                     (it is delivered, or it is returned  to  the
                      sender).
 
-              2)     New mail arrives, and  the  new  message  is
-                     given  the same queue ID as the message that
-                     postsuper is supposed to delete.  The proba-
-                     bility  for  reusing  a  deleted queue ID is
-                     about 1 in 2**15 (the  number  of  different
+              2)     New  mail  arrives,  and  the new message is
+                     given the same queue ID as the message  that
+                     postsuper(1)  is  supposed  to  delete.  The
+                     probability for reusing a deleted  queue  ID
+                     is about 1 in 2**15 (the number of different
                      microsecond values that the system clock can
                      distinguish within a second).
 
-              3)     postsuper deletes the new  message,  instead
-                     of  the  old  message  that  it  should have
-                     deleted.
+              3)     postsuper(1)   deletes   the   new  message,
+                     instead of the old message  that  it  should
+                     have deleted.
 
        -h queue_id
-              Put mail "on hold" so that no attempt  is  made  to
-              deliver  it.  Move one message with the named queue
+              Put  mail  "on  hold" so that no attempt is made to
+              deliver it.  Move one message with the named  queue
               ID from the named mail queue(s) (default: incoming,
-              active  and  deferred)  to  the  hold  queue.  If a
+              active and deferred)  to  the  hold  queue.   If  a
               queue_id of - is specified, the program reads queue
               IDs from standard input.
 
-              Specify  -h  ALL to hold all messages; for example,
+              Specify -h ALL to hold all messages;  for  example,
               specify  -h  ALL  deferred  to  hold  mail  in  the
-              deferred  queue.  As a safety measure, the word ALL
+              deferred queue.  As a safety measure, the word  ALL
               must be specified in upper case.
 
-              Note: while mail is "on hold" it  will  not  expire
-              when  its  time  in  the  queue  exceeds  the maxi-
+              Note:  while  mail  is "on hold" it will not expire
+              when its  time  in  the  queue  exceeds  the  maxi-
               mal_queue_lifetime  or  bounce_queue_lifetime  set-
-              ting.  It becomes subject to expiration after it is
+              ting. It becomes subject to expiration after it  is
               released from "hold".
 
        -H queue_id
               Release mail that was put "on hold".  Move one mes-
-              sage  with  the  named queue ID from the named mail
+              sage with the named queue ID from  the  named  mail
               queue(s) (default: hold) to the deferred queue.  If
-              a  queue_id  of  -  is specified, the program reads
+              a queue_id of - is  specified,  the  program  reads
               queue IDs from standard input.
 
-              Note: use "postsuper -r" to release mail  that  was
-              kept  on  hold for a significant fraction of $maxi-
+              Note:  use  "postsuper -r" to release mail that was
+              kept on hold for a significant fraction  of  $maxi-
               mal_queue_lifetime  or  $bounce_queue_lifetime,  or
               longer.
 
-              Specify  -H  ALL  to  release  all mail that is "on
-              hold".  As a safety measure, the word ALL  must  be
+              Specify -H ALL to release  all  mail  that  is  "on
+              hold".   As  a safety measure, the word ALL must be
               specified in upper case.
 
-       -p     Purge  old temporary files that are left over after
+       -p     Purge old temporary files that are left over  after
               system or software crashes.
 
        -r queue_id
-              Requeue the message with the named  queue  ID  from
-              the  named  mail queue(s) (default: hold, incoming,
-              active and deferred).   To  requeue  multiple  mes-
-              sages,  specify  multiple  -r command-line options.
+              Requeue  the  message  with the named queue ID from
+              the named mail queue(s) (default:  hold,  incoming,
+              active  and  deferred).   To  requeue multiple mes-
+              sages, specify multiple  -r  command-line  options.
               Alternatively, if a queue_id of - is specified, the
               program reads queue IDs from standard input.
 
               Specify -r ALL to requeue all messages. As a safety
-              measure, the word ALL must be  specified  in  upper
+              measure,  the  word  ALL must be specified in upper
               case.
 
-              A  requeued message is moved to the maildrop queue,
-              from where it is copied by the pickup daemon  to  a
-              new  file whose name is guaranteed to match the new
+              A requeued message is moved to the maildrop  queue,
+              from  where  it is copied by the pickup daemon to a
+              new file whose name is guaranteed to match the  new
               queue file inode number. The new queue file is sub-
-              jected  again to mail address rewriting and substi-
+              jected again to mail address rewriting and  substi-
               tution. This is useful when rewriting rules or vir-
               tual mappings have changed.
 
-              Warning:  Postfix queue IDs are reused.  There is a
-              very small possibility that postsuper requeues  the
-              wrong  message  file  when it is executed while the
-              Postfix mail system is running, but no harm  should
-              be done.
+              Warning: Postfix queue IDs are reused.  There is  a
+              very  small  possibility that postsuper(1) requeues
+              the wrong message file when it  is  executed  while
+              the  Postfix  mail  system  is running, but no harm
+              should be done.
 
-       -s     Structure  check and structure repair.  This should
+       -s     Structure check and structure repair.  This  should
               be done once before Postfix startup.
 
-              o      Rename files whose name does not  match  the
+              o      Rename  files  whose name does not match the
                      message file inode number. This operation is
-                     necessary after restoring a mail queue  from
+                     necessary  after restoring a mail queue from
                      a different machine, or from backup media.
 
               o      Move queue files that are in the wrong place
                      in the file system hierarchy and remove sub-
                      directories that are no longer needed.  File
-                     position rearrangements are necessary  after
+                     position  rearrangements are necessary after
                      a  change  in  the  hash_queue_names  and/or
                      hash_queue_depth configuration parameters.
 
        -v     Enable verbose logging for debugging purposes. Mul-
-              tiple  -v  options  make  the software increasingly
+              tiple -v options  make  the  software  increasingly
               verbose.
 
 DIAGNOSTICS
-       Problems are reported to the standard error stream and  to
+       Problems  are reported to the standard error stream and to
        syslogd(8).
 
-       postsuper  reports the number of messages deleted with -d,
-       the number of messages requeued with -r, and the number of
-       messages  whose  queue  file  name  was fixed with -s. The
-       report is written to the standard error stream and to sys-
-       logd(8).
+       postsuper(1) reports the number of messages  deleted  with
+       -d,  the number of messages requeued with -r, and the num-
+       ber of messages whose queue file name was fixed  with  -s.
+       The  report is written to the standard error stream and to
+       syslogd(8).
 
 ENVIRONMENT
        MAIL_CONFIG
               Directory with the main.cf file.
 
 BUGS
-       Mail  that  is  not sanitized by Postfix (i.e. mail in the
+       Mail that is not sanitized by Postfix (i.e.  mail  in  the
        maildrop queue) cannot be placed "on hold".
 
 CONFIGURATION PARAMETERS
-       The following main.cf parameters are  especially  relevant
+       The  following  main.cf parameters are especially relevant
        to this program.  The text below provides only a parameter
-       summary. See postconf(5) for more details including  exam-
+       summary.  See postconf(5) for more details including exam-
        ples.
 
        config_directory (see 'postconf -d' output)
-              The  default  location  of  the Postfix main.cf and
+              The default location of  the  Postfix  main.cf  and
               master.cf configuration files.
 
        hash_queue_depth (1)
-              The number of subdirectory levels for queue  direc-
-              tories  listed with the hash_queue_names parameter.
+              The  number of subdirectory levels for queue direc-
+              tories listed with the hash_queue_names  parameter.
 
-       hash_queue_names (see 'postconf -d' output)
-              The names  of  queue  directories  that  are  split
+       hash_queue_names (deferred, defer)
+              The  names  of  queue  directories  that  are split
               across multiple subdirectory levels.
 
        queue_directory (see 'postconf -d' output)
-              The  location of the Postfix top-level queue direc-
+              The location of the Postfix top-level queue  direc-
               tory.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The mail system name that is prepended to the  pro-
+              The  mail system name that is prepended to the pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -212,7 +215,7 @@ POSTSUPER(1)                                         POSTSUPER(1)
        postqueue(1), unprivileged queue operations
 
 LICENSE
-       The Secure Mailer license must be  distributed  with  this
+       The  Secure  Mailer  license must be distributed with this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/proxymap.8.html b/postfix/html/proxymap.8.html
index ceb8ff7df..9a998b5a4 100644
--- a/postfix/html/proxymap.8.html
+++ b/postfix/html/proxymap.8.html
@@ -13,101 +13,102 @@ PROXYMAP(8)                                           PROXYMAP(8)
        proxymap [generic Postfix daemon options]
 
 DESCRIPTION
-       The  proxymap  server provides read-only table lookup ser-
-       vice to Postfix processes. The purpose of the service is:
-
-       o      To overcome chroot  restrictions.  For  example,  a
-              chrooted  SMTP  server  needs  access to the system
-              passwd file in order to reject mail  for  non-exis-
-              tent  local  addresses,  but it is not practical to
-              maintain a copy of the passwd file  in  the  chroot
+       The  proxymap(8)  server  provides  read-only table lookup
+       service to Postfix processes. The purpose of  the  service
+       is:
+
+       o      To  overcome  chroot  restrictions.  For example, a
+              chrooted SMTP server needs  access  to  the  system
+              passwd  file  in order to reject mail for non-exis-
+              tent local addresses, but it is  not  practical  to
+              maintain  a  copy  of the passwd file in the chroot
               jail.  The solution:
 
               local_recipient_maps =
                   proxy:unix:passwd.byname $alias_maps
 
-       o      To  consolidate the number of open lookup tables by
-              sharing one open table  among  multiple  processes.
-              For  example,  making  mysql connections from every
+       o      To consolidate the number of open lookup tables  by
+              sharing  one  open  table among multiple processes.
+              For example, making mysql  connections  from  every
               Postfix daemon process results in "too many connec-
               tions" errors. The solution:
 
               virtual_alias_maps =
                   proxy:mysql:/etc/postfix/virtual_alias.cf
 
-              The  total  number of connections is limited by the
+              The total number of connections is limited  by  the
               number of proxymap server processes.
 
-       The proxymap server implements the following requests:
+       The proxymap(8) server implements the following requests:
 
        open maptype:mapname flags
-              Open the table with type maptype and name  mapname,
+              Open  the table with type maptype and name mapname,
               as controlled by flags. The reply includes the map-
               type dependent flags (to distinguish a fixed string
               table from a regular expression table).
 
        lookup maptype:mapname flags key
-              Look  up  the  data stored under the requested key.
-              The reply is the  request  completion  status  code
-              (below)  and  the  lookup  result  value.  The map-
-              type:mapname and flags are the  same  as  with  the
+              Look up the data stored under  the  requested  key.
+              The  reply  is  the  request completion status code
+              (below) and the  lookup  result  value.   The  map-
+              type:mapname  and  flags  are  the same as with the
               open request.
 
-       There  is  no  close  command,  nor  are tables implicitly
-       closed when a client disconnects. The purpose is to  share
+       There is no  close  command,  nor  are  tables  implicitly
+       closed  when a client disconnects. The purpose is to share
        tables among multiple client processes.
 
 SERVER PROCESS MANAGEMENT
-       proxymap  servers  run under control by the Postfix master
-       server.  Each server can handle multiple simultaneous con-
-       nections.   When  all servers are busy while a client con-
-       nects, the master creates a new proxymap  server  process,
-       provided  that  the  process  limit is not exceeded.  Each
-       server terminates after serving at least $max_use  clients
-       or after $max_idle seconds of idle time.
+       proxymap(8) servers run under control by the Postfix  mas-
+       ter(8) server.  Each server can handle multiple simultane-
+       ous connections.  When all servers are busy while a client
+       connects,  the  master(8) creates a new proxymap(8) server
+       process, provided that the process limit is not  exceeded.
+       Each  server  terminates  after  serving at least $max_use
+       clients or after $max_idle seconds of idle time.
 
 SECURITY
-       The  proxymap  server  opens only tables that are approved
-       via the proxy_read_maps configuration parameter, does  not
-       talk  to  users,  and  can  run  at  fixed  low privilege,
-       chrooted or not.  However,  running  the  proxymap  server
-       chrooted  severely  limits  usability, because it can open
+       The proxymap(8) server opens only tables that are approved
+       via  the proxy_read_maps configuration parameter, does not
+       talk to  users,  and  can  run  at  fixed  low  privilege,
+       chrooted  or  not.   However,  running the proxymap server
+       chrooted severely limits usability, because  it  can  open
        only chrooted tables.
 
-       The proxymap server is not a trusted daemon  process,  and
-       must  not be used to look up sensitive information such as
-       user or group IDs, mailbox file/directory names or  exter-
-       nal commands.
+       The  proxymap(8)  server  is not a trusted daemon process,
+       and must not be used to look up sensitive information such
+       as  user  or  group  IDs,  mailbox file/directory names or
+       external commands.
 
        In Postfix version 2.2 and later, the proxymap client rec-
-       ognizes requests to access a table for  security-sensitive
-       purposes,  and  opens  the table directly. This allows the
-       same main.cf setting to be used by sensitive and  non-sen-
+       ognizes  requests to access a table for security-sensitive
+       purposes, and opens the table directly.  This  allows  the
+       same  main.cf setting to be used by sensitive and non-sen-
        sitive processes.
 
 DIAGNOSTICS
        Problems and transactions are logged to syslogd(8).
 
 BUGS
-       The  proxymap server provides service to multiple clients,
-       and must therefore not be used for tables that have  high-
-       latency lookups.
+       The  proxymap(8)  server  provides  service  to   multiple
+       clients,  and  must  therefore not be used for tables that
+       have high-latency lookups.
 
 CONFIGURATION PARAMETERS
-       On  busy  mail  systems  a long time may pass before prox-
-       ymap(8) relevant changes to main.cf are picked up. Use the
+       On busy mail systems a long time  may  pass  before  prox-
+       ymap(8) relevant changes to main.cf are picked up. Use the
        command "postfix reload" to speed up a change.
 
-       The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       The text below provides  only  a  parameter  summary.  See
+       postconf(5) for more details including examples.
 
        config_directory (see 'postconf -d' output)
-              The default location of  the  Postfix  main.cf  and
+              The  default  location  of  the Postfix main.cf and
               master.cf configuration files.
 
        daemon_timeout (18000s)
-              How  much time a Postfix daemon process may take to
-              handle a request  before  it  is  terminated  by  a
+              How much time a Postfix daemon process may take  to
+              handle  a  request  before  it  is  terminated by a
               built-in watchdog timer.
 
        ipc_timeout (3600s)
@@ -115,24 +116,24 @@ PROXYMAP(8)                                           PROXYMAP(8)
               over an internal communication channel.
 
        max_idle (100s)
-              The maximum amount of time  that  an  idle  Postfix
-              daemon  process  waits for the next service request
+              The  maximum  amount  of  time that an idle Postfix
+              daemon process waits for the next  service  request
               before exiting.
 
        max_use (100)
-              The maximal number of connection requests before  a
+              The  maximal number of connection requests before a
               Postfix daemon process terminates.
 
        process_id (read-only)
-              The  process ID of a Postfix command or daemon pro-
+              The process ID of a Postfix command or daemon  pro-
               cess.
 
        process_name (read-only)
-              The process name of a  Postfix  command  or  daemon
+              The  process  name  of  a Postfix command or daemon
               process.
 
        proxy_read_maps (see 'postconf -d' output)
-              The  lookup  tables  that the proxymap(8) server is
+              The lookup tables that the  proxymap(8)  server  is
               allowed to access.
 
 SEE ALSO
@@ -143,7 +144,7 @@ PROXYMAP(8)                                           PROXYMAP(8)
        DATABASE_README, Postfix lookup table overview
 
 LICENSE
-       The  Secure  Mailer  license must be distributed with this
+       The Secure Mailer license must be  distributed  with  this
        software.
 
 HISTORY
diff --git a/postfix/html/qmgr.8.html b/postfix/html/qmgr.8.html
index a15260820..47cb95caa 100644
--- a/postfix/html/qmgr.8.html
+++ b/postfix/html/qmgr.8.html
@@ -13,7 +13,7 @@ QMGR(8)                                                   QMGR(8)
        qmgr [generic Postfix daemon options]
 
 DESCRIPTION
-       The  qmgr  daemon  awaits the arrival of incoming mail and
+       The qmgr(8) daemon awaits the arrival of incoming mail and
        arranges for its delivery via Postfix delivery  processes.
        The actual mail routing strategy is delegated to the triv-
        ial-rewrite(8) daemon.  This program  expects  to  be  run
@@ -24,11 +24,12 @@ QMGR(8)                                                   QMGR(8)
        by undeliverable bounce notifications.
 
 MAIL QUEUES
-       The qmgr daemon maintains the following queues:
+       The qmgr(8) daemon maintains the following queues:
 
        incoming
               Inbound mail from the network, or mail picked up by
-              the local pickup agent from the maildrop directory.
+              the local pickup(8) daemon from the maildrop direc-
+              tory.
 
        active Messages  that  the  queue  manager  has opened for
               delivery. Only a  limited  number  of  messages  is
@@ -49,8 +50,8 @@ QMGR(8)                                                   QMGR(8)
               until someone sets them free.
 
 DELIVERY STATUS REPORTS
-       The  qmgr daemon keeps an eye on per-message delivery sta-
-       tus reports in  the  following  directories.  Each  status
+       The  qmgr(8)  daemon  keeps an eye on per-message delivery
+       status reports in the following directories.  Each  status
        report file has the same name as the corresponding message
        file:
 
@@ -67,22 +68,23 @@ QMGR(8)                                                   QMGR(8)
               mand.  These files are maintained by  the  trace(8)
               daemon.
 
-       The  qmgr  daemon is responsible for asking the bounce(8),
-       defer(8) or trace(8) daemons to send delivery reports.
+       The   qmgr(8)   daemon   is  responsible  for  asking  the
+       bounce(8), defer(8) or trace(8) daemons to  send  delivery
+       reports.
 
 STRATEGIES
-       The queue manager implements a variety of  strategies  for
+       The  queue  manager implements a variety of strategies for
        either opening queue files (input) or for message delivery
        (output).
 
        leaky bucket
-              This strategy limits the number of messages in  the
-              active  queue  and  prevents the queue manager from
+              This  strategy limits the number of messages in the
+              active queue and prevents the  queue  manager  from
               running out of memory under heavy load.
 
        fairness
-              When the active queue has room, the  queue  manager
-              takes  one  message from the incoming queue and one
+              When  the  active queue has room, the queue manager
+              takes one message from the incoming queue  and  one
               from the deferred queue. This prevents a large mail
               backlog from blocking the delivery of new mail.
 
@@ -93,42 +95,42 @@ QMGR(8)                                                   QMGR(8)
 
        round robin
               The queue manager sorts delivery requests by desti-
-              nation.  Round-robin selection prevents one  desti-
+              nation.   Round-robin selection prevents one desti-
               nation from dominating deliveries to other destina-
               tions.
 
        exponential backoff
               Mail  that  cannot  be  delivered  upon  the  first
-              attempt  is  deferred.   The  time interval between
+              attempt is deferred.   The  time  interval  between
               delivery attempts is doubled after each attempt.
 
        destination status cache
-              The  queue  manager  avoids  unnecessary   delivery
-              attempts  by  maintaining  a  short-term, in-memory
+              The   queue  manager  avoids  unnecessary  delivery
+              attempts by  maintaining  a  short-term,  in-memory
               list of unreachable destinations.
 
        preemptive message scheduling
-              The queue manager attempts to minimize the  average
+              The  queue manager attempts to minimize the average
               per-recipient delay while still preserving the cor-
               rect per-message delays, using a sophisticated pre-
               emptive message scheduling.
 
 TRIGGERS
        On an idle system, the queue manager waits for the arrival
-       of trigger events, or it waits for a timer to  go  off.  A
-       trigger  is  a one-byte message.  Depending on the message
-       received, the queue manager performs one of the  following
-       actions  (the message is followed by the symbolic constant
+       of  trigger  events,  or it waits for a timer to go off. A
+       trigger is a one-byte message.  Depending on  the  message
+       received,  the queue manager performs one of the following
+       actions (the message is followed by the symbolic  constant
        used internally by the software):
 
        D (QMGR_REQ_SCAN_DEFERRED)
-              Start a deferred queue scan.  If a  deferred  queue
-              scan  is  already  in  progress,  that scan will be
+              Start  a  deferred queue scan.  If a deferred queue
+              scan is already in  progress,  that  scan  will  be
               restarted as soon as it finishes.
 
        I (QMGR_REQ_SCAN_INCOMING)
-              Start an incoming queue scan. If an incoming  queue
-              scan  is  already  in  progress,  that scan will be
+              Start  an incoming queue scan. If an incoming queue
+              scan is already in  progress,  that  scan  will  be
               restarted as soon as it finishes.
 
        A (QMGR_REQ_SCAN_ALL)
@@ -136,32 +138,33 @@ QMGR(8)                                                   QMGR(8)
               affects the next deferred queue scan.
 
        F (QMGR_REQ_FLUSH_DEAD)
-              Purge  all  information  about  dead transports and
+              Purge all information  about  dead  transports  and
               destinations.
 
        W (TRIGGER_REQ_WAKEUP)
-              Wakeup call, This is used by the master  server  to
-              instantiate  servers  that  should not go away for-
-              ever. The action is  to  start  an  incoming  queue
+              Wakeup  call,  This is used by the master server to
+              instantiate servers that should not  go  away  for-
+              ever.  The  action  is  to  start an incoming queue
               scan.
 
-       The  qmgr daemon reads an entire buffer worth of triggers.
-       Multiple identical trigger  requests  are  collapsed  into
-       one,  and trigger requests are sorted so that A and F pre-
-       cede D and I. Thus, in order to  force  a  deferred  queue
+       The qmgr(8) daemon reads an entire buffer worth  of  trig-
+       gers.   Multiple  identical trigger requests are collapsed
+       into one, and trigger requests are sorted so that A and  F
+       precede  D and I. Thus, in order to force a deferred queue
        run, one would request A F D; in order to notify the queue
        manager of the arrival of new mail one would request I.
 
 STANDARDS
-       None. The qmgr daemon does not interact with  the  outside
-       world.
+       None.  The  qmgr(8) daemon does not interact with the out-
+       side world.
 
 SECURITY
-       The  qmgr  daemon is not security sensitive. It reads sin-
-       gle-character messages from  untrusted  local  users,  and
-       thus  may be susceptible to denial of service attacks. The
-       qmgr daemon does not talk to the outside world, and it can
-       be run at fixed low privilege in a chrooted environment.
+       The qmgr(8) daemon is not  security  sensitive.  It  reads
+       single-character  messages from untrusted local users, and
+       thus may be susceptible to denial of service attacks.  The
+       qmgr(8)  daemon does not talk to the outside world, and it
+       can be run at fixed low privilege in a  chrooted  environ-
+       ment.
 
 DIAGNOSTICS
        Problems and transactions are logged to the syslog daemon.
@@ -174,17 +177,17 @@ QMGR(8)                                                   QMGR(8)
 
 BUGS
        A  single  queue  manager  process has to compete for disk
-       access with multiple front-end processes such as smtpd.  A
-       sudden  burst  of  inbound mail can negatively impact out-
-       bound delivery rates.
+       access  with  multiple   front-end   processes   such   as
+       cleanup(8).  A sudden burst of inbound mail can negatively
+       impact outbound delivery rates.
 
 CONFIGURATION PARAMETERS
        Changes to main.cf are  not  picked  up  automatically  as
-       qmgr(8)  is  a  persistent process. Use the postfix reload
+       qmgr(8)  is a persistent process. Use the "postfix reload"
        command after a configuration change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        In  the text below, transport is the first field in a mas-
        ter.cf entry.
@@ -368,7 +371,7 @@ QMGR(8)                                                   QMGR(8)
        postconf(5), configuration parameters
        master(5), generic daemon options
        master(8), process manager
-       syslogd(8) system logging
+       syslogd(8), system logging
 
 README FILES
        SCHEDULER_README, scheduling algorithm
diff --git a/postfix/html/qmqpd.8.html b/postfix/html/qmqpd.8.html
index bf94ce6c0..9443f5abc 100644
--- a/postfix/html/qmqpd.8.html
+++ b/postfix/html/qmqpd.8.html
@@ -44,11 +44,11 @@ QMQPD(8)                                                 QMQPD(8)
 
 CONFIGURATION PARAMETERS
        Changes   to  main.cf  are  picked  up  automatically,  as
-       qmqpd(8) processes run for only a limited amount of  time.
+       qmqpd(8) processes run for only a limited amount of  time.
        Use the command "postfix reload" to speed up a change.
 
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
 CONTENT INSPECTION CONTROLS
        content_filter (empty)
@@ -147,7 +147,7 @@ QMQPD(8)                                                 QMQPD(8)
 
        verp_delimiter_filter (-=+)
               The  characters  Postfix  accepts as VERP delimiter
-              characters on the Postfix sendmail(1) command  line
+              characters on the Postfix sendmail(1) command  line
               and in SMTP commands.
 
 SEE ALSO
diff --git a/postfix/html/qshape.1.html b/postfix/html/qshape.1.html
index 9b378ae42..c439f912a 100644
--- a/postfix/html/qshape.1.html
+++ b/postfix/html/qshape.1.html
@@ -100,7 +100,7 @@ QSHAPE(1)                                               QSHAPE(1)
               incoming and active queue distribution.
 
 SEE ALSO
-       mailq(1) List all messages in the queue.
+       mailq(1), List all messages in the queue.
        QSHAPE_README Examples and background material.
 
 FILES
diff --git a/postfix/html/regexp_table.5.html b/postfix/html/regexp_table.5.html
index 9dbf93cdb..cd605834f 100644
--- a/postfix/html/regexp_table.5.html
+++ b/postfix/html/regexp_table.5.html
@@ -25,9 +25,9 @@ REGEXP_TABLE(5)                                   REGEXP_TABLE(5)
        found the corresponding result is returned.
 
        To  find out what types of lookup tables your Postfix sys-
-       tem supports use the postconf -m command.
+       tem supports use the "postconf -m" command.
 
-       To test lookup tables, use  the  postmap  -fq  command  as
+       To test lookup tables, use the "postmap  -fq"  command  as
        described in the SYNOPSIS above.
 
 TABLE FORMAT
@@ -68,8 +68,8 @@ REGEXP_TABLE(5)                                   REGEXP_TABLE(5)
 
        Each  pattern  is a POSIX regular expression enclosed by a
        pair of delimiters. The regular expression syntax is docu-
-       mented  in  re_format(7)  with  4.4BSD,  in  regex(5) with
-       Solaris, and in regex(7) with Linux. Other systems may use
+       mented  in  re_format(7)  with  4.4BSD,  in  regex(5) with
+       Solaris, and in regex(7) with Linux. Other systems may use
        other document names.
 
        The  expression  delimiter  can  be  any character, except
diff --git a/postfix/html/relocated.5.html b/postfix/html/relocated.5.html
index c9619a50e..5072c5ead 100644
--- a/postfix/html/relocated.5.html
+++ b/postfix/html/relocated.5.html
@@ -7,21 +7,21 @@
 RELOCATED(5)                                         RELOCATED(5)
 
 NAME
-       relocated - format of Postfix relocated table
+       relocated - Postfix relocated table format
 
 SYNOPSIS
        postmap /etc/postfix/relocated
 
 DESCRIPTION
-       The optional relocated table provides the information that
-       is used in "user has moved to  new_location"  bounce  mes-
-       sages.
+       The  optional  relocated(5) table provides the information
+       that is used in "user has moved  to  new_location"  bounce
+       messages.
 
-       Normally,  the relocated table is specified as a text file
-       that serves as  input  to  the  postmap(1)  command.   The
+       Normally,  the  relocated(5)  table is specified as a text
+       file that serves as input to the postmap(1) command.   The
        result,  an  indexed file in dbm or db format, is used for
        fast searching by the mail  system.  Execute  the  command
-       postmap  /etc/postfix/relocated  in  order  to rebuild the
+       "postmap  /etc/postfix/relocated"  in order to rebuild the
        indexed file after changing the relocated table.
 
        When the table is provided via other means  such  as  NIS,
@@ -102,8 +102,8 @@ RELOCATED(5)                                         RELOCATED(5)
        This  section  describes how the table lookups change when
        lookups are directed to a TCP-based server. For a descrip-
        tion   of  the  TCP  client/server  lookup  protocol,  see
-       tcp_table(5).  This feature is not  available  in  Postfix
-       version 2.1.
+       tcp_table(5).  This feature is not  available  up  to  and
+       including Postfix version 2.2.
 
        Each lookup operation uses the entire address once.  Thus,
        user@domain mail addresses are not broken  up  into  their
@@ -118,7 +118,7 @@ RELOCATED(5)                                         RELOCATED(5)
 CONFIGURATION PARAMETERS
        The  following main.cf parameters are especially relevant.
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        relocated_maps
               List of lookup tables for relocated users or sites.
diff --git a/postfix/html/scache.8.html b/postfix/html/scache.8.html
index d2d54cee7..bc48785bb 100644
--- a/postfix/html/scache.8.html
+++ b/postfix/html/scache.8.html
@@ -13,7 +13,7 @@ SCACHE(8)                                               SCACHE(8)
        scache [generic Postfix daemon options]
 
 DESCRIPTION
-       The  scache  server  maintains  a  shared multi-connection
+       The  scache(8)  server maintains a shared multi-connection
        cache. This information can be used by, for example, Post-
        fix SMTP clients or other Postfix delivery agents.
 
@@ -31,11 +31,11 @@ SCACHE(8)                                               SCACHE(8)
        one endpoint may refer to zero or more connections.
 
        The exact syntax of a logical destination or endpoint name
-       is  application  dependent;  the  scache  service does not
+       is  application  dependent;  the scache(8) server does not
        care.   A  connection  is  stored  as  a  file  descriptor
        together  with  application-dependent  information that is
        needed to re-activate  a  connection  object.  Again,  the
-       scache  service is completely unaware about the details of
+       scache(8)  server  is completely unaware of the details of
        that information.
 
        All information is stored  with  a  finite  time  to  live
@@ -67,31 +67,31 @@ SCACHE(8)                                               SCACHE(8)
               the specified logical destination.
 
 SECURITY
-       The connection cache server is not security-sensitive.  It
-       does  not  talk  to  the  network, and it does not talk to
-       local users.  The scache server can run chrooted at  fixed
-       low privilege.
+       The scache(8) server is not  security-sensitive.  It  does
+       not  talk  to  the  network, and it does not talk to local
+       users.  The scache(8) server can run chrooted at fixed low
+       privilege.
 
-       The  connection  cache server is not a trusted process. It
-       must not be used to store  information  that  is  security
-       sensitive.
+       The scache(8) server is not a trusted process. It must not
+       be used to store information that is security sensitive.
 
 DIAGNOSTICS
        Problems and transactions are logged to syslogd(8).
 
 BUGS
-       Sessions cannot be cached across multiple machines.
+       The  session  cache  cannot  be  shared   among   multiple
+       machines.
 
-       When  a  connection  expires  from  the cache it is closed
-       without protocol specific handshake.
+       When  a  connection  expires  from the cache, it is closed
+       without the appropriate protocol specific handshake.
 
 CONFIGURATION PARAMETERS
        Changes  to  main.cf  are  picked  up   automatically   as
-       scache(8) processes run for only a limited amount of time.
+       scache(8) processes run for only a limited amount of time.
        Use the command "postfix reload" to speed up a change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
 RESOURCE CONTROLS
        connection_cache_ttl_limit (2s)
@@ -99,7 +99,7 @@ SCACHE(8)                                               SCACHE(8)
               cache server allows.
 
        connection_cache_status_update_time (600s)
-              How frequently  the  scache(8)  server  logs  usage
+              How frequently  the  scache(8)  server  logs  usage
               statistics with connection cache hit and miss rates
               for logical  destinations  and  for  physical  end-
               points.
diff --git a/postfix/html/sendmail.1.html b/postfix/html/sendmail.1.html
index 39caa1660..a154aae2a 100644
--- a/postfix/html/sendmail.1.html
+++ b/postfix/html/sendmail.1.html
@@ -19,16 +19,16 @@ SENDMAIL(1)                                           SENDMAIL(1)
        sendmail -I
 
 DESCRIPTION
-       The  Postfix  sendmail  command  implements the Postfix to
+       The  Postfix sendmail(1) command implements the Postfix to
        Sendmail compatibility interface.  For the sake of compat-
        ibility with existing applications, some Sendmail command-
        line options are recognized but silently ignored.
 
-       By default, Postfix sendmail reads a message from standard
-       input  until  EOF  or  until it reads a line with only a .
-       character, and arranges for  delivery.   Postfix  sendmail
-       relies  on  the postdrop(1) command to create a queue file
-       in the maildrop directory.
+       By default, Postfix sendmail(1) reads a message from stan-
+       dard  input until EOF or until it reads a line with only a
+       . character, and arranges  for  delivery.   Postfix  send-
+       mail(1)  relies  on  the  postdrop(1)  command to create a
+       queue file in the maildrop directory.
 
        Specific command aliases are  provided  for  other  common
        modes of operation:
@@ -52,8 +52,8 @@ SENDMAIL(1)                                           SENDMAIL(1)
               implemented by running the postalias(1) command.
 
               Note: it may take a minute or so  before  an  alias
-              database  update  becomes  visible. Use the postfix
-              reload command to eliminate this delay.
+              database  update  becomes visible. Use the "postfix
+              reload" command to eliminate this delay.
 
        These and other features can be selected by specifying the
        appropriate combination of command-line options. Some fea-
@@ -73,7 +73,8 @@ SENDMAIL(1)                                           SENDMAIL(1)
               The message body MIME type: 7BIT or 8BITMIME.
 
        -bd    Go  into  daemon  mode.  This  mode of operation is
-              implemented by executing the postfix start command.
+              implemented by executing the "postfix  start"  com-
+              mand.
 
        -bh (ignored)
 
@@ -117,8 +118,9 @@ SENDMAIL(1)                                           SENDMAIL(1)
 
        -f sender
               Set  the  envelope  sender  address.  This  is  the
-              address where delivery problems are sent to, unless
-              the message contains an Errors-To: message  header.
+              address  where  delivery problems are sent to. With
+              Postfix versions before 2.1, the Errors-To: message
+              header overrides the error return address.
 
        -G (ignored)
               Gateway  (relay)  submission, as opposed to initial
@@ -177,8 +179,9 @@ SENDMAIL(1)                                           SENDMAIL(1)
 
        -r sender
               Set  the  envelope  sender  address.  This  is  the
-              address where delivery problems are sent to, unless
-              the  message contains an Errors-To: message header.
+              address where delivery problems are sent  to.  With
+              Postfix versions before 2.1, the Errors-To: message
+              header overrides the error return address.
 
        -R return_limit (ignored)
               Limit  the  size   of   bounced   mail.   Use   the
@@ -205,7 +208,7 @@ SENDMAIL(1)                                           SENDMAIL(1)
 
        -qSsite
               This  command  is  not  implemented. Use the slower
-              sendmail -q command instead.
+              "sendmail -q" command instead.
 
        -t     Extract recipients from message headers. These  are
               added  to  any  recipients specified on the command
@@ -272,7 +275,7 @@ SENDMAIL(1)                                           SENDMAIL(1)
 CONFIGURATION PARAMETERS
        The  following  main.cf parameters are especially relevant
        to this program.  The text below provides only a parameter
-       summary.  See postconf(5) for more details including exam-
+       summary.  See postconf(5) for more details including exam-
        ples.
 
 TROUBLE SHOOTING CONTROLS
@@ -306,8 +309,8 @@ SENDMAIL(1)                                           SENDMAIL(1)
 
        authorized_submit_users (static:anyone)
               List  of  users  who  are authorized to submit mail
-              with the sendmail(1) command (and with  the  privi-
-              leged postdrop(1) helper command).
+              with the sendmail(1) command (and with  the  privi-
+              leged postdrop(1) helper command).
 
 RESOURCE AND RATE CONTROLS
        bounce_size_limit (50000)
@@ -349,12 +352,12 @@ SENDMAIL(1)                                           SENDMAIL(1)
 
        verp_delimiter_filter (-=+)
               The  characters  Postfix  accepts as VERP delimiter
-              characters on the Postfix sendmail(1) command  line
+              characters on the Postfix sendmail(1) command  line
               and in SMTP commands.
 
 MISCELLANEOUS CONTROLS
        alias_database (see 'postconf -d' output)
-              The  alias databases for local(8) delivery that are
+              The  alias databases for local(8) delivery that are
               updated with "newaliases" or with "sendmail -bi".
 
        command_directory (see 'postconf -d' output)
@@ -370,32 +373,40 @@ SENDMAIL(1)                                           SENDMAIL(1)
               daemon programs.
 
        default_database_type (see 'postconf -d' output)
-              The default database type for use in newaliases(1),
-              postalias(1) and postmap(1) commands.
+              The default database type for use in newaliases(1),
+              postalias(1) and postmap(1) commands.
 
        delay_warning_time (0h)
               The time after which the sender receives  the  mes-
               sage headers of mail that is still queued.
 
+       enable_errors_to (no)
+              Report  mail  delivery errors to the address speci-
+              fied  with  the  non-standard  Errors-To:   message
+              header,  instead  of  the  envelope  sender address
+              (this feature  is  removed  with  Postfix  2.2,  is
+              turned  off  by  default  with  Postfix 2.1, and is
+              always turned on with older Postfix versions).
+
        mail_owner (postfix)
               The UNIX system account that owns the Postfix queue
               and most Postfix daemon processes.
 
        queue_directory (see 'postconf -d' output)
-              The location of the Postfix top-level queue  direc-
+              The  location of the Postfix top-level queue direc-
               tory.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The  mail system name that is prepended to the pro-
+              The mail system name that is prepended to the  pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
        trigger_timeout (10s)
-              The  time  limit for sending a trigger to a Postfix
-              daemon (for example, the pickup(8) or qmgr(8)  dae-
+              The time limit for sending a trigger to  a  Postfix
+              daemon  (for example, the pickup(8) or qmgr(8) dae-
               mon).
 
 FILES
@@ -420,7 +431,7 @@ SENDMAIL(1)                                           SENDMAIL(1)
        VERP_README, Postfix VERP howto
 
 LICENSE
-       The  Secure  Mailer  license must be distributed with this
+       The Secure Mailer license must be  distributed  with  this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/showq.8.html b/postfix/html/showq.8.html
index 0bf9b8988..7359f2c3b 100644
--- a/postfix/html/showq.8.html
+++ b/postfix/html/showq.8.html
@@ -13,39 +13,39 @@ SHOWQ(8)                                                 SHOWQ(8)
        showq [generic Postfix daemon options]
 
 DESCRIPTION
-       The  showq  daemon  reports the Postfix mail queue status.
+       The showq(8) daemon reports the Postfix mail queue status.
        It is the program that emulates the sendmail `mailq'  com-
        mand.
 
-       The  showq  daemon  can also be run in stand-alone mode by
+       The showq(8) daemon can also be run in stand-alone mode by
        the superuser. This mode of operation is used  to  emulate
        the `mailq' command while the Postfix mail system is down.
 
 SECURITY
-       The showq daemon can run in a chroot  jail  at  fixed  low
+       The showq(8) daemon can run in a chroot jail at fixed  low
        privilege, and takes no input from the client. Its service
        port is accessible to local untrusted users, so  the  ser-
        vice can be susceptible to denial of service attacks.
 
 STANDARDS
-       None.  The showq daemon does not interact with the outside
-       world.
+       None.  The showq(8) daemon does not interact with the out-
+       side world.
 
 DIAGNOSTICS
        Problems and transactions are logged to syslogd(8).
 
 BUGS
-       The showq daemon runs at a  fixed  low  privilege;  conse-
+       The showq(8) daemon runs at a fixed low privilege;  conse-
        quently, it cannot extract information from queue files in
        the maildrop directory.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked up automatically as showq(8)
+       Changes to main.cf are picked up automatically as showq(8)
        processes  run  for only a limited amount of time. Use the
        command "postfix reload" to speed up a change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        config_directory (see 'postconf -d' output)
               The  default  location  of  the Postfix main.cf and
@@ -58,8 +58,8 @@ SHOWQ(8)                                                 SHOWQ(8)
 
        duplicate_filter_limit (1000)
               The maximal number of addresses remembered  by  the
-              address  duplicate  filter  for  aliases(5) or vir-
-              tual(5) alias expansion, or for showq(8) queue dis-
+              address  duplicate  filter  for  aliases(5) or vir-
+              tual(5) alias expansion, or for showq(8) queue dis-
               plays.
 
        empty_address_recipient (MAILER-DAEMON)
diff --git a/postfix/html/smtp-sink.1.html b/postfix/html/smtp-sink.1.html
index b131650e6..90c41c1d8 100644
--- a/postfix/html/smtp-sink.1.html
+++ b/postfix/html/smtp-sink.1.html
@@ -99,7 +99,7 @@ SMTP-SINK(1)                                         SMTP-SINK(1)
 
        backlog
               The maximum length the  queue  of  pending  connec-
-              tions, as defined by the listen(2) call.
+              tions, as defined by the listen(2) system call.
 
 SEE ALSO
        smtp-source(1), SMTP/LMTP message generator
diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html
index 708da272d..862048f47 100644
--- a/postfix/html/smtp.8.html
+++ b/postfix/html/smtp.8.html
@@ -7,17 +7,17 @@
 SMTP(8)                                                   SMTP(8)
 
 NAME
-       smtp - Postfix remote delivery via SMTP
+       smtp - Postfix SMTP client
 
 SYNOPSIS
        smtp [generic Postfix daemon options]
 
 DESCRIPTION
-       The  SMTP  client processes message delivery requests from
-       the queue manager. Each request specifies a queue file,  a
-       sender address, a domain or host to deliver to, and recip-
-       ient information.  This program expects to be run from the
-       master(8) process manager.
+       The   Postfix   SMTP  client  processes  message  delivery
+       requests from the queue manager. Each request specifies  a
+       queue  file, a sender address, a domain or host to deliver
+       to, and recipient information.  This program expects to be
+       run from the master(8) process manager.
 
        The  SMTP  client updates the queue file and marks recipi-
        ents as finished, or it informs  the  queue  manager  that
@@ -35,7 +35,7 @@ SMTP(8)                                                   SMTP(8)
        client will try to deliver the mail to an alternate  host.
 
        After  a  successful mail transaction, a connection may be
-       saved to the scache(8) connection cache server, so that it
+       saved to the scache(8) connection cache server, so that it
        may  be  used by any SMTP client for a subsequent transac-
        tion.
 
@@ -82,12 +82,12 @@ SMTP(8)                                                   SMTP(8)
        address and TCP port.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked up automatically, as smtp(8)
+       Changes to main.cf are picked up automatically, as smtp(8)
        processes run for only a limited amount of time.  Use  the
        command "postfix reload" to speed up a change.
 
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
 COMPATIBILITY CONTROLS
        ignore_mx_lookup_error (no)
@@ -280,8 +280,8 @@ SMTP(8)                                                   SMTP(8)
               sion cache information.
 
        tls_daemon_random_bytes (32)
-              The number of pseudo-random bytes that  an  smtp(8)
-              or  smtpd(8)  process  requests  from the tlsmgr(8)
+              The number of pseudo-random bytes that  an  smtp(8)
+              or  smtpd(8)  process  requests  from the tlsmgr(8)
               server in order to seed its internal pseudo  random
               number generator (PRNG).
 
diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html
index 0b373dc35..b9bc40019 100644
--- a/postfix/html/smtpd.8.html
+++ b/postfix/html/smtpd.8.html
@@ -57,11 +57,11 @@ SMTPD(8)                                                 SMTPD(8)
 
 CONFIGURATION PARAMETERS
        Changes   to  main.cf  are  picked  up  automatically,  as
-       smtpd(8) processes run for only a limited amount of  time.
+       smtpd(8) processes run for only a limited amount of  time.
        Use the command "postfix reload" to speed up a change.
 
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
 COMPATIBILITY CONTROLS
        The following parameters work around implementation errors
@@ -328,8 +328,8 @@ SMTPD(8)                                                 SMTPD(8)
               mand.
 
        tls_daemon_random_bytes (32)
-              The number of pseudo-random bytes that  an  smtp(8)
-              or  smtpd(8)  process  requests  from the tlsmgr(8)
+              The number of pseudo-random bytes that  an  smtp(8)
+              or  smtpd(8)  process  requests  from the tlsmgr(8)
               server in order to seed its internal pseudo  random
               number generator (PRNG).
 
@@ -348,7 +348,7 @@ SMTPD(8)                                                 SMTPD(8)
 
        verp_delimiter_filter (-=+)
               The  characters  Postfix  accepts as VERP delimiter
-              characters on the Postfix sendmail(1) command  line
+              characters on the Postfix sendmail(1) command  line
               and in SMTP commands.
 
        Available in Postfix version 1.1 and 2.0:
@@ -538,7 +538,7 @@ SMTPD(8)                                                 SMTPD(8)
               receipt of EHLO, RSET, or end of DATA.
 
        The per SMTP client connection count and request rate lim-
-       its are implemented in co-operation with the anvil(8) ser-
+       its are implemented in co-operation with the anvil(8) ser-
        vice,  and are available in Postfix version 2.2 and later.
 
        smtpd_client_connection_count_limit (50)
@@ -679,7 +679,7 @@ SMTPD(8)                                                 SMTPD(8)
               tions.
 
        smtpd_null_access_lookup_key (<>)
-              The  lookup key to be used in SMTP access(5) tables
+              The  lookup key to be used in SMTP access(5) tables
               instead of the null sender address.
 
        permit_mx_backup_networks (empty)
@@ -726,13 +726,13 @@ SMTPD(8)                                                 SMTPD(8)
        ered.  This feature is requested  via  the  reject_unveri-
        fied_sender    and    reject_unverified_recipient   access
        restrictions.  The status of verification probes is  main-
-       tained by the verify(8) server.  See the file ADDRESS_VER-
+       tained by the verify(8) server.  See the file ADDRESS_VER-
        IFICATION_README for information about  how  to  configure
        and operate the Postfix sender/recipient address verifica-
        tion service.
 
        address_verify_poll_count (3)
-              How many times to query the verify(8)  service  for
+              How many times to query the verify(8)  service  for
               the  completion  of an address verification request
               in progress.
 
@@ -760,7 +760,7 @@ SMTPD(8)                                                 SMTPD(8)
 
        access_map_reject_code (554)
               The  numerical  Postfix  SMTP  server response code
-              when a client  is  rejected  by  an  access(5)  map
+              when a client  is  rejected  by  an  access(5)  map
               restriction.
 
        defer_code (450)
@@ -790,7 +790,7 @@ SMTPD(8)                                                 SMTPD(8)
        reject_code (554)
               The  numerical  Postfix  SMTP  server response code
               when a remote SMTP client request  is  rejected  by
-              the "reject" restriction.
+              the "reject" restriction.
 
        relay_domains_reject_code (554)
               The  numerical  Postfix  SMTP  server response code
diff --git a/postfix/html/spawn.8.html b/postfix/html/spawn.8.html
index 77e203a9b..f572103bd 100644
--- a/postfix/html/spawn.8.html
+++ b/postfix/html/spawn.8.html
@@ -13,14 +13,14 @@ SPAWN(8)                                                 SPAWN(8)
        spawn [generic Postfix daemon options] command_attributes...
 
 DESCRIPTION
-       The spawn daemon provides the Postfix equivalent of inetd.
-       It listens on a port as specified in the Postfix master.cf
-       file  and spawns an external command whenever a connection
-       is established.  The connection can be made over local IPC
-       (such  as UNIX-domain sockets) or over non-local IPC (such
-       as TCP sockets).  The command's standard input, output and
-       error  streams are connected directly to the communication
-       endpoint.
+       The  spawn(8)  daemon  provides  the Postfix equivalent of
+       inetd.  It listens on a port as specified in  the  Postfix
+       master.cf  file  and spawns an external command whenever a
+       connection is established.  The  connection  can  be  made
+       over  local IPC (such as UNIX-domain sockets) or over non-
+       local IPC (such as TCP sockets).  The  command's  standard
+       input,  output and error streams are connected directly to
+       the communication endpoint.
 
        This daemon expects to be run from the  master(8)  process
        manager.
@@ -38,7 +38,7 @@ SPAWN(8)                                                 SPAWN(8)
               execute  commands with root privileges, or with the
               privileges of the mail system owner.  If  groupname
               is  specified,  the  corresponding group ID is used
-              instead of the group ID of of username.
+              instead of the group ID of username.
 
        argv=command... (required)
               The command to be executed. This must be  specified
@@ -49,29 +49,29 @@ SPAWN(8)                                                 SPAWN(8)
 
 BUGS
        In order to enforce standard Postfix process resource con-
-       trols,  the spawn daemon runs only one external command at
-       a time.  As such, it presents  a  noticeable  overhead  by
-       wasting  precious  process  resources. The spawn daemon is
+       trols,  the spawn(8) daemon runs only one external command
+       at a time.  As such, it presents a noticeable overhead  by
+       wasting precious process resources. The spawn(8) daemon is
        expected to be replaced by a more structural solution.
 
 DIAGNOSTICS
-       The spawn daemon reports abnormal child  exits.   Problems
-       are logged to syslogd(8).
+       The spawn(8) daemon reports abnormal child  exits.   Prob-
+       lems are logged to syslogd(8).
 
 SECURITY
        This  program  needs  root  privilege  in order to execute
        external commands as the specified user. It  is  therefore
-       security  sensitive.   However  the  spawn daemon does not
+       security  sensitive.  However the spawn(8) daemon does not
        talk to the external command and thus is not vulnerable to
        data-driven attacks.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked up automatically as spawn(8)
+       Changes to main.cf are picked up automatically as spawn(8)
        processes run for only a limited amount of time.  Use  the
        command "postfix reload" to speed up a change.
 
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        In the text below, transport is the  first  field  of  the
        entry in the master.cf file.
diff --git a/postfix/html/tcp_table.5.html b/postfix/html/tcp_table.5.html
index a644dede5..22fe96ff6 100644
--- a/postfix/html/tcp_table.5.html
+++ b/postfix/html/tcp_table.5.html
@@ -21,9 +21,9 @@ TCP_TABLE(5)                                         TCP_TABLE(5)
        to a TCP server.
 
        To find out what types of lookup tables your Postfix  sys-
-       tem supports use the postconf -m command.
+       tem supports use the "postconf -m" command.
 
-       To   test  lookup  tables,  use  the  postmap  command  as
+       To  test  lookup  tables,  use the "postmap -q" command as
        described in the SYNOPSIS above.
 
 PROTOCOL DESCRIPTION
@@ -90,9 +90,9 @@ TCP_TABLE(5)                                         TCP_TABLE(5)
 
 SEE ALSO
        postmap(1), Postfix lookup table manager
-       regexp_table(5) format of regular expression tables
-       pcre_table(5) format of PCRE tables
-       cidr_table(5) format of CIDR tables
+       regexp_table(5), format of regular expression tables
+       pcre_table(5), format of PCRE tables
+       cidr_table(5), format of CIDR tables
 
 README FILES
        DATABASE_README, Postfix lookup table overview
diff --git a/postfix/html/tlsmgr.8.html b/postfix/html/tlsmgr.8.html
index 4c5dba186..5273fabf5 100644
--- a/postfix/html/tlsmgr.8.html
+++ b/postfix/html/tlsmgr.8.html
@@ -13,39 +13,38 @@ TLSMGR(8)                                               TLSMGR(8)
        tlsmgr [generic Postfix daemon options]
 
 DESCRIPTION
-       The  tlsmgr(8)  manages the TLS session caches for Postfix
-       SMTP client and server processes.  It stores and retrieves
-       cache  entries  on  request  by  smtpd(8) and smtp(8) pro-
-       cesses,  and  periodically  removes  entries   that   have
-       expired.
-
-       The  tlsmgr(8) also manages the PRNG (pseudo random number
-       generator) pool. It answers queries by  the  smtpd(8)  and
-       smtp(8) processes to seed their internal PRNG pools.
-
-       The  tlsmgr(8)'s  PRNG  pool  is  initially seeded from an
-       external source (EGD, /dev/urandom, or regular file).   It
-       is  updated  at  configurable pseudo-random intervals with
-       data from the external source. It is updated  periodically
+       The  tlsmgr(8) manages the Postfix TLS session caches.  It
+       stores and retrieves cache entries on request by  smtpd(8)
+       and  smtp(8)  processes,  and periodically removes entries
+       that have expired.
+
+       The tlsmgr(8) also manages the PRNG (pseudo random  number
+       generator)  pool.  It  answers queries by the smtpd(8) and
+       smtp(8) processes to seed their internal PRNG pools.
+
+       The tlsmgr(8)'s PRNG pool  is  initially  seeded  from  an
+       external  source (EGD, /dev/urandom, or regular file).  It
+       is updated at configurable  pseudo-random  intervals  with
+       data  from the external source. It is updated periodically
        with data from TLS session cache entries and with the time
-       of day, and is updated with the time  of  day  whenever  a
-       process requests tlsmgr(8) service.
+       of  day,  and  is  updated with the time of day whenever a
+       process requests tlsmgr(8) service.
 
-       The  tlsmgr(8)  saves  the  PRNG state to an exchange file
-       periodically and when the process  terminates,  and  reads
+       The tlsmgr(8) saves the PRNG state  to  an  exchange  file
+       periodically  and  when  the process terminates, and reads
        the exchange file when initializing its PRNG.
 
 SECURITY
-       tlsmgr(8)  is  not security-sensitive. The code that main-
-       tains the  external  and  internal  PRNG  pools  does  not
-       "trust"  the  data  that it manipulates, and the code that
-       maintains the TLS session cache does not  touch  the  con-
+       The tlsmgr(8) is not  security-sensitive.  The  code  that
+       maintains  the  external  and internal PRNG pools does not
+       "trust" the data that it manipulates, and  the  code  that
+       maintains  the  TLS  session cache does not touch the con-
        tents of the cached entries, except for seeding its inter-
        nal PRNG pool.
 
-       The tlsmgr(8) can be run chrooted and with reduced  privi-
-       leges.   At  process  startup  it  connects to the entropy
-       source and exchange file, and  creates  or  truncates  the
+       The  tlsmgr(8) can be run chrooted and with reduced privi-
+       leges.  At process startup  it  connects  to  the  entropy
+       source  and  exchange  file,  and creates or truncates the
        optional TLS session cache files.
 
 DIAGNOSTICS
@@ -58,15 +57,15 @@ TLSMGR(8)                                               TLSMGR(8)
 
 CONFIGURATION PARAMETERS
        Changes  to  main.cf  are  not  picked  up  automatically,
-       because tlsmgr(8) is a persistent processes.  Use the com-
+       because tlsmgr(8) is a persistent processes.  Use the com-
        mand "postfix reload" after a configuration change.
 
-       The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       The  text  below  provides  only  a parameter summary. See
+       postconf(5) for more details including examples.
 
 TLS SESSION CACHE
        smtpd_tls_session_cache_database (empty)
-              Name  of  the  file containing the optional Postfix
+              Name of the file containing  the  optional  Postfix
               SMTP server TLS session cache.
 
        smtpd_tls_session_cache_timeout (3600s)
@@ -74,7 +73,7 @@ TLSMGR(8)                                               TLSMGR(8)
               sion cache information.
 
        smtp_tls_session_cache_database (empty)
-              Name  of  the  file containing the optional Postfix
+              Name of the file containing  the  optional  Postfix
               SMTP client TLS session cache.
 
        smtp_tls_session_cache_timeout (3600s)
@@ -84,58 +83,58 @@ TLSMGR(8)                                               TLSMGR(8)
 PSEUDO RANDOM NUMBER GENERATOR
        tls_random_source (see 'postconf -d' output)
               The  external  entropy  source  for  the  in-memory
-              tlsmgr(8) pseudo  random  number  generator  (PRNG)
+              tlsmgr(8)  pseudo  random  number  generator (PRNG)
               pool.
 
        tls_random_bytes (32)
-              The  number  of  bytes  that  tlsmgr(8)  reads from
-              $tls_random_source when (re)seeding  the  in-memory
+              The number  of  bytes  that  tlsmgr(8)  reads  from
+              $tls_random_source  when  (re)seeding the in-memory
               pseudo random number generator (PRNG) pool.
 
        tls_random_exchange_name (${config_directory}/prng_exch)
-              Name  of  the pseudo random number generator (PRNG)
-              state file that is maintained by tlsmgr(8).
+              Name of the pseudo random number  generator  (PRNG)
+              state file that is maintained by tlsmgr(8).
 
        tls_random_prng_update_period (3600s)
-              The time between attempts by tlsmgr(8) to save  the
-              state  of the pseudo random number generator (PRNG)
+              The  time between attempts by tlsmgr(8) to save the
+              state of the pseudo random number generator  (PRNG)
               to    the    file    specified    with    $tls_ran-
               dom_exchange_name.
 
        tls_random_reseed_period (3600s)
-              The  maximal  time between attempts by tlsmgr(8) to
-              re-seed the in-memory pseudo random number  genera-
+              The maximal time between attempts by  tlsmgr(8)  to
+              re-seed  the in-memory pseudo random number genera-
               tor (PRNG) pool from external sources.
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The  default  location  of  the Postfix main.cf and
+              The default location of  the  Postfix  main.cf  and
               master.cf configuration files.
 
        daemon_timeout (18000s)
-              How much time a Postfix daemon process may take  to
-              handle  a  request  before  it  is  terminated by a
+              How  much time a Postfix daemon process may take to
+              handle a request  before  it  is  terminated  by  a
               built-in watchdog timer.
 
        process_id (read-only)
-              The process ID of a Postfix command or daemon  pro-
+              The  process ID of a Postfix command or daemon pro-
               cess.
 
        process_name (read-only)
-              The  process  name  of  a Postfix command or daemon
+              The process name of a  Postfix  command  or  daemon
               process.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The mail system name that is prepended to the  pro-
+              The  mail system name that is prepended to the pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
 SEE ALSO
-       smtp(8) Postfix SMTP client
-       smtpd(8) Postfix SMTP server
+       smtp(8), Postfix SMTP client
+       smtpd(8), Postfix SMTP server
        postconf(5), configuration parameters
        master(5), generic daemon options
        master(8), process manager
@@ -145,7 +144,7 @@ TLSMGR(8)                                               TLSMGR(8)
        TLS_README, Postfix TLS configuration and operation
 
 LICENSE
-       The  Secure  Mailer  license must be distributed with this
+       The Secure Mailer license must be  distributed  with  this
        software.
 
 AUTHOR(S)
diff --git a/postfix/html/transport.5.html b/postfix/html/transport.5.html
index ea57c1e11..05800b5bb 100644
--- a/postfix/html/transport.5.html
+++ b/postfix/html/transport.5.html
@@ -7,7 +7,7 @@
 TRANSPORT(5)                                         TRANSPORT(5)
 
 NAME
-       transport - format of Postfix transport table
+       transport - Postfix transport table format
 
 SYNOPSIS
        postmap /etc/postfix/transport
@@ -17,7 +17,7 @@ TRANSPORT(5)                                         TRANSPORT(5)
        postmap -q - /etc/postfix/transport <inputfile
 
 DESCRIPTION
-       The  optional  transport  table  specifies  a mapping from
+       The  optional  transport(5) table specifies a mapping from
        email addresses  to  message  delivery  transports  and/or
        relay hosts. The mapping is used by the trivial-rewrite(8)
        daemon.
@@ -42,11 +42,11 @@ TRANSPORT(5)                                         TRANSPORT(5)
               Mail for any other destination is by default deliv-
               ered via $default_transport.
 
-       Normally, the transport table is specified as a text  file
-       that  serves  as  input  to  the  postmap(1) command.  The
+       Normally, the transport(5) table is specified  as  a  text
+       file  that serves as input to the postmap(1) command.  The
        result, an indexed file in dbm or db format, is  used  for
        fast  searching  by  the  mail system. Execute the command
-       postmap /etc/postfix/transport in  order  to  rebuild  the
+       "postmap /etc/postfix/transport" in order to  rebuild  the
        indexed file after changing the transport table.
 
        When  the  table  is provided via other means such as NIS,
@@ -227,8 +227,8 @@ TRANSPORT(5)                                         TRANSPORT(5)
        This  section  describes how the table lookups change when
        lookups are directed to a TCP-based server. For a descrip-
        tion   of  the  TCP  client/server  lookup  protocol,  see
-       tcp_table(5).  This feature is not  available  in  Postfix
-       version 2.1.
+       tcp_table(5).  This feature is not  available  up  to  and
+       including Postfix version 2.2.
 
        Each  lookup  operation  uses the entire recipient address
        once.  Thus, some.domain.hierarchy is not  looked  up  via
@@ -240,7 +240,7 @@ TRANSPORT(5)                                         TRANSPORT(5)
 CONFIGURATION PARAMETERS
        The following main.cf parameters are especially  relevant.
        The  text  below  provides  only  a parameter summary. See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
        empty_address_recipient
               The address that is looked up instead of  the  null
diff --git a/postfix/html/trivial-rewrite.8.html b/postfix/html/trivial-rewrite.8.html
index 27e5b0f7b..fc7ab6d82 100644
--- a/postfix/html/trivial-rewrite.8.html
+++ b/postfix/html/trivial-rewrite.8.html
@@ -14,8 +14,8 @@ TRIVIAL-REWRITE(8)                             TRIVIAL-REWRITE(8)
        trivial-rewrite [generic Postfix daemon options]
 
 DESCRIPTION
-       The trivial-rewrite daemon processes three types of client
-       service requests:
+       The trivial-rewrite(8) daemon  processes  three  types  of
+       client service requests:
 
        rewrite context address
               Rewrite  an  address to standard form, according to
@@ -62,22 +62,22 @@ TRIVIAL-REWRITE(8)                             TRIVIAL-REWRITE(8)
               poses.
 
 SERVER PROCESS MANAGEMENT
-       The trivial-rewrite servers run under control by the Post-
-       fix master server.  Each server can handle multiple simul-
-       taneous  connections.   When  all servers are busy while a
-       client connects, the master creates a new server  process,
-       provided  that the trivial-rewrite server process limit is
-       not  exceeded.   Each  trivial-rewrite  server  terminates
-       after serving at least $max_use clients of after $max_idle
-       seconds of idle time.
+       The  trivial-rewrite(8)  servers  run under control by the
+       Postfix master server.  Each server  can  handle  multiple
+       simultaneous connections.  When all servers are busy while
+       a client connects, the master creates a  new  server  pro-
+       cess,  provided  that  the  trivial-rewrite server process
+       limit is not exceeded.  Each trivial-rewrite server termi-
+       nates  after  serving  at  least $max_use clients of after
+       $max_idle seconds of idle time.
 
 STANDARDS
        None. The command  does  not  interact  with  the  outside
        world.
 
 SECURITY
-       The  trivial-rewrite daemon is not security sensitive.  By
-       default, this daemon does not  talk  to  remote  or  local
+       The  trivial-rewrite(8)  daemon is not security sensitive.
+       By default, this daemon does not talk to remote  or  local
        users.   It can run at a fixed low privilege in a chrooted
        environment.
 
@@ -86,11 +86,11 @@ TRIVIAL-REWRITE(8)                             TRIVIAL-REWRITE(8)
 
 CONFIGURATION PARAMETERS
        On busy mail systems a long time may pass before a main.cf
-       change  affecting trivial_rewrite(8) is picked up. Use the
+       change  affecting trivial-rewrite(8) is picked up. Use the
        command "postfix reload" to speed up a change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
 COMPATIBILITY CONTROLS
        resolve_dequoted_address (yes)
@@ -173,7 +173,7 @@ TRIVIAL-REWRITE(8)                             TRIVIAL-REWRITE(8)
 
        relayhost (empty)
               The default host to send non-local mail to when  no
-              entry  is  matched  in  the  optional  transport(5)
+              entry  is  matched  in  the  optional  transport(5)
               table.
 
        transport_maps (empty)
diff --git a/postfix/html/verify.8.html b/postfix/html/verify.8.html
index b51bc56ec..6723126b2 100644
--- a/postfix/html/verify.8.html
+++ b/postfix/html/verify.8.html
@@ -13,9 +13,9 @@ VERIFY(8)                                               VERIFY(8)
        verify [generic Postfix daemon options]
 
 DESCRIPTION
-       The Postfix address verification server maintains a record
-       of what recipient addresses are known to be deliverable or
-       undeliverable.
+       The  verify(8)  address  verification  server  maintains a
+       record of what recipient addresses are known to be  deliv-
+       erable or undeliverable.
 
        Addresses  are  verified  by injecting probe messages into
        the Postfix queue. Probe messages are run through all  the
@@ -26,13 +26,13 @@ VERIFY(8)                                               VERIFY(8)
        MTA  for  the  specified  address,  and will therefore not
        detect all undeliverable addresses.
 
-       This server is designed to run under control by the  Post-
-       fix  master  server.  It  maintains an optional persistent
-       database.  To avoid being interrupted by "postfix stop" in
-       the  middle  of  a  database update, the process runs in a
-       separate process group.
+       The verify(8) server is designed to run under  control  by
+       the  Postfix  master server. It maintains an optional per-
+       sistent database.  To avoid being interrupted by  "postfix
+       stop" in the middle of a database update, the process runs
+       in a separate process group.
 
-       This server implements the following requests:
+       The verify(8) server implements the following requests:
 
        update address status text
               Update  the  status  and  text  of  the   specified
@@ -71,11 +71,11 @@ VERIFY(8)                                               VERIFY(8)
 
 CONFIGURATION PARAMETERS
        Changes to main.cf are not  picked  up  automatically,  as
-       verify(8) processes are persistent. Use the command "post-
+       verify(8) processes are persistent. Use the command "post-
        fix reload" after a configuration change.
 
        The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       postconf(5) for more details including examples.
 
 CACHE CONTROLS
        address_verify_map (empty)
diff --git a/postfix/html/virtual.5.html b/postfix/html/virtual.5.html
index df26578e5..ec135d3e7 100644
--- a/postfix/html/virtual.5.html
+++ b/postfix/html/virtual.5.html
@@ -7,7 +7,7 @@
 VIRTUAL(5)                                             VIRTUAL(5)
 
 NAME
-       virtual - format of Postfix virtual alias table
+       virtual - Postfix virtual alias table format
 
 SYNOPSIS
        postmap /etc/postfix/virtual
@@ -17,10 +17,10 @@ VIRTUAL(5)                                             VIRTUAL(5)
        postmap -q - /etc/postfix/virtual <inputfile
 
 DESCRIPTION
-       The  optional virtual alias table specifies address alias-
-       ing for arbitrary local or non-local recipient  addresses.
-       Virtual  aliasing is recursive, and is done by the Postfix
-       cleanup(8) daemon.
+       The  optional  virtual(5)  alias  table  specifies address
+       aliasing  for  arbitrary  local  or  non-local   recipient
+       addresses.  Virtual  aliasing is recursive, and is done by
+       the Postfix cleanup(8) daemon.
 
        The main applications of virtual aliasing are:
 
@@ -42,11 +42,11 @@ VIRTUAL(5)                                             VIRTUAL(5)
        Sendmail  rule  set S0, if you like. Use canonical(5) map-
        ping to rewrite header and envelope addresses in  general.
 
-       Normally,  the  virtual alias table is specified as a text
-       file that serves as input to the postmap(1) command.   The
-       result,  an  indexed file in dbm or db format, is used for
-       fast searching by the mail  system.  Execute  the  command
-       postmap  /etc/postfix/virtual  in  order  to  rebuild  the
+       Normally,  the  virtual(5)  alias  table is specified as a
+       text file that serves as input to the postmap(1)  command.
+       The  result,  an indexed file in dbm or db format, is used
+       for fast searching by the mail system. Execute the command
+       "postmap  /etc/postfix/virtual"  in  order  to rebuild the
        indexed file after changing the text file.
 
        When the table is provided via other means  such  as  NIS,
@@ -93,7 +93,7 @@ VIRTUAL(5)                                             VIRTUAL(5)
 
               This  functionality  overlaps with functionality of
               the local aliases(5) database.  The  difference  is
-              that  virtual  mapping  can be applied to non-local
+              that virtual(5) mapping can be applied to non-local
               addresses.
 
        @domain address, address, ...
@@ -137,8 +137,8 @@ VIRTUAL(5)                                             VIRTUAL(5)
            virtual_alias_maps = hash:/etc/postfix/virtual
 
            Note:  some systems use dbm databases instead of hash.
-           See the output from postconf -m for available database
-           types.
+           See  the  output  from  "postconf  -m"  for  available
+           database types.
 
        /etc/postfix/virtual:
            virtual-alias.domain anything (right-hand content does not matter)
@@ -189,8 +189,8 @@ VIRTUAL(5)                                             VIRTUAL(5)
        This  section  describes how the table lookups change when
        lookups are directed to a TCP-based server. For a descrip-
        tion   of  the  TCP  client/server  lookup  protocol,  see
-       tcp_table(5).  This feature is not  available  in  Postfix
-       version 2.1.
+       tcp_table(5).  This feature is not  available  up  to  and
+       including Postfix version 2.2.
 
        Each lookup operation uses the entire address once.  Thus,
        user@domain mail addresses are not broken  up  into  their
@@ -205,7 +205,7 @@ VIRTUAL(5)                                             VIRTUAL(5)
 CONFIGURATION PARAMETERS
        The  following  main.cf parameters are especially relevant
        to this topic. See the Postfix  main.cf  file  for  syntax
-       details  and  for  default  values. Use the postfix reload
+       details  and  for default values. Use the "postfix reload"
        command after a configuration change.
 
        virtual_alias_maps
diff --git a/postfix/html/virtual.8.html b/postfix/html/virtual.8.html
index 0c241132a..6fe3584eb 100644
--- a/postfix/html/virtual.8.html
+++ b/postfix/html/virtual.8.html
@@ -14,7 +14,7 @@ VIRTUAL(8)                                             VIRTUAL(8)
 
 DESCRIPTION
        The virtual(8) delivery agent is designed for virtual mail
-       hosting services. Originally based on the Postfix local(8)
+       hosting services. Originally based on the Postfix local(8)
        delivery  agent,  this  agent looks up recipients with map
        lookups of their full recipient address, instead of  using
        hard-coded unix password file lookups of the address local
@@ -43,7 +43,7 @@ VIRTUAL(8)                                             VIRTUAL(8)
        is delivered in UNIX mailbox format.   This format  stores
        multiple messages in one textfile.
 
-       The   virtual  delivery  agent  prepends  a  "From  sender
+       The  virtual(8)  delivery  agent  prepends  a "From sender
        time_stamp" envelope header to each  message,  prepends  a
        Delivered-To:  message  header with the envelope recipient
        address, prepends an X-Original-To: header with the recip-
@@ -61,7 +61,7 @@ VIRTUAL(8)                                             VIRTUAL(8)
        ered  in qmail maildir format. This format stores one mes-
        sage per file.
 
-       The virtual delivery agent daemon prepends a Delivered-To:
+       The virtual(8) delivery  agent  prepends  a  Delivered-To:
        message  header with the final envelope recipient address,
        prepends  an  X-Original-To:  header  with  the  recipient
        address  as  given to Postfix, and prepends a Return-Path:
@@ -111,19 +111,19 @@ VIRTUAL(8)                                             VIRTUAL(8)
        given to the regular-expression map.
 
 SECURITY
-       The virtual delivery agent is not security sensitive, pro-
-       vided  that the lookup tables with recipient user/group ID
-       information are adequately protected. This program is  not
-       designed to run chrooted.
+       The virtual(8) delivery agent is not  security  sensitive,
+       provided  that the lookup tables with recipient user/group
+       ID information are adequately protected. This  program  is
+       not designed to run chrooted.
 
-       The  virtual  delivery  agent disallows regular expression
+       The virtual(8) delivery agent disallows regular expression
        substitution of  $1  etc.  in  regular  expression  lookup
        tables, because that would open a security hole.
 
-       The  virtual  delivery agent will silently ignore requests
-       to use the proxymap(8) server. Instead it  will  open  the
-       table  directly.  Before  Postfix version 2.2, the virtual
-       delivery agent will terminate with a fatal error.
+       The   virtual(8)   delivery  agent  will  silently  ignore
+       requests to use the proxymap(8) server.  Instead  it  will
+       open  the  table directly. Before Postfix version 2.2, the
+       virtual delivery agent will terminate with a fatal  error.
 
 STANDARDS
        RFC 822 (ARPA Internet Text Messages)
@@ -133,109 +133,109 @@ VIRTUAL(8)                                             VIRTUAL(8)
        recipient is over disk quota. In all other cases, mail for
        an existing recipient is deferred and a warning is logged.
 
-       Problems  and transactions are logged to syslogd(8).  Cor-
-       rupted message files are marked so that the queue  manager
+       Problems and transactions are logged to syslogd(8).   Cor-
+       rupted  message files are marked so that the queue manager
        can move them to the corrupt queue afterwards.
 
-       Depending  on the setting of the notify_classes parameter,
-       the postmaster is notified of bounces and of  other  trou-
+       Depending on the setting of the notify_classes  parameter,
+       the  postmaster  is notified of bounces and of other trou-
        ble.
 
 BUGS
-       This  delivery  agent supports address extensions in email
+       This delivery agent supports address extensions  in  email
        addresses and in lookup table keys, but does not propagate
-       address  extension  information  to  the  result  of table
+       address extension  information  to  the  result  of  table
        lookup.
 
        Postfix should have lookup tables that can return multiple
-       result  attributes. In order to avoid the inconvenience of
+       result attributes. In order to avoid the inconvenience  of
        maintaining three tables, use an LDAP or MYSQL database.
 
 CONFIGURATION PARAMETERS
-       Changes to main.cf are picked up  automatically,  as  vir-
-       tual(8)  processes  run for only a limited amount of time.
+       Changes  to  main.cf  are picked up automatically, as vir-
+       tual(8) processes run for only a limited amount  of  time.
        Use the command "postfix reload" to speed up a change.
 
-       The text below provides  only  a  parameter  summary.  See
-       postconf(5) for more details including examples.
+       The  text  below  provides  only  a parameter summary. See
+       postconf(5) for more details including examples.
 
 MAILBOX DELIVERY CONTROLS
        virtual_mailbox_base (empty)
-              A   prefix   that  the  virtual(8)  delivery  agent
-              prepends  to  all  pathname  results   from   $vir-
+              A  prefix  that  the  virtual(8)   delivery   agent
+              prepends   to   all  pathname  results  from  $vir-
               tual_mailbox_maps table lookups.
 
        virtual_mailbox_maps (empty)
-              Optional  lookup tables with all valid addresses in
+              Optional lookup tables with all valid addresses  in
               the domains that match $virtual_mailbox_domains.
 
        virtual_minimum_uid (100)
-              The minimum  user  ID  value  that  the  virtual(8)
-              delivery  agent  accepts  as  a  result  from $vir-
-              tual_uid_maps table lookup.
+              The  minimum  user  ID  value  that  the virtual(8)
+              delivery agent  accepts  as  a  result  from  $vir-
+              tual_uid_maps table lookup.
 
        virtual_uid_maps (empty)
-              Lookup tables with the per-recipient user  ID  that
-              the virtual(8) delivery agent uses while writing to
+              Lookup  tables  with the per-recipient user ID that
+              the virtual(8) delivery agent uses while writing to
               the recipient's mailbox.
 
        virtual_gid_maps (empty)
-              Lookup tables with the per-recipient group  ID  for
-              virtual(8) mailbox delivery.
+              Lookup  tables  with the per-recipient group ID for
+              virtual(8) mailbox delivery.
 
        Available in Postfix version 2.0 and later:
 
        virtual_mailbox_domains ($virtual_mailbox_maps)
               Postfix is final destination for the specified list
-              of  domains;  mail  is  delivered  via  the   $vir-
+              of   domains;  mail  is  delivered  via  the  $vir-
               tual_transport mail delivery transport.
 
        virtual_transport (virtual)
-              The  default  mail  delivery  transport for domains
-              that match the  $virtual_mailbox_domains  parameter
+              The default mail  delivery  transport  for  domains
+              that  match  the $virtual_mailbox_domains parameter
               value.
 
 LOCKING CONTROLS
        virtual_mailbox_lock (see 'postconf -d' output)
-              How  to lock a UNIX-style virtual(8) mailbox before
+              How to lock a UNIX-style virtual(8) mailbox  before
               attempting delivery.
 
        deliver_lock_attempts (20)
               The maximal number of attempts to acquire an exclu-
-              sive lock on a mailbox file or bounce(8) logfile.
+              sive lock on a mailbox file or bounce(8) logfile.
 
        deliver_lock_delay (1s)
-              The  time  between attempts to acquire an exclusive
-              lock on a mailbox file or bounce(8) logfile.
+              The time between attempts to acquire  an  exclusive
+              lock on a mailbox file or bounce(8) logfile.
 
        stale_lock_time (500s)
-              The time after  which  a  stale  exclusive  mailbox
+              The  time  after  which  a  stale exclusive mailbox
               lockfile is removed.
 
 RESOURCE AND RATE CONTROLS
        virtual_destination_concurrency_limit   ($default_destina-
        tion_concurrency_limit)
-              The  maximal  number  of parallel deliveries to the
-              same destination via the virtual  message  delivery
+              The maximal number of parallel  deliveries  to  the
+              same  destination  via the virtual message delivery
               transport.
 
        virtual_destination_recipient_limit     ($default_destina-
        tion_recipient_limit)
-              The  maximal  number of recipients per delivery via
+              The maximal number of recipients per  delivery  via
               the virtual message delivery transport.
 
        virtual_mailbox_limit (51200000)
-              The maximal size in bytes of an individual  mailbox
+              The  maximal size in bytes of an individual mailbox
               or maildir file, or zero (no limit).
 
 MISCELLANEOUS CONTROLS
        config_directory (see 'postconf -d' output)
-              The  default  location  of  the Postfix main.cf and
+              The default location of  the  Postfix  main.cf  and
               master.cf configuration files.
 
        daemon_timeout (18000s)
-              How much time a Postfix daemon process may take  to
-              handle  a  request  before  it  is  terminated by a
+              How  much time a Postfix daemon process may take to
+              handle a request  before  it  is  terminated  by  a
               built-in watchdog timer.
 
        ipc_timeout (3600s)
@@ -243,31 +243,31 @@ VIRTUAL(8)                                             VIRTUAL(8)
               over an internal communication channel.
 
        max_idle (100s)
-              The  maximum  amount  of  time that an idle Postfix
-              daemon process waits for the next  service  request
+              The maximum amount of time  that  an  idle  Postfix
+              daemon  process  waits for the next service request
               before exiting.
 
        max_use (100)
-              The  maximal number of connection requests before a
+              The maximal number of connection requests before  a
               Postfix daemon process terminates.
 
        process_id (read-only)
-              The process ID of a Postfix command or daemon  pro-
+              The  process ID of a Postfix command or daemon pro-
               cess.
 
        process_name (read-only)
-              The  process  name  of  a Postfix command or daemon
+              The process name of a  Postfix  command  or  daemon
               process.
 
        queue_directory (see 'postconf -d' output)
-              The location of the Postfix top-level queue  direc-
+              The  location of the Postfix top-level queue direc-
               tory.
 
        syslog_facility (mail)
               The syslog facility of Postfix logging.
 
        syslog_name (postfix)
-              The  mail system name that is prepended to the pro-
+              The mail system name that is prepended to the  pro-
               cess  name  in  syslog  records,  so  that  "smtpd"
               becomes, for example, "postfix/smtpd".
 
@@ -281,20 +281,20 @@ VIRTUAL(8)                                             VIRTUAL(8)
        VIRTUAL_README, domain hosting howto
 
 LICENSE
-       The  Secure  Mailer  license must be distributed with this
+       The Secure Mailer license must be  distributed  with  this
        software.
 
 HISTORY
-       This delivery agent was originally based  on  the  Postfix
-       local  delivery  agent.  Modifications mainly consisted of
-       removing code that either was not applicable or  that  was
-       not  safe  in this context: aliases, ~user/.forward files,
+       This  delivery  agent  was originally based on the Postfix
+       local delivery agent. Modifications  mainly  consisted  of
+       removing  code  that either was not applicable or that was
+       not safe in this context: aliases,  ~user/.forward  files,
        delivery to "|command" or to /file/name.
 
        The Delivered-To: message header appears in the qmail sys-
        tem by Daniel Bernstein.
 
-       The  maildir  structure  appears  in  the  qmail system by
+       The maildir structure  appears  in  the  qmail  system  by
        Daniel Bernstein.
 
 AUTHOR(S)
diff --git a/postfix/makedefs b/postfix/makedefs
index 5aaaa9fab..d8cb0a6fb 100644
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -25,19 +25,14 @@
 #	\fIinclude\fR directory.
 #	The following directives are special:
 # .RS
-# .IP \fB-DUSE_TLS\f
-#	Build with TLS (transport level security) support. This
-#	requires that OpenSSL is installed.
-# .IP \fB-DNO_TLS\fR
-#	Do not build with TLS support.
 # .IP \fB-DNO_IPV6\fR
 #	Do not build with IPv6 support.
-# .IP \fB-DHAS_PCRE\fR
-#	Build with PCRE (Perl-compatible regular expression) support.
-#	By default, PCRE support is enabled when the \fBpcre-config\fR
-#	utility is installed.
+#	By default, IPv6 support is compiled in on platforms that
+#	are known to have IPv6 support.
 # .IP \fB-DNO_PCRE\fR
 #	Do not build with PCRE support.
+#	By default, PCRE support is compiled in when the \fBpcre-config\fR
+#	utility is installed.
 # .RE
 # .IP \fBDEBUG=\fIdebug_level\fR
 #	Specifies a non-default debugging level. The default is \fB-g\fR.
diff --git a/postfix/man/man1/postalias.1 b/postfix/man/man1/postalias.1
index 1cb0b5365..1c80de7e2 100644
--- a/postfix/man/man1/postalias.1
+++ b/postfix/man/man1/postalias.1
@@ -15,7 +15,7 @@ Postfix alias database maintenance
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostalias\fR command creates or queries one or more Postfix
+The \fBpostalias\fR(1) command creates or queries one or more Postfix
 alias databases, or updates an existing one. The input and output
 file formats are expected to be compatible with Sendmail version 8,
 and are expected to be suitable for the use as NIS alias maps.
@@ -47,19 +47,21 @@ Do not fold the lookup key to lower case while creating or querying
 a map.
 .IP \fB-i\fR
 Incremental mode. Read entries from standard input and do not
-truncate an existing database. By default, \fBpostalias\fR creates
+truncate an existing database. By default, \fBpostalias\fR(1) creates
 a new database from the entries in \fIfile_name\fR.
 .IP \fB-N\fR
 Include the terminating null character that terminates lookup keys
-and values. By default, Postfix does whatever is the default for
+and values. By default, \fBpostalias\fR(1) does whatever
+is the default for
 the host operating system.
 .IP \fB-n\fR
 Don't include the terminating null character that terminates lookup
-keys and values. By default, Postfix does whatever is the default for
+keys and values. By default, \fBpostalias\fR(1) does whatever
+is the default for
 the host operating system.
 .IP \fB-o\fR
 Do not release root privileges when processing a non-root
-input file. By default, \fBpostalias\fR drops root privileges
+input file. By default, \fBpostalias\fR(1) drops root privileges
 and runs as the source file owner instead.
 .IP \fB-p\fR
 Do not inherit the file access permissions from the input file
@@ -96,7 +98,7 @@ Arguments:
 The database type. To find out what types are supported, use
 the "\fBpostconf -m\fR" command.
 
-The \fBpostalias\fR command can query any supported file type,
+The \fBpostalias\fR(1) command can query any supported file type,
 but it can create only the following file types:
 .RS
 .IP \fBbtree\fR
@@ -132,8 +134,8 @@ Problems are logged to the standard error stream and to
 no problems were detected. Duplicate entries are skipped and are
 flagged with a warning.
 
-\fBpostalias\fR terminates with zero exit status in case of success
-(including successful \fBpostalias -q\fR lookup) and terminates
+\fBpostalias\fR(1) terminates with zero exit status in case of success
+(including successful "\fBpostalias -q\fR" lookup) and terminates
 with non-zero exit status in case of failure.
 .SH "ENVIRONMENT"
 .na
@@ -153,9 +155,9 @@ The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBalias_database (see 'postconf -d' output)\fR"
-The alias databases for local(8) delivery that are updated with
+The alias databases for \fBlocal\fR(8) delivery that are updated with
 "\fBnewaliases\fR" or with "\fBsendmail -bi\fR".
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
@@ -167,8 +169,8 @@ hash or btree tables.
 The per-table I/O buffer size for programs that read Berkeley DB
 hash or btree tables.
 .IP "\fBdefault_database_type (see 'postconf -d' output)\fR"
-The default database type for use in newaliases(1), postalias(1)
-and postmap(1) commands.
+The default database type for use in \fBnewaliases\fR(1), \fBpostalias\fR(1)
+and \fBpostmap\fR(1) commands.
 .IP "\fBsyslog_facility (mail)\fR"
 The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (postfix)\fR"
diff --git a/postfix/man/man1/postcat.1 b/postfix/man/man1/postcat.1
index d3942d142..4c40c6b4f 100644
--- a/postfix/man/man1/postcat.1
+++ b/postfix/man/man1/postcat.1
@@ -12,7 +12,7 @@ show Postfix queue file contents
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostcat\fR command prints the contents of the named
+The \fBpostcat\fR(1) command prints the contents of the named
 \fIfiles\fR in human-readable form. The files are expected
 to be in Postfix queue file format. If no
 \fIfiles\fR are specified on the command line, the program
@@ -52,7 +52,7 @@ The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
diff --git a/postfix/man/man1/postconf.1 b/postfix/man/man1/postconf.1
index 6b8fe66f3..48c97d76f 100644
--- a/postfix/man/man1/postconf.1
+++ b/postfix/man/man1/postconf.1
@@ -17,7 +17,7 @@ Postfix configuration utility
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostconf\fR command prints the actual value of
+The \fBpostconf\fR(1) command prints the actual value of
 \fIparameter\fR (all known parameters by default) one
 parameter per line, changes its value, or prints other
 information about the Postfix mail system.
@@ -109,7 +109,7 @@ A table that always returns its name as lookup result. For example,
 result.
 .IP "\fBtcp\fR (read-only)"
 Perform lookups using a simple request-reply protocol that is
-described in tcp_table(5).
+described in \fBtcp_table\fR(5).
 This feature is not included with Postfix 2.1.
 .IP "\fBunix\fR (read-only)"
 A limited way to query the UNIX authentication database. The
@@ -117,10 +117,10 @@ following tables are implemented:
 .RS
 . IP \fBunix:passwd.byname\fR
 The table is the UNIX password database. The key is a login name.
-The result is a password file entry in passwd(5) format.
+The result is a password file entry in \fBpasswd\fR(5) format.
 .IP \fBunix:group.byname\fR
 The table is the UNIX group database. The key is a group name.
-The result is a group file entry in group(5) format.
+The result is a group file entry in \fBgroup\fR(5) format.
 .RE
 .RE
 .sp
@@ -151,7 +151,7 @@ The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
diff --git a/postfix/man/man1/postdrop.1 b/postfix/man/man1/postdrop.1
index 6c42b1cbb..bf2a990e6 100644
--- a/postfix/man/man1/postdrop.1
+++ b/postfix/man/man1/postdrop.1
@@ -12,7 +12,7 @@ Postfix mail posting utility
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostdrop\fR command creates a file in the \fBmaildrop\fR
+The \fBpostdrop\fR(1) command creates a file in the \fBmaildrop\fR
 directory and copies its standard input to the file.
 
 Options:
@@ -66,7 +66,7 @@ The command is invoked by the super-user.
 The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBalternate_config_directories (empty)\fR"
 A list of non-default Postfix configuration directories that may
 be specified with "-c config_directory" on the command line, or
@@ -86,12 +86,12 @@ The mail system name that is prepended to the process name in syslog
 records, so that "smtpd" becomes, for example, "postfix/smtpd".
 .IP "\fBtrigger_timeout (10s)\fR"
 The time limit for sending a trigger to a Postfix daemon (for
-example, the pickup(8) or qmgr(8) daemon).
+example, the \fBpickup\fR(8) or \fBqmgr\fR(8) daemon).
 .PP
 Available in Postfix version 2.2 and later:
 .IP "\fBauthorized_submit_users (static:anyone)\fR"
-List of users who are authorized to submit mail with the sendmail(1)
-command (and with the privileged postdrop(1) helper command).
+List of users who are authorized to submit mail with the \fBsendmail\fR(1)
+command (and with the privileged \fBpostdrop\fR(1) helper command).
 .SH "FILES"
 .na
 .nf
diff --git a/postfix/man/man1/postfix.1 b/postfix/man/man1/postfix.1
index da7b1812f..a08e0a5d0 100644
--- a/postfix/man/man1/postfix.1
+++ b/postfix/man/man1/postfix.1
@@ -14,13 +14,13 @@ Postfix control program
 .ad
 .fi
 This command is reserved for the superuser. To submit mail,
-use the Postfix \fBsendmail\fR command.
+use the Postfix \fBsendmail\fR(1) command.
 
-The \fBpostfix\fR command controls the operation of the Postfix
-mail system: start or stop the \fBmaster\fR daemon, do a health
+The \fBpostfix\fR(1) command controls the operation of the Postfix
+mail system: start or stop the \fBmaster\fR(8) daemon, do a health
 check, and other maintenance.
 
-The \fBpostfix\fR command sets up a standardized environment and
+The \fBpostfix\fR(1) command sets up a standardized environment and
 runs the \fBpostfix-script\fR shell script to do the actual work.
 
 The following commands are implemented:
@@ -88,7 +88,7 @@ options make the software increasingly verbose.
 .nf
 .ad
 .fi
-The \fBpostfix\fR command exports the following environment
+The \fBpostfix\fR(1) command exports the following environment
 variables before executing the \fBpostfix-script\fR file:
 .IP \fBMAIL_CONFIG\fR
 This is set when the -c command-line option is present.
@@ -120,13 +120,13 @@ The group ownership of set-gid Postfix commands and of group-writable
 Postfix directories.
 .IP "\fBsendmail_path (see 'postconf -d' output)\fR"
 A Sendmail compatibility feature that specifies the location of
-the Postfix sendmail(1) command.
+the Postfix \fBsendmail\fR(1) command.
 .IP "\fBnewaliases_path (see 'postconf -d' output)\fR"
 Sendmail compatibility feature that specifies the location of the
-newaliases(1) command.
+\fBnewaliases\fR(1) command.
 .IP "\fBmailq_path (see 'postconf -d' output)\fR"
 Sendmail compatibility feature that specifies where the Postfix
-mailq(1) command is installed.
+\fBmailq\fR(1) command is installed.
 .IP "\fBhtml_directory (see 'postconf -d' output)\fR"
 The location of Postfix HTML files that describe how to build,
 configure or operate a specific Postfix subsystem or feature.
@@ -162,6 +162,7 @@ records, so that "smtpd" becomes, for example, "postfix/smtpd".
 Commands:
 postalias(1), create/update/query alias database
 postcat(1), examine Postfix queue file
+postconf(1), Postfix configuration utility
 postkick(1), trigger Postfix daemon
 postlock(1), Postfix-compatible locking
 postlog(1), Postfix-compatible logging
diff --git a/postfix/man/man1/postkick.1 b/postfix/man/man1/postkick.1
index 4bc9e8264..c85314fe7 100644
--- a/postfix/man/man1/postkick.1
+++ b/postfix/man/man1/postkick.1
@@ -14,7 +14,7 @@ kick a Postfix service
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostkick\fR command sends \fIrequest\fR to the
+The \fBpostkick\fR(1) command sends \fIrequest\fR to the
 specified \fIservice\fR over a local transport channel.
 This command makes Postfix private IPC accessible
 for use in, for example, shell scripts.
@@ -58,12 +58,12 @@ Enable verbose logging for debugging purposes.
 The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
 .IP "\fBapplication_event_drain_time (100s)\fR"
-How long the postkick(1) command waits for a request to enter the
+How long the \fBpostkick\fR(1) command waits for a request to enter the
 server's input buffer before giving up.
 .IP "\fBqueue_directory (see 'postconf -d' output)\fR"
 The location of the Postfix top-level queue directory.
diff --git a/postfix/man/man1/postlock.1 b/postfix/man/man1/postlock.1
index 8a4108e34..18eacd3cf 100644
--- a/postfix/man/man1/postlock.1
+++ b/postfix/man/man1/postlock.1
@@ -14,7 +14,7 @@ lock mail folder and execute command
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostlock\fR command locks \fIfile\fR for exclusive
+The \fBpostlock\fR(1) command locks \fIfile\fR for exclusive
 access, and executes \fIcommand\fR. The locking method is
 compatible with the Postfix UNIX-style local delivery agent.
 
@@ -39,7 +39,7 @@ interpretation by a shell command interpreter.
 .SH DIAGNOSTICS
 .ad
 .fi
-The result status is 75 (EX_TEMPFAIL) when \fBpostlock\fR
+The result status is 75 (EX_TEMPFAIL) when \fBpostlock\fR(1)
 could not perform the requested operation.  Otherwise, the
 exit status is the exit status from the command.
 .SH BUGS
@@ -65,7 +65,7 @@ Enable verbose logging for debugging purposes.
 The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "LOCKING CONTROLS"
 .na
 .nf
@@ -73,14 +73,14 @@ postconf(5) for more details including examples.
 .fi
 .IP "\fBdeliver_lock_attempts (20)\fR"
 The maximal number of attempts to acquire an exclusive lock on a
-mailbox file or bounce(8) logfile.
+mailbox file or \fBbounce\fR(8) logfile.
 .IP "\fBdeliver_lock_delay (1s)\fR"
 The time between attempts to acquire an exclusive lock on a mailbox
-file or bounce(8) logfile.
+file or \fBbounce\fR(8) logfile.
 .IP "\fBstale_lock_time (500s)\fR"
 The time after which a stale exclusive mailbox lockfile is removed.
 .IP "\fBmailbox_delivery_lock (see 'postconf -d' output)\fR"
-How to lock a UNIX-style local(8) mailbox before attempting delivery.
+How to lock a UNIX-style \fBlocal\fR(8) mailbox before attempting delivery.
 .SH "RESOURCE AND RATE CONTROLS"
 .na
 .nf
diff --git a/postfix/man/man1/postlog.1 b/postfix/man/man1/postlog.1
index 2eaf16911..d83267d53 100644
--- a/postfix/man/man1/postlog.1
+++ b/postfix/man/man1/postlog.1
@@ -14,12 +14,12 @@ Postfix-compatible logging utility
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostlog\fR command implements a Postfix-compatible logging
+The \fBpostlog\fR(1) command implements a Postfix-compatible logging
 interface for use in, for example, shell scripts.
 
-By default, \fBpostlog\fR logs the \fItext\fR given on the command
+By default, \fBpostlog\fR(1) logs the \fItext\fR given on the command
 line as one record. If no \fItext\fR is specified on the command
-line, \fBpostlog\fR reads from standard input and logs each input
+line, \fBpostlog\fR(1) reads from standard input and logs each input
 line as one record.
 
 Logging is sent to \fBsyslogd\fR(8); when the standard error stream
@@ -57,7 +57,7 @@ The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
diff --git a/postfix/man/man1/postmap.1 b/postfix/man/man1/postmap.1
index 76bc922ec..0674e23ac 100644
--- a/postfix/man/man1/postmap.1
+++ b/postfix/man/man1/postmap.1
@@ -15,7 +15,7 @@ Postfix lookup table management
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostmap\fR command creates or queries one or more Postfix
+The \fBpostmap\fR(1) command creates or queries one or more Postfix
 lookup tables, or updates an existing one. The input and output
 file formats are expected to be compatible with:
 
@@ -72,19 +72,21 @@ Do not fold the lookup key to lower case while creating or querying
 a map.
 .IP \fB-i\fR
 Incremental mode. Read entries from standard input and do not
-truncate an existing database. By default, \fBpostmap\fR creates
+truncate an existing database. By default, \fBpostmap\fR(1) creates
 a new database from the entries in \fBfile_name\fR.
 .IP \fB-N\fR
 Include the terminating null character that terminates lookup keys
-and values. By default, Postfix does whatever is the default for
+and values. By default, \fBpostmap\fR(1) does whatever is
+the default for
 the host operating system.
 .IP \fB-n\fR
 Don't include the terminating null character that terminates lookup
-keys and values. By default, Postfix does whatever is the default for
+keys and values. By default, \fBpostmap\fR(1) does whatever
+is the default for
 the host operating system.
 .IP \fB-o\fR
 Do not release root privileges when processing a non-root
-input file. By default, \fBpostmap\fR drops root privileges
+input file. By default, \fBpostmap\fR(1) drops root privileges
 and runs as the source file owner instead.
 .IP \fB-p\fR
 Do not inherit the file access permissions from the input file
@@ -121,7 +123,7 @@ Arguments:
 The database type. To find out what types are supported, use
 the "\fBpostconf -m\fR" command.
 
-The \fBpostmap\fR command can query any supported file type,
+The \fBpostmap\fR(1) command can query any supported file type,
 but it can create only the following file types:
 .RS
 .IP \fBbtree\fR
@@ -156,8 +158,8 @@ Problems are logged to the standard error stream and to
 No output means that no problems were detected. Duplicate entries are
 skipped and are flagged with a warning.
 
-\fBpostmap\fR terminates with zero exit status in case of success
-(including successful \fBpostmap -q\fR lookup) and terminates
+\fBpostmap\fR(1) terminates with zero exit status in case of success
+(including successful "\fBpostmap -q\fR" lookup) and terminates
 with non-zero exit status in case of failure.
 .SH "ENVIRONMENT"
 .na
@@ -176,7 +178,7 @@ Enable verbose logging for debugging purposes.
 The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBberkeley_db_create_buffer_size (16777216)\fR"
 The per-table I/O buffer size for programs that create Berkeley DB
 hash or btree tables.
@@ -187,8 +189,8 @@ hash or btree tables.
 The default location of the Postfix main.cf and master.cf
 configuration files.
 .IP "\fBdefault_database_type (see 'postconf -d' output)\fR"
-The default database type for use in newaliases(1), postalias(1)
-and postmap(1) commands.
+The default database type for use in \fBnewaliases\fR(1), \fBpostalias\fR(1)
+and \fBpostmap\fR(1) commands.
 .IP "\fBsyslog_facility (mail)\fR"
 The syslog facility of Postfix logging.
 .IP "\fBsyslog_name (postfix)\fR"
diff --git a/postfix/man/man1/postqueue.1 b/postfix/man/man1/postqueue.1
index 682fd4585..6dfdc46d2 100644
--- a/postfix/man/man1/postqueue.1
+++ b/postfix/man/man1/postqueue.1
@@ -16,7 +16,7 @@ Postfix queue control
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostqueue\fR program implements the Postfix user interface
+The \fBpostqueue\fR(1) command implements the Postfix user interface
 for queue management. It implements operations that are
 traditionally available via the \fBsendmail\fR(1) command.
 See the \fBpostsuper\fR(1) command for queue operations
@@ -31,7 +31,7 @@ MAIL_CONFIG environment setting below.
 .IP \fB-f\fR
 Flush the queue: attempt to deliver all queued mail.
 
-This option implements the traditional \fBsendmail -q\fR command,
+This option implements the traditional "\fBsendmail -q\fR" command,
 by contacting the Postfix \fBqmgr\fR(8) daemon.
 
 Warning: flushing undeliverable mail frequently will result in
@@ -63,7 +63,7 @@ The site must be eligible for the "fast flush" service.
 See \fBflush\fR(8) for more information about the "fast flush"
 service.
 
-This option implements the traditional \fBsendmail -qR\fIsite\fR
+This option implements the traditional "\fBsendmail -qR\fIsite\fR"
 command, by contacting the Postfix \fBflush\fR(8) daemon.
 .IP \fB-v\fR
 Enable verbose logging for debugging purposes. Multiple \fB-v\fR
@@ -104,7 +104,7 @@ The command is invoked by the super-user.
 The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBalternate_config_directories (empty)\fR"
 A list of non-default Postfix configuration directories that may
 be specified with "-c config_directory" on the command line, or
@@ -129,7 +129,7 @@ The mail system name that is prepended to the process name in syslog
 records, so that "smtpd" becomes, for example, "postfix/smtpd".
 .IP "\fBtrigger_timeout (10s)\fR"
 The time limit for sending a trigger to a Postfix daemon (for
-example, the pickup(8) or qmgr(8) daemon).
+example, the \fBpickup\fR(8) or \fBqmgr\fR(8) daemon).
 .PP
 Available in Postfix version 2.2 and later:
 .IP "\fBauthorized_flush_users (static:anyone)\fR"
diff --git a/postfix/man/man1/postsuper.1 b/postfix/man/man1/postsuper.1
index a63a8ebf8..5c2982bbf 100644
--- a/postfix/man/man1/postsuper.1
+++ b/postfix/man/man1/postsuper.1
@@ -16,12 +16,13 @@ Postfix superintendent
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpostsuper\fR command does maintenance jobs on the Postfix
+The \fBpostsuper\fR(1) command does maintenance jobs on the Postfix
 queue. Use of the command is restricted to the superuser.
-See the \fBpostqueue\fR command for unprivileged queue operations
+See the \fBpostqueue\fR(1) command for unprivileged queue operations
 such as listing or flushing the mail queue.
 
-By default, \fBpostsuper\fR performs the operations requested with the
+By default, \fBpostsuper\fR(1) performs the operations
+requested with the
 \fB-s\fR and \fB-p\fR command-line options on all Postfix queue
 directories - this includes the \fBincoming\fR, \fBactive\fR and
 \fBdeferred\fR directories with mail files and the \fBbounce\fR,
@@ -38,11 +39,15 @@ mail queue(s) (default: \fBhold\fR, \fBincoming\fR, \fBactive\fR and
 \fBdeferred\fR).
 If a \fIqueue_id\fR of \fB-\fR is specified, the program reads
 queue IDs from standard input. For example, to delete all mail
-from or to \fBuser@example.com\fR:
+with exactly one recipient \fBuser@example.com\fR:
 .sp
-mailq | tail +2 | awk  \'BEGIN { RS = "" } \e
+mailq | tail +2 | awk  \'BEGIN { RS = "" }
 .ti +4
-/ user@example\e.com$/ { print $1 } \e
+# $7=sender, $8=recipient1, $9=recipient2
+.ti +4
+{ if ($8 == "user@example.com" && $9 == "")
+.ti +6
+print $1 }
 .br
 \' | tr -d '*!' | postsuper -d -
 .sp
@@ -59,17 +64,17 @@ system is delivering mail.
 The scenario is as follows:
 .RS
 .IP 1)
-The Postfix queue manager deletes the message that \fBpostsuper\fR
+The Postfix queue manager deletes the message that \fBpostsuper\fR(1)
 is asked to delete, because Postfix is finished with the
 message (it is delivered, or it is returned to the sender).
 .IP 2)
 New mail arrives, and the new message is given the same queue ID
-as the message that \fBpostsuper\fR is supposed to delete.
+as the message that \fBpostsuper\fR(1) is supposed to delete.
 The probability for reusing a deleted queue ID is about 1 in 2**15
 (the number of different microsecond values that the system clock
 can distinguish within a second).
 .IP 3)
-\fBpostsuper\fR deletes the new message, instead of the old
+\fBpostsuper\fR(1) deletes the new message, instead of the old
 message that it should have deleted.
 .RE
 .IP "\fB-h \fIqueue_id\fR"
@@ -126,7 +131,7 @@ substitution. This is useful when rewriting rules or virtual
 mappings have changed.
 .sp
 Warning: Postfix queue IDs are reused.
-There is a very small possibility that \fBpostsuper\fR requeues
+There is a very small possibility that \fBpostsuper\fR(1) requeues
 the wrong message file when it is executed while the Postfix mail
 system is running, but no harm should be done.
 .IP \fB-s\fR
@@ -153,7 +158,7 @@ options make the software increasingly verbose.
 Problems are reported to the standard error stream and to
 \fBsyslogd\fR(8).
 
-\fBpostsuper\fR reports the number of messages deleted with \fB-d\fR,
+\fBpostsuper\fR(1) reports the number of messages deleted with \fB-d\fR,
 the number of messages requeued with \fB-r\fR, and the number of
 messages whose queue file name was fixed with \fB-s\fR. The report
 is written to the standard error stream and to \fBsyslogd\fR(8).
@@ -177,14 +182,14 @@ queue) cannot be placed "on hold".
 The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
 .IP "\fBhash_queue_depth (1)\fR"
 The number of subdirectory levels for queue directories listed with
 the hash_queue_names parameter.
-.IP "\fBhash_queue_names (see 'postconf -d' output)\fR"
+.IP "\fBhash_queue_names (deferred, defer)\fR"
 The names of queue directories that are split across multiple
 subdirectory levels.
 .IP "\fBqueue_directory (see 'postconf -d' output)\fR"
diff --git a/postfix/man/man1/qshape.1 b/postfix/man/man1/qshape.1
index 7a23b810a..6c2c9908a 100644
--- a/postfix/man/man1/qshape.1
+++ b/postfix/man/man1/qshape.1
@@ -84,7 +84,7 @@ default incoming and active queue distribution.
 .SH "SEE ALSO"
 .na
 .nf
-mailq(1) List all messages in the queue.
+mailq(1), List all messages in the queue.
 QSHAPE_README Examples and background material.
 .SH "FILES"
 .na
diff --git a/postfix/man/man1/sendmail.1 b/postfix/man/man1/sendmail.1
index f35a4529b..e32f702d1 100644
--- a/postfix/man/man1/sendmail.1
+++ b/postfix/man/man1/sendmail.1
@@ -18,14 +18,15 @@ Postfix to Sendmail compatibility interface
 .SH DESCRIPTION
 .ad
 .fi
-The Postfix \fBsendmail\fR command implements the Postfix to Sendmail
-compatibility interface.
+The Postfix \fBsendmail\fR(1) command implements the Postfix
+to Sendmail compatibility interface.
 For the sake of compatibility with existing applications, some
 Sendmail command-line options are recognized but silently ignored.
 
-By default, Postfix \fBsendmail\fR reads a message from standard input
+By default, Postfix \fBsendmail\fR(1) reads a message from
+standard input
 until EOF or until it reads a line with only a \fB.\fR character,
-and arranges for delivery.  Postfix \fBsendmail\fR relies on the
+and arranges for delivery.  Postfix \fBsendmail\fR(1) relies on the
 \fBpostdrop\fR(1) command to create a queue file in the \fBmaildrop\fR
 directory.
 
@@ -47,7 +48,7 @@ This mode of operation is implemented by running the \fBpostalias\fR(1)
 command.
 .sp
 Note: it may take a minute or so before an alias database update
-becomes visible. Use the \fBpostfix reload\fR command to eliminate
+becomes visible. Use the "\fBpostfix reload\fR" command to eliminate
 this delay.
 .PP
 These and other features can be selected by specifying the
@@ -63,7 +64,7 @@ whether or not a message is an initial submission.
 The message body MIME type: \fB7BIT\fR or \fB8BITMIME\fR.
 .IP \fB-bd\fR
 Go into daemon mode. This mode of operation is implemented by
-executing the \fBpostfix start\fR command.
+executing the "\fBpostfix start\fR" command.
 .IP "\fB-bh\fR (ignored)"
 .IP "\fB-bH\fR (ignored)"
 Postfix has no persistent host status database.
@@ -98,8 +99,8 @@ Set the sender full name. This is used only with messages that
 have no \fBFrom:\fR message header.
 .IP "\fB-f \fIsender\fR"
 Set the envelope sender address. This is the address where
-delivery problems are sent to, unless the message contains an
-\fBErrors-To:\fR message header.
+delivery problems are sent to. With Postfix versions before 2.1, the
+\fBErrors-To:\fR message header overrides the error return address.
 .IP "\fB-G\fR (ignored)"
 Gateway (relay) submission, as opposed to initial user submission.
 .IP "\fB-h \fIhop_count\fR (ignored)"
@@ -141,8 +142,8 @@ Set option \fIx\fR to \fIvalue\fR. Use the equivalent
 configuration parameter in \fBmain.cf\fR instead.
 .IP "\fB-r \fIsender\fR"
 Set the envelope sender address. This is the address where
-delivery problems are sent to, unless the message contains an
-\fBErrors-To:\fR message header.
+delivery problems are sent to. With Postfix versions before 2.1, the
+\fBErrors-To:\fR message header overrides the error return address.
 .IP "\fB-R \fIreturn_limit\fR (ignored)"
 Limit the size of bounced mail. Use the \fBbounce_size_limit\fR
 configuration parameter instead.
@@ -163,7 +164,7 @@ executing the \fBpostqueue\fR(1) command.
 See \fBflush\fR(8) for more information about the "fast flush"
 service.
 .IP \fB-qS\fIsite\fR
-This command is not implemented. Use the slower \fBsendmail -q\fR
+This command is not implemented. Use the slower "\fBsendmail -q\fR"
 command instead.
 .IP \fB-t\fR
 Extract recipients from message headers. These are added to any
@@ -231,7 +232,7 @@ Enable debugging with an external command, as specified with the
 The following \fBmain.cf\fR parameters are especially relevant to
 this program.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "TROUBLE SHOOTING CONTROLS"
 .na
 .nf
@@ -260,8 +261,8 @@ List of users who are authorized to flush the queue.
 .IP "\fBauthorized_mailq_users (static:anyone)\fR"
 List of users who are authorized to view the queue.
 .IP "\fBauthorized_submit_users (static:anyone)\fR"
-List of users who are authorized to submit mail with the sendmail(1)
-command (and with the privileged postdrop(1) helper command).
+List of users who are authorized to submit mail with the \fBsendmail\fR(1)
+command (and with the privileged \fBpostdrop\fR(1) helper command).
 .SH "RESOURCE AND RATE CONTROLS"
 .na
 .nf
@@ -301,14 +302,14 @@ path addresses.
 The two default VERP delimiter characters.
 .IP "\fBverp_delimiter_filter (-=+)\fR"
 The characters Postfix accepts as VERP delimiter characters on the
-Postfix sendmail(1) command line and in SMTP commands.
+Postfix \fBsendmail\fR(1) command line and in SMTP commands.
 .SH "MISCELLANEOUS CONTROLS"
 .na
 .nf
 .ad
 .fi
 .IP "\fBalias_database (see 'postconf -d' output)\fR"
-The alias databases for local(8) delivery that are updated with
+The alias databases for \fBlocal\fR(8) delivery that are updated with
 "\fBnewaliases\fR" or with "\fBsendmail -bi\fR".
 .IP "\fBcommand_directory (see 'postconf -d' output)\fR"
 The location of all postfix administrative commands.
@@ -318,11 +319,17 @@ configuration files.
 .IP "\fBdaemon_directory (see 'postconf -d' output)\fR"
 The directory with Postfix support programs and daemon programs.
 .IP "\fBdefault_database_type (see 'postconf -d' output)\fR"
-The default database type for use in newaliases(1), postalias(1)
-and postmap(1) commands.
+The default database type for use in \fBnewaliases\fR(1), \fBpostalias\fR(1)
+and \fBpostmap\fR(1) commands.
 .IP "\fBdelay_warning_time (0h)\fR"
 The time after which the sender receives the message headers of
 mail that is still queued.
+.IP "\fBenable_errors_to (no)\fR"
+Report mail delivery errors to the address specified with the
+non-standard Errors-To: message header, instead of the envelope
+sender address (this feature is removed with Postfix 2.2, is
+turned off by default with Postfix 2.1, and is always turned on
+with older Postfix versions).
 .IP "\fBmail_owner (postfix)\fR"
 The UNIX system account that owns the Postfix queue and most Postfix
 daemon processes.
@@ -335,7 +342,7 @@ The mail system name that is prepended to the process name in syslog
 records, so that "smtpd" becomes, for example, "postfix/smtpd".
 .IP "\fBtrigger_timeout (10s)\fR"
 The time limit for sending a trigger to a Postfix daemon (for
-example, the pickup(8) or qmgr(8) daemon).
+example, the \fBpickup\fR(8) or \fBqmgr\fR(8) daemon).
 .SH "FILES"
 .na
 .nf
diff --git a/postfix/man/man1/smtp-sink.1 b/postfix/man/man1/smtp-sink.1
index 0a2ac7575..e2b845449 100644
--- a/postfix/man/man1/smtp-sink.1
+++ b/postfix/man/man1/smtp-sink.1
@@ -83,7 +83,7 @@ specified in numeric or symbolic form.
 Listen on the UNIX-domain socket at \fIpathname\fR.
 .IP \fIbacklog\fR
 The maximum length the queue of pending connections,
-as defined by the listen(2) call.
+as defined by the \fBlisten\fR(2) system call.
 .SH "SEE ALSO"
 .na
 .nf
diff --git a/postfix/man/man5/access.5 b/postfix/man/man5/access.5
index 5a4c816aa..7f9cfb821 100644
--- a/postfix/man/man5/access.5
+++ b/postfix/man/man5/access.5
@@ -4,7 +4,7 @@
 .SH NAME
 access
 \-
-format of Postfix access table
+Postfix access table format
 .SH "SYNOPSIS"
 .na
 .nf
@@ -16,7 +16,7 @@ format of Postfix access table
 .SH DESCRIPTION
 .ad
 .fi
-The optional \fBaccess\fR table directs the Postfix SMTP server
+The optional \fBaccess\fR(5) table directs the Postfix SMTP server
 to selectively reject or accept mail. Access can be allowed or
 denied for specific host names, domain names, networks, host
 addresses or mail addresses.
@@ -24,7 +24,7 @@ addresses or mail addresses.
 For an example, see the EXAMPLE section at the end of this
 manual page.
 
-Normally, the \fBaccess\fR table is specified as a text file
+Normally, the \fBaccess\fR(5) table is specified as a text file
 that serves as input to the \fBpostmap\fR(1) command.
 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
 is used for fast searching by the mail system. Execute the command
@@ -124,7 +124,7 @@ canonical form, with unnecessary null characters eliminated.
 Address information must not be enclosed with "[]" characters.
 
 NOTE 2: use the \fBcidr\fR lookup table type to specify
-network/netmask patterns. See cidr_table(5) for details.
+network/netmask patterns. See \fBcidr_table\fR(5) for details.
 .IP \fInet:work:addr:ess\fR
 .IP \fInet:work:addr\fR
 .IP \fInet:work\fR
@@ -147,7 +147,7 @@ canonical form, with unnecessary null characters eliminated.
 Address information must not be enclosed with "[]" characters.
 
 NOTE 3: use the \fBcidr\fR lookup table type to specify
-network/netmask patterns. See cidr_table(5) for details.
+network/netmask patterns. See \fBcidr_table\fR(5) for details.
 
 IPv6 support is available in Postfix 2.2 and later.
 .SH "ACCEPT ACTIONS"
@@ -214,7 +214,8 @@ This feature is available in Postfix 2.0 and later.
 .IP "\fBFILTER \fItransport:destination\fR"
 After the message is queued, send the entire message through
 the specified external content filter. The \fItransport:destination\fR
-syntax is described in the transport(5) manual page.  More information
+syntax is described in the \fBtransport\fR(5) manual page.
+More information
 about external content filters is in the Postfix FILTER_README file.
 .sp
 Note: this action overrides the \fBmain.cf content_filter\fR setting,
@@ -291,7 +292,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on.
 This section describes how the table lookups change when lookups
 are directed to a TCP-based server. For a description of the TCP
 client/server lookup protocol, see \fBtcp_table\fR(5).
-This feature is not available in Postfix version 2.1.
+This feature is not available up to and including Postfix version 2.2.
 
 Each lookup operation uses the entire query string once.
 Depending on the application, that string is an entire client
diff --git a/postfix/man/man5/aliases.5 b/postfix/man/man5/aliases.5
index ec1f5c539..bfd5c22b5 100644
--- a/postfix/man/man5/aliases.5
+++ b/postfix/man/man5/aliases.5
@@ -4,7 +4,7 @@
 .SH NAME
 aliases
 \-
-format of the Postfix alias database
+Postfix local alias database format
 .SH "SYNOPSIS"
 .na
 .nf
@@ -13,11 +13,11 @@ format of the Postfix alias database
 .SH DESCRIPTION
 .ad
 .fi
-The \fBaliases\fR table provides a system-wide mechanism to
+The \fBaliases\fR(5) table provides a system-wide mechanism to
 redirect mail for local recipients. The redirections are
 processed by the Postfix \fBlocal\fR(8) delivery agent.
 
-Normally, the \fBaliases\fR table is specified as a text file
+Normally, the \fBaliases\fR(5) table is specified as a text file
 that serves as input to the \fBpostalias\fR(1) command. The
 result, an indexed file in \fBdbm\fR or \fBdb\fR format, is
 used for fast lookup by the mail system. Execute the command
@@ -31,7 +31,7 @@ use as NIS maps.
 Users can control delivery of their own mail by setting
 up \fB.forward\fR files in their home directory.
 Lines in per-user \fB.forward\fR files have the same syntax
-as the right-hand side of \fBaliases\fR entries.
+as the right-hand side of \fBaliases\fR(5) entries.
 
 The format of the alias database input file is as follows:
 .IP \(bu
@@ -119,7 +119,7 @@ agent will terminate with a fatal error.
 .fi
 The following \fBmain.cf\fR parameters are especially relevant.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP \fBalias_database\fR
 List of alias databases that are updated by the
 \fBnewaliases\fR(1) command.
diff --git a/postfix/man/man5/canonical.5 b/postfix/man/man5/canonical.5
index 98b503d1c..7032b003b 100644
--- a/postfix/man/man5/canonical.5
+++ b/postfix/man/man5/canonical.5
@@ -4,7 +4,7 @@
 .SH NAME
 canonical
 \-
-format of Postfix canonical table
+Postfix canonical table format
 .SH "SYNOPSIS"
 .na
 .nf
@@ -16,15 +16,15 @@ format of Postfix canonical table
 .SH DESCRIPTION
 .ad
 .fi
-The optional \fBcanonical\fR table specifies an address mapping for
+The optional \fBcanonical\fR(5) table specifies an address mapping for
 local and non-local addresses. The mapping is used by the
 \fBcleanup\fR(8) daemon.  The address mapping is recursive.
 
-Normally, the \fBcanonical\fR table is specified as a text file
+Normally, the \fBcanonical\fR(5) table is specified as a text file
 that serves as input to the \fBpostmap\fR(1) command.
 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
 is used for fast searching by the mail system. Execute the command
-\fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+"\fBpostmap /etc/postfix/canonical\fR" in order to rebuild the indexed
 file after changing the text file.
 
 When the table is provided via other means such as NIS, LDAP
@@ -36,28 +36,28 @@ can be directed to TCP-based server. In that case, the lookups are
 done in a slightly different way as described below under
 "REGULAR EXPRESSION TABLES" and "TCP-BASED TABLES".
 
-By default the \fBcanonical\fR mapping affects both message
+By default the \fBcanonical\fR(5) mapping affects both message
 header addresses (i.e. addresses that appear inside messages)
 and message envelope addresses (for example, the addresses
 that are used in SMTP protocol commands). Think Sendmail
 rule set \fBS3\fR, if you like.  This is controlled with
 the \fBcanonical_classes\fR parameter.
 
-Typically, one would use the \fBcanonical\fR table to replace login
+Typically, one would use the \fBcanonical\fR(5) table to replace login
 names by \fIFirstname.Lastname\fR, or to clean up addresses produced
 by legacy mail systems.
 
-The \fBcanonical\fR mapping is not to be confused with \fIvirtual
+The \fBcanonical\fR(5) mapping is not to be confused with \fIvirtual
 domain\fR support. Use the \fBvirtual\fR(5) map for that purpose.
 
-The \fBcanonical\fR mapping is not to be confused with local aliasing.
+The \fBcanonical\fR(5) mapping is not to be confused with local aliasing.
 Use the \fBaliases\fR(5) map for that purpose.
 .SH "TABLE FORMAT"
 .na
 .nf
 .ad
 .fi
-The input format for the \fBpostmap\fR(1) command is as follows:
+make#   The input format for the \fBpostmap\fR(1) command is as follows:
 .IP "\fIpattern result\fR"
 When \fIpattern\fR matches a mail address, replace it by the
 corresponding \fIresult\fR.
@@ -134,7 +134,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on.
 This section describes how the table lookups change when lookups
 are directed to a TCP-based server. For a description of the TCP
 client/server lookup protocol, see \fBtcp_table\fR(5).
-This feature is not available in Postfix version 2.1.
+This feature is not available up to and including Postfix version 2.2.
 
 Each lookup operation uses the entire address once.  Thus,
 \fIuser@domain\fR mail addresses are not broken up into their
@@ -153,7 +153,7 @@ The table format does not understand quoting conventions.
 .fi
 The following \fBmain.cf\fR parameters are especially relevant.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP \fBcanonical_classes\fR
 What addresses are subject to canonical address mapping.
 .IP \fBcanonical_maps\fR
diff --git a/postfix/man/man5/cidr_table.5 b/postfix/man/man5/cidr_table.5
index b764ad515..b4aa31ec6 100644
--- a/postfix/man/man5/cidr_table.5
+++ b/postfix/man/man5/cidr_table.5
@@ -20,9 +20,9 @@ Alternatively, lookup tables can be specified in CIDR
 (Classless Inter-Domain Routing) form.
 
 To find out what types of lookup tables your Postfix system
-supports use the \fBpostconf -m\fR command.
+supports use the "\fBpostconf -m\fR" command.
 
-To test lookup tables, use the \fBpostmap\fR command as
+To test lookup tables, use the "\fBpostmap -q\fR" command as
 described in the SYNOPSIS above.
 .SH "TABLE FORMAT"
 .na
@@ -82,8 +82,8 @@ smtpd_client_restrictions = ... cidr:/etc/postfix/client.cidr ...
 .na
 .nf
 postmap(1), Postfix lookup table manager
-regexp_table(5) format of regular expression tables
-pcre_table(5) format of PCRE tables
+regexp_table(5), format of regular expression tables
+pcre_table(5), format of PCRE tables
 .SH "README FILES"
 .na
 .nf
diff --git a/postfix/man/man5/header_checks.5 b/postfix/man/man5/header_checks.5
index 4d09189f8..71a48372d 100644
--- a/postfix/man/man5/header_checks.5
+++ b/postfix/man/man5/header_checks.5
@@ -70,7 +70,7 @@ in the form of Postfix regular expression lookup tables. Usually the
 best performance is obtained with \fBpcre\fR (Perl Compatible Regular
 Expression) tables, but the slower \fBregexp\fR (POSIX regular
 expressions) support is more widely available.
-Use the command \fBpostconf -m\fR to find out what lookup table
+Use the command "\fBpostconf -m\fR" to find out what lookup table
 types your Postfix system supports.
 
 The general format of Postfix regular expression tables is
@@ -119,9 +119,10 @@ next input line is inspected.
 .fi
 Substitution of substrings from the matched expression into the
 \fIaction\fR
-string is possible using the conventional Perl syntax ($1, $2, etc.).
-The macros in the result string may need to be written as ${n}
-or $(n) if they aren't followed by whitespace.
+string is possible using the conventional Perl syntax
+(\fB$1\fR, \fB$2\fR, etc.).
+The macros in the result string may need to be written as \fB${n}\fR
+or \fB$(n)\fR if they aren't followed by whitespace.
 
 Note: since negated patterns (those preceded by \fB!\fR) return a
 result when the expression does not match, substitutions are not
@@ -187,12 +188,18 @@ the next input line.
 Prepend one line with the specified text and inspect the next
 input line.
 .sp
-Note: the prepended text is output immediately before the
-input that triggered the \fBPREPEND\fR action. A body action
-cannot prepend a message header.
-.sp
-Note: this action cannot be used to prepend multi-line text.
-.sp
+Notes:
+.RS
+.IP \(bu
+The prepended text is output on a separate line, immediately
+before the input that triggered the \fBPREPEND\fR action.
+.IP \(bu
+When prepending text before a message header line, the prepended
+text must begin with a valid message header label.
+.IP \(bu
+This action cannot be used to prepend multi-line text.
+.RE
+.IP
 This feature is available in Postfix 2.1 and later.
 .IP "\fBREDIRECT \fIuser@domain\fR"
 Write a message redirection request to the queue file and
@@ -205,6 +212,14 @@ all recipients of the message. If multiple \fBREDIRECT\fR actions
 fire, only the last one is executed.
 .sp
 This feature is available in Postfix 2.1 and later.
+.IP "\fBREPLACE \fItext...\fR"
+Replace the current line with the specified text and inspect the next
+input line.
+.sp
+Note: when replacing a message header line, the replacement text
+must begin with a valid header label.
+.sp
+This feature is available in Postfix 2.2 and later.
 .IP "\fBREJECT \fIoptional text...\fR
 Reject the entire message. Reply with \fIoptional text...\fR when
 the optional text is specified, otherwise reply with a generic error
diff --git a/postfix/man/man5/master.5 b/postfix/man/man5/master.5
index ca3ac5b1f..e046e8909 100644
--- a/postfix/man/man5/master.5
+++ b/postfix/man/man5/master.5
@@ -110,7 +110,7 @@ directory (pathname is controlled by the \fBqueue_directory\fR
 configuration variable in the main.cf file).
 .sp
 Chroot should not be used with the \fBlocal\fR(8),
-\fBpipe\fR(8), \fBspawn\fR(8), and virtual(8) daemons.
+\fBpipe\fR(8), \fBspawn\fR(8), and \fBvirtual\fR(8) daemons.
 Although the
 \fBproxymap\fR(8) server can run chrooted, doing so defeats
 most of the purpose of having that service in the first
diff --git a/postfix/man/man5/nisplus_table.5 b/postfix/man/man5/nisplus_table.5
index 963fc9249..e8a6716b3 100644
--- a/postfix/man/man5/nisplus_table.5
+++ b/postfix/man/man5/nisplus_table.5
@@ -22,7 +22,7 @@ databases.
 To find out what types of lookup tables your Postfix system
 supports use the "\fBpostconf -m\fR" command.
 
-To test Postfix NIS+ lookup tables, use the \fBpostmap\fR
+To test Postfix NIS+ lookup tables, use the "\fBpostmap -q\fR"
 command as described in the SYNOPSIS above.
 .SH "QUERY SYNTAX"
 .na
diff --git a/postfix/man/man5/pcre_table.5 b/postfix/man/man5/pcre_table.5
index ed7b003c7..90e72e99f 100644
--- a/postfix/man/man5/pcre_table.5
+++ b/postfix/man/man5/pcre_table.5
@@ -24,9 +24,9 @@ against a list of patterns, and when a match is found the
 corresponding result is returned.
 
 To find out what types of lookup tables your Postfix system
-supports use the \fBpostconf -m\fR command.
+supports use the "\fBpostconf -m\fR" command.
 
-To test lookup tables, use the \fBpostmap -fq\fR command as
+To test lookup tables, use the "\fBpostmap -fq\fR" command as
 described in the SYNOPSIS above.
 .SH "TABLE FORMAT"
 .na
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index c8f05f879..c249734df 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -50,7 +50,7 @@ Otherwise, the order of main.cf parameter definitions does not matter.
 The remainder of this document is a description of all Postfix
 configuration parameters. Default values are shown after the 
 parameter name in parentheses, and can be looked up with the
-\fBpostconf -d\fR command. 
+"\fBpostconf -d\fR" command. 
 .PP
 Note: this is not an invitation to make changes to Postfix
 configuration parameters. Unnecessary changes can impair the
@@ -61,7 +61,7 @@ the sender.  This feature is enabled with the notify_classes
 parameter.
 .SH access_map_reject_code (default: 554)
 The numerical Postfix SMTP server response code when a client
-is rejected by an access(5) map restriction.
+is rejected by an \fBaccess\fR(5) map restriction.
 .PP
 Do not change this unless you have a complete understanding of RFC 821.
 .SH address_verify_default_transport (default: $default_transport)
@@ -76,7 +76,7 @@ verification probes.
 This feature is available in Postfix 2.1 and later.
 .SH address_verify_map (default: empty)
 Optional lookup table for persistent address verification status
-storage.  The table is maintained by the verify(8) service, and
+storage.  The table is maintained by the \fBverify\fR(8) service, and
 is opened before the process releases privileges.
 .PP
 By default, the information is kept in volatile memory, and is lost
@@ -120,7 +120,7 @@ Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH address_verify_poll_count (default: 3)
-How many times to query the verify(8) service for the completion
+How many times to query the \fBverify\fR(8) service for the completion
 of an address verification request in progress.
 .PP
 The default poll count is 3.
@@ -196,7 +196,7 @@ address_verify_sender = postmaster@my.domain
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH address_verify_service_name (default: verify)
-The name of the verify(8) address verification service. This service
+The name of the \fBverify\fR(8) address verification service. This service
 maintains the status of sender and/or recipient address verification
 probes, and generates probes on request by other Postfix processes.
 .SH address_verify_transport_maps (default: $transport_maps)
@@ -210,7 +210,7 @@ verification probes.
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH alias_database (default: see "postconf -d" output)
-The alias databases for local(8) delivery that are updated with
+The alias databases for \fBlocal\fR(8) delivery that are updated with
 "\fBnewaliases\fR" or with "\fBsendmail -bi\fR".
 .PP
 This is a separate configuration parameter because not all the
@@ -227,8 +227,8 @@ alias_database = hash:/etc/mail/aliases
 .ad
 .ft R
 .SH alias_maps (default: see "postconf -d" output)
-The alias databases that are used for local(8) delivery. See
-aliases(5) for syntax details.
+The alias databases that are used for \fBlocal\fR(8) delivery. See
+\fBaliases\fR(5) for syntax details.
 .PP
 The default list is system dependent.  On systems with NIS, the
 default is to search the local alias database, then the NIS alias
@@ -238,12 +238,12 @@ If you change the alias database, run "\fBpostalias /etc/aliases\fR"
 (or wherever your system stores the mail alias file), or simply
 run "\fBnewaliases\fR" to build the necessary DBM or DB file.
 .PP
-The local(8) delivery agent disallows regular expression substitution
+The \fBlocal\fR(8) delivery agent disallows regular expression substitution
 of $1 etc. in alias_maps, because that would open a security hole.
 .PP
-The local(8) delivery agent will silently ignore requests to use
-the proxymap(8) server within alias_maps. Instead it will open the
-table directly. Before Postfix version 2.2, the local(8) delivery
+The \fBlocal\fR(8) delivery agent will silently ignore requests to use
+the \fBproxymap\fR(8) server within alias_maps. Instead it will open the
+table directly. Before Postfix version 2.2, the \fBlocal\fR(8) delivery
 agent will terminate with a fatal error.
 .PP
 Examples:
@@ -257,12 +257,12 @@ alias_maps = hash:/etc/aliases
 .ad
 .ft R
 .SH allow_mail_to_commands (default: alias, forward)
-Restrict local(8) mail delivery to external commands.  The default
+Restrict \fBlocal\fR(8) mail delivery to external commands.  The default
 is to disallow delivery to "|command" in :include:  files (see
-aliases(5) for the text that defines this terminology).
+\fBaliases\fR(5) for the text that defines this terminology).
 .PP
 Specify zero or more of: \fBalias\fR, \fBforward\fR or \fBinclude\fR,
-in order to allow commands in aliases(5), .forward files or in
+in order to allow commands in \fBaliases\fR(5), .forward files or in
 :include:  files, respectively.
 .PP
 Example:
@@ -275,12 +275,12 @@ allow_mail_to_commands = alias,forward,include
 .ad
 .ft R
 .SH allow_mail_to_files (default: alias, forward)
-Restrict local(8) mail delivery to external files. The default is
+Restrict \fBlocal\fR(8) mail delivery to external files. The default is
 to disallow "/file/name" destinations in :include:  files (see
-aliases(5) for the text that defines this terminology).
+\fBaliases\fR(5) for the text that defines this terminology).
 .PP
 Specify zero or more of: \fBalias\fR, \fBforward\fR or \fBinclude\fR,
-in order to allow "/file/name" destinations in aliases(5), .forward
+in order to allow "/file/name" destinations in \fBaliases\fR(5), .forward
 files and in :include:  files, respectively.
 .PP
 Example:
@@ -330,8 +330,8 @@ be specified with "-c config_directory" on the command line, or
 via the MAIL_CONFIG environment parameter.
 .PP
 This list must be specified in the default Postfix configuration
-directory, and is used by set-gid Postfix commands such as postqueue(1)
-and postdrop(1).
+directory, and is used by set-gid Postfix commands such as \fBpostqueue\fR(1)
+and \fBpostdrop\fR(1).
 .SH always_bcc (default: empty)
 Optional address that receives a "blind carbon copy" of each message
 that is received by the Postfix mail system.
@@ -347,21 +347,20 @@ generates itself.
 The time unit over which client connection rates and other rates
 are calculated.
 .PP
-This feature is implemented by the anvil(8) service which is not
+This feature is implemented by the \fBanvil\fR(8) service which is not
 part of the stable Postfix 2.1 release.
 .PP
 The default interval is relatively short. Because of the high
-frequency of updates, the anvil(8) server uses volatile memory
+frequency of updates, the \fBanvil\fR(8) server uses volatile memory
 only. Thus, information is lost whenever the process terminates.
 .PP
 Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 The default time unit is s (seconds).
 .SH anvil_status_update_time (default: 600s)
-How frequently the anvil(8) connection and rate limiting server
+How frequently the \fBanvil\fR(8) connection and rate limiting server
 logs peak usage information.
 .PP
-This feature is implemented by the anvil(8) service which is not
-part of the stable Postfix 2.1 release.
+This feature is available in Postfix 2.2 and later.
 .PP
 Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 The default time unit is s (seconds).
@@ -382,7 +381,7 @@ This feature is enabled by default. If disabled, users will not be
 able to send mail to "user@partialdomainname" but will have to
 specify full domain names instead.
 .SH application_event_drain_time (default: 100s)
-How long the postkick(1) command waits for a request to enter the
+How long the \fBpostkick\fR(1) command waits for a request to enter the
 server's input buffer before giving up.
 .PP
 Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
@@ -430,8 +429,8 @@ lines by starting the next line with whitespace.
 .PP
 This feature is available in Postfix 2.2 and later.
 .SH authorized_submit_users (default: static:anyone)
-List of users who are authorized to submit mail with the sendmail(1)
-command (and with the privileged postdrop(1) helper command).
+List of users who are authorized to submit mail with the \fBsendmail\fR(1)
+command (and with the privileged \fBpostdrop\fR(1) helper command).
 .PP
 By default, all users are allowed to submit mail.  Otherwise, the
 real UID of the process is looked up in the system password file,
@@ -476,8 +475,8 @@ specified with "/file/name".  IP version 6 addresses contain the
 ":" character, and would otherwise be confused with a "type:table"
 pattern.
 .SH backwards_bounce_logfile_compatibility (default: yes)
-Produce additional bounce(8) logfile records that can be read by
-older Postfix versions. The current and more extensible "name =
+Produce additional \fBbounce\fR(8) logfile records that can be read by
+Postfix versions before 2.0. The current and more extensible "name =
 value" format is needed in order to implement more sophisticated
 functionality.
 .PP
@@ -501,13 +500,13 @@ $virtual_alias_domains, or $virtual_mailbox_domains.  By default,
 the Postfix SMTP client returns such mail as undeliverable.
 .PP
 Specify, for example, "best_mx_transport = local" to pass the mail
-from the SMTP client to the local(8) delivery agent. You can specify
+from the SMTP client to the \fBlocal\fR(8) delivery agent. You can specify
 any message delivery "transport" or "transport:nexthop" that is
-defined in the master.cf file. See the transport(5) manual page
+defined in the master.cf file. See the \fBtransport\fR(5) manual page
 for the syntax and meaning of "transport" or "transport:nexthop".
 .PP
 However, this feature is expensive because it ties up a Postfix
-SMTP client process while the local(8) delivery agent is doing its
+SMTP client process while the \fBlocal\fR(8) delivery agent is doing its
 work. It is more efficient (for Postfix) to list all hosted domains
 in a table or database.
 .SH biff (default: yes)
@@ -517,10 +516,10 @@ notification with the UNIX command "biff y".
 .PP
 For compatibility reasons this feature is on by default.  On systems
 with lots of interactive users, the biff service can be a performance
-drain.  Specify "biff = no" to disable.
+drain.  Specify "biff = no" in main.cf to disable.
 .SH body_checks (default: empty)
 Optional lookup tables for content inspection as specified in
-the body_checks(5) manual page.
+the \fBbody_checks\fR(5) manual page.
 .PP
 Note: with Postfix versions before 2.0, these rules inspect
 all content after the primary message headers.
@@ -547,7 +546,7 @@ Specify 0 when mail delivery should be tried only once.
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH bounce_service_name (default: bounce)
-The name of the bounce(8) service. This service maintains a record
+The name of the \fBbounce\fR(8) service. This service maintains a record
 of failed delivery attempts and generates non-delivery notifications.
 .PP
 This feature is available in Postfix 2.0 and later.
@@ -562,7 +561,7 @@ version of the AUTH command (RFC 2554). Examples of such clients
 are MicroSoft Outlook Express version 4 and MicroSoft Exchange
 version 5.0.
 .PP
-Specify "\fBbroken_sasl_auth_clients = yes\fR" to have Postfix advertise
+Specify "broken_sasl_auth_clients = yes" to have Postfix advertise
 AUTH support in a non-standard way.
 .SH canonical_classes (default: envelope_sender, envelope_recipient, header_sender, header_recipient)
 What addresses are subject to canonical_maps address mapping.
@@ -581,7 +580,7 @@ addresses, in both envelopes and in headers, as controlled
 with the canonical_classes parameter. This is typically used
 to clean up dirty addresses from legacy mail systems, or to replace
 login names by Firstname.Lastname.  The table format and lookups
-are documented in canonical(5).
+are documented in \fBcanonical\fR(5).
 .PP
 If you use this feature, run "\fBpostmap /etc/postfix/canonical\fR" to
 build the necessary DBM or DB file after every change. The changes
@@ -599,15 +598,15 @@ canonical_maps = hash:/etc/postfix/canonical
 .ad
 .ft R
 .SH cleanup_service_name (default: cleanup)
-The name of the cleanup(8) service. This service rewrites addresses
-into the standard form, and performs canonical(5) address mapping
-and virtual(5) aliasing.
+The name of the \fBcleanup\fR(8) service. This service rewrites addresses
+into the standard form, and performs \fBcanonical\fR(5) address mapping
+and \fBvirtual\fR(5) aliasing.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH command_directory (default: see "postconf -d" output)
 The location of all postfix administrative commands.
 .SH command_execution_directory (default: empty)
-The local(8) delivery agent working directory for delivery to
+The \fBlocal\fR(8) delivery agent working directory for delivery to
 external command.  Failure to change directory causes the delivery
 to be deferred.
 .PP
@@ -641,13 +640,13 @@ Instead of $name you can also specify ${name} or $(name).
 .PP
 This feature is available in Postfix 2.2 and later.
 .SH command_expansion_filter (default: see "postconf -d" output)
-Restrict the characters that the local(8) delivery agent allows in
+Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
 $name expansions of $mailbox_command.  Characters outside the
 allowed set are replaced by underscores.
 .SH command_time_limit (default: 1000s)
 Time limit for delivery to external commands. This limit is used
-by the local(8) delivery agent, and is the default time limit for
-delivery by the pipe(8) delivery agent.
+by the \fBlocal\fR(8) delivery agent, and is the default time limit for
+delivery by the \fBpipe\fR(8) delivery agent.
 .PP
 Note: if you set this time limit to a large value you must update the
 global ipc_timeout parameter as well.
@@ -665,14 +664,27 @@ With Postfix command that run with set-gid privileges, a
 config_directory override requires either root privileges, or it
 requires that the directory is listed with the alternate_config_directories
 parameter in the default main.cf file.
+.SH connection_cache_service (default: scache)
+The name of the \fBscache\fR(8) connection cache service.  This service
+maintains a limited pool of cached sessions.
+.SH connection_cache_status_update_time (default: 600s)
+How frequently the \fBscache\fR(8) server logs usage statistics with
+connection cache hit and miss rates for logical destinations and for
+physical endpoints.
+.SH connection_cache_ttl_limit (default: 2s)
+The maximal time-to-live value that the connection cache server
+allows. Requests that specify a larger TTL will be stored with the
+maximum allowed TTL. The purpose of this additional control is to
+protect the infrastructure against careless people. The cache TTL
+is already bounded by $max_idle.
 .SH content_filter (default: empty)
 The name of a mail delivery transport that filters mail after
 it is queued.
 .PP
 This parameter uses the same syntax as the right-hand side of a
-Postfix transport(5) table. This setting has a lower precedence
-than a content filter that is specified with an access(5) table or
-in a header_checks(5) or body_checks(5) table.
+Postfix \fBtransport\fR(5) table. This setting has a lower precedence
+than a content filter that is specified with an \fBaccess\fR(5) table or
+in a \fBheader_checks\fR(5) or \fBbody_checks\fR(5) table.
 .SH daemon_directory (default: see "postconf -d" output)
 The directory with Postfix support programs and daemon programs.
 These should not be invoked directly by humans. The directory must
@@ -728,8 +740,8 @@ debugger_command =
 .ad
 .ft R
 .SH default_database_type (default: see "postconf -d" output)
-The default database type for use in newaliases(1), postalias(1)
-and postmap(1) commands. On many UNIX systems the default type is
+The default database type for use in \fBnewaliases\fR(1), \fBpostalias\fR(1)
+and \fBpostmap\fR(1) commands. On many UNIX systems the default type is
 either \fBdbm\fR or \fBhash\fR. The default setting is frozen
 when the Postfix system is built.
 .PP
@@ -804,12 +816,12 @@ Note that the full amount will still have to be accumulated before
 another preemption can take place later.
 .SH default_destination_concurrency_limit (default: 20)
 The default maximal number of parallel deliveries to the same
-destination.  This is the default limit for delivery via the lmtp(8),
-pipe(8), smtp(8) and virtual(8) delivery agents.
+destination.  This is the default limit for delivery via the \fBlmtp\fR(8),
+\fBpipe\fR(8), \fBsmtp\fR(8) and \fBvirtual\fR(8) delivery agents.
 .SH default_destination_recipient_limit (default: 50)
 The default maximal number of recipients per message delivery.
-This is the default limit for delivery via the lmtp(8), pipe(8),
-smtp(8) and virtual(8) delivery agents.
+This is the default limit for delivery via the \fBlmtp\fR(8), \fBpipe\fR(8),
+\fBsmtp\fR(8) and \fBvirtual\fR(8) delivery agents.
 .PP
 Setting this parameter to a value of 1 changes the meaning of
 the corresponding per-destination concurrency limit from concurrency
@@ -827,9 +839,9 @@ Postfix queue manager's scheduling algorithm at all.  Messages
 which would never accumulate at least this many delivery slots
 (subject to slot cost parameter as well) are never preempted.
 .SH default_privs (default: nobody)
-The default rights used by the local(8) delivery agent for delivery
+The default rights used by the \fBlocal\fR(8) delivery agent for delivery
 to external file or command.  These rights are used when delivery
-is requested from an aliases(5) file that is owned by \fBroot\fR, or
+is requested from an \fBaliases\fR(5) file that is owned by \fBroot\fR, or
 when delivery is done on behalf of \fBroot\fR. \fBDO NOT SPECIFY A
 PRIVILEGED USER OR THE POSTFIX OWNER\fR.
 .SH default_process_limit (default: 100)
@@ -849,7 +861,7 @@ The client hostname and IP address, formatted as name[address].
 .IP "\fB$client_address\fR"
 The client IP address.
 .IP "\fB$client_name\fR"
-The client hostname or "\fBunknown\fR".
+The client hostname or "unknown".
 .IP "\fB$helo_name\fR"
 The hostname given in HELO or EHLO command or empty string.
 .IP "\fB$rbl_class\fR"
@@ -893,12 +905,12 @@ and qmgr_message_recipient_minimum.
 The default mail delivery transport for domains that do not match
 $mydestination, $inet_interfaces, $proxy_interfaces,
 $virtual_alias_domains, $virtual_mailbox_domains, or $relay_domains.
-This information can be overruled with the transport(5) table.
+This information can be overruled with the \fBtransport\fR(5) table.
 .PP
 Specify a string of the form \fItransport:nexthop\fR, where \fItransport\fR
 is the name of a mail delivery transport defined in master.cf.
 The \fI:nexthop\fR part is optional.  For more details see the
-transport(5) manual page.
+\fBtransport\fR(5) manual page.
 .PP
 Example:
 .PP
@@ -922,7 +934,7 @@ client request is rejected by the "defer" restriction.
 .PP
 Do not change this unless you have a complete understanding of RFC 821.
 .SH defer_service_name (default: defer)
-The name of the defer(8) service. This service maintains a record
+The name of the \fBdefer\fR(8) service. This service maintains a record
 of failed delivery attempts and generates non-delivery notifications.
 .PP
 This feature is available in Postfix 2.0 and later.
@@ -957,10 +969,10 @@ Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 The default time unit is h (hours).
 .SH deliver_lock_attempts (default: 20)
 The maximal number of attempts to acquire an exclusive lock on a
-mailbox file or bounce(8) logfile.
+mailbox file or \fBbounce\fR(8) logfile.
 .SH deliver_lock_delay (default: 1s)
 The time between attempts to acquire an exclusive lock on a mailbox
-file or bounce(8) logfile.
+file or \fBbounce\fR(8) logfile.
 .PP
 Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 The default time unit is s (seconds).
@@ -1008,15 +1020,15 @@ disable_vrfy_command = no
 .SH dont_remove (default: 0)
 Don't remove queue files and save them to the "saved" mail queue.
 This is a debugging aid.  To inspect the envelope information and
-content of a Postfix queue file, use the postcat(1) command.
+content of a Postfix queue file, use the \fBpostcat\fR(1) command.
 .SH double_bounce_sender (default: double-bounce)
 The sender address of postmaster notifications that are generated
 by the mail system. All mail to this address is silently discarded,
 in order to terminate mail bounce loops.
 .SH duplicate_filter_limit (default: 1000)
 The maximal number of addresses remembered by the address
-duplicate filter for aliases(5) or virtual(5) alias expansion, or
-for showq(8) queue displays.
+duplicate filter for \fBaliases\fR(5) or \fBvirtual\fR(5) alias expansion, or
+for \fBshowq\fR(8) queue displays.
 .SH empty_address_recipient (default: MAILER-DAEMON)
 The recipient of mail addressed to the null address.  Postfix does
 not accept such addresses in SMTP commands, but they may still be
@@ -1024,18 +1036,19 @@ created locally as the result of configuration or software error.
 .SH enable_errors_to (default: no)
 Report mail delivery errors to the address specified with the
 non-standard Errors-To: message header, instead of the envelope
-sender address.  This support is disabled by default with Postfix
-2.1 and later, and is always turned on with older Postfix versions.
+sender address (this feature is removed with Postfix 2.2, is
+turned off by default with Postfix 2.1, and is always turned on
+with older Postfix versions).
 .SH enable_original_recipient (default: yes)
 Enable support for the X-Original-To message header. This header
 is needed for multi-recipient mailboxes.
 .PP
-When this parameter is set to yes, the cleanup(8) daemon performs
+When this parameter is set to yes, the \fBcleanup\fR(8) daemon performs
 duplicate elimination on distinct pairs of (original recipient,
 rewritten recipient), and generates non-empty original recipient
 queue file records.
 .PP
-When this parameter is set to no, the cleanup(8) daemon performs
+When this parameter is set to no, the \fBcleanup\fR(8) daemon performs
 duplicate elimination on the rewritten recipient address only, and
 generates empty original recipient queue file records.
 .PP
@@ -1049,12 +1062,12 @@ problems that are caused by policy, resource, software or protocol
 errors.  These notifications are enabled with the notify_classes
 parameter.
 .SH error_service_name (default: error)
-The name of the error(8) pseudo delivery agent. This service always
+The name of the \fBerror\fR(8) pseudo delivery agent. This service always
 returns mail as undeliverable.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH execution_directory_expansion_filter (default: see "postconf -d" output)
-Restrict the characters that the local(8) delivery agent allows
+Restrict the characters that the \fBlocal\fR(8) delivery agent allows
 in $name expansions of $command_execution_directory.  Characters
 outside the allowed set are replaced by underscores.
 .PP
@@ -1084,7 +1097,7 @@ export_environment = TZ PATH=/bin:/usr/bin
 .ft R
 .SH extract_recipient_limit (default: 10240)
 The maximal number of recipient addresses that Postfix will extract
-from message headers when mail is submitted with "sendmail -t".
+from message headers when mail is submitted with "\fBsendmail -t\fR".
 .PP
 This feature was removed in Postfix 2.1.
 .SH fallback_relay (default: empty)
@@ -1104,18 +1117,18 @@ for a backup or primary MX domain. Mail would loop between the
 Postfix MX host and the fallback_relay host when the final destination
 is unavailable.
 .IP \(bu
-In main.cf specify "relay_transport = relay",
+In main.cf specify "relay_transport = relay",
 .IP \(bu
-In master.cf specify "-o fallback_relay =" at the
-end of the relay entry.
+In master.cf specify "-o fallback_relay =" (i.e., empty) at
+the end of the relay entry.
 .IP \(bu
-In transport maps, specify "relay:\fInexthop...\fR"
+In transport maps, specify "relay:\fInexthop...\fR"
 as the right-hand side for backup or primary MX domain entries.
 .PP
 These are default settings in Postfix version 2.2 and later.
 .SH fallback_transport (default: empty)
-Optional message delivery transport that the local(8) delivery
-agent should use for names that are not found in the aliases(5)
+Optional message delivery transport that the \fBlocal\fR(8) delivery
+agent should use for names that are not found in the \fBaliases\fR(5)
 database or in the UNIX passwd database.
 .SH fast_flush_domains (default: $relay_domains)
 Optional list of destinations that are eligible for per-destination
@@ -1124,7 +1137,7 @@ logfiles with mail that is queued to those destinations.
 By default, Postfix maintains "fast flush" logfiles only for
 destinations that the Postfix SMTP server is willing to relay to
 (i.e. the default is: "fast_flush_domains = $relay_domains"; see
-the relay_domains parameter in the postconf(5) manual).
+the relay_domains parameter in the \fBpostconf\fR(5) manual).
 .PP
 Specify a list of hosts or domains, "/file/name" patterns or
 "type:table" lookup tables, separated by commas and/or whitespace.
@@ -1133,7 +1146,8 @@ Continue long lines by starting the next line with whitespace. A
 lookup table is matched when the domain or its parent domain appears
 as lookup key.
 .PP
-Specify "fast_flush_domains =" to disable the feature altogether.
+Specify "fast_flush_domains =" (i.e., empty) to disable the feature
+altogether.
 .SH fast_flush_purge_time (default: 7d)
 The time after which an empty per-destination "fast flush" logfile
 is deleted.
@@ -1154,7 +1168,7 @@ d=days, w=weeks.  The default time unit is hours.
 Force specific internal tests to fail, to test the handling of
 errors that are difficult to reproduce otherwise.
 .SH flush_service_name (default: flush)
-The name of the flush(8) service. This service maintains per-destination
+The name of the \fBflush\fR(8) service. This service maintains per-destination
 logfiles with the queue file names of mail that is queued for those
 destinations.
 .PP
@@ -1167,11 +1181,11 @@ The delay between attempts to fork() a child process.
 Time units: s (seconds), m (minutes), h (hours), d (days), w
 (weeks).  The default time unit is s (seconds).
 .SH forward_expansion_filter (default: see "postconf -d" output)
-Restrict the characters that the local(8) delivery agent allows in
+Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
 $name expansions of $forward_path.  Characters outside the
 allowed set are replaced by underscores.
 .SH forward_path (default: see "postconf -d" output)
-The local(8) delivery agent search list for finding a .forward
+The \fBlocal\fR(8) delivery agent search list for finding a .forward
 file with user-specified delivery methods. The first file that is
 found is used.
 .PP
@@ -1235,26 +1249,26 @@ execute the command "\fBpostfix reload\fR".
 .SH header_address_token_limit (default: 10240)
 The maximal number of address tokens are allowed in an address
 message header. Information that exceeds the limit is discarded.
-The limit is enforced by the cleanup(8) server.
+The limit is enforced by the \fBcleanup\fR(8) server.
 .SH header_checks (default: empty)
 Optional lookup tables for content inspection of primary non-MIME
-message headers, as specified in the header_checks(5) manual page.
+message headers, as specified in the \fBheader_checks\fR(5) manual page.
 .SH header_size_limit (default: 102400)
 The maximal amount of memory in bytes for storing a message header.
 If a header is larger, the excess is discarded.  The limit is
-enforced by the cleanup(8) server.
+enforced by the \fBcleanup\fR(8) server.
 .SH helpful_warnings (default: yes)
 Log warnings about problematic configuration settings, and provide
 helpful suggestions.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH home_mailbox (default: empty)
-Optional pathname of a mailbox file relative to a local(8) user's
+Optional pathname of a mailbox file relative to a \fBlocal\fR(8) user's
 home directory.
 .PP
 Specify a pathname ending "/" for qmail-style delivery.
 .PP
-The precedence of local(8) delivery features from high to low is:
+The precedence of \fBlocal\fR(8) delivery features from high to low is:
 aliases, .forward files, mailbox_transport, mailbox_command_maps,
 mailbox_command, home_mailbox, mail_spool_directory, fallback_transport
 and luser_relay.
@@ -1281,7 +1295,7 @@ Ignore DNS MX lookups that produce no response.  By default,
 the Postfix SMTP client defers delivery and tries again after some
 delay.  This behavior is required by the SMTP standard.
 .PP
-Specify "\fBignore_mx_lookup_error = yes\fR" to force a DNS A record
+Specify "ignore_mx_lookup_error = yes" to force a DNS A record
 lookup instead. This violates the SMTP standard and can result in
 mis-delivery of mail.
 .SH import_environment (default: see "postconf -d" output)
@@ -1305,17 +1319,17 @@ Time to pause before accepting a new message, when the message
 arrival rate exceeds the message delivery rate. This feature is
 turned on by default (it's disabled on SCO UNIX due to an SCO bug).
 .PP
-With the default 100 SMTP server process limit, "\fBin_flow_delay
-= 1s\fR" limits the mail inflow to 100 messages per second above the
+With the default 100 SMTP server process limit, "in_flow_delay
+= 1s" limits the mail inflow to 100 messages per second above the
 number of messages delivered per second.
 .PP
 Specify 0 to disable the feature. Valid delays are 0..10.
 .SH inet_interfaces (default: all)
 The network interface addresses that this mail system receives
-mail on.  By default, the software claims all active interfaces on
-the machine; with Postfix 2.2 and later, specify "\fBloopback-only\fR"
-to select only local interfaces.  The parameter also controls
-delivery of mail to user@[ip.address].
+mail on. Specify "all" to receive mail on all network
+interfaces (default), and "loopback-only" to receive mail
+on loopback network interfaces only (Postfix 2.2 and later).  The
+parameter also controls delivery of mail to user@[ip.address].
 .PP
 Note: you need to stop and start Postfix when this parameter changes.
 .PP
@@ -1332,8 +1346,8 @@ IPv4, and setting smtp_bind_address6 to :: solves the problem
 for IPv6.
 .PP
 A better solution for multi-homed firewalls is to leave inet_interfaces
-at the default value
-and instead use explicit IP addresses in master.cf. This preserves SMTP
+at the default value and instead use explicit IP addresses in
+the master.cf SMTP server definitions.  This preserves the SMTP client's
 loop detection, by ensuring that each side of the firewall knows that the
 other IP address is still the same host. Setting $inet_interfaces to a
 single IPv4 and/or IPV6 address is primarily useful with virtual
@@ -1350,17 +1364,18 @@ Examples:
 .na
 .ft C
 inet_interfaces = all (DEFAULT)
-inet_interfaces = loopback-only
+inet_interfaces = loopback-only (Postfix 2.2 and later)
 inet_interfaces = 127.0.0.1
+inet_interfaces = 127.0.0.1, [::1] (Postfix 2.2 and later)
 inet_interfaces = 192.168.1.2, 127.0.0.1
 .fi
 .ad
 .ft R
 .SH inet_protocols (default: ipv4)
 The Internet protocols Postfix will attempt to use when making
-or accepting connections. Specify one or more of "ipv4" or "ipv6",
-separated by whitespace or commas. The form "all" is equivalent to
-"ipv4, ipv6".
+or accepting connections. Specify one or more of "ipv4"
+or "ipv6", separated by whitespace or commas. The form
+"all" is equivalent to "ipv4, ipv6".
 .PP
 This feature is available in Postfix version 2.2 and later.
 .PP
@@ -1401,8 +1416,8 @@ inet_protocols = ipv4, ipv6
 .ft R
 .SH initial_destination_concurrency (default: 5)
 The initial per-destination concurrency level for parallel delivery
-to the same destination. This limit applies to delivery via smtp(8),
-and via the pipe(8) and virtual(8) delivery agents.
+to the same destination. This limit applies to delivery via \fBsmtp\fR(8),
+and via the \fBpipe\fR(8) and \fBvirtual\fR(8) delivery agents.
 .PP
 Warning: with concurrency of 1, one bad message can be enough to
 block all mail to a site.
@@ -1589,7 +1604,7 @@ lmtp_sasl_security_options = noplaintext
 .ft R
 .SH lmtp_send_xforward_command (default: no)
 Send an XFORWARD command to the LMTP server when the LMTP LHLO
-server response announces XFORWARD support.  This allows an lmtp(8)
+server response announces XFORWARD support.  This allows an \fBlmtp\fR(8)
 delivery agent, used for content filter message injection, to
 forward the name, address, protocol and HELO name of the original
 client to the content filter and downstream queuing LMTP server.
@@ -1613,7 +1628,7 @@ The default time unit is s (seconds).
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH local_command_shell (default: empty)
-Optional shell program for local(8) delivery to non-Postfix command.
+Optional shell program for \fBlocal\fR(8) delivery to non-Postfix command.
 By default, non-Postfix commands are executed directly; commands
 are given to given to /bin/sh only when they contain shell meta
 characters or shell built-in commands.
@@ -1764,12 +1779,12 @@ You redefine the local delivery agent in master.cf.
 You redefine the "local_transport" setting in main.cf.
 .IP \(bu
 You use the "luser_relay", "mailbox_transport", or "fallback_transport"
-feature of the Postfix local(8) delivery agent.
+feature of the Postfix \fBlocal\fR(8) delivery agent.
 .PP
 Details are described in the LOCAL_RECIPIENT_README file.
 .PP
 Beware: if the Postfix SMTP server runs chrooted, you need to access
-the passwd file via the proxymap(8) service, in order to overcome
+the passwd file via the \fBproxymap\fR(8) service, in order to overcome
 chroot access restrictions. The alternative, maintaining a copy of
 the system password file in the chroot jail is not practical.
 .PP
@@ -1785,7 +1800,7 @@ local_recipient_maps =
 .SH local_transport (default: local:$myhostname)
 The default mail delivery transport for domains that match
 $mydestination, $inet_interfaces or $proxy_interfaces.  This
-information can be overruled with the transport(5) table.
+information can be overruled with the \fBtransport\fR(5) table.
 .PP
 By default, local mail is delivered to the transport called "local",
 which is just the name of a service that is defined the master.cf file.
@@ -1793,13 +1808,13 @@ which is just the name of a service that is defined the master.cf file.
 Specify a string of the form \fItransport:nexthop\fR, where \fItransport\fR
 is the name of a mail delivery transport defined in master.cf.
 The \fI:nexthop\fR part is optional.  For more details see the
-transport(5) manual page.
+\fBtransport\fR(5) manual page.
 .PP
 Beware: if you override the default local delivery agent then you
 need to review the LOCAL_RECIPIENT_README document, otherwise the
 SMTP server may reject mail for local recipients.
 .SH luser_relay (default: empty)
-Optional catch-all destination for unknown local(8) recipients.
+Optional catch-all destination for unknown \fBlocal\fR(8) recipients.
 By default, mail for unknown recipients in domains that match
 $mydestination, $inet_interfaces or $proxy_interfaces is returned
 as undeliverable.
@@ -1828,10 +1843,10 @@ Expands to \fIvalue\fR when \fI$name\fR has an empty value.
 .PP
 Instead of $name you can also specify ${name} or $(name).
 .PP
-Note: luser_relay works only for the Postfix local(8) delivery agent.
+Note: luser_relay works only for the Postfix \fBlocal\fR(8) delivery agent.
 .PP
 NOTE: if you use this feature for accounts not in the UNIX password
-file, then you must specify "\fBlocal_recipient_maps =\fR" (i.e. empty)
+file, then you must specify "local_recipient_maps =" (i.e. empty)
 in the main.cf file, otherwise the Postfix SMTP server will reject mail
 for non-UNIX accounts with "User unknown in local recipient table".
 .PP
@@ -1858,7 +1873,7 @@ or daemon.  PLEASE USE A DEDICATED USER ID AND GROUP ID.
 .SH mail_release_date (default: see "postconf -d" output)
 The Postfix release date, in "YYYYMMDD" format.
 .SH mail_spool_directory (default: see "postconf -d" output)
-The directory where local(8) UNIX-style mailboxes are kept. The
+The directory where \fBlocal\fR(8) UNIX-style mailboxes are kept. The
 default setting depends on the system type. Specify a name ending
 in / for maildir-style delivery.
 .PP
@@ -1883,7 +1898,7 @@ The version of the mail system. Stable releases are named
 also include the release date. The version string can be used in,
 for example, the SMTP greeting banner.
 .SH mailbox_command (default: empty)
-Optional external command that the local(8) delivery agent should
+Optional external command that the \fBlocal\fR(8) delivery agent should
 use for mailbox delivery.  The command is run with the user ID and
 the primary group ID privileges of the recipient.  Exception:
 command delivery for root executes with $default_privs privileges.
@@ -1942,7 +1957,7 @@ Note: if you use the mailbox_command feature to deliver mail
 system-wide, you must set up an alias that forwards mail for root
 to a real user.
 .PP
-The precedence of local(8) delivery features from high to low is:
+The precedence of \fBlocal\fR(8) delivery features from high to low is:
 aliases, .forward files, mailbox_transport, mailbox_command_maps,
 mailbox_command, home_mailbox, mail_spool_directory, fallback_transport
 and luser_relay.
@@ -1961,14 +1976,14 @@ mailbox_command = /some/where/maildrop -d "$USER"
 .ft R
 .SH mailbox_command_maps (default: empty)
 Optional lookup tables with per-recipient external commands to use
-for local(8) mailbox delivery.  Behavior is as with mailbox_command.
+for \fBlocal\fR(8) mailbox delivery.  Behavior is as with mailbox_command.
 .PP
-The precedence of local(8) delivery features from high to low is:
+The precedence of \fBlocal\fR(8) delivery features from high to low is:
 aliases, .forward files, mailbox_transport, mailbox_command_maps,
 mailbox_command, home_mailbox, mail_spool_directory, fallback_transport
 and luser_relay.
 .SH mailbox_delivery_lock (default: see "postconf -d" output)
-How to lock a UNIX-style local(8) mailbox before attempting delivery.
+How to lock a UNIX-style \fBlocal\fR(8) mailbox before attempting delivery.
 For a list of available file locking methods, use the "\fBpostconf
 -l\fR" command.
 .PP
@@ -1980,25 +1995,25 @@ GID has write access to the parent directory of the mailbox file.
 .PP
 Note: the default setting of this parameter is system dependent.
 .SH mailbox_size_limit (default: 51200000)
-The maximal size of any local(8) individual mailbox or maildir
+The maximal size of any \fBlocal\fR(8) individual mailbox or maildir
 file, or zero (no limit).  In fact, this limits the size of any
 file that is written to upon local delivery, including files written
-by external commands that are executed by the local(8) delivery
+by external commands that are executed by the \fBlocal\fR(8) delivery
 agent.
 .PP
 This limit must not be smaller than the message size limit.
 .SH mailbox_transport (default: empty)
-Optional message delivery transport that the local(8) delivery
+Optional message delivery transport that the \fBlocal\fR(8) delivery
 agent should use for mailbox delivery to all local recipients,
 whether or not they are found in the UNIX passwd database.
 .PP
-The precedence of local(8) delivery features from high to low is:
+The precedence of \fBlocal\fR(8) delivery features from high to low is:
 aliases, .forward files, mailbox_transport, mailbox_command_maps,
 mailbox_command, home_mailbox, mail_spool_directory, fallback_transport
 and luser_relay.
 .SH mailq_path (default: see "postconf -d" output)
 Sendmail compatibility feature that specifies where the Postfix
-mailq(1) command is installed. This command can be used to
+\fBmailq\fR(1) command is installed. This command can be used to
 list the Postfix mail queue.
 .SH manpage_directory (default: see "postconf -d" output)
 Where the Postfix manual pages are installed.
@@ -2119,7 +2134,7 @@ do not differ in the first $mime_boundary_length_limit characters.
 This feature is available in Postfix 2.0 and later.
 .SH mime_header_checks (default: $header_checks)
 Optional lookup tables for content inspection of MIME related
-message headers, as described in the header_checks(5) manual page.
+message headers, as described in the \fBheader_checks\fR(5) manual page.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH mime_nesting_limit (default: 100)
@@ -2144,7 +2159,7 @@ Do not change this unless you have a complete understanding of RFC 821.
 This feature is available in Postfix 2.1 and later.
 .SH mydestination (default: $myhostname, localhost.$mydomain, localhost)
 The list of domains that are delivered via the $local_transport
-mail delivery transport. By default this is the Postfix local(8)
+mail delivery transport. By default this is the Postfix \fBlocal\fR(8)
 delivery agent which looks up all recipients in /etc/passwd and
 /etc/aliases. The SMTP server validates recipient addresses with
 $local_recipient_maps and rejects non-existent recipients. See also
@@ -2170,7 +2185,7 @@ set up backup MX hosts.
 .IP \(bu
 By default, the Postfix SMTP server rejects mail for recipients
 not listed with the local_recipient_maps parameter.  See the
-postconf(5) manual for a description of the local_recipient_maps
+\fBpostconf\fR(5) manual for a description of the local_recipient_maps
 and unknown_local_recipient_reject_code parameters.
 .PP
 Specify a list of host or domain names, "/file/name" or "type:table"
@@ -2224,7 +2239,7 @@ The list of "trusted" SMTP clients that have more privileges than
 .PP
 In particular, "trusted" SMTP clients are allowed to relay mail
 through Postfix.  See the smtpd_recipient_restrictions parameter
-description in the postconf(5) manual.
+description in the \fBpostconf\fR(5) manual.
 .PP
 You can specify the list of "trusted" network addresses by hand
 or you can let Postfix do it for you (which is the default).
@@ -2303,14 +2318,14 @@ myorigin = $mydomain
 .ft R
 .SH nested_header_checks (default: $header_checks)
 Optional lookup tables for content inspection of non-MIME message
-headers in attached messages, as described in the header_checks(5)
+headers in attached messages, as described in the \fBheader_checks\fR(5)
 manual page.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH newaliases_path (default: see "postconf -d" output)
 Sendmail compatibility feature that specifies the location of the
-newaliases(1) command. This command can be used to rebuild the
-local(8) aliases(5) database.
+\fBnewaliases\fR(1) command. This command can be used to rebuild the
+\fBlocal\fR(8) \fBaliases\fR(5) database.
 .SH non_fqdn_reject_code (default: 504)
 The numerical Postfix SMTP server reply code when a client request
 is rejected by the reject_non_fqdn_hostname, reject_non_fqdn_sender
@@ -2381,12 +2396,12 @@ you really want to match subdomains.
 Restrict the use of the permit_mx_backup SMTP access feature to
 only domains whose primary MX hosts match the listed networks.
 .SH pickup_service_name (default: pickup)
-The name of the pickup(8) service. This service picks up local mail
+The name of the \fBpickup\fR(8) service. This service picks up local mail
 submissions from the Postfix maildrop queue.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH prepend_delivered_header (default: command, file, forward)
-The message delivery contexts where the Postfix local(8) delivery
+The message delivery contexts where the Postfix \fBlocal\fR(8) delivery
 agent prepends a Delivered-To:  message header.
 .PP
 By default, the Postfix local delivery agent prepends a Delivered-To:
@@ -2416,14 +2431,14 @@ The process name of a Postfix command or daemon process.
 What address lookup tables copy an address extension from the lookup
 key to the lookup result.
 .PP
-For example, with a virtual(5) mapping of "\fIjoe@domain ->
+For example, with a \fBvirtual\fR(5) mapping of "\fIjoe@domain ->
 joe.user\fR", the address "\fIjoe+foo@domain\fR" would rewrite
 to "\fIjoe.user+foo\fR".
 .PP
 Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
 \fBforward\fR or \fBinclude\fR. These cause address extension
-propagation with canonical(5), virtual(5), and aliases(5) maps,
-and with local(8) .forward and :include: file lookups, respectively.
+propagation with \fBcanonical\fR(5), \fBvirtual\fR(5), and \fBaliases\fR(5) maps,
+and with \fBlocal\fR(8) .forward and :include: file lookups, respectively.
 .PP
 Note: enabling this feature for types other than \fBcanonical\fR
 and \fBvirtual\fR is likely to cause problems when mail is forwarded
@@ -2461,9 +2476,9 @@ proxy_interfaces = 1.2.3.4
 .ad
 .ft R
 .SH proxy_read_maps (default: see "postconf -d" output)
-The lookup tables that the proxymap(8) server is allowed to access.
+The lookup tables that the \fBproxymap\fR(8) server is allowed to access.
 Table references that don't begin with proxy: are ignored.  The
-proxymap(8) table accesses are read-only.
+\fBproxymap\fR(8) table accesses are read-only.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH qmgr_clog_warn_time (default: 300s)
@@ -2478,7 +2493,7 @@ Obsolete feature: the percentage of delivery resources that a busy
 mail system will use up for delivery of a large mailing  list
 message.
 .PP
-This feature exists only in the oqmgr(8) old queue manager. The
+This feature exists only in the \fBoqmgr\fR(8) old queue manager. The
 current queue manager solves the problem in a better way.
 .SH qmgr_message_active_limit (default: 20000)
 The maximal number of messages in the active queue.
@@ -2537,7 +2552,7 @@ The location of the Postfix top-level queue directory. This is the
 root directory of Postfix daemon processes that run chrooted.
 .SH queue_file_attribute_count_limit (default: 100)
 The maximal number of (name=value) attributes that may be stored
-in a Postfix queue file. The limit is enforced by the cleanup(8)
+in a Postfix queue file. The limit is enforced by the \fBcleanup\fR(8)
 server.
 .PP
 This feature is available in Postfix 2.0 and later.
@@ -2559,7 +2574,7 @@ The time between deferred queue scans by the queue manager.
 Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 The default time unit is s (seconds).
 .SH queue_service_name (default: qmgr)
-The name of the qmgr(8) service. This service manages the Postfix
+The name of the \fBqmgr\fR(8) service. This service manages the Postfix
 queue and schedules delivery requests.
 .PP
 This feature is available in Postfix 2.0 and later.
@@ -2577,12 +2592,12 @@ configure or operate a specific Postfix subsystem or feature.
 .SH receive_override_options (default: empty)
 Enable or disable recipient validation, built-in content
 filtering, or address mapping. Typically, these are specified in
-master.cf as command-line arguments for the smtpd(8), qmqpd(8) or
-pickup(8) daemons.
+master.cf as command-line arguments for the \fBsmtpd\fR(8), \fBqmqpd\fR(8) or
+\fBpickup\fR(8) daemons.
 .PP
 Specify zero or more of the following options.  The options
-override main.cf settings and are either implemented by smtpd(8),
-qmqpd(8), or pickup(8) themselves, or they are forwarded to the
+override main.cf settings and are either implemented by \fBsmtpd\fR(8),
+\fBqmqpd\fR(8), or \fBpickup\fR(8) themselves, or they are forwarded to the
 cleanup server.
 .IP "\fBno_unknown_recipient_checks\fR"
 Do not try to reject unknown recipients (SMTP server only).
@@ -2670,7 +2685,7 @@ This feature is available in Postfix 2.2 and later.
 .SH recipient_canonical_maps (default: empty)
 Optional address mapping lookup tables for envelope and header
 recipient addresses.
-The table format and lookups are documented in canonical(5).
+The table format and lookups are documented in \fBcanonical\fR(5).
 .PP
 Note: $recipient_canonical_maps is processed before $canonical_maps.
 .PP
@@ -2685,7 +2700,7 @@ recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
 .ft R
 .SH recipient_delimiter (default: empty)
 The separator between user names and address extensions (user+foo).
-See canonical(5), local(8), relocated(5) and virtual(5) for the
+See \fBcanonical\fR(5), \fBlocal\fR(8), \fBrelocated\fR(5) and \fBvirtual\fR(5) for the
 effects this has on aliases, canonical, virtual, relocated and
 on .forward file lookups.  Basically, the software tries user+foo
 and .forward+foo before trying user and .forward.
@@ -2701,7 +2716,7 @@ recipient_delimiter = +
 .ft R
 .SH reject_code (default: 554)
 The numerical Postfix SMTP server response code when a remote SMTP
-client request is rejected by the "\fBreject\fR" restriction.
+client request is rejected by the "reject" restriction.
 .PP
 Do not change this unless you have a complete understanding of RFC 821.
 .SH relay_clientcerts (default: empty)
@@ -2760,7 +2775,7 @@ ADDRESS_CLASS_README file.
 .PP
 NOTE: Postfix will not automatically forward mail for domains
 that list this system as their primary or backup MX host. See the
-permit_mx_backup restriction in the postconf(5) manual page.
+permit_mx_backup restriction in the \fBpostconf\fR(5) manual page.
 .PP
 Specify a list of host or domain names, "/file/name" patterns
 or "type:table" lookup tables, separated by commas and/or whitespace.
@@ -2802,12 +2817,12 @@ This feature is available in Postfix 2.0 and later.
 .SH relay_transport (default: relay)
 The default mail delivery transport and next-hop information for
 domains that match the $relay_domains parameter value. This
-information can be overruled with the transport(5) table.
+information can be overruled with the \fBtransport\fR(5) table.
 .PP
 Specify a string of the form \fItransport:nexthop\fR, where \fItransport\fR
 is the name of a mail delivery transport defined in master.cf.
 The \fI:nexthop\fR part is optional.  For more details see the
-transport(5) manual page.
+\fBtransport\fR(5) manual page.
 .PP
 See also the relay domains address class in the ADDRESS_CLASS_README
 file.
@@ -2815,7 +2830,7 @@ file.
 This feature is available in Postfix 2.0 and later.
 .SH relayhost (default: empty)
 The default host to send non-local mail to when no entry is matched
-in the optional transport(5) table. When no relayhost is given,
+in the optional \fBtransport\fR(5) table. When no relayhost is given,
 mail is routed directly to the destination.
 .PP
 On an intranet, specify the organizational domain name. If your
@@ -2844,7 +2859,7 @@ relayhost = [an.ip.add.ress]
 .SH relocated_maps (default: empty)
 Optional lookup tables with new contact information for users or
 domains that no longer exist.  The table format and lookups are
-documented in relocated(5).
+documented in \fBrelocated\fR(5).
 .PP
 If you use this feature, run "\fBpostmap /etc/postfix/relocated\fR" to
 build the necessary DBM or DB file after change, then "\fBpostfix
@@ -2892,7 +2907,7 @@ clients at all.
 .ad
 .ft R
 .SH require_home_directory (default: no)
-Whether or not a local(8) recipient's home directory must exist
+Whether or not a \fBlocal\fR(8) recipient's home directory must exist
 before mail delivery is attempted. By default this test is disabled.
 It can be useful for environments that import home directories to
 the mail server (NOT RECOMMENDED).
@@ -2905,7 +2920,8 @@ address localpart as per RFC 822, so that additional @ or % or !
 operators remain visible. This behavior is safe but it is also
 technically incorrect.
 .PP
-If you specify "resolve_dequoted_address = no", then the Postfix
+If you specify "resolve_dequoted_address = no", then
+the Postfix
 resolver will not know about additional @ etc. operators in the
 address localpart. This opens opportunities for obscure mail relay
 attacks with user@domain@domain addresses when Postfix provides
@@ -2987,7 +3003,7 @@ This feature is available in Postfix 2.2 and later.
 .SH sender_canonical_maps (default: empty)
 Optional address mapping lookup tables for envelope and header
 sender addresses.
-The table format and lookups are documented in canonical(5).
+The table format and lookups are documented in \fBcanonical\fR(5).
 .PP
 Example: you want to rewrite the SENDER address "user@ugly.domain"
 to "user@pretty.domain", while still being able to send mail to
@@ -3006,31 +3022,19 @@ sender_canonical_maps = hash:/etc/postfix/sender_canonical
 .ft R
 .SH sendmail_path (default: see "postconf -d" output)
 A Sendmail compatibility feature that specifies the location of
-the Postfix sendmail(1) command. This command can be used to
+the Postfix \fBsendmail\fR(1) command. This command can be used to
 submit mail into the Postfix queue.
 .SH service_throttle_time (default: 60s)
-How long the Postfix master(8) waits before forking a server that
+How long the Postfix \fBmaster\fR(8) waits before forking a server that
 appears to be malfunctioning.
 .PP
 Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 The default time unit is s (seconds).
-.SH session_cache_service (default: scache)
-The name of the scache(8) connection cache service.  This service
-maintains a limited pool of cached sessions.
-.SH session_cache_status_update_time (default: 600s)
-How frequently the scache(8) server logs usage statistics with
-connection cache hit and miss rates for logical destinations and for
-physical endpoints.
-.SH session_cache_ttl_limit (default: 2s)
-The maximal time-to-live value that the connection cache server
-allows. Requests that specify a larger TTL will be stored with the
-maximum allowed TTL. The purpose of this additional control is to
-protect the infrastructure against careless people. The cache TTL
-is already bounded by $max_idle.
 .SH setgid_group (default: postdrop)
 The group ownership of set-gid Postfix commands and of group-writable
 Postfix directories. When this parameter value is changed you need
-to re-run "\fBpost-install set-permissions\fR".
+to re-run "\fBpostfix set-permissions\fR" (with Postfix 2.0 and
+earlier: "\fB/etc/postfix/post-install set-permissions\fR".
 .SH show_user_unknown_table_name (default: yes)
 Display the name of the recipient table in the "User unknown"
 responses.  The extra detail makes trouble shooting easier but also
@@ -3038,7 +3042,7 @@ reveals information that is nobody elses business.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH showq_service_name (default: showq)
-The name of the showq(8) service. This service produces mail queue
+The name of the \fBshowq\fR(8) service. This service produces mail queue
 status reports.
 .PP
 This feature is available in Postfix 2.0 and later.
@@ -3344,7 +3348,7 @@ a broken SMTP server, configure a special SMTP client in master.cf:
 .ft R
 .PP
 and route mail for the destination in question to the "broken-smtp"
-message delivery with a transport(5) table.
+message delivery with a \fBtransport\fR(5) table.
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH smtp_randomize_addresses (default: yes)
@@ -3653,7 +3657,7 @@ server certificate was issued by a trusted CA.
 .PP
 Special hint for enforcement mode:  since no secure DNS lookup
 mechanism is available, the recommended setup is:  specify local
-transport(5) table entries for sensitive domains with explicit
+\fBtransport\fR(5) table entries for sensitive domains with explicit
 smtp:[mailhost] destinations (since you can assure security of this
 table unlike DNS), then specify MUST for these mail hosts in the
 smtp_tls_per_site table.
@@ -3909,7 +3913,7 @@ client network address information.
 .IP "\fBcheck_client_access \fItype:table\fR\fR"
 Search the specified access database for the client hostname,
 parent domains, client IP address, or networks obtained by stripping
-least significant octets. See the access(5) manual page for details.
+least significant octets. See the \fBaccess\fR(5) manual page for details.
 .IP "\fBpermit_inet_interfaces\fR"
 Permit the request when the client IP address matches
 $inet_interfaces.
@@ -4023,9 +4027,7 @@ rejected requests (default: 554).
 Pause for the specified number of seconds and proceed with
 the next restriction in the list, if any. This may stop zombie
 mail when used as:
-.na
-.nf
-.in +4
+.PP
 .nf
 .na
 .ft C
@@ -4036,9 +4038,7 @@ mail when used as:
 .fi
 .ad
 .ft R
-.in -4
-.fi
-.ad
+This feature is available in Postfix 2.3.
 .IP "\fBwarn_if_reject\fR"
 Change the meaning of the next restriction, so that it logs
 a warning instead of rejecting a request (look for logfile records
@@ -4135,7 +4135,7 @@ dedicated servers.
 .PP
 Note 1: this mode implies "smtpd_tls_auth_only = yes".
 .PP
-Note 2: when invoked via "sendmail -bs", Postfix will never offer
+Note 2: when invoked via "\fBsendmail -bs\fR", Postfix will never offer
 STARTTLS due to insufficient privileges to access the server private
 key. This is intended behavior.
 .SH smtpd_error_sleep_time (default: 1s)
@@ -4164,7 +4164,7 @@ The following restrictions are specific to the domain name information
 received with the ETRN command.
 .IP "\fBcheck_etrn_access \fItype:table\fR\fR"
 Search the specified access database for the ETRN domain name
-or its parent domains. See the access(5) manual page for details.
+or its parent domains. See the \fBaccess\fR(5) manual page for details.
 .PP
 Other restrictions that are valid in this context:
 .IP \(bu
@@ -4230,16 +4230,16 @@ restriction that matches wins.
 The following restrictions are specific to the hostname information
 received with the HELO or EHLO command.
 .IP "\fBcheck_helo_access \fItype:table\fR\fR"
-Search the specified access(5) database for the HELO or EHLO
+Search the specified \fBaccess\fR(5) database for the HELO or EHLO
 hostname or parent domains, and execute the corresponding action.
 .IP "\fBcheck_helo_mx_access \fItype:table\fR\fR"
-Search the specified access(5) database for the MX hosts for
+Search the specified \fBaccess\fR(5) database for the MX hosts for
 the HELO or EHLO hostname, and execute the corresponding action.
 Note: a result of "OK" is not allowed for safety reasons. Instead,
 use DUNNO in order to exclude specific hosts from blacklists.  This
 feature is available in Postfix 2.1 and later.
 .IP "\fBcheck_helo_ns_access \fItype:table\fR\fR"
-Search the specified access(5) database for the DNS servers
+Search the specified \fBaccess\fR(5) database for the DNS servers
 for the HELO or EHLO hostname, and execute the corresponding action.
 Note: a result of "OK" is not allowed for safety reasons. Instead,
 use DUNNO in order to exclude specific hosts from blacklists.  This
@@ -4304,7 +4304,7 @@ List of commands that the Postfix SMTP server replies to with "250
 Ok", without doing any syntax checks and without changing state.
 This list overrides any commands built into the Postfix SMTP server.
 .SH smtpd_null_access_lookup_key (default: <>)
-The lookup key to be used in SMTP access(5) tables instead of the
+The lookup key to be used in SMTP \fBaccess\fR(5) tables instead of the
 null sender address.
 .SH smtpd_policy_service_max_idle (default: 300s)
 The time after which an idle SMTPD policy service connection is
@@ -4390,17 +4390,17 @@ restriction that matches wins.
 The following restrictions are specific to the recipient address
 that is received with the RCPT TO command.
 .IP "\fBcheck_recipient_access \fItype:table\fR\fR"
-Search the specified access(5) database for the resolved RCPT
+Search the specified \fBaccess\fR(5) database for the resolved RCPT
 TO address, domain, parent domains, or localpart@, and execute the
 corresponding action.
 .IP "\fBcheck_recipient_mx_access \fItype:table\fR\fR"
-Search the specified access(5) database for the MX hosts for
+Search the specified \fBaccess\fR(5) database for the MX hosts for
 the RCPT TO address, and execute the corresponding action.  Note:
 a result of "OK" is not allowed for safety reasons. Instead, use
 DUNNO in order to exclude specific hosts from blacklists.  This
 feature is available in Postfix 2.1 and later.
 .IP "\fBcheck_recipient_ns_access \fItype:table\fR\fR"
-Search the specified access(5) database for the DNS servers
+Search the specified \fBaccess\fR(5) database for the DNS servers
 for the RCPT TO address, and execute the corresponding action.
 Note: a result of "OK" is not allowed for safety reasons. Instead,
 use DUNNO in order to exclude specific hosts from blacklists.  This
@@ -4477,7 +4477,7 @@ This feature is available in Postfix 2.1 and later.
 .IP "\fBreject_unverified_recipient\fR"
 Reject the request when mail to the RCPT TO address is known
 to bounce, or when the recipient address destination is not reachable.
-Address verification information is managed by the verify(8) server;
+Address verification information is managed by the \fBverify\fR(8) server;
 see the ADDRESS_VERIFICATION_README file for details.
 .br
 The
@@ -4552,7 +4552,7 @@ This feature is available in Postfix 2.1 and later.
 .SH smtpd_restriction_classes (default: empty)
 User-defined aliases for groups of access restrictions. The aliases
 can be specified in smtpd_recipient_restrictions etc., and on the
-right-hand side of a Postfix access(5) table.
+right-hand side of a Postfix \fBaccess\fR(5) table.
 .PP
 One major application is for implementing per-recipient UCE control.
 See the RESTRICTION_CLASS_README document for other examples.
@@ -4712,17 +4712,17 @@ restriction that matches wins.
 The following restrictions are specific to the sender address
 received with the MAIL FROM command.
 .IP "\fBcheck_sender_access \fItype:table\fR\fR"
-Search the specified access(5) database for the MAIL FROM
+Search the specified \fBaccess\fR(5) database for the MAIL FROM
 address, domain, parent domains, or localpart@, and execute the
 corresponding action.
 .IP "\fBcheck_sender_mx_access \fItype:table\fR\fR"
-Search the specified access(5) database for the MX hosts for
+Search the specified \fBaccess\fR(5) database for the MX hosts for
 the MAIL FROM address, and execute the corresponding action.  Note:
 a result of "OK" is not allowed for safety reasons. Instead, use
 DUNNO in order to exclude specific hosts from blacklists.  This
 feature is available in Postfix 2.1 and later.
 .IP "\fBcheck_sender_ns_access \fItype:table\fR\fR"
-Search the specified access(5) database for the DNS servers
+Search the specified \fBaccess\fR(5) database for the DNS servers
 for the MAIL FROM address, and execute the corresponding action.
 Note: a result of "OK" is not allowed for safety reasons. Instead,
 use DUNNO in order to exclude specific hosts from blacklists.  This
@@ -4777,7 +4777,7 @@ This feature is available in Postfix 2.1 and later.
 .IP "\fBreject_unverified_sender\fR"
 Reject the request when mail to the MAIL FROM address is known to
 bounce, or when the sender address destination is not reachable.
-Address verification information is managed by the verify(8) server;
+Address verification information is managed by the \fBverify\fR(8) server;
 see the ADDRESS_VERIFICATION_README file for details.
 .br
 The
@@ -5075,7 +5075,7 @@ purpose.
 Opportunistic mode: announce STARTTLS support to SMTP clients,
 but do not require that clients use TLS encryption.
 .PP
-Note: when invoked via "sendmail -bs", Postfix will never offer
+Note: when invoked via "\fBsendmail -bs\fR", Postfix will never offer
 STARTTLS due to insufficient privileges to access the server private
 key. This is intended behavior.
 .SH soft_bounce (default: no)
@@ -5147,7 +5147,7 @@ By default, the Postfix SMTP server accepts RFC 822 syntax in MAIL
 FROM and RCPT TO addresses.
 .SH sun_mailtool_compatibility (default: no)
 Obsolete SUN mailtool compatibility feature. Instead, use
-"\fBmailbox_delivery_lock = dotlock\fR".
+"mailbox_delivery_lock = dotlock".
 .SH swap_bangpath (default: yes)
 Enable the rewriting of "site!user" into "user@site".  This is
 necessary if your machine is connected to UUCP networks.  It is
@@ -5164,7 +5164,7 @@ swap_bangpath = no
 .ft R
 .SH syslog_facility (default: mail)
 The syslog facility of Postfix logging. Specify a facility as
-defined in syslog.conf(5). The default facility is "mail".
+defined in syslog.\fBconf\fR(5). The default facility is "mail".
 .PP
 Warning: a non-default syslog_facility setting takes effect only
 after a Postfix process has completed initialization.  Errors during
@@ -5181,36 +5181,36 @@ process initialization will be logged with the default name. Examples
 are errors while parsing the command line arguments, and errors
 while accessing the Postfix main.cf configuration file.
 .SH tls_daemon_random_bytes (default: 32)
-The number of pseudo-random bytes that an smtp(8) or smtpd(8)
-process requests from the tlsmgr(8) server in order to seed its
+The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
+process requests from the \fBtlsmgr\fR(8) server in order to seed its
 internal pseudo random number generator (PRNG).  The default of 32
 bytes (equivalent to 256 bits) is sufficient to generate a 128bit
 (or 168bit) session key.
 .SH tls_random_bytes (default: 32)
-The number of bytes that tlsmgr(8) reads from $tls_random_source
+The number of bytes that \fBtlsmgr\fR(8) reads from $tls_random_source
 when (re)seeding the in-memory pseudo random number generator (PRNG)
 pool. The default of 32 bytes (256 bits) is good enough for 128bit
 symmetric keys.  If using EGD or a device file, a maximum of 255
 bytes is read.
 .SH tls_random_exchange_name (default: ${config_directory}/prng_exch)
 Name of the pseudo random number generator (PRNG) state file
-that is maintained by tlsmgr(8). The file is created when it does
+that is maintained by \fBtlsmgr\fR(8). The file is created when it does
 not exist, and its length is fixed at 1024 bytes.
 .PP
 Since this file is modified by Postfix, it should probably be
 kept in the /var file system, instead of under $config_directory.
 The location should not be inside the chroot jail.
 .SH tls_random_prng_update_period (default: 3600s)
-The time between attempts by tlsmgr(8) to save the state of
+The time between attempts by \fBtlsmgr\fR(8) to save the state of
 the pseudo random number generator (PRNG) to the file specified
 with $tls_random_exchange_name.
 .SH tls_random_reseed_period (default: 3600s)
-The maximal time between attempts by tlsmgr(8) to re-seed the
+The maximal time between attempts by \fBtlsmgr\fR(8) to re-seed the
 in-memory pseudo random number generator (PRNG) pool from external
 sources.  The actual time between re-seeding attempts is calculated
 using the PRNG, and is between 0 and the time specified.
 .SH tls_random_source (default: see "postconf -d" output)
-The external entropy source for the in-memory tlsmgr(8) pseudo
+The external entropy source for the in-memory \fBtlsmgr\fR(8) pseudo
 random number generator (PRNG) pool. Be sure to specify a non-blocking
 source.  If this source is not a regular file, the entropy source
 type must be prepended:  egd:/path/to/egd_socket for a source with
@@ -5220,14 +5220,14 @@ device file.
 Note: on OpenBSD systems specify /dev/arandom when /dev/urandom
 gives timeout errors.
 .SH trace_service_name (default: trace)
-The name of the trace(8) service. This service maintains a record
+The name of the \fBtrace\fR(8) service. This service maintains a record
 of mail deliveries and produces a mail delivery report when verbose
 delivery is requested with "\fBsendmail -v\fR".
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH transport_maps (default: empty)
 Optional lookup tables with mappings from recipient address to
-(message delivery transport, next-hop destination).  See transport(5)
+(message delivery transport, next-hop destination).  See \fBtransport\fR(5)
 for details.
 .PP
 Specify zero or more "type:table" lookup tables.  If you use this
@@ -5252,14 +5252,14 @@ Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 The default time unit is s (seconds).
 .SH trigger_timeout (default: 10s)
 The time limit for sending a trigger to a Postfix daemon (for
-example, the pickup(8) or qmgr(8) daemon). This time limit prevents
+example, the \fBpickup\fR(8) or \fBqmgr\fR(8) daemon). This time limit prevents
 programs from getting stuck when the mail system is under heavy
 load.
 .PP
 Time units: s (seconds), m (minutes), h (hours), d (days), w (weeks).
 The default time unit is s (seconds).
 .SH undisclosed_recipients_header (default: To: undisclosed-recipients:;)
-Message header that the Postfix cleanup(8) server inserts when a
+Message header that the Postfix \fBcleanup\fR(8) server inserts when a
 message contains no To: or Cc: message header.
 .SH unknown_address_reject_code (default: 450)
 The numerical Postfix SMTP server response code when a sender or
@@ -5342,7 +5342,7 @@ Do not change this unless you have a complete understanding of RFC 821.
 This feature is available in Postfix 2.1 and later.
 .SH verp_delimiter_filter (default: -=+)
 The characters Postfix accepts as VERP delimiter characters on the
-Postfix sendmail(1) command line and in SMTP commands.
+Postfix \fBsendmail\fR(1) command line and in SMTP commands.
 .PP
 This feature is available in Postfix 1.1 and later.
 .SH virtual_alias_domains (default: $virtual_alias_maps)
@@ -5390,7 +5390,7 @@ 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 address.  The table format and lookups
-are documented in virtual(5).
+are documented in \fBvirtual\fR(5).
 .PP
 This feature is available in Postfix 2.0 and later. The default
 value is backwards compatible with Postfix 1.1.
@@ -5431,7 +5431,7 @@ Setting this parameter to a value of 1 changes the meaning of
 virtual_destination_concurrency_limit from concurrency per domain
 into concurrency per recipient.
 .SH virtual_gid_maps (default: empty)
-Lookup tables with the per-recipient group ID for virtual(8) mailbox
+Lookup tables with the per-recipient group ID for \fBvirtual\fR(8) mailbox
 delivery.
 .PP
 In a lookup table, specify a left-hand side of "@domain.tld" to
@@ -5439,20 +5439,20 @@ match any user in the specified domain that does not have a specific
 "user@domain.tld" entry.
 .PP
 When a recipient address has an optional address extension
-(user+foo@domain.tld), the virtual(8) delivery agent looks up
+(user+foo@domain.tld), the \fBvirtual\fR(8) delivery agent looks up
 the full address first, and when the lookup fails, it looks up the
 unextended address (user@domain.tld).
 .PP
-Note 1: for security reasons, the virtual(8) delivery agent disallows
+Note 1: for security reasons, the \fBvirtual\fR(8) delivery agent disallows
 regular expression substitution of $1 etc. in regular expression
 lookup tables, because that would open a security hole.
 .PP
-Note 2: for security reasons, the virtual(8) delivery agent will
-silently ignore requests to use the proxymap(8) server. Instead
+Note 2: for security reasons, the \fBvirtual\fR(8) delivery agent will
+silently ignore requests to use the \fBproxymap\fR(8) server. Instead
 it will open the table directly. Before Postfix version 2.2, the
-virtual(8) delivery agent will terminate with a fatal error.
+\fBvirtual\fR(8) delivery agent will terminate with a fatal error.
 .SH virtual_mailbox_base (default: empty)
-A prefix that the virtual(8) delivery agent prepends to all pathname
+A prefix that the \fBvirtual\fR(8) delivery agent prepends to all pathname
 results from $virtual_mailbox_maps table lookups.  This is a safety
 measure to ensure that an out of control map doesn't litter the
 file system with mailboxes.  While virtual_mailbox_base could be
@@ -5470,7 +5470,7 @@ virtual_mailbox_base = /var/mail
 .SH virtual_mailbox_domains (default: $virtual_mailbox_maps)
 Postfix is final destination for the specified list of domains;
 mail is delivered via the $virtual_transport mail delivery transport.
-By default this is the Postfix virtual(8) delivery agent.  The SMTP
+By default this is the Postfix \fBvirtual\fR(8) delivery agent.  The SMTP
 server validates recipient addresses with $virtual_mailbox_maps
 and rejects mail for non-existent recipients.  See also the virtual
 mailbox domain class in the ADDRESS_CLASS_README file.
@@ -5484,7 +5484,7 @@ value is backwards compatible with Postfix 1.1.
 The maximal size in bytes of an individual mailbox or maildir file,
 or zero (no limit).
 .SH virtual_mailbox_lock (default: see "postconf -d" output)
-How to lock a UNIX-style virtual(8) mailbox before attempting
+How to lock a UNIX-style \fBvirtual\fR(8) mailbox before attempting
 delivery.  For a list of available file locking methods, use the
 "\fBpostconf -l\fR" command.
 .PP
@@ -5504,7 +5504,7 @@ In a lookup table, specify a left-hand side of "@domain.tld" to
 match any user in the specified domain that does not have a specific
 "user@domain.tld" entry.
 .PP
-The virtual(8) delivery agent uses this table to look up the
+The \fBvirtual\fR(8) delivery agent uses this table to look up the
 per-recipient mailbox or maildir pathname.  If the lookup result
 ends in a slash ("/"), maildir-style delivery is carried out,
 otherwise the path is assumed to specify a UNIX-style mailbox file.
@@ -5512,18 +5512,18 @@ Note that $virtual_mailbox_base is unconditionally prepended to
 this path.
 .PP
 When a recipient address has an optional address extension
-(user+foo@domain.tld), the virtual(8) delivery agent looks up
+(user+foo@domain.tld), the \fBvirtual\fR(8) delivery agent looks up
 the full address first, and when the lookup fails, it looks up the
 unextended address (user@domain.tld).
 .PP
-Note 1: for security reasons, the virtual(8) delivery agent disallows
+Note 1: for security reasons, the \fBvirtual\fR(8) delivery agent disallows
 regular expression substitution of $1 etc. in regular expression
 lookup tables, because that would open a security hole.
 .PP
-Note 2: for security reasons, the virtual(8) delivery agent will
-silently ignore requests to use the proxymap(8) server. Instead
+Note 2: for security reasons, the \fBvirtual\fR(8) delivery agent will
+silently ignore requests to use the \fBproxymap\fR(8) server. Instead
 it will open the table directly. Before Postfix version 2.2, the
-virtual(8) delivery agent will terminate with a fatal error.
+\fBvirtual\fR(8) delivery agent will terminate with a fatal error.
 .SH virtual_maps (default: empty)
 Optional lookup tables with a) names of domains for which all
 addresses are aliased to addresses in other local or remote domains,
@@ -5532,23 +5532,23 @@ remote domains.  Available before Postfix version 2.0. With Postfix 2.0
 and later, this is replaced by separate controls: virtual_alias_domains
 and virtual_alias_maps.
 .SH virtual_minimum_uid (default: 100)
-The minimum user ID value that the virtual(8) delivery agent accepts
-as a result from \fB$virtual_uid_maps\fR table lookup.  Returned
+The minimum user ID value that the \fBvirtual\fR(8) delivery agent accepts
+as a result from $virtual_uid_maps table lookup.  Returned
 values less than this will be rejected, and the message will be
 deferred.
 .SH virtual_transport (default: virtual)
 The default mail delivery transport for domains that match the
 $virtual_mailbox_domains parameter value. This information can
-be overruled with the transport(5) table.
+be overruled with the \fBtransport\fR(5) table.
 .PP
 Specify a string of the form \fItransport:nexthop\fR, where \fItransport\fR
 is the name of a mail delivery transport defined in master.cf.
 The \fI:nexthop\fR part is optional.  For more details see the
-transport(5) manual page.
+\fBtransport\fR(5) manual page.
 .PP
 This feature is available in Postfix 2.0 and later.
 .SH virtual_uid_maps (default: empty)
-Lookup tables with the per-recipient user ID that the virtual(8)
+Lookup tables with the per-recipient user ID that the \fBvirtual\fR(8)
 delivery agent uses while writing to the recipient's mailbox.
 .PP
 In a lookup table, specify a left-hand side of "@domain.tld"
@@ -5556,23 +5556,23 @@ to match any user in the specified domain that does not have a
 specific "user@domain.tld" entry.
 .PP
 When a recipient address has an optional address extension
-(user+foo@domain.tld), the virtual(8) delivery agent looks up
+(user+foo@domain.tld), the \fBvirtual\fR(8) delivery agent looks up
 the full address first, and when the lookup fails, it looks up the
 unextended address (user@domain.tld).
 .PP
-Note 1: for security reasons, the virtual(8) delivery agent disallows
+Note 1: for security reasons, the \fBvirtual\fR(8) delivery agent disallows
 regular expression substitution of $1 etc. in regular expression
 lookup tables, because that would open a security hole.
 .PP
-Note 2: for security reasons, the virtual(8) delivery agent will
-silently ignore requests to use the proxymap(8) server. Instead
+Note 2: for security reasons, the \fBvirtual\fR(8) delivery agent will
+silently ignore requests to use the \fBproxymap\fR(8) server. Instead
 it will open the table directly. Before Postfix version 2.2, the
-virtual(8) delivery agent will terminate with a fatal error.
+\fBvirtual\fR(8) delivery agent will terminate with a fatal error.
 .SH SEE ALSO
 .na
 .nf
-postconf(1) Postfix configuration parameter maintenance
-master(5) Postfix daemon configuration maintenance
+postconf(1), Postfix configuration parameter maintenance
+master(5), Postfix daemon configuration maintenance
 .SH LICENSE
 .ad
 .fi
diff --git a/postfix/man/man5/regexp_table.5 b/postfix/man/man5/regexp_table.5
index cb43347e7..432f4e977 100644
--- a/postfix/man/man5/regexp_table.5
+++ b/postfix/man/man5/regexp_table.5
@@ -24,9 +24,9 @@ list of patterns, and when a match is found the corresponding
 result is returned.
 
 To find out what types of lookup tables your Postfix system
-supports use the \fBpostconf -m\fR command.
+supports use the "\fBpostconf -m\fR" command.
 
-To test lookup tables, use the \fBpostmap -fq\fR command as
+To test lookup tables, use the "\fBpostmap -fq\fR" command as
 described in the SYNOPSIS above.
 .SH "TABLE FORMAT"
 .na
@@ -62,8 +62,8 @@ starts with whitespace continues a logical line.
 .PP
 Each pattern is a POSIX regular expression enclosed by a pair of
 delimiters. The regular expression syntax is documented in
-re_format(7) with 4.4BSD, in regex(5) with Solaris, and in
-regex(7) with Linux. Other systems may use other document names.
+\fBre_format\fR(7) with 4.4BSD, in \fBregex\fR(5) with Solaris, and in
+\fBregex\fR(7) with Linux. Other systems may use other document names.
 
 The expression delimiter can be any character, except whitespace
 or characters that have special meaning (traditionally the forward
diff --git a/postfix/man/man5/relocated.5 b/postfix/man/man5/relocated.5
index d05209cb3..c48cc952a 100644
--- a/postfix/man/man5/relocated.5
+++ b/postfix/man/man5/relocated.5
@@ -4,7 +4,7 @@
 .SH NAME
 relocated
 \-
-format of Postfix relocated table
+Postfix relocated table format
 .SH "SYNOPSIS"
 .na
 .nf
@@ -12,14 +12,14 @@ format of Postfix relocated table
 .SH DESCRIPTION
 .ad
 .fi
-The optional \fBrelocated\fR table provides the information that is
+The optional \fBrelocated\fR(5) table provides the information that is
 used in "user has moved to \fInew_location\fR" bounce messages.
 
-Normally, the \fBrelocated\fR table is specified as a text file
+Normally, the \fBrelocated\fR(5) table is specified as a text file
 that serves as input to the \fBpostmap\fR(1) command.
 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
 is used for fast searching by the mail system. Execute the command
-\fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+"\fBpostmap /etc/postfix/relocated\fR" in order to rebuild the indexed
 file after changing the relocated table.
 
 When the table is provided via other means such as NIS, LDAP
@@ -105,7 +105,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on.
 This section describes how the table lookups change when lookups
 are directed to a TCP-based server. For a description of the TCP
 client/server lookup protocol, see \fBtcp_table\fR(5).
-This feature is not available in Postfix version 2.1.
+This feature is not available up to and including Postfix version 2.2.
 
 Each lookup operation uses the entire address once.  Thus,
 \fIuser@domain\fR mail addresses are not broken up into their
@@ -124,7 +124,7 @@ The table format does not understand quoting conventions.
 .fi
 The following \fBmain.cf\fR parameters are especially relevant.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP \fBrelocated_maps\fR
 List of lookup tables for relocated users or sites.
 .PP
diff --git a/postfix/man/man5/tcp_table.5 b/postfix/man/man5/tcp_table.5
index 1d7ef7987..6eb90fedd 100644
--- a/postfix/man/man5/tcp_table.5
+++ b/postfix/man/man5/tcp_table.5
@@ -20,9 +20,9 @@ rewriting or mail routing. These tables are usually in
 can be directed to a TCP server.
 
 To find out what types of lookup tables your Postfix system
-supports use the \fBpostconf -m\fR command.
+supports use the "\fBpostconf -m\fR" command.
 
-To test lookup tables, use the \fBpostmap\fR command as
+To test lookup tables, use the "\fBpostmap -q\fR" command as
 described in the SYNOPSIS above.
 .SH "PROTOCOL DESCRIPTION"
 .na
@@ -96,9 +96,9 @@ a long time.
 .na
 .nf
 postmap(1), Postfix lookup table manager
-regexp_table(5) format of regular expression tables
-pcre_table(5) format of PCRE tables
-cidr_table(5) format of CIDR tables
+regexp_table(5), format of regular expression tables
+pcre_table(5), format of PCRE tables
+cidr_table(5), format of CIDR tables
 .SH "README FILES"
 .na
 .nf
diff --git a/postfix/man/man5/transport.5 b/postfix/man/man5/transport.5
index 9a6ba14dd..8155003cb 100644
--- a/postfix/man/man5/transport.5
+++ b/postfix/man/man5/transport.5
@@ -4,7 +4,7 @@
 .SH NAME
 transport
 \-
-format of Postfix transport table
+Postfix transport table format
 .SH "SYNOPSIS"
 .na
 .nf
@@ -16,7 +16,7 @@ format of Postfix transport table
 .SH DESCRIPTION
 .ad
 .fi
-The optional \fBtransport\fR table specifies a mapping from email
+The optional \fBtransport\fR(5) table specifies a mapping from email
 addresses to message delivery transports and/or relay hosts. The
 mapping is used by the \fBtrivial-rewrite\fR(8) daemon.
 
@@ -36,11 +36,11 @@ A list of domains that is by default delivered via
 Mail for any other destination is by default delivered via
 \fB$default_transport\fR.
 .PP
-Normally, the \fBtransport\fR table is specified as a text file
+Normally, the \fBtransport\fR(5) table is specified as a text file
 that serves as input to the \fBpostmap\fR(1) command.
 The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used
 for fast searching by the mail system. Execute the command
-\fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+"\fBpostmap /etc/postfix/transport\fR" in order to rebuild the indexed
 file after changing the transport table.
 
 When the table is provided via other means such as NIS, LDAP
@@ -231,7 +231,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on.
 This section describes how the table lookups change when lookups
 are directed to a TCP-based server. For a description of the TCP
 client/server lookup protocol, see \fBtcp_table\fR(5).
-This feature is not available in Postfix version 2.1.
+This feature is not available up to and including Postfix version 2.2.
 
 Each lookup operation uses the entire recipient address once.  Thus,
 \fIsome.domain.hierarchy\fR is not looked up via its parent domains,
@@ -245,7 +245,7 @@ Results are the same as with indexed file lookups.
 .fi
 The following \fBmain.cf\fR parameters are especially relevant.
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP \fBempty_address_recipient\fR
 The address that is looked up instead of the null sender address.
 .IP \fBparent_domain_matches_subdomains\fR
diff --git a/postfix/man/man5/virtual.5 b/postfix/man/man5/virtual.5
index ade5fab37..f53af1b5e 100644
--- a/postfix/man/man5/virtual.5
+++ b/postfix/man/man5/virtual.5
@@ -4,7 +4,7 @@
 .SH NAME
 virtual
 \-
-format of Postfix virtual alias table
+Postfix virtual alias table format
 .SH "SYNOPSIS"
 .na
 .nf
@@ -16,7 +16,7 @@ format of Postfix virtual alias table
 .SH DESCRIPTION
 .ad
 .fi
-The optional \fBvirtual\fR alias table specifies address aliasing
+The optional \fBvirtual\fR(5) alias table specifies address aliasing
 for arbitrary local or non-local recipient addresses. Virtual aliasing
 is recursive, and is done by the Postfix \fBcleanup\fR(8) daemon.
 
@@ -37,11 +37,11 @@ envelope addresses, and does not affect message headers.
 Think Sendmail rule set \fBS0\fR, if you like. Use \fBcanonical\fR(5)
 mapping to rewrite header and envelope addresses in general.
 
-Normally, the \fBvirtual\fR alias table is specified as a text file
+Normally, the \fBvirtual\fR(5) alias table is specified as a text file
 that serves as input to the \fBpostmap\fR(1) command.
 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
 is used for fast searching by the mail system. Execute the command
-\fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+"\fBpostmap /etc/postfix/virtual\fR" in order to rebuild the indexed
 file after changing the text file.
 
 When the table is provided via other means such as NIS, LDAP
@@ -81,7 +81,7 @@ $\fBmydestination\fR, or when it is listed in $\fBinet_interfaces\fR
 or $\fBproxy_interfaces\fR.
 .sp
 This functionality overlaps with functionality of the local
-\fIaliases\fR(5) database. The difference is that \fBvirtual\fR
+\fIaliases\fR(5) database. The difference is that \fBvirtual\fR(5)
 mapping can be applied to non-local addresses.
 .IP "@\fIdomain address, address, ...\fR"
 Mail for any user in \fIdomain\fR is redirected to \fIaddress\fR.
@@ -130,7 +130,7 @@ Support for a virtual alias domain looks like:
 virtual_alias_maps = hash:/etc/postfix/virtual
 
 Note: some systems use \fBdbm\fR databases instead of \fBhash\fR.
-See the output from \fBpostconf -m\fR for available database types.
+See the output from "\fBpostconf -m\fR" for available database types.
 
 .ti -4
 /etc/postfix/virtual:
@@ -191,7 +191,7 @@ pattern can be interpolated as \fB$1\fR, \fB$2\fR and so on.
 This section describes how the table lookups change when lookups
 are directed to a TCP-based server. For a description of the TCP
 client/server lookup protocol, see \fBtcp_table\fR(5).
-This feature is not available in Postfix version 2.1.
+This feature is not available up to and including Postfix version 2.2.
 
 Each lookup operation uses the entire address once.  Thus,
 \fIuser@domain\fR mail addresses are not broken up into their
@@ -210,7 +210,7 @@ The table format does not understand quoting conventions.
 .fi
 The following \fBmain.cf\fR parameters are especially relevant to
 this topic. See the Postfix \fBmain.cf\fR file for syntax details
-and for default values. Use the \fBpostfix reload\fR command after
+and for default values. Use the "\fBpostfix reload\fR" command after
 a configuration change.
 .IP \fBvirtual_alias_maps\fR
 List of virtual aliasing tables.
diff --git a/postfix/man/man8/anvil.8 b/postfix/man/man8/anvil.8
index be2692165..c44b8d8b8 100644
--- a/postfix/man/man8/anvil.8
+++ b/postfix/man/man8/anvil.8
@@ -12,14 +12,14 @@ Postfix session count and request rate control
 .SH DESCRIPTION
 .ad
 .fi
-The Postfix \fBanvil\fR server maintains short-term statistics
+The Postfix \fBanvil\fR(8) server maintains short-term statistics
 to defend against clients that hammer a server with either too
 many simultaneous sessions, or with too many successive requests
 within a configurable time interval.
 This server is designed to run under control by the Postfix
-master server.
+\fBmaster\fR(8) server.
 
-The \fBanvil\fR server maintains no persistent database. Standard
+The \fBanvil\fR(8) server maintains no persistent database. Standard
 library utilities do not meet Postfix performance and robustness
 requirements.
 .SH "CONNECTION COUNT/RATE LIMITING"
@@ -28,7 +28,7 @@ requirements.
 .ad
 .fi
 When a remote client connects, a connection count (or rate) limited
-server should send the following request to the \fBanvil\fR server:
+server should send the following request to the \fBanvil\fR(8) server:
 .PP
 .in +4
 \fBrequest=connect\fR
@@ -37,7 +37,7 @@ server should send the following request to the \fBanvil\fR server:
 .in
 .PP
 This registers a new connection for the (service, client)
-combination specified with \fBident\fR. The \fBanvil\fR server
+combination specified with \fBident\fR. The \fBanvil\fR(8) server
 answers with the number of simultaneous connections and the
 number of connections per unit time for that (service, client)
 combination:
@@ -56,7 +56,7 @@ It is left up to the server to decide if the remote client
 exceeds the connection count (or rate) limit.
 .PP
 When a remote client disconnects, a connection count (or rate) limited
-server should send the following request to the \fBanvil\fR server:
+server should send the following request to the \fBanvil\fR(8) server:
 .PP
 .in +4
 \fBrequest=disconnect\fR
@@ -65,7 +65,7 @@ server should send the following request to the \fBanvil\fR server:
 .in
 .PP
 This registers a disconnect event for the (service, client)
-combination specified with \fBident\fR. The \fBanvil\fR
+combination specified with \fBident\fR. The \fBanvil\fR(8)
 server replies with:
 .PP
 .ti +4
@@ -77,7 +77,7 @@ server replies with:
 .fi
 When a remote client sends a message delivery request, a
 message rate limited server should send the following
-request to the \fBanvil\fR server:
+request to the \fBanvil\fR(8) server:
 .PP
 .in +4
 \fBrequest=message\fR
@@ -86,7 +86,7 @@ request to the \fBanvil\fR server:
 .in
 .PP
 This registers a message delivery request for the (service, client)
-combination specified with \fBident\fR. The \fBanvil\fR server
+combination specified with \fBident\fR. The \fBanvil\fR(8) server
 answers with the number of message delivery requests per unit time
 for that (service, client) combination:
 .PP
@@ -96,11 +96,9 @@ for that (service, client) combination:
 \fBrate=\fInumber\fR
 .in
 .PP
-In order prevent the anvil server from discarding client
+In order to prevent the \fBanvil\fR(8) server from discarding client
 request rates too early or too late, a message rate limited
 service should also register connect/disconnect events.
-.PP
-This feature is available in Postfix 2.2 and later.
 .SH "RECIPIENT RATE LIMITING"
 .na
 .nf
@@ -108,7 +106,7 @@ This feature is available in Postfix 2.2 and later.
 .fi
 When a remote client sends a recipient address, a recipient
 rate limited server should send the following request to
-the \fBanvil\fR server:
+the \fBanvil\fR(8) server:
 .PP
 .in +4
 \fBrequest=recipient\fR
@@ -116,8 +114,8 @@ the \fBanvil\fR server:
 \fBident=\fIstring\fR
 .in
 .PP
-This registers a recipient address for the (service, client)
-combination specified with \fBident\fR. The \fBanvil\fR server
+This registers a recipient request for the (service, client)
+combination specified with \fBident\fR. The \fBanvil\fR(8) server
 answers with the number of recipient addresses per unit time
 for that (service, client) combination:
 .PP
@@ -127,20 +125,18 @@ for that (service, client) combination:
 \fBrate=\fInumber\fR
 .in
 .PP
-In order prevent the anvil server from discarding client
+In order to prevent the \fBanvil\fR(8) server from discarding client
 request rates too early or too late, a recipient rate limited
 service should also register connect/disconnect events.
-.PP
-This feature is available in Postfix 2.2 and later.
 .SH "SECURITY"
 .na
 .nf
 .ad
 .fi
-The \fBanvil\fR server does not talk to the network or to local
+The \fBanvil\fR(8) server does not talk to the network or to local
 users, and can run chrooted at fixed low privilege.
 
-The \fBanvil\fR server maintains an in-memory table with information
+The \fBanvil\fR(8) server maintains an in-memory table with information
 about recent clients of a connection count (or rate) limited service.
 Although state is kept only temporarily, this may require a lot of
 memory on systems that handle connections from many remote clients.
@@ -174,17 +170,17 @@ are ignored.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically as anvil(8)
+Changes to \fBmain.cf\fR are picked up automatically as \fBanvil\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBanvil_rate_time_unit (60s)\fR"
 The time unit over which client connection rates and other rates
 are calculated.
 .IP "\fBanvil_status_update_time (600s)\fR"
-How frequently the anvil(8) connection and rate limiting server
+How frequently the \fBanvil\fR(8) connection and rate limiting server
 logs peak usage information.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
@@ -237,7 +233,7 @@ The Secure Mailer license must be distributed with this software.
 .nf
 .ad
 .fi
-The anvil service was introduced with Postfix 2.1.
+The anvil service is available in Postfix 2.2 and later.
 .SH "AUTHOR(S)"
 .na
 .nf
diff --git a/postfix/man/man8/bounce.8 b/postfix/man/man8/bounce.8
index 2ec0b5911..cf8799842 100644
--- a/postfix/man/man8/bounce.8
+++ b/postfix/man/man8/bounce.8
@@ -12,7 +12,7 @@ Postfix message bounce or defer daemon
 .SH DESCRIPTION
 .ad
 .fi
-The \fBbounce\fR daemon maintains per-message log files with
+The \fBbounce\fR(8) daemon maintains per-message log files with
 non-delivery status information. Each log file is named after the
 queue file that it corresponds to, and is kept in a queue subdirectory
 named after the service name in the \fBmaster.cf\fR file (either
@@ -20,7 +20,7 @@ named after the service name in the \fBmaster.cf\fR file (either
 This program expects to be run from the \fBmaster\fR(8) process
 manager.
 
-The \fBbounce\fR daemon processes two types of service requests:
+The \fBbounce\fR(8) daemon processes two types of service requests:
 .IP \(bu
 Append a recipient (non-)delivery status record to a per-message
 log file.
@@ -52,18 +52,18 @@ Problems and transactions are logged to \fBsyslogd\fR(8).
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically, as bounce(8)
+Changes to \fBmain.cf\fR are picked up automatically, as \fBbounce\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fB2bounce_notice_recipient (postmaster)\fR"
 The recipient of undeliverable mail that cannot be returned to
 the sender.
 .IP "\fBbackwards_bounce_logfile_compatibility (yes)\fR"
-Produce additional bounce(8) logfile records that can be read by
-older Postfix versions.
+Produce additional \fBbounce\fR(8) logfile records that can be read by
+Postfix versions before 2.0.
 .IP "\fBbounce_notice_recipient (postmaster)\fR"
 The recipient of postmaster notifications with the message headers
 of mail that Postfix did not deliver and of SMTP conversation
@@ -83,10 +83,10 @@ of mail that cannot be delivered within $delay_warning_time time
 units.
 .IP "\fBdeliver_lock_attempts (20)\fR"
 The maximal number of attempts to acquire an exclusive lock on a
-mailbox file or bounce(8) logfile.
+mailbox file or \fBbounce\fR(8) logfile.
 .IP "\fBdeliver_lock_delay (1s)\fR"
 The time between attempts to acquire an exclusive lock on a mailbox
-file or bounce(8) logfile.
+file or \fBbounce\fR(8) logfile.
 .IP "\fBipc_timeout (3600s)\fR"
 The time limit for sending or receiving information over an internal
 communication channel.
diff --git a/postfix/man/man8/cleanup.8 b/postfix/man/man8/cleanup.8
index be120c5cd..f66ecc62d 100644
--- a/postfix/man/man8/cleanup.8
+++ b/postfix/man/man8/cleanup.8
@@ -12,11 +12,11 @@ canonicalize and enqueue Postfix message
 .SH DESCRIPTION
 .ad
 .fi
-The \fBcleanup\fR daemon processes inbound mail, inserts it
+The \fBcleanup\fR(8) daemon processes inbound mail, inserts it
 into the \fBincoming\fR mail queue, and informs the queue
 manager of its arrival.
 
-The \fBcleanup\fR daemon always performs the following transformations:
+The \fBcleanup\fR(8) daemon always performs the following transformations:
 .IP \(bu
 Insert missing message headers: (\fBResent-\fR) \fBFrom:\fR,
 \fBTo:\fR, \fBMessage-Id:\fR, and \fBDate:\fR.
@@ -42,11 +42,11 @@ By default, address masquerading does not affect envelope recipients.
 Optionally, expand envelope recipients according to information
 found in the \fBvirtual\fR(5) lookup tables.
 .PP
-The \fBcleanup\fR daemon performs sanity checks on the content of
+The \fBcleanup\fR(8) daemon performs sanity checks on the content of
 each message. When it finds a problem, by default it returns a
 diagnostic status to the client, and leaves it up to the client
 to deal with the problem. Alternatively, the client can request
-the \fBcleanup\fR daemon to bounce the message back to the sender
+the \fBcleanup\fR(8) daemon to bounce the message back to the sender
 in case of trouble.
 .SH "STANDARDS"
 .na
@@ -68,19 +68,20 @@ else\fR and other logical relationships.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically, as cleanup(8)
+Changes to \fBmain.cf\fR are picked up automatically, as
+\fBcleanup\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "COMPATIBILITY CONTROLS"
 .na
 .nf
 .ad
 .fi
 .IP "\fBundisclosed_recipients_header (To: undisclosed-recipients:;)\fR"
-Message header that the Postfix cleanup(8) server inserts when a
+Message header that the Postfix \fBcleanup\fR(8) server inserts when a
 message contains no To: or Cc: message header.
 .PP
 Available in Postfix version 2.1 and later:
@@ -93,10 +94,10 @@ Postfix built-in content filtering is meant to stop a flood of
 worms or viruses. It is not a general content filter.
 .IP "\fBbody_checks (empty)\fR"
 Optional lookup tables for content inspection as specified in
-the body_checks(5) manual page.
+the \fBbody_checks\fR(5) manual page.
 .IP "\fBheader_checks (empty)\fR"
 Optional lookup tables for content inspection of primary non-MIME
-message headers, as specified in the header_checks(5) manual page.
+message headers, as specified in the \fBheader_checks\fR(5) manual page.
 .PP
 Available in Postfix version 2.0 and later:
 .IP "\fBbody_checks_size_limit (51200)\fR"
@@ -104,10 +105,10 @@ How much text in a message body segment (or attachment, if you
 prefer to use that term) is subjected to body_checks inspection.
 .IP "\fBmime_header_checks ($header_checks)\fR"
 Optional lookup tables for content inspection of MIME related
-message headers, as described in the header_checks(5) manual page.
+message headers, as described in the \fBheader_checks\fR(5) manual page.
 .IP "\fBnested_header_checks ($header_checks)\fR"
 Optional lookup tables for content inspection of non-MIME message
-headers in attached messages, as described in the header_checks(5)
+headers in attached messages, as described in the \fBheader_checks\fR(5)
 manual page.
 .SH "MIME PROCESSING CONTROLS"
 .na
@@ -154,8 +155,8 @@ recipient address.
 .nf
 .ad
 .fi
-Address rewriting is delegated to the trivial-rewrite(8) daemon.
-The cleanup(8) server implements table driven address mapping.
+Address rewriting is delegated to the \fBtrivial-rewrite\fR(8) daemon.
+The \fBcleanup\fR(8) server implements table driven address mapping.
 .IP "\fBempty_address_recipient (MAILER-DAEMON)\fR"
 The recipient of mail addressed to the null address.
 .IP "\fBcanonical_maps (empty)\fR"
@@ -211,8 +212,8 @@ and append the specified domain name to incomplete addresses.
 .fi
 .IP "\fBduplicate_filter_limit (1000)\fR"
 The maximal number of addresses remembered by the address
-duplicate filter for aliases(5) or virtual(5) alias expansion, or
-for showq(8) queue displays.
+duplicate filter for \fBaliases\fR(5) or \fBvirtual\fR(5) alias expansion, or
+for \fBshowq\fR(8) queue displays.
 .IP "\fBheader_size_limit (102400)\fR"
 The maximal amount of memory in bytes for storing a message header.
 .IP "\fBhopcount_limit (50)\fR"
diff --git a/postfix/man/man8/discard.8 b/postfix/man/man8/discard.8
index 0c534b93a..19be8c370 100644
--- a/postfix/man/man8/discard.8
+++ b/postfix/man/man8/discard.8
@@ -12,14 +12,15 @@ Postfix discard mail delivery agent
 .SH DESCRIPTION
 .ad
 .fi
-The Postfix discard delivery agent processes delivery requests from
+The Postfix \fBdiscard\fR(8) delivery agent processes
+delivery requests from
 the queue manager. Each request specifies a queue file, a sender
 address, a domain or host name that is treated as the reason for
 discarding the mail, and recipient information.
 This program expects to be run from the \fBmaster\fR(8) process
 manager.
 
-The discard delivery agent pretends to deliver all recipients
+The \fBdiscard\fR(8) delivery agent pretends to deliver all recipients
 in the delivery request, logs the "next-hop" domain or host
 information as the reason for discarding the mail, updates the
 queue file and marks recipients as finished or informs the
@@ -32,7 +33,7 @@ daemon as appropriate.
 .nf
 .ad
 .fi
-The discard mailer is not security-sensitive. It does not talk
+The \fBdiscard\fR(8) mailer is not security-sensitive. It does not talk
 to the network, and can be run chrooted at fixed low privilege.
 .SH "STANDARDS"
 .na
@@ -50,12 +51,12 @@ the postmaster is notified of bounces and of other trouble.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically as discard(8)
+Changes to \fBmain.cf\fR are picked up automatically as \fBdiscard\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
diff --git a/postfix/man/man8/error.8 b/postfix/man/man8/error.8
index 140758c85..45df13163 100644
--- a/postfix/man/man8/error.8
+++ b/postfix/man/man8/error.8
@@ -12,14 +12,15 @@ Postfix error mail delivery agent
 .SH DESCRIPTION
 .ad
 .fi
-The Postfix error delivery agent processes delivery requests from
+The Postfix \fBerror\fR(8) delivery agent processes delivery
+requests from
 the queue manager. Each request specifies a queue file, a sender
 address, a domain or host name that is treated as the reason for
 non-delivery, and recipient information.
 This program expects to be run from the \fBmaster\fR(8) process
 manager.
 
-The error delivery agent bounces all recipients in the delivery
+The \fBerror\fR(8) delivery agent bounces all recipients in the delivery
 request using the "next-hop"
 domain or host information as the reason for non-delivery, updates
 the queue file and marks recipients as finished or informs the
@@ -32,7 +33,7 @@ Delivery status reports are sent to the \fBbounce\fR(8),
 .nf
 .ad
 .fi
-The error mailer is not security-sensitive. It does not talk
+The \fBerror\fR(8) mailer is not security-sensitive. It does not talk
 to the network, and can be run chrooted at fixed low privilege.
 .SH "STANDARDS"
 .na
@@ -50,12 +51,12 @@ the postmaster is notified of bounces and of other trouble.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically as error(8)
+Changes to \fBmain.cf\fR are picked up automatically as \fBerror\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fB2bounce_notice_recipient (postmaster)\fR"
 The recipient of undeliverable mail that cannot be returned to
 the sender.
diff --git a/postfix/man/man8/flush.8 b/postfix/man/man8/flush.8
index 52fabee0d..c71950cdf 100644
--- a/postfix/man/man8/flush.8
+++ b/postfix/man/man8/flush.8
@@ -12,7 +12,8 @@ Postfix fast flush server
 .SH DESCRIPTION
 .ad
 .fi
-The flush server maintains a record of deferred mail by destination.
+The \fBflush\fR(8) server maintains a record of deferred
+mail by destination.
 This information is used to improve the performance of the SMTP
 \fBETRN\fR request, and of its command-line equivalent,
 "\fBsendmail -qR\fR" or "\fBpostqueue -f\fR".
@@ -33,7 +34,7 @@ which defaults to \fB$relay_domains\fR.
 
 This server implements the following requests:
 .IP "\fBadd\fI sitename queueid\fR"
-Inform the fast flush server that the message with the specified
+Inform the \fBflush\fR(8) server that the message with the specified
 queue ID is queued for the specified destination.
 .IP "\fBsend\fI sitename\fR"
 Request delivery of mail that is queued for the specified
@@ -54,7 +55,7 @@ Do a \fBrefresh\fR for all per-destination logfiles.
 .nf
 .ad
 .fi
-The fast flush server is not security-sensitive. It does not
+The \fBflush\fR(8) server is not security-sensitive. It does not
 talk to the network, and it does not talk to local users.
 The fast flush server can run chrooted at fixed low privilege.
 .SH DIAGNOSTICS
@@ -72,7 +73,7 @@ be automated with a suitable wakeup timer setting in the
 \fBmaster.cf\fR configuration file.
 
 Upon receipt of a request to deliver mail for an eligible
-destination, the \fBflush\fR server requests delivery of all messages
+destination, the \fBflush\fR(8) server requests delivery of all messages
 that are listed in that destination's logfile, regardless of the
 recipients of those messages. This is not an issue for mail
 that is sent to a \fBrelay_domains\fR destination because
@@ -82,12 +83,12 @@ such mail typically only has recipients in one domain.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically as flush(8)
+Changes to \fBmain.cf\fR are picked up automatically as \fBflush\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
diff --git a/postfix/man/man8/lmtp.8 b/postfix/man/man8/lmtp.8
index ff803afc6..725338f25 100644
--- a/postfix/man/man8/lmtp.8
+++ b/postfix/man/man8/lmtp.8
@@ -78,12 +78,12 @@ other trouble.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically, as lmtp(8)
+Changes to \fBmain.cf\fR are picked up automatically, as \fBlmtp\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "COMPATIBILITY CONTROLS"
 .na
 .nf
diff --git a/postfix/man/man8/local.8 b/postfix/man/man8/local.8
index a7ae4536f..00156aa8f 100644
--- a/postfix/man/man8/local.8
+++ b/postfix/man/man8/local.8
@@ -12,14 +12,14 @@ Postfix local mail delivery
 .SH DESCRIPTION
 .ad
 .fi
-The \fBlocal\fR daemon processes delivery requests from the
+The \fBlocal\fR(8) daemon processes delivery requests from the
 Postfix queue manager to deliver mail to local recipients.
 Each delivery request specifies a queue file, a sender address,
 a domain or host to deliver to, and one or more recipients.
 This program expects to be run from the \fBmaster\fR(8) process
 manager.
 
-The \fBlocal\fR daemon updates queue files and marks recipients
+The \fBlocal\fR(8) daemon updates queue files and marks recipients
 as finished, or it informs the queue manager that delivery should
 be tried again at a later time. Delivery status reports are sent
 to the \fBbounce\fR(8), \fBdefer\fR(8) or \fBtrace\fR(8) daemon as
@@ -127,7 +127,7 @@ The \fBfallback_transport\fR parameter specifies a message transport
 for recipients that are not found in the UNIX passwd database.
 
 In the case of UNIX-style mailbox delivery,
-the \fBlocal\fR daemon prepends a "\fBFrom \fIsender time_stamp\fR"
+the \fBlocal\fR(8) daemon prepends a "\fBFrom \fIsender time_stamp\fR"
 envelope header to each message, prepends an
 \fBX-Original-To:\fR header with the recipient address as given to
 Postfix, prepends an
@@ -238,7 +238,7 @@ configuration parameter are exported unchanged.
 
 The current working directory is the mail queue directory.
 
-The \fBlocal\fR daemon prepends a "\fBFrom \fIsender time_stamp\fR"
+The \fBlocal\fR(8) daemon prepends a "\fBFrom \fIsender time_stamp\fR"
 envelope header to each message, prepends an
 \fBX-Original-To:\fR header with the recipient address as given to
 Postfix, prepends an
@@ -260,7 +260,7 @@ delivery to external files. The default setting (\fBalias,
 forward\fR) forbids file destinations in \fB:include:\fR files.
 
 In the case of UNIX-style mailbox delivery,
-the \fBlocal\fR daemon prepends a "\fBFrom \fIsender time_stamp\fR"
+the \fBlocal\fR(8) daemon prepends a "\fBFrom \fIsender time_stamp\fR"
 envelope header to each message, prepends an
 \fBX-Original-To:\fR header with the recipient address as given to
 Postfix, prepends an
@@ -298,7 +298,7 @@ or to the alias \fIname\fR, to the destinations listed in
 to the mailbox owned by the user \fIname\fR, or it is sent back as
 undeliverable.
 
-In all cases the \fBlocal\fR daemon prepends an optional
+In all cases the \fBlocal\fR(8) daemon prepends an optional
 `\fBDelivered-To:\fR header line with the final recipient
 address.
 .SH "DELIVERY RIGHTS"
@@ -308,7 +308,7 @@ address.
 .fi
 Deliveries to external files and external commands are made with
 the rights of the receiving user on whose behalf the delivery is made.
-In the absence of a user context, the \fBlocal\fR daemon uses the
+In the absence of a user context, the \fBlocal\fR(8) daemon uses the
 owner rights of the \fB:include:\fR file or alias database.
 When those files are owned by the superuser, delivery is made with
 the rights specified with the \fBdefault_privs\fR configuration
@@ -366,7 +366,7 @@ processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "COMPATIBILITY CONTROLS"
 .na
 .nf
@@ -394,35 +394,35 @@ aliases, .forward files, mailbox_transport, mailbox_command_maps,
 mailbox_command, home_mailbox, mail_spool_directory, fallback_transport
 and luser_relay.
 .IP "\fBalias_maps (see 'postconf -d' output)\fR"
-The alias databases that are used for local(8) delivery.
+The alias databases that are used for \fBlocal\fR(8) delivery.
 .IP "\fBforward_path (see 'postconf -d' output)\fR"
-The local(8) delivery agent search list for finding a .forward
+The \fBlocal\fR(8) delivery agent search list for finding a .forward
 file with user-specified delivery methods.
 .IP "\fBmailbox_transport (empty)\fR"
-Optional message delivery transport that the local(8) delivery
+Optional message delivery transport that the \fBlocal\fR(8) delivery
 agent should use for mailbox delivery to all local recipients,
 whether or not they are found in the UNIX passwd database.
 .IP "\fBmailbox_command_maps (empty)\fR"
 Optional lookup tables with per-recipient external commands to use
-for local(8) mailbox delivery.
+for \fBlocal\fR(8) mailbox delivery.
 .IP "\fBmailbox_command (empty)\fR"
-Optional external command that the local(8) delivery agent should
+Optional external command that the \fBlocal\fR(8) delivery agent should
 use for mailbox delivery.
 .IP "\fBhome_mailbox (empty)\fR"
-Optional pathname of a mailbox file relative to a local(8) user's
+Optional pathname of a mailbox file relative to a \fBlocal\fR(8) user's
 home directory.
 .IP "\fBmail_spool_directory (see 'postconf -d' output)\fR"
-The directory where local(8) UNIX-style mailboxes are kept.
+The directory where \fBlocal\fR(8) UNIX-style mailboxes are kept.
 .IP "\fBfallback_transport (empty)\fR"
-Optional message delivery transport that the local(8) delivery
-agent should use for names that are not found in the aliases(5)
+Optional message delivery transport that the \fBlocal\fR(8) delivery
+agent should use for names that are not found in the \fBaliases\fR(5)
 database or in the UNIX passwd database.
 .IP "\fBluser_relay (empty)\fR"
-Optional catch-all destination for unknown local(8) recipients.
+Optional catch-all destination for unknown \fBlocal\fR(8) recipients.
 .PP
 Available in Postfix version 2.2 and later:
 .IP "\fBcommand_execution_directory (empty)\fR"
-The local(8) delivery agent working directory for delivery to
+The \fBlocal\fR(8) delivery agent working directory for delivery to
 external command.
 .SH "MAILBOX LOCKING CONTROLS"
 .na
@@ -431,14 +431,14 @@ external command.
 .fi
 .IP "\fBdeliver_lock_attempts (20)\fR"
 The maximal number of attempts to acquire an exclusive lock on a
-mailbox file or bounce(8) logfile.
+mailbox file or \fBbounce\fR(8) logfile.
 .IP "\fBdeliver_lock_delay (1s)\fR"
 The time between attempts to acquire an exclusive lock on a mailbox
-file or bounce(8) logfile.
+file or \fBbounce\fR(8) logfile.
 .IP "\fBstale_lock_time (500s)\fR"
 The time after which a stale exclusive mailbox lockfile is removed.
 .IP "\fBmailbox_delivery_lock (see 'postconf -d' output)\fR"
-How to lock a UNIX-style local(8) mailbox before attempting delivery.
+How to lock a UNIX-style \fBlocal\fR(8) mailbox before attempting delivery.
 .SH "RESOURCE AND RATE CONTROLS"
 .na
 .nf
@@ -448,8 +448,8 @@ How to lock a UNIX-style local(8) mailbox before attempting delivery.
 Time limit for delivery to external commands.
 .IP "\fBduplicate_filter_limit (1000)\fR"
 The maximal number of addresses remembered by the address
-duplicate filter for aliases(5) or virtual(5) alias expansion, or
-for showq(8) queue displays.
+duplicate filter for \fBaliases\fR(5) or \fBvirtual\fR(5) alias expansion, or
+for \fBshowq\fR(8) queue displays.
 .IP "\fBlocal_destination_concurrency_limit (2)\fR"
 The maximal number of parallel deliveries via the local mail
 delivery transport to the same recipient (when
@@ -460,7 +460,7 @@ parallel deliveries to the same local domain (when
 The maximal number of recipients per message delivery via the
 local mail delivery transport.
 .IP "\fBmailbox_size_limit (51200000)\fR"
-The maximal size of any local(8) individual mailbox or maildir
+The maximal size of any \fBlocal\fR(8) individual mailbox or maildir
 file, or zero (no limit).
 .SH "SECURITY CONTROLS"
 .na
@@ -468,22 +468,22 @@ file, or zero (no limit).
 .ad
 .fi
 .IP "\fBallow_mail_to_commands (alias, forward)\fR"
-Restrict local(8) mail delivery to external commands.
+Restrict \fBlocal\fR(8) mail delivery to external commands.
 .IP "\fBallow_mail_to_files (alias, forward)\fR"
-Restrict local(8) mail delivery to external files.
+Restrict \fBlocal\fR(8) mail delivery to external files.
 .IP "\fBcommand_expansion_filter (see 'postconf -d' output)\fR"
-Restrict the characters that the local(8) delivery agent allows in
+Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
 $name expansions of $mailbox_command.
 .IP "\fBdefault_privs (nobody)\fR"
-The default rights used by the local(8) delivery agent for delivery
+The default rights used by the \fBlocal\fR(8) delivery agent for delivery
 to external file or command.
 .IP "\fBforward_expansion_filter (see 'postconf -d' output)\fR"
-Restrict the characters that the local(8) delivery agent allows in
+Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
 $name expansions of $forward_path.
 .PP
 Available in Postfix version 2.2 and later:
 .IP "\fBexecution_directory_expansion_filter (see 'postconf -d' output)\fR"
-Restrict the characters that the local(8) delivery agent allows
+Restrict the characters that the \fBlocal\fR(8) delivery agent allows
 in $name expansions of $command_execution_directory.
 .SH "MISCELLANEOUS CONTROLS"
 .na
@@ -503,7 +503,7 @@ to non-Postfix processes.
 The time limit for sending or receiving information over an internal
 communication channel.
 .IP "\fBlocal_command_shell (empty)\fR"
-Optional shell program for local(8) delivery to non-Postfix command.
+Optional shell program for \fBlocal\fR(8) delivery to non-Postfix command.
 .IP "\fBmax_idle (100s)\fR"
 The maximum amount of time that an idle Postfix daemon process
 waits for the next service request before exiting.
@@ -511,7 +511,7 @@ waits for the next service request before exiting.
 The maximal number of connection requests before a Postfix daemon
 process terminates.
 .IP "\fBprepend_delivered_header (command, file, forward)\fR"
-The message delivery contexts where the Postfix local(8) delivery
+The message delivery contexts where the Postfix \fBlocal\fR(8) delivery
 agent prepends a Delivered-To:  message header.
 .IP "\fBprocess_id (read-only)\fR"
 The process ID of a Postfix command or daemon process.
@@ -525,7 +525,7 @@ The location of the Postfix top-level queue directory.
 .IP "\fBrecipient_delimiter (empty)\fR"
 The separator between user names and address extensions (user+foo).
 .IP "\fBrequire_home_directory (no)\fR"
-Whether or not a local(8) recipient's home directory must exist
+Whether or not a \fBlocal\fR(8) recipient's home directory must exist
 before mail delivery is attempted.
 .IP "\fBsyslog_facility (mail)\fR"
 The syslog facility of Postfix logging.
diff --git a/postfix/man/man8/master.8 b/postfix/man/man8/master.8
index a6f6280cf..14b84b41b 100644
--- a/postfix/man/man8/master.8
+++ b/postfix/man/man8/master.8
@@ -12,7 +12,7 @@ Postfix master process
 .SH DESCRIPTION
 .ad
 .fi
-The \fBmaster\fR daemon is the resident process that runs Postfix
+The \fBmaster\fR(8) daemon is the resident process that runs Postfix
 daemons on demand: daemons to send or receive messages via the
 network, daemons to deliver mail locally, etc.  These daemons are
 created on demand up to a configurable maximum number per service.
@@ -20,10 +20,11 @@ created on demand up to a configurable maximum number per service.
 Postfix daemons terminate voluntarily, either after being idle for
 a configurable amount of time, or after having serviced a
 configurable number of requests. Exceptions to this rule are the
-resident queue manager and the resident address verification server.
+resident queue manager, address verification server, and the TLS
+session cache and pseudo-random number server.
 
-The behavior of the \fBmaster\fR daemon is controlled by the
-\fBmaster.cf\fR configuration file, as described in master(5).
+The behavior of the \fBmaster\fR(8) daemon is controlled by the
+\fBmaster.cf\fR configuration file, as described in \fBmaster\fR(5).
 
 Options:
 .IP "\fB-c \fIconfig_dir\fR"
@@ -41,7 +42,7 @@ the \fBmain.cf\fR global configuration file.
 .IP \fB-t\fR
 Test mode. Return a zero exit status when the \fBmaster.pid\fR lock
 file does not exist or when that file is not locked.  This is evidence
-that the \fBmaster\fR daemon is not running.
+that the \fBmaster\fR(8) daemon is not running.
 .IP \fB-v\fR
 Enable verbose logging for debugging purposes. This option
 is passed on to child processes. Multiple \fB-v\fR options
@@ -49,7 +50,7 @@ make the software increasingly verbose.
 .PP
 Signals:
 .IP \fBSIGHUP\fR
-Upon receipt of a \fBHUP\fR signal (e.g., after \fBpostfix reload\fR),
+Upon receipt of a \fBHUP\fR signal (e.g., after "\fBpostfix reload\fR"),
 the master process re-reads its configuration files. If a service has
 been removed from the \fBmaster.cf\fR file, its running processes
 are terminated immediately.
@@ -57,11 +58,11 @@ Otherwise, running processes are allowed to terminate as soon
 as is convenient, so that changes in configuration settings
 affect only new service requests.
 .IP \fBSIGTERM\fR
-Upon receipt of a \fBTERM\fR signal (e.g., after \fBpostfix abort\fR),
+Upon receipt of a \fBTERM\fR signal (e.g., after "\fBpostfix abort\fR"),
 the master process passes the signal on to its child processes and
 terminates.
 This is useful for an emergency shutdown. Normally one would
-terminate only the master (\fBpostfix stop\fR) and allow running
+terminate only the master ("\fBpostfix stop\fR") and allow running
 processes to finish what they are doing.
 .SH DIAGNOSTICS
 .ad
@@ -83,10 +84,10 @@ Directory with Postfix configuration files.
 .nf
 .ad
 .fi
-Unlike most Postfix daemon processes, the master(8) server does
+Unlike most Postfix daemon processes, the \fBmaster\fR(8) server does
 not automatically pick up changes to \fBmain.cf\fR. Changes
 to \fBmaster.cf\fR are never picked up automatically.
-Use the \fBpostfix reload\fR command after a configuration change.
+Use the "\fBpostfix reload\fR" command after a configuration change.
 .SH "RESOURCE AND RATE CONTROLS"
 .na
 .nf
@@ -102,7 +103,7 @@ waits for the next service request before exiting.
 The maximal number of connection requests before a Postfix daemon
 process terminates.
 .IP "\fBservice_throttle_time (60s)\fR"
-How long the Postfix master(8) waits before forking a server that
+How long the Postfix \fBmaster\fR(8) waits before forking a server that
 appears to be malfunctioning.
 .SH "MISCELLANEOUS CONTROLS"
 .na
diff --git a/postfix/man/man8/oqmgr.8 b/postfix/man/man8/oqmgr.8
index fad4bbb24..99a87f859 100644
--- a/postfix/man/man8/oqmgr.8
+++ b/postfix/man/man8/oqmgr.8
@@ -12,7 +12,7 @@ old Postfix queue manager
 .SH DESCRIPTION
 .ad
 .fi
-The \fBoqmgr\fR daemon awaits the arrival of incoming mail
+The \fBoqmgr\fR(8) daemon awaits the arrival of incoming mail
 and arranges for its delivery via Postfix delivery processes.
 The actual mail routing strategy is delegated to the
 \fBtrivial-rewrite\fR(8) daemon.
@@ -27,10 +27,10 @@ undeliverable bounce notifications.
 .nf
 .ad
 .fi
-The \fBoqmgr\fR daemon maintains the following queues:
+The \fBoqmgr\fR(8) daemon maintains the following queues:
 .IP \fBincoming\fR
 Inbound mail from the network, or mail picked up by the
-local \fBpickup\fR agent from the \fBmaildrop\fR directory.
+local \fBpickup\fR(8) agent from the \fBmaildrop\fR directory.
 .IP \fBactive\fR
 Messages that the queue manager has opened for delivery. Only
 a limited number of messages is allowed to enter the \fBactive\fR
@@ -49,7 +49,7 @@ sets them free.
 .nf
 .ad
 .fi
-The \fBoqmgr\fR daemon keeps an eye on per-message delivery status
+The \fBoqmgr\fR(8) daemon keeps an eye on per-message delivery status
 reports in the following directories. Each status report file has
 the same name as the corresponding message file:
 .IP \fBbounce\fR
@@ -63,7 +63,7 @@ Per-recipient status information as requested with the
 Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv\fR" command.
 These files are maintained by the \fBtrace\fR(8) daemon.
 .PP
-The \fBoqmgr\fR daemon is responsible for asking the
+The \fBoqmgr\fR(8) daemon is responsible for asking the
 \fBbounce\fR(8), \fBdefer\fR(8) or \fBtrace\fR(8) daemons to
 send delivery reports.
 .SH "STRATEGIES"
@@ -123,7 +123,7 @@ Wakeup call, This is used by the master server to instantiate
 servers that should not go away forever. The action is to start
 an incoming queue scan.
 .PP
-The \fBoqmgr\fR daemon reads an entire buffer worth of triggers.
+The \fBoqmgr\fR(8) daemon reads an entire buffer worth of triggers.
 Multiple identical trigger requests are collapsed into one, and
 trigger requests are sorted so that \fBA\fR and \fBF\fR precede
 \fBD\fR and \fBI\fR. Thus, in order to force a deferred queue run,
@@ -134,21 +134,21 @@ of the arrival of new mail one would request \fBI\fR.
 .nf
 .ad
 .fi
-None. The \fBoqmgr\fR daemon does not interact with the outside world.
+None. The \fBoqmgr\fR(8) daemon does not interact with the outside world.
 .SH "SECURITY"
 .na
 .nf
 .ad
 .fi
-The \fBoqmgr\fR daemon is not security sensitive. It reads
+The \fBoqmgr\fR(8) daemon is not security sensitive. It reads
 single-character messages from untrusted local users, and thus may
-be susceptible to denial of service attacks. The \fBoqmgr\fR daemon
+be susceptible to denial of service attacks. The \fBoqmgr\fR(8) daemon
 does not talk to the outside world, and it can be run at fixed low
 privilege in a chrooted environment.
 .SH DIAGNOSTICS
 .ad
 .fi
-Problems and transactions are logged to the syslog daemon.
+Problems and transactions are logged to the \fBsyslog\fR(8) daemon.
 Corrupted message files are saved to the \fBcorrupt\fR queue
 for further inspection.
 
@@ -158,19 +158,20 @@ the postmaster is notified of bounces and of other trouble.
 .ad
 .fi
 A single queue manager process has to compete for disk access with
-multiple front-end processes such as \fBsmtpd\fR. A sudden burst of
+multiple front-end processes such as \fBcleanup\fR(8). A sudden burst of
 inbound mail can negatively impact outbound delivery rates.
 .SH "CONFIGURATION PARAMETERS"
 .na
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are not picked up automatically, as oqmgr(8)
+Changes to \fBmain.cf\fR are not picked up automatically,
+as \fBoqmgr\fR(8)
 is a persistent process. Use the command "\fBpostfix reload\fR" after
 a configuration change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 
 In the text below, \fItransport\fR is the first field in a
 \fBmaster.cf\fR entry.
@@ -289,7 +290,7 @@ bounce(8), delivery status reports
 postconf(5), configuration parameters
 master(5), generic daemon options
 master(8), process manager
-syslogd(8) system logging
+syslogd(8), system logging
 .SH "README FILES"
 .na
 .nf
diff --git a/postfix/man/man8/pickup.8 b/postfix/man/man8/pickup.8
index eaa693802..ece84a09d 100644
--- a/postfix/man/man8/pickup.8
+++ b/postfix/man/man8/pickup.8
@@ -12,7 +12,7 @@ Postfix local mail pickup
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpickup\fR daemon waits for hints that new mail has been
+The \fBpickup\fR(8) daemon waits for hints that new mail has been
 dropped into the \fBmaildrop\fR directory, and feeds it into the
 \fBcleanup\fR(8) daemon.
 Ill-formatted files are deleted without notifying the originator.
@@ -23,16 +23,17 @@ manager.
 .nf
 .ad
 .fi
-None. The \fBpickup\fR daemon does not interact with the outside world.
+None. The \fBpickup\fR(8) daemon does not interact with
+the outside world.
 .SH "SECURITY"
 .na
 .nf
 .ad
 .fi
-The \fBpickup\fR daemon is moderately security sensitive. It runs
+The \fBpickup\fR(8) daemon is moderately security sensitive. It runs
 with fixed low privilege and can run in a chrooted environment.
 However, the program reads files from potentially hostile users.
-The \fBpickup\fR daemon opens no files for writing, is careful about
+The \fBpickup\fR(8) daemon opens no files for writing, is careful about
 what files it opens for reading, and does not actually touch any data
 that is sent to its public service endpoint.
 .SH DIAGNOSTICS
@@ -42,7 +43,7 @@ Problems and transactions are logged to \fBsyslogd\fR(8).
 .SH BUGS
 .ad
 .fi
-The \fBpickup\fR daemon copies mail from file to the \fBcleanup\fR(8)
+The \fBpickup\fR(8) daemon copies mail from file to the \fBcleanup\fR(8)
 daemon.  It could avoid message copying overhead by sending a file
 descriptor instead of file data, but then the already complex
 \fBcleanup\fR(8) daemon would have to deal with unfiltered user data.
@@ -51,12 +52,12 @@ descriptor instead of file data, but then the already complex
 .nf
 .ad
 .fi
-As the pickup(8) daemon is a relatively long-running process, up
+As the \fBpickup\fR(8) daemon is a relatively long-running process, up
 to an hour may pass before a \fBmain.cf\fR change takes effect.
 Use the command "\fBpostfix reload\fR" command to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "CONTENT INSPECTION CONTROLS"
 .na
 .nf
diff --git a/postfix/man/man8/pipe.8 b/postfix/man/man8/pipe.8
index b4c9c3410..ae9043a25 100644
--- a/postfix/man/man8/pipe.8
+++ b/postfix/man/man8/pipe.8
@@ -12,7 +12,7 @@ Postfix delivery to external command
 .SH DESCRIPTION
 .ad
 .fi
-The \fBpipe\fR daemon processes requests from the Postfix queue
+The \fBpipe\fR(8) daemon processes requests from the Postfix queue
 manager to deliver messages to external commands.
 This program expects to be run from the \fBmaster\fR(8) process
 manager.
@@ -21,7 +21,7 @@ Message attributes such as sender address, recipient address and
 next-hop host name can be specified as command-line macros that are
 expanded before the external command is executed.
 
-The \fBpipe\fR daemon updates queue files and marks recipients
+The \fBpipe\fR(8) daemon updates queue files and marks recipients
 as finished, or it informs the queue manager that delivery should
 be tried again at a later time. Delivery status reports are sent
 to the \fBbounce\fR(8), \fBdefer\fR(8) or \fBtrace\fR(8) daemon as
@@ -100,7 +100,7 @@ transparent version of RFC 822.
 This is recommended for delivery via \fBUUCP\fR or \fBBSMTP\fR.
 .sp
 The result is compatible with the address parsing of command-line
-recipients by the Postfix \fBsendmail\fR mail submission command.
+recipients by the Postfix \fBsendmail\fR(1) mail submission command.
 .sp
 The \fBq\fR flag affects only entire addresses, not the partial
 address information from the \fB$user\fR, \fB$extension\fR or
@@ -243,12 +243,12 @@ commands as the specified user. It is therefore security sensitive.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically as pipe(8)
+Changes to \fBmain.cf\fR are picked up automatically as \fBpipe\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "RESOURCE AND RATE CONTROLS"
 .na
 .nf
diff --git a/postfix/man/man8/proxymap.8 b/postfix/man/man8/proxymap.8
index 5628d6cc3..4cf7464a6 100644
--- a/postfix/man/man8/proxymap.8
+++ b/postfix/man/man8/proxymap.8
@@ -12,7 +12,7 @@ Postfix lookup table proxy server
 .SH DESCRIPTION
 .ad
 .fi
-The \fBproxymap\fR server provides read-only table
+The \fBproxymap\fR(8) server provides read-only table
 lookup service to Postfix processes. The purpose
 of the service is:
 .IP \(bu
@@ -38,7 +38,7 @@ proxy:mysql:/etc/postfix/virtual_alias.cf
 The total number of connections is limited by the number of
 proxymap server processes.
 .PP
-The proxymap server implements the following requests:
+The \fBproxymap\fR(8) server implements the following requests:
 .IP "\fBopen\fR \fImaptype:mapname flags\fR"
 Open the table with type \fImaptype\fR and name \fImapname\fR,
 as controlled by \fIflags\fR. The reply includes the \fImaptype\fR
@@ -59,10 +59,11 @@ multiple client processes.
 .nf
 .ad
 .fi
-\fBproxymap\fR servers run under control by the Postfix \fBmaster\fR
+\fBproxymap\fR(8) servers run under control by the Postfix
+\fBmaster\fR(8)
 server.  Each server can handle multiple simultaneous connections.
-When all servers are busy while a client connects, the \fBmaster\fR
-creates a new \fBproxymap\fR server process, provided that the
+When all servers are busy while a client connects, the \fBmaster\fR(8)
+creates a new \fBproxymap\fR(8) server process, provided that the
 process limit is not exceeded.
 Each server terminates after serving at least \fB$max_use\fR clients
 or after \fB$max_idle\fR seconds of idle time.
@@ -71,13 +72,13 @@ or after \fB$max_idle\fR seconds of idle time.
 .nf
 .ad
 .fi
-The proxymap server opens only tables that are approved via the
+The \fBproxymap\fR(8) server opens only tables that are approved via the
 \fBproxy_read_maps\fR configuration parameter, does not talk to
 users, and can run at fixed low privilege, chrooted or not.
 However, running the proxymap server chrooted severely limits
 usability, because it can open only chrooted tables.
 
-The proxymap server is not a trusted daemon process, and must
+The \fBproxymap\fR(8) server is not a trusted daemon process, and must
 not be used to look up sensitive information such as user or
 group IDs, mailbox file/directory names or external commands.
 
@@ -92,7 +93,7 @@ Problems and transactions are logged to \fBsyslogd\fR(8).
 .SH BUGS
 .ad
 .fi
-The proxymap server provides service to multiple clients,
+The \fBproxymap\fR(8) server provides service to multiple clients,
 and must therefore not be used for tables that have high-latency
 lookups.
 .SH "CONFIGURATION PARAMETERS"
@@ -100,12 +101,13 @@ lookups.
 .nf
 .ad
 .fi
-On busy mail systems a long time may pass before proxymap(8) relevant
+On busy mail systems a long time may pass before
+\fBproxymap\fR(8) relevant
 changes to \fBmain.cf\fR are picked up. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
@@ -126,7 +128,7 @@ The process ID of a Postfix command or daemon process.
 .IP "\fBprocess_name (read-only)\fR"
 The process name of a Postfix command or daemon process.
 .IP "\fBproxy_read_maps (see 'postconf -d' output)\fR"
-The lookup tables that the proxymap(8) server is allowed to access.
+The lookup tables that the \fBproxymap\fR(8) server is allowed to access.
 .SH "SEE ALSO"
 .na
 .nf
diff --git a/postfix/man/man8/qmgr.8 b/postfix/man/man8/qmgr.8
index 432b1ce6f..4ea5c7044 100644
--- a/postfix/man/man8/qmgr.8
+++ b/postfix/man/man8/qmgr.8
@@ -12,7 +12,7 @@ Postfix queue manager
 .SH DESCRIPTION
 .ad
 .fi
-The \fBqmgr\fR daemon awaits the arrival of incoming mail
+The \fBqmgr\fR(8) daemon awaits the arrival of incoming mail
 and arranges for its delivery via Postfix delivery processes.
 The actual mail routing strategy is delegated to the
 \fBtrivial-rewrite\fR(8) daemon.
@@ -27,10 +27,10 @@ undeliverable bounce notifications.
 .nf
 .ad
 .fi
-The \fBqmgr\fR daemon maintains the following queues:
+The \fBqmgr\fR(8) daemon maintains the following queues:
 .IP \fBincoming\fR
 Inbound mail from the network, or mail picked up by the
-local \fBpickup\fR agent from the \fBmaildrop\fR directory.
+local \fBpickup\fR(8) daemon from the \fBmaildrop\fR directory.
 .IP \fBactive\fR
 Messages that the queue manager has opened for delivery. Only
 a limited number of messages is allowed to enter the \fBactive\fR
@@ -49,7 +49,7 @@ sets them free.
 .nf
 .ad
 .fi
-The \fBqmgr\fR daemon keeps an eye on per-message delivery status
+The \fBqmgr\fR(8) daemon keeps an eye on per-message delivery status
 reports in the following directories. Each status report file has
 the same name as the corresponding message file:
 .IP \fBbounce\fR
@@ -63,7 +63,7 @@ Per-recipient status information as requested with the
 Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv\fR" command.
 These files are maintained by the \fBtrace\fR(8) daemon.
 .PP
-The \fBqmgr\fR daemon is responsible for asking the
+The \fBqmgr\fR(8) daemon is responsible for asking the
 \fBbounce\fR(8), \fBdefer\fR(8) or \fBtrace\fR(8) daemons to
 send delivery reports.
 .SH "STRATEGIES"
@@ -127,7 +127,7 @@ Wakeup call, This is used by the master server to instantiate
 servers that should not go away forever. The action is to start
 an incoming queue scan.
 .PP
-The \fBqmgr\fR daemon reads an entire buffer worth of triggers.
+The \fBqmgr\fR(8) daemon reads an entire buffer worth of triggers.
 Multiple identical trigger requests are collapsed into one, and
 trigger requests are sorted so that \fBA\fR and \fBF\fR precede
 \fBD\fR and \fBI\fR. Thus, in order to force a deferred queue run,
@@ -138,15 +138,15 @@ of the arrival of new mail one would request \fBI\fR.
 .nf
 .ad
 .fi
-None. The \fBqmgr\fR daemon does not interact with the outside world.
+None. The \fBqmgr\fR(8) daemon does not interact with the outside world.
 .SH "SECURITY"
 .na
 .nf
 .ad
 .fi
-The \fBqmgr\fR daemon is not security sensitive. It reads
+The \fBqmgr\fR(8) daemon is not security sensitive. It reads
 single-character messages from untrusted local users, and thus may
-be susceptible to denial of service attacks. The \fBqmgr\fR daemon
+be susceptible to denial of service attacks. The \fBqmgr\fR(8) daemon
 does not talk to the outside world, and it can be run at fixed low
 privilege in a chrooted environment.
 .SH DIAGNOSTICS
@@ -162,19 +162,20 @@ the postmaster is notified of bounces and of other trouble.
 .ad
 .fi
 A single queue manager process has to compete for disk access with
-multiple front-end processes such as \fBsmtpd\fR. A sudden burst of
+multiple front-end processes such as \fBcleanup\fR(8). A sudden burst of
 inbound mail can negatively impact outbound delivery rates.
 .SH "CONFIGURATION PARAMETERS"
 .na
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are not picked up automatically as qmgr(8)
-is a persistent process. Use the \fBpostfix reload\fR command after
+Changes to \fBmain.cf\fR are not picked up automatically
+as \fBqmgr\fR(8)
+is a persistent process. Use the "\fBpostfix reload\fR" command after
 a configuration change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 
 In the text below, \fItransport\fR is the first field in a
 \fBmaster.cf\fR entry.
@@ -328,7 +329,7 @@ bounce(8), delivery status reports
 postconf(5), configuration parameters
 master(5), generic daemon options
 master(8), process manager
-syslogd(8) system logging
+syslogd(8), system logging
 .SH "README FILES"
 .na
 .nf
diff --git a/postfix/man/man8/qmqpd.8 b/postfix/man/man8/qmqpd.8
index 52f3d5701..b19fb1c93 100644
--- a/postfix/man/man8/qmqpd.8
+++ b/postfix/man/man8/qmqpd.8
@@ -49,12 +49,12 @@ client to handle the situation.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically, as qmqpd(8)
+Changes to \fBmain.cf\fR are picked up automatically, as \fBqmqpd\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "CONTENT INSPECTION CONTROLS"
 .na
 .nf
@@ -139,7 +139,7 @@ The mail system name that is prepended to the process name in syslog
 records, so that "smtpd" becomes, for example, "postfix/smtpd".
 .IP "\fBverp_delimiter_filter (-=+)\fR"
 The characters Postfix accepts as VERP delimiter characters on the
-Postfix sendmail(1) command line and in SMTP commands.
+Postfix \fBsendmail\fR(1) command line and in SMTP commands.
 .SH "SEE ALSO"
 .na
 .nf
diff --git a/postfix/man/man8/scache.8 b/postfix/man/man8/scache.8
index f1d84df7a..01b481fed 100644
--- a/postfix/man/man8/scache.8
+++ b/postfix/man/man8/scache.8
@@ -12,7 +12,7 @@ Postfix connection cache server
 .SH DESCRIPTION
 .ad
 .fi
-The \fBscache\fR server maintains a shared multi-connection
+The \fBscache\fR(8) server maintains a shared multi-connection
 cache. This information can be used by, for example, Postfix
 SMTP clients or other Postfix delivery agents.
 
@@ -30,11 +30,11 @@ be referenced by zero or more logical destinations, and
 one endpoint may refer to zero or more connections.
 
 The exact syntax of a logical destination or endpoint name
-is application dependent; the \fBscache\fR service does
+is application dependent; the \fBscache\fR(8) server does
 not care.  A connection is stored as a file descriptor together
 with application-dependent information that is needed to
-re-activate a connection object. Again, the \fBscache\fR
-service is completely unaware about the details of that
+re-activate a connection object. Again, the \fBscache\fR(8)
+server is completely unaware of the details of that
 information.
 
 All information is stored with a finite time to live (ttl).
@@ -64,11 +64,11 @@ and a cached file descriptor for the specified logical destination.
 .nf
 .ad
 .fi
-The connection cache server is not security-sensitive. It does not
+The \fBscache\fR(8) server is not security-sensitive. It does not
 talk to the network, and it does not talk to local users.
-The scache server can run chrooted at fixed low privilege.
+The \fBscache\fR(8) server can run chrooted at fixed low privilege.
 
-The connection cache server is not a trusted process. It must
+The \fBscache\fR(8) server is not a trusted process. It must
 not be used to store information that is security sensitive.
 .SH DIAGNOSTICS
 .ad
@@ -77,21 +77,21 @@ Problems and transactions are logged to \fBsyslogd\fR(8).
 .SH BUGS
 .ad
 .fi
-Sessions cannot be cached across multiple machines.
+The session cache cannot be shared among multiple machines.
 
-When a connection expires from the cache it is closed without
-protocol specific handshake.
+When a connection expires from the cache, it is closed without
+the appropriate protocol specific handshake.
 .SH "CONFIGURATION PARAMETERS"
 .na
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically as scache(8)
+Changes to \fBmain.cf\fR are picked up automatically as \fBscache\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "RESOURCE CONTROLS"
 .na
 .nf
@@ -101,7 +101,7 @@ postconf(5) for more details including examples.
 The maximal time-to-live value that the connection cache server
 allows.
 .IP "\fBconnection_cache_status_update_time (600s)\fR"
-How frequently the scache(8) server logs usage statistics with
+How frequently the \fBscache\fR(8) server logs usage statistics with
 connection cache hit and miss rates for logical destinations and for
 physical endpoints.
 .SH "MISCELLANEOUS CONTROLS"
diff --git a/postfix/man/man8/showq.8 b/postfix/man/man8/showq.8
index 6d0debc59..c8b802623 100644
--- a/postfix/man/man8/showq.8
+++ b/postfix/man/man8/showq.8
@@ -12,10 +12,10 @@ list the Postfix mail queue
 .SH DESCRIPTION
 .ad
 .fi
-The \fBshowq\fR daemon reports the Postfix mail queue status.
+The \fBshowq\fR(8) daemon reports the Postfix mail queue status.
 It is the program that emulates the sendmail `mailq' command.
 
-The \fBshowq\fR daemon can also be run in stand-alone mode
+The \fBshowq\fR(8) daemon can also be run in stand-alone mode
 by the superuser. This mode of operation is used to emulate
 the `mailq' command while the Postfix mail system is down.
 .SH "SECURITY"
@@ -23,7 +23,7 @@ the `mailq' command while the Postfix mail system is down.
 .nf
 .ad
 .fi
-The \fBshowq\fR daemon can run in a chroot jail at fixed low
+The \fBshowq\fR(8) daemon can run in a chroot jail at fixed low
 privilege, and takes no input from the client. Its service port
 is accessible to local untrusted users, so the service can be
 susceptible to denial of service attacks.
@@ -32,7 +32,8 @@ susceptible to denial of service attacks.
 .nf
 .ad
 .fi
-None. The showq daemon does not interact with the outside world.
+None. The \fBshowq\fR(8) daemon does not interact with the
+outside world.
 .SH DIAGNOSTICS
 .ad
 .fi
@@ -40,7 +41,7 @@ Problems and transactions are logged to \fBsyslogd\fR(8).
 .SH BUGS
 .ad
 .fi
-The \fBshowq\fR daemon runs at a fixed low privilege; consequently,
+The \fBshowq\fR(8) daemon runs at a fixed low privilege; consequently,
 it cannot extract information from queue files in the
 \fBmaildrop\fR directory.
 .SH "CONFIGURATION PARAMETERS"
@@ -48,12 +49,12 @@ it cannot extract information from queue files in the
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically as showq(8)
+Changes to \fBmain.cf\fR are picked up automatically as \fBshowq\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 The default location of the Postfix main.cf and master.cf
 configuration files.
@@ -62,8 +63,8 @@ How much time a Postfix daemon process may take to handle a
 request before it is terminated by a built-in watchdog timer.
 .IP "\fBduplicate_filter_limit (1000)\fR"
 The maximal number of addresses remembered by the address
-duplicate filter for aliases(5) or virtual(5) alias expansion, or
-for showq(8) queue displays.
+duplicate filter for \fBaliases\fR(5) or \fBvirtual\fR(5) alias expansion, or
+for \fBshowq\fR(8) queue displays.
 .IP "\fBempty_address_recipient (MAILER-DAEMON)\fR"
 The recipient of mail addressed to the null address.
 .IP "\fBipc_timeout (3600s)\fR"
diff --git a/postfix/man/man8/smtp.8 b/postfix/man/man8/smtp.8
index fdc479ee4..f740a1920 100644
--- a/postfix/man/man8/smtp.8
+++ b/postfix/man/man8/smtp.8
@@ -4,7 +4,7 @@
 .SH NAME
 smtp
 \-
-Postfix remote delivery via SMTP
+Postfix SMTP client
 .SH "SYNOPSIS"
 .na
 .nf
@@ -12,7 +12,7 @@ Postfix remote delivery via SMTP
 .SH DESCRIPTION
 .ad
 .fi
-The SMTP client processes message delivery requests from
+The Postfix SMTP client processes message delivery requests from
 the queue manager. Each request specifies a queue file, a sender
 address, a domain or host to deliver to, and recipient information.
 This program expects to be run from the \fBmaster\fR(8) process
@@ -33,7 +33,7 @@ to a recoverable error condition, the SMTP client will try to
 deliver the mail to an alternate host.
 
 After a successful mail transaction, a connection may be saved
-to the \fBscache(8)\fR connection cache server, so that it
+to the \fBscache\fR(8) connection cache server, so that it
 may be used by any SMTP client for a subsequent transaction.
 
 By default, connection caching is enabled temporarily for
@@ -86,12 +86,12 @@ all destinations that map onto the same IP address and TCP port.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically, as smtp(8)
+Changes to \fBmain.cf\fR are picked up automatically, as \fBsmtp\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "COMPATIBILITY CONTROLS"
 .na
 .nf
@@ -236,8 +236,8 @@ TLS session cache.
 The expiration time of Postfix SMTP client TLS session cache
 information.
 .IP "\fBtls_daemon_random_bytes (32)\fR"
-The number of pseudo-random bytes that an smtp(8) or smtpd(8)
-process requests from the tlsmgr(8) server in order to seed its
+The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
+process requests from the \fBtlsmgr\fR(8) server in order to seed its
 internal pseudo random number generator (PRNG).
 .SH "RESOURCE AND RATE CONTROLS"
 .na
diff --git a/postfix/man/man8/smtpd.8 b/postfix/man/man8/smtpd.8
index d860efe5d..b332100a4 100644
--- a/postfix/man/man8/smtpd.8
+++ b/postfix/man/man8/smtpd.8
@@ -63,12 +63,12 @@ policy violations, and of other trouble.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically, as smtpd(8)
+Changes to \fBmain.cf\fR are picked up automatically, as \fBsmtpd\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "COMPATIBILITY CONTROLS"
 .na
 .nf
@@ -280,8 +280,8 @@ information.
 Run the Postfix SMTP server in the non-standard "wrapper" mode,
 instead of using the STARTTLS command.
 .IP "\fBtls_daemon_random_bytes (32)\fR"
-The number of pseudo-random bytes that an smtp(8) or smtpd(8)
-process requests from the tlsmgr(8) server in order to seed its
+The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
+process requests from the \fBtlsmgr\fR(8) server in order to seed its
 internal pseudo random number generator (PRNG).
 .SH "VERP SUPPORT CONTROLS"
 .na
@@ -300,7 +300,7 @@ and later.
 The two default VERP delimiter characters.
 .IP "\fBverp_delimiter_filter (-=+)\fR"
 The characters Postfix accepts as VERP delimiter characters on the
-Postfix sendmail(1) command line and in SMTP commands.
+Postfix \fBsendmail\fR(1) command line and in SMTP commands.
 .PP
 Available in Postfix version 1.1 and 2.0:
 .IP "\fBauthorized_verp_clients ($mynetworks)\fR"
@@ -444,7 +444,7 @@ 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.
 .PP
 The per SMTP client connection count and request rate limits are
-implemented in co-operation with the anvil(8) service, and
+implemented in co-operation with the \fBanvil\fR(8) service, and
 are available in Postfix version 2.2 and later.
 .IP "\fBsmtpd_client_connection_count_limit (50)\fR"
 How many simultaneous connections any client is allowed to
@@ -551,7 +551,7 @@ from untrusted clients to destinations matching $relay_domains.
 .IP "\fBsmtpd_restriction_classes (empty)\fR"
 User-defined aliases for groups of access restrictions.
 .IP "\fBsmtpd_null_access_lookup_key (<>)\fR"
-The lookup key to be used in SMTP access(5) tables instead of the
+The lookup key to be used in SMTP \fBaccess\fR(5) tables instead of the
 null sender address.
 .IP "\fBpermit_mx_backup_networks (empty)\fR"
 Restrict the use of the permit_mx_backup SMTP access feature to
@@ -589,12 +589,12 @@ 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.
+verification probes is maintained by the \fBverify\fR(8) server.
 See the file ADDRESS_VERIFICATION_README for information
 about how to configure and operate the Postfix sender/recipient
 address verification service.
 .IP "\fBaddress_verify_poll_count (3)\fR"
-How many times to query the verify(8) service for the completion
+How many times to query the \fBverify\fR(8) service for the completion
 of an address verification request in progress.
 .IP "\fBaddress_verify_poll_delay (3s)\fR"
 The delay between queries for the completion of an address
@@ -616,7 +616,7 @@ The following parameters control numerical SMTP reply codes
 and/or text responses.
 .IP "\fBaccess_map_reject_code (554)\fR"
 The numerical Postfix SMTP server response code when a client
-is rejected by an access(5) map restriction.
+is rejected by an \fBaccess\fR(5) map restriction.
 .IP "\fBdefer_code (450)\fR"
 The numerical Postfix SMTP server response code when a remote SMTP
 client request is rejected by the "defer" restriction.
@@ -634,7 +634,7 @@ is rejected by the reject_non_fqdn_hostname, reject_non_fqdn_sender
 or reject_non_fqdn_recipient restriction.
 .IP "\fBreject_code (554)\fR"
 The numerical Postfix SMTP server response code when a remote SMTP
-client request is rejected by the "\fBreject\fR" restriction.
+client request is rejected by the "reject" restriction.
 .IP "\fBrelay_domains_reject_code (554)\fR"
 The numerical Postfix SMTP server response code when a client
 request is rejected by the reject_unauth_destination recipient
diff --git a/postfix/man/man8/spawn.8 b/postfix/man/man8/spawn.8
index 6499fed80..72ebfcec9 100644
--- a/postfix/man/man8/spawn.8
+++ b/postfix/man/man8/spawn.8
@@ -12,7 +12,8 @@ Postfix external command spawner
 .SH DESCRIPTION
 .ad
 .fi
-The \fBspawn\fR daemon provides the Postfix equivalent of \fBinetd\fR.
+The \fBspawn\fR(8) daemon provides the Postfix equivalent
+of \fBinetd\fR.
 It listens on a port as specified in the Postfix \fBmaster.cf\fR file
 and spawns an external command whenever a connection is established.
 The connection can be made over local IPC (such as UNIX-domain
@@ -35,7 +36,7 @@ The external command is executed with the rights of the
 specified \fIusername\fR.  The software refuses to execute
 commands with root privileges, or with the privileges of the
 mail system owner. If \fIgroupname\fR is specified, the
-corresponding group ID is used instead of the group ID of
+corresponding group ID is used instead of the group ID
 of \fIusername\fR.
 .IP "\fBargv\fR=\fIcommand\fR... (required)"
 The command to be executed. This must be specified as the
@@ -46,14 +47,14 @@ shell meta characters by a shell command interpreter.
 .ad
 .fi
 In order to enforce standard Postfix process resource controls,
-the \fBspawn\fR daemon runs only one external command at a time.
+the \fBspawn\fR(8) daemon runs only one external command at a time.
 As such, it presents a noticeable overhead by wasting precious
-process resources. The \fBspawn\fR daemon is expected to be
+process resources. The \fBspawn\fR(8) daemon is expected to be
 replaced by a more structural solution.
 .SH DIAGNOSTICS
 .ad
 .fi
-The \fBspawn\fR daemon reports abnormal child exits.
+The \fBspawn\fR(8) daemon reports abnormal child exits.
 Problems are logged to \fBsyslogd\fR(8).
 .SH "SECURITY"
 .na
@@ -62,19 +63,19 @@ Problems are logged to \fBsyslogd\fR(8).
 .ad
 This program needs root privilege in order to execute external
 commands as the specified user. It is therefore security sensitive.
-However the \fBspawn\fR daemon does not talk to the external command
+However the \fBspawn\fR(8) daemon does not talk to the external command
 and thus is not vulnerable to data-driven attacks.
 .SH "CONFIGURATION PARAMETERS"
 .na
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically as spawn(8)
+Changes to \fBmain.cf\fR are picked up automatically as \fBspawn\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 
 In the text below, \fItransport\fR is the first field of the entry
 in the \fBmaster.cf\fR file.
diff --git a/postfix/man/man8/tlsmgr.8 b/postfix/man/man8/tlsmgr.8
index 331b08916..368d4397f 100644
--- a/postfix/man/man8/tlsmgr.8
+++ b/postfix/man/man8/tlsmgr.8
@@ -12,24 +12,25 @@ Postfix TLS session cache and PRNG manager
 .SH DESCRIPTION
 .ad
 .fi
-The tlsmgr(8) manages the TLS session caches for Postfix
-SMTP client and server processes.  It stores and retrieves
-cache entries on request by smtpd(8) and smtp(8) processes,
-and periodically removes entries that have expired.
+The \fBtlsmgr\fR(8) manages the Postfix TLS session caches.
+It stores and retrieves cache entries on request by
+\fBsmtpd\fR(8) and \fBsmtp\fR(8) processes, and periodically
+removes entries that have expired.
 
-The tlsmgr(8) also manages the PRNG (pseudo random number
-generator) pool. It answers queries by the smtpd(8) and smtp(8)
+The \fBtlsmgr\fR(8) also manages the PRNG (pseudo random number
+generator) pool. It answers queries by the \fBsmtpd\fR(8)
+and \fBsmtp\fR(8)
 processes to seed their internal PRNG pools.
 
-The tlsmgr(8)'s PRNG pool is initially seeded from
+The \fBtlsmgr\fR(8)'s PRNG pool is initially seeded from
 an external source (EGD, /dev/urandom, or regular file).
 It is updated at configurable pseudo-random intervals with
 data from the external source. It is updated periodically
 with data from TLS session cache entries and with the time
 of day, and is updated with the time of day whenever a
-process requests tlsmgr(8) service.
+process requests \fBtlsmgr\fR(8) service.
 
-The tlsmgr(8) saves the PRNG state to an exchange file
+The \fBtlsmgr\fR(8) saves the PRNG state to an exchange file
 periodically and when the process terminates, and reads
 the exchange file when initializing its PRNG.
 .SH "SECURITY"
@@ -37,13 +38,13 @@ the exchange file when initializing its PRNG.
 .nf
 .ad
 .fi
-tlsmgr(8) is not security-sensitive. The code that maintains
+The \fBtlsmgr\fR(8) is not security-sensitive. The code that maintains
 the external and internal PRNG pools does not "trust" the
 data that it manipulates, and the code that maintains the
 TLS session cache does not touch the contents of the cached
 entries, except for seeding its internal PRNG pool.
 
-The tlsmgr(8) can be run chrooted and with reduced privileges.
+The \fBtlsmgr\fR(8) can be run chrooted and with reduced privileges.
 At process startup it connects to the entropy source and
 exchange file, and creates or truncates the optional TLS
 session cache files.
@@ -62,11 +63,11 @@ TLS session caches and/or the size of the TLS cache files.
 .ad
 .fi
 Changes to \fBmain.cf\fR are not picked up automatically,
-because tlsmgr(8) is a persistent processes.  Use the
+because \fBtlsmgr\fR(8) is a persistent processes.  Use the
 command "\fBpostfix reload\fR" after a configuration change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "TLS SESSION CACHE"
 .na
 .nf
@@ -90,21 +91,21 @@ information.
 .ad
 .fi
 .IP "\fBtls_random_source (see 'postconf -d' output)\fR"
-The external entropy source for the in-memory tlsmgr(8) pseudo
+The external entropy source for the in-memory \fBtlsmgr\fR(8) pseudo
 random number generator (PRNG) pool.
 .IP "\fBtls_random_bytes (32)\fR"
-The number of bytes that tlsmgr(8) reads from $tls_random_source
+The number of bytes that \fBtlsmgr\fR(8) reads from $tls_random_source
 when (re)seeding the in-memory pseudo random number generator (PRNG)
 pool.
 .IP "\fBtls_random_exchange_name (${config_directory}/prng_exch)\fR"
 Name of the pseudo random number generator (PRNG) state file
-that is maintained by tlsmgr(8).
+that is maintained by \fBtlsmgr\fR(8).
 .IP "\fBtls_random_prng_update_period (3600s)\fR"
-The time between attempts by tlsmgr(8) to save the state of
+The time between attempts by \fBtlsmgr\fR(8) to save the state of
 the pseudo random number generator (PRNG) to the file specified
 with $tls_random_exchange_name.
 .IP "\fBtls_random_reseed_period (3600s)\fR"
-The maximal time between attempts by tlsmgr(8) to re-seed the
+The maximal time between attempts by \fBtlsmgr\fR(8) to re-seed the
 in-memory pseudo random number generator (PRNG) pool from external
 sources.
 .SH "MISCELLANEOUS CONTROLS"
@@ -130,8 +131,8 @@ records, so that "smtpd" becomes, for example, "postfix/smtpd".
 .SH "SEE ALSO"
 .na
 .nf
-smtp(8) Postfix SMTP client
-smtpd(8) Postfix SMTP server
+smtp(8), Postfix SMTP client
+smtpd(8), Postfix SMTP server
 postconf(5), configuration parameters
 master(5), generic daemon options
 master(8), process manager
diff --git a/postfix/man/man8/trivial-rewrite.8 b/postfix/man/man8/trivial-rewrite.8
index 73b030d75..97522bca6 100644
--- a/postfix/man/man8/trivial-rewrite.8
+++ b/postfix/man/man8/trivial-rewrite.8
@@ -12,7 +12,7 @@ Postfix address rewriting and resolving daemon
 .SH DESCRIPTION
 .ad
 .fi
-The \fBtrivial-rewrite\fR daemon processes three types of client
+The \fBtrivial-rewrite\fR(8) daemon processes three types of client
 service requests:
 .IP "\fBrewrite \fIcontext address\fR"
 Rewrite an address to standard form, according to the
@@ -55,7 +55,8 @@ Resolve an address for address verification purposes.
 .nf
 .ad
 .fi
-The trivial-rewrite servers run under control by the Postfix master
+The \fBtrivial-rewrite\fR(8) servers run under control by
+the Postfix master
 server.  Each server can handle multiple simultaneous connections.
 When all servers are busy while a client connects, the master
 creates a new server process, provided that the trivial-rewrite
@@ -74,7 +75,7 @@ None. The command does not interact with the outside world.
 .nf
 .ad
 .fi
-The \fBtrivial-rewrite\fR daemon is not security sensitive.
+The \fBtrivial-rewrite\fR(8) daemon is not security sensitive.
 By default, this daemon does not talk to remote or local users.
 It can run at a fixed low privilege in a chrooted environment.
 .SH DIAGNOSTICS
@@ -87,11 +88,11 @@ Problems and transactions are logged to \fBsyslogd\fR(8).
 .ad
 .fi
 On busy mail systems a long time may pass before a \fBmain.cf\fR
-change affecting trivial_rewrite(8) is picked up. Use the command
+change affecting \fBtrivial-rewrite\fR(8) is picked up. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "COMPATIBILITY CONTROLS"
 .na
 .nf
@@ -157,7 +158,7 @@ What Postfix features match subdomains of "domain.tld" automatically,
 instead of requiring an explicit ".domain.tld" pattern.
 .IP "\fBrelayhost (empty)\fR"
 The default host to send non-local mail to when no entry is matched
-in the optional transport(5) table.
+in the optional \fBtransport\fR(5) table.
 .IP "\fBtransport_maps (empty)\fR"
 Optional lookup tables with mappings from recipient address to
 (message delivery transport, next-hop destination).
diff --git a/postfix/man/man8/verify.8 b/postfix/man/man8/verify.8
index 00786159a..2a9eedbe0 100644
--- a/postfix/man/man8/verify.8
+++ b/postfix/man/man8/verify.8
@@ -12,7 +12,7 @@ Postfix address verification server
 .SH DESCRIPTION
 .ad
 .fi
-The Postfix address verification server maintains a record
+The \fBverify\fR(8) address verification server maintains a record
 of what recipient addresses are known to be deliverable or
 undeliverable.
 
@@ -25,13 +25,14 @@ Address verification relies on the answer from the nearest
 MTA for the specified address, and will therefore not detect
 all undeliverable addresses.
 
-This server is designed to run under control by the Postfix
+The \fBverify\fR(8) server is designed to run under control
+by the Postfix
 master server. It maintains an optional persistent database.
 To avoid being interrupted by "postfix stop" in the middle
 of a database update, the process runs in a separate process
 group.
 
-This server implements the following requests:
+The \fBverify\fR(8) server implements the following requests:
 .IP "\fBupdate\fI address status text\fR"
 Update the status and text of the specified address.
 .IP "\fBquery\fI address\fR"
@@ -72,12 +73,13 @@ a basic Postfix principle.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are not picked up automatically, as verify(8)
+Changes to \fBmain.cf\fR are not picked up automatically,
+as \fBverify\fR(8)
 processes are persistent. Use the command "\fBpostfix reload\fR" after
 a configuration change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "CACHE CONTROLS"
 .na
 .nf
diff --git a/postfix/man/man8/virtual.8 b/postfix/man/man8/virtual.8
index 3ab976c78..37c68c7e0 100644
--- a/postfix/man/man8/virtual.8
+++ b/postfix/man/man8/virtual.8
@@ -13,7 +13,8 @@ Postfix virtual domain mail delivery agent
 .ad
 .fi
 The \fBvirtual\fR(8) delivery agent is designed for virtual mail
-hosting services. Originally based on the Postfix local(8) delivery
+hosting services. Originally based on the Postfix \fBlocal\fR(8)
+delivery
 agent, this agent looks up recipients with map lookups of their
 full recipient address, instead of using hard-coded unix password
 file lookups of the address local part only.
@@ -46,7 +47,7 @@ When the mailbox location does not end in \fB/\fR, the message
 is delivered in UNIX mailbox format.   This format stores multiple
 messages in one textfile.
 
-The \fBvirtual\fR delivery agent prepends a "\fBFrom \fIsender
+The \fBvirtual\fR(8) delivery agent prepends a "\fBFrom \fIsender
 time_stamp\fR" envelope header to each message, prepends a
 \fBDelivered-To:\fR message header with the envelope recipient
 address,
@@ -67,7 +68,7 @@ mailbox to its original length.
 When the mailbox location ends in \fB/\fR, the message is delivered
 in qmail \fBmaildir\fR format. This format stores one message per file.
 
-The \fBvirtual\fR delivery agent daemon prepends a \fBDelivered-To:\fR
+The \fBvirtual\fR(8) delivery agent prepends a \fBDelivered-To:\fR
 message header with the final envelope recipient address,
 prepends an \fBX-Original-To:\fR header with the recipient address as
 given to Postfix, and prepends a
@@ -124,16 +125,16 @@ map.
 .nf
 .ad
 .fi
-The virtual delivery agent is not security sensitive, provided
+The \fBvirtual\fR(8) delivery agent is not security sensitive, provided
 that the lookup tables with recipient user/group ID information are
 adequately protected. This program is not designed to run chrooted.
 
-The virtual delivery agent disallows regular expression
+The \fBvirtual\fR(8) delivery agent disallows regular expression
 substitution of $1 etc. in regular expression lookup tables,
 because that would open a security hole.
 
-The virtual delivery agent will silently ignore requests
-to use the proxymap(8) server. Instead it will open the
+The \fBvirtual\fR(8) delivery agent will silently ignore requests
+to use the \fBproxymap\fR(8) server. Instead it will open the
 table directly. Before Postfix version 2.2, the virtual
 delivery agent will terminate with a fatal error.
 .SH "STANDARDS"
@@ -168,31 +169,32 @@ three tables, use an LDAP or MYSQL database.
 .nf
 .ad
 .fi
-Changes to \fBmain.cf\fR are picked up automatically, as virtual(8)
+Changes to \fBmain.cf\fR are picked up automatically, as
+\fBvirtual\fR(8)
 processes run for only a limited amount of time. Use the command
 "\fBpostfix reload\fR" to speed up a change.
 
 The text below provides only a parameter summary. See
-postconf(5) for more details including examples.
+\fBpostconf\fR(5) for more details including examples.
 .SH "MAILBOX DELIVERY CONTROLS"
 .na
 .nf
 .ad
 .fi
 .IP "\fBvirtual_mailbox_base (empty)\fR"
-A prefix that the virtual(8) delivery agent prepends to all pathname
+A prefix that the \fBvirtual\fR(8) delivery agent prepends to all pathname
 results from $virtual_mailbox_maps table lookups.
 .IP "\fBvirtual_mailbox_maps (empty)\fR"
 Optional lookup tables with all valid addresses in the domains that
 match $virtual_mailbox_domains.
 .IP "\fBvirtual_minimum_uid (100)\fR"
-The minimum user ID value that the virtual(8) delivery agent accepts
-as a result from \fB$virtual_uid_maps\fR table lookup.
+The minimum user ID value that the \fBvirtual\fR(8) delivery agent accepts
+as a result from $virtual_uid_maps table lookup.
 .IP "\fBvirtual_uid_maps (empty)\fR"
-Lookup tables with the per-recipient user ID that the virtual(8)
+Lookup tables with the per-recipient user ID that the \fBvirtual\fR(8)
 delivery agent uses while writing to the recipient's mailbox.
 .IP "\fBvirtual_gid_maps (empty)\fR"
-Lookup tables with the per-recipient group ID for virtual(8) mailbox
+Lookup tables with the per-recipient group ID for \fBvirtual\fR(8) mailbox
 delivery.
 .PP
 Available in Postfix version 2.0 and later:
@@ -208,14 +210,14 @@ $virtual_mailbox_domains parameter value.
 .ad
 .fi
 .IP "\fBvirtual_mailbox_lock (see 'postconf -d' output)\fR"
-How to lock a UNIX-style virtual(8) mailbox before attempting
+How to lock a UNIX-style \fBvirtual\fR(8) mailbox before attempting
 delivery.
 .IP "\fBdeliver_lock_attempts (20)\fR"
 The maximal number of attempts to acquire an exclusive lock on a
-mailbox file or bounce(8) logfile.
+mailbox file or \fBbounce\fR(8) logfile.
 .IP "\fBdeliver_lock_delay (1s)\fR"
 The time between attempts to acquire an exclusive lock on a mailbox
-file or bounce(8) logfile.
+file or \fBbounce\fR(8) logfile.
 .IP "\fBstale_lock_time (500s)\fR"
 The time after which a stale exclusive mailbox lockfile is removed.
 .SH "RESOURCE AND RATE CONTROLS"
diff --git a/postfix/mantools/fixman b/postfix/mantools/fixman
index b2e56ac78..c3d443b61 100755
--- a/postfix/mantools/fixman
+++ b/postfix/mantools/fixman
@@ -101,6 +101,9 @@ sub emit_text()
 	$block =~ s/^(\.(PP|sp)\n)+//;
 	#$wantpp = !($block =~ /^\.(SH|IP)/);
 
+	# Boldify man page references.
+	$block =~ s/([_a-zA-Z0-9-]+)(\([0-9]\))/\\fB\1\\fR\2/g;
+
 	# Encapsulate as C code comment.
 	$block =~ s/^([^.])/\/\*\t\1/;
 	$block =~ s/^\./\/\* ./;
diff --git a/postfix/mantools/mandouble b/postfix/mantools/mandouble
new file mode 100644
index 000000000..ffb287e02
--- /dev/null
+++ b/postfix/mantools/mandouble
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for file
+do
+    echo ==== $file ====
+    deroff $file | double
+done
diff --git a/postfix/mantools/manlint b/postfix/mantools/manlint
new file mode 100755
index 000000000..8927d897c
--- /dev/null
+++ b/postfix/mantools/manlint
@@ -0,0 +1,165 @@
+#!/bin/sh
+
+# manlint - lint manual page 'roff source, stop list in mantools/manlint.stop
+
+# example: mantools/manlint man/man?/*
+
+grep -n . "$@" | sed -n '
+    s/$/ /
+    # Non-bold manual page references 
+    /[a-z][_a-z0-9_]*([0-9])/{
+	p
+	d
+    }
+    # Command examples not enclosed in quotes
+    /[^"]\\fB[a-z][_a-z0-9-]* /{
+	p
+	d
+    }
+    # Missing manual page sections
+    /\\fBanvil\\fR[^-(]/{
+	p
+	d
+    }
+    /\\fBbounce\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBcleanup\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBdiscard\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBerror\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBflush\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBlmtp\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBlocal\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBmaster\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBoqmgr\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpickup\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpipe\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostalias\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostcat\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostconf\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostdrop\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostfix\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostkick\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostlock\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostlog\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostmap\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostqueue\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBpostsuper\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBproxymap\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBqmgr\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBqmqpd\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBscache\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBsendmail\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBshowq\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBsmtp\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBsmtpd\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBspawn\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBtlsmgr\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBtrivial-rewrite\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBverify\\fR[^-(]/{
+        p
+        d
+    }
+    /\\fBvirtual\\fR[^-(]/{
+        p
+        d
+    }
+' | egrep -v ':[a-z][_a-z0-9-]*\([0-9]\),' | 
+    fgrep -vf mantools/manlint.stop
diff --git a/postfix/mantools/manlint.stop b/postfix/mantools/manlint.stop
new file mode 100644
index 000000000..793167d8c
--- /dev/null
+++ b/postfix/mantools/manlint.stop
@@ -0,0 +1,105 @@
+man/man1/postmap.1:23:\fBmakemap \fIfile_type\fR \fIfile_name\fR < \fIfile_name\fR
+man/man1/sendmail.1:14:\fBsendmail -bp\fR
+man/man1/sendmail.1:17:\fBsendmail -I\fR
+man/man5/access.5:11:\fBpostmap /etc/postfix/access\fR
+man/man5/access.5:13:\fBpostmap -q "\fIstring\fB" /etc/postfix/access\fR
+man/man5/access.5:15:\fBpostmap -q - /etc/postfix/access <\fIinputfile\fR
+man/man5/canonical.5:11:\fBpostmap /etc/postfix/canonical\fR
+man/man5/canonical.5:13:\fBpostmap -q "\fIstring\fB" /etc/postfix/canonical\fR
+man/man5/canonical.5:15:\fBpostmap -q - /etc/postfix/canonical <\fIinputfile\fR
+man/man5/cidr_table.5:11:\fBpostmap -q "\fIstring\fB" cidr:/etc/postfix/\fIfilename\fR
+man/man5/cidr_table.5:13:\fBpostmap -q - cidr:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+man/man5/header_checks.5:11:\fBheader_checks = pcre:/etc/postfix/header_checks\fR
+man/man5/header_checks.5:13:\fBmime_header_checks = pcre:/etc/postfix/mime_header_checks\fR
+man/man5/header_checks.5:15:\fBnested_header_checks = pcre:/etc/postfix/nested_header_checks\fR
+man/man5/header_checks.5:17:\fBbody_checks = pcre:/etc/postfix/body_checks\fR
+man/man5/header_checks.5:19:\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
+man/man5/header_checks.5:21:\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+man/man5/ldap_table.5:11:\fBpostmap -q "\fIstring\fB" ldap:/etc/postfix/filename\fR
+man/man5/ldap_table.5:13:\fBpostmap -q - ldap:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+man/man5/mysql_table.5:11:\fBpostmap -q "\fIstring\fB" mysql:/etc/postfix/filename\fR
+man/man5/mysql_table.5:13:\fBpostmap -q - mysql:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+man/man5/nisplus_table.5:11:\fBpostmap -q "\fIstring\fB" "nisplus:[\fIname\fB=%s];\fIname.name.\fB"\fR
+man/man5/nisplus_table.5:13:\fBpostmap -q - "nisplus:[\fIname\fB=%s];\fIname.name.\fB"\fR <\fIinputfile\fR
+man/man5/pcre_table.5:11:\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
+man/man5/pcre_table.5:13:\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+man/man5/pgsql_table.5:11:\fBpostmap -q "\fIstring\fB" pgsql:/etc/postfix/filename\fR
+man/man5/pgsql_table.5:13:\fBpostmap -q - pgsql:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+man/man5/postconf.5:11:\fBpostconf -e\fR "\fIparameter=value\fR" ...
+man/man5/regexp_table.5:11:\fBpostmap -fq "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
+man/man5/regexp_table.5:13:\fBpostmap -fq - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+man/man5/relocated.5:11:\fBpostmap /etc/postfix/relocated\fR
+man/man5/tcp_table.5:11:\fBpostmap -q "\fIstring\fB" tcp:\fIhost:port\fR
+man/man5/tcp_table.5:13:\fBpostmap -q - tcp:\fIhost:port\fR <\fIinputfile\fR
+man/man5/transport.5:11:\fBpostmap /etc/postfix/transport\fR
+man/man5/transport.5:13:\fBpostmap -q "\fIstring\fB" /etc/postfix/transport\fR
+man/man5/transport.5:15:\fBpostmap -q - /etc/postfix/transport <\fIinputfile\fR
+man/man5/virtual.5:11:\fBpostmap /etc/postfix/virtual\fR
+man/man5/virtual.5:13:\fBpostmap -q "\fIstring\fB" /etc/postfix/virtual\fR
+man/man5/virtual.5:15:\fBpostmap -q - /etc/postfix/virtual <\fIinputfile\fR
+man/man8/cleanup.8:64:Table-driven rewriting rules make it hard to express \fBif then
+man/man8/lmtp.8:144:.IP "\fItransport_\fBdestination_concurrency_limit ($default_destination_concurrency_limit)\fR"
+man/man8/lmtp.8:147:.IP "\fItransport_\fBdestination_recipient_limit ($default_destination_recipient_limit)\fR"
+man/man1/postalias.1:12:\fBpostalias\fR [\fB-Nfinoprsvw\fR] [\fB-c \fIconfig_dir\fR]
+man/man1/postcat.1:11:\fBpostcat\fR [\fB-oqv\fR] [\fB-c \fIconfig_dir\fR] [\fIfiles\fR...]
+man/man1/postconf.1:12:\fBpostconf\fR [\fB-dhmlnv\fR] [\fB-c \fIconfig_dir\fR]
+man/man1/postconf.1:15:\fBpostconf\fR [\fB-ev\fR] [\fB-c \fIconfig_dir\fR]
+man/man1/postdrop.1:11:\fBpostdrop\fR [\fB-rv\fR] [\fB-c \fIconfig_dir\fR]
+man/man1/postfix.1:12:\fBpostfix\fR [\fB-Dv\fR] [\fB-c \fIconfig_dir\fR] \fIcommand\fR
+man/man1/postkick.1:12:\fBpostkick\fR [\fB-c \fIconfig_dir\fR] [\fB-v\fR]
+man/man1/postlock.1:12:\fBpostlock\fR [\fB-c \fIconfig_dir\fB] [\fB-l \fIlock_style\fB]
+man/man1/postlog.1:12:\fBpostlog\fR [\fB-iv\fR] [\fB-c \fIconfig_dir\fR]
+man/man1/postlog.1:36:\fBerror\fR, \fBfatal\fR, or \fBpanic\fR.
+man/man1/postmap.1:12:\fBpostmap\fR [\fB-Nfinoprsvw\fR] [\fB-c \fIconfig_dir\fR]
+man/man1/postqueue.1:11:\fBpostqueue\fR [\fB-c \fIconfig_dir\fR] \fB-f\fR
+man/man1/postqueue.1:13:\fBpostqueue\fR [\fB-c \fIconfig_dir\fR] \fB-p\fR
+man/man1/postqueue.1:15:\fBpostqueue\fR [\fB-c \fIconfig_dir\fR] \fB-s \fIsite\fR
+man/man1/postsuper.1:12:\fBpostsuper\fR [\fB-psv\fR]
+man/man1/postsuper.1:28:\fBdeferred\fR directories with mail files and the \fBbounce\fR,
+man/man1/postsuper.1:29:\fBdefer\fR, \fBtrace\fR and \fBflush\fR directories with log files.
+man/man1/qshape.1:24:\fBpostfix\fR).
+man/man1/sendmail.1:11:\fBsendmail\fR [\fIoption ...\fR] [\fIrecipient ...\fR]
+man/man1/smtp-source.1:79:port is \fBsmtp\fR.
+man/man5/postconf.5:9:\fBpostconf\fR \fIparameter\fR ...
+man/man5/postconf.5:2438:Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
+man/man5/postconf.5:2444:and \fBvirtual\fR is likely to cause problems when mail is forwarded
+man/man5/postconf.5:4562:is \fBsmtpd\fR, corresponding to a SASL configuration file named
+man/man5/transport.5:117:such as \fBsmtp\fR or \fBlocal\fR. The \fInexthop\fR field
+man/man5/virtual.5:223:Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
+man/man8/anvil.8:11:\fBanvil\fR [generic Postfix daemon options]
+man/man8/bounce.8:11:\fBbounce\fR [generic Postfix daemon options]
+man/man8/cleanup.8:11:\fBcleanup\fR [generic Postfix daemon options]
+man/man8/discard.8:11:\fBdiscard\fR [generic Postfix daemon options]
+man/man8/error.8:11:\fBerror\fR [generic Postfix daemon options]
+man/man8/flush.8:11:\fBflush\fR [generic Postfix daemon options]
+man/man8/lmtp.8:11:\fBlmtp\fR [generic Postfix daemon options]
+man/man8/lmtp.8:38:\fBlmtp\fR in \fBservices\fR(4).
+man/man8/local.8:11:\fBlocal\fR [generic Postfix daemon options]
+man/man8/local.8:33:\fBsendmail\fR-style alias databases.
+man/man8/local.8:34:Users can have \fBsendmail\fR-style ~/.\fBforward\fR files.
+man/man8/master.8:11:\fBmaster\fR [\fB-Dtv\fR] [\fB-c \fIconfig_dir\fR] [\fB-e \fIexit_time\fR]
+man/man8/oqmgr.8:11:\fBoqmgr\fR [generic Postfix daemon options]
+man/man8/pickup.8:11:\fBpickup\fR [generic Postfix daemon options]
+man/man8/pipe.8:11:\fBpipe\fR [generic Postfix daemon options] command_attributes...
+man/man8/proxymap.8:11:\fBproxymap\fR [generic Postfix daemon options]
+man/man8/qmgr.8:11:\fBqmgr\fR [generic Postfix daemon options]
+man/man8/qmqpd.8:11:\fBqmqpd\fR [generic Postfix daemon options]
+man/man8/scache.8:11:\fBscache\fR [generic Postfix daemon options]
+man/man8/showq.8:11:\fBshowq\fR [generic Postfix daemon options]
+man/man8/smtp.8:11:\fBsmtp\fR [generic Postfix daemon options]
+man/man8/smtpd.8:11:\fBsmtpd\fR [generic Postfix daemon options]
+man/man8/spawn.8:11:\fBspawn\fR [generic Postfix daemon options] command_attributes...
+man/man8/tlsmgr.8:11:\fBtlsmgr\fR [generic Postfix daemon options]
+man/man8/trivial-rewrite.8:11:\fBtrivial-rewrite\fR [generic Postfix daemon options]
+man/man8/trivial-rewrite.8:31:the \fBlocal\fR address rewriting context. This prevents
+man/man8/verify.8:11:\fBverify\fR [generic Postfix daemon options]
+man/man8/virtual.8:11:\fBvirtual\fR [generic Postfix daemon options]
+man/man5/aliases.5:140:\fBvirtual\fR, \fBalias\fR, \fBforward\fR, or \fBinclude\fR.
+man/man5/canonical.5:170:Specify zero or more of \fBcanonical\fR, \fBvirtual\fR, \fBalias\fR,
+man/man8/bounce.8:19:\fBbounce\fR, \fBdefer\fR or \fBtrace\fR).
+man/man1/postfix.1:80:.IP "\fB-D\fR (with \fBpostfix start\fR only)"
+man/man5/postconf.5:2340:.IP "\fBbounce\fR (also implies \fB2bounce\fR)"
+man/man1/postfix.1:44:.IP \fBflush\fR 
+man/man8/oqmgr.8:55:.IP \fBbounce\fR 
+man/man8/qmgr.8:55:.IP \fBbounce\fR 
+man/man8/trivial-rewrite.8:21:.IP \fBlocal\fR 
diff --git a/postfix/mantools/manspell b/postfix/mantools/manspell
new file mode 100644
index 000000000..6fa43d980
--- /dev/null
+++ b/postfix/mantools/manspell
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for file
+do
+    echo ==== $file ====
+    deroff $file | spell
+done | fgrep -vf proto/stop
diff --git a/postfix/mantools/postconf2man b/postfix/mantools/postconf2man
index bd4fe7aae..acb182f35 100755
--- a/postfix/mantools/postconf2man
+++ b/postfix/mantools/postconf2man
@@ -72,6 +72,7 @@ while(<>) {
     $block =~ s/&/\&/g;
     $block =~ s/\s+\n/\n/g;
     $block =~ s/^\n//g;
+    $block =~ s/([a-z][_a-zA-Z0-9-]*)(\([0-9]\))/\\fB\1\\fR\2/g;
     print $block;
     $wantpp = !($block =~ /^\.(SH|IP)/);
 }
diff --git a/postfix/mantools/postlink b/postfix/mantools/postlink
index 1d33914c6..78675dc75 100755
--- a/postfix/mantools/postlink
+++ b/postfix/mantools/postlink
@@ -153,6 +153,7 @@ while (<>) {
     s;\bdupli[-]*\n* *[]*cate_filter_limit\b;$&;g;
     s;\bempty_address_recip[-]*\n* *[]*ient\b;$&;g;
     s;\benable_original_recip[-]*\n* *[]*ient\b;$&;g;
+    s;\benable_errors_to\b;$&;g;
     s;\berror_notice_recip[-]*\n* *[]*ient\b;$&;g;
     s;\berror_service_name\b;$&;g;
     s;\bexpand_owner_alias\b;$&;g;
@@ -509,7 +510,7 @@ while (<>) {
     s/[]*bounce[<\/bB>]*\(8\)/$&<\/a>/g;
     s/[]*cleanup[<\/bB>]*\(8\)/$&<\/a>/g;
     s/[]*defer[<\/bB>]*\(8\)/$&<\/a>/g;
-    s/[]*discard[<\/bB>]*\(8\)/$&<\/a>/g;
+    s/[]*dis[-<\/bB>]*\n* *[]*card[<\/bB>]*\(8\)/$&<\/a>/g;
     s/[]*error[<\/bB>]*\(8\)/$&<\/a>/g;
     s/[]*flush[<\/bB>]*\(8\)/$&<\/a>/g;
     s/[]*lmtp[<\/bB>]*\(8\)/$&<\/a>/g;
@@ -564,8 +565,8 @@ while (<>) {
     s/[]*scache[<\/bB>]*\(8\)/$&<\/a>/g;
     s/[]*trans[-<\/bB>]*\n*[ ]*port[<\/bB>]*\(5\)/$&<\/a>/g;
     s/[]*verify[<\/bB>]*\(8\)/$&<\/a>/g;
-    s/[]*virtual[<\/bB>]*\(5\)/$&<\/a>/g;
-    s/[]*virtual[<\/bB>]*\(8\)/$&<\/a>/g;
+    s/[]*vir[-<\/bB>]*\n*[ ]*tual[<\/bB>]*\(5\)/$&<\/a>/g;
+    s/[]*vir[-<\/bB>]*\n*[ ]*tual[<\/bB>]*\(8\)/$&<\/a>/g;
     s/[]*cidr_table[<\/bB>]*\(5\)/$&<\/a>/g;
     s/[]*tcp_table[<\/bB>]*\(5\)/$&<\/a>/g;
     s/[]*body_checks[<\/bB>]*\(5\)/$&<\/a>/g;
diff --git a/postfix/proto/DATABASE_README.html b/postfix/proto/DATABASE_README.html
index ecbcfe0a5..ab2cf804f 100644
--- a/postfix/proto/DATABASE_README.html
+++ b/postfix/proto/DATABASE_README.html
@@ -363,8 +363,8 @@ example, the lookup table "static:foobar" always returns the string
 described in tcp_table(5). The lookup table name is "tcp:host:port"
 where "host" specifies a symbolic hostname or a numeric IP address,
 and "port" specifies a symbolic service name or a numeric port
-number. This protocol is not available in Postfix version 2.1.
-
+number. This protocol is not available up to and including Postfix
+version 2.2.  
 
 
         unix (read-only) 
        
 
diff --git a/postfix/proto/INSTALL.html b/postfix/proto/INSTALL.html
index 7c3431b87..fe706d2cf 100644
--- a/postfix/proto/INSTALL.html
+++ b/postfix/proto/INSTALL.html
@@ -156,7 +156,7 @@ OPENSTEP 4.x 
        
 OSF1.V3 - OSF1.V5 (Digital UNIX) 
        
 Reliant UNIX 5.x 
        
 Rhapsody 5.x 
        
-SunOS 4.1.4 (April 2004) 
        
+SunOS 4.1.4 (February 2005) 
        
 SunOS 5.4 - 5.9 (Solaris 2.4..9) 
        
 Ultrix 4.x (well, that was long ago) 
        
 
        
diff --git a/postfix/proto/IPV6_README.html b/postfix/proto/IPV6_README.html
index 88cf5808b..a16d581be 100644
--- a/postfix/proto/IPV6_README.html
+++ b/postfix/proto/IPV6_README.html
@@ -21,13 +21,21 @@ IPv6 Support
 
        Introduction
        
 
 
         Postfix 2.2 introduces support for the IPv6 (IP version 6)
-protocol, whose main feature of interest is that it uses 128-bit
-IP addresses instead of the 32-bit addresses used by IPv4.  
        
-
-
         With this, Postfix can use the same SMTP protocol over IPv6 as
-it already uses over the older IPv4 network, and Postfix can do
-AAAA record lookups in the DNS in addition to the older A records.
-Information about IPv6 can be found at http://www.ipv6.org/. 
        
+protocol. IPv6 support older Postfix versions was available as an
+add-on patch. The section "        Compatibility with
+Postfix <2.2 IPv6 support" below discusses the differences
+between these implementations. 
        
+
+
         The main feature of interest is that IPv6 uses 128-bit IP
+addresses instead of the 32-bit addresses used by IPv4. It can
+therefore accomodate a much larger number of hosts and networks
+without ugly kluges such as NAT. A side benefit of the much larger
+address space is that it makes network scanning unpractical.  
        
+
+
         Postfix uses the same SMTP protocol over IPv6 as it already
+uses over the older IPv4 network, and does AAAA record lookups in
+the DNS in addition to the older A records.  Information about IPv6
+can be found at http://www.ipv6.org/. 
        
 
 
         This document provides information on the following topics:
 
        
@@ -76,21 +84,22 @@ IPv6 support to other environments.  
        
 
 
         Postfix IPv6 support introduces two new main.cf configuration
 parameters, and introduces an important change in address syntax
-notation in match lists such as mynetworks or
-debug_peer_list. 
        
+notation in match lists such as mynetworks or
+debug_peer_list. 
        
 
 
         Postfix IPv6 address syntax is a little tricky, because there
-are a few places where you must enclose IPv6 address inside
-[] characters, and a few places where you must not. It is
-a good idea to use [] only in the few places where you
+are a few places where you must enclose an IPv6 address inside
+"[]" characters, and a few places where you must not. It is
+a good idea to use "[]" only in the few places where you
 have to. Check out the postconf(5) manual whenever you do IPv6
 related configuration work with Postfix.  
        
 
 
          
 
-
        •  
           The new inet_protocols parameter specifies what
-IP protocols Postfix will use.  This parameter also controls what
-DNS lookups Postfix will do. 
          
+
        •  
           The first new parameter is called inet_protocols.  This
+specifies what protocols Postfix will use when it makes or accepts
+network connections, and also controls what DNS lookups Postfix
+will use when it makes network connections.  
          
 
 
          
 
          @@ -118,7 +127,7 @@ default. Any attempt to use it would fail immediately. 
          
 
        
 
 
         Note 1: you must stop and start Postfix after changing the
-inet_protocols configuration parameter. 
        
+inet_protocols configuration parameter. 
        
 
 
         Note 2: if you see error messages like the following, then
 you're running Linux and need to turn on IPv6 in the kernel: see
@@ -134,15 +143,15 @@ postconf: warning: inet_protocols: configuring for IPv4 support only
 
      
 
 
       Note 3: on older Linux and Solaris systems, the setting
-"inet_protocols = ipv6" will not prevent Postfix from
+"inet_protocols = ipv6" will not prevent Postfix from
 accepting IPv4 connections.  Postfix will present the client IP
 addresses in IPv6 format, though. In all other cases, Postfix always
 presents IPv4 client IP addresses in the traditional dotted quad
 IPv4 format.  
      
 
-
    •  
       The other new parameter is smtp_bind_address6.
+
    •  
       The other new parameter is smtp_bind_address6.
 This sets the local interface address for outgoing IPv6 SMTP
-connections, just like the smtp_bind_address parameter
+connections, just like the smtp_bind_address parameter
 does for IPv4: 
      
 
 
      
@@ -152,8 +161,8 @@ does for IPv4: 
      
 
      • 
 
      
 
-
    •  
       If you left the value of the mynetworks parameter at its
-default (i.e. no mynetworks setting in main.cf) Postfix will figure
+
    •  
       If you left the value of the mynetworks parameter at its
+default (i.e. no mynetworks setting in main.cf) Postfix will figure
 out by itself what its network addresses are. This is what a typical
 setting looks like: 
      
 
@@ -164,10 +173,10 @@ mynetworks = 127.0.0.0/8 168.100.189.0/28 [::1]/128 [fe80::]/10 [2001:240:5c7::]
    • -

    If you did specify the mynetworks parameter value in -main.cf, you need update the mynetworks value to include +

    If you did specify the mynetworks parameter value in +main.cf, you need update the mynetworks value to include the IPv6 networks the system is in. Be sure to specify IPv6 address -information inside [], like this:

    +information inside "[]", like this: 

    @@ -179,8 +188,8 @@ information inside [], like this: 
    
 
 
 
      NOTE: when configuring Postfix match lists such as
-mynetworks or debug_peer_list, you must specify
-IPv6 address information inside [] in the main.cf parameter
+mynetworks or debug_peer_list, you must specify
+IPv6 address information inside "[]" in the main.cf parameter
 value and in files specified with a "/file/name" pattern.
 IPv6 addresses contain the ":" character, and would otherwise be
 confused with a "type:table" pattern.   
    
@@ -197,13 +206,14 @@ blackhole list) lookups for IPv6 client IP addresses; currently
 there are no blacklists that cover the IPv6 address space. 
    
 
 
  •  
     IPv6 does not have class A, B, C, etc. networks. With IPv6
-networks, the setting "mynetworks_style = class" has the
-same effect as the setting "mynetworks_style = subnet".
+networks, the setting "mynetworks_style = class" has the
+same effect as the setting "mynetworks_style = subnet".
 
    
 
-
  •  
     On Tru64Unix, Postfix can't figure out the local subnet mask
+
  •  
     On Tru64Unix and AIX, Postfix can't figure out the local
+subnet mask
 and always assumes a /128 network. This is a problem only with
-"mynetworks_style = subnet" and no explicit mynetworks
+"mynetworks_style = subnet" and no explicit mynetworks
 setting in main.cf. 
    
 
 
@@ -216,28 +226,28 @@ by Dean Strik and others, but differs in a few minor ways. 
    
 
 
      
 
-
    •  
       main.cf: The inet_interfaces parameter does not support
-the notation  "ipv6:all" or "ipv4:all". Use the
-inet_protocols parameter instead. 
      
+
    •  
       main.cf: The inet_interfaces parameter does not support
+the notation  "ipv6:all" or "ipv4:all". Use the
+inet_protocols parameter instead. 
      
 
-
    •  
       main.cf: Specify "inet_protocols = all" or
-"inet_protocols = ipv4, ipv6" in order to enable both IPv4
+
    •  
       main.cf: Specify "inet_protocols = all" or
+"inet_protocols = ipv4, ipv6" in order to enable both IPv4
 and IPv6 support. 
      
 
-
    •  
       main.cf: The inet_protocols parameter also controls
+
    •  
       main.cf: The inet_protocols parameter also controls
 what DNS lookups Postfix will attempt to make when delivering or
 receiving mail. 
      
 
-
    •  
       main.cf: Specify "inet_interfaces = loopback-only"
+
    •  
       main.cf: Specify "inet_interfaces = loopback-only"
 to listen on loopback network interfaces only. 
      
 
-
    •  
       The lmtp_bind_address and lmtp_bind_address6
+
    •  
       The lmtp_bind_address and lmtp_bind_address6
 features were omitted. The Postfix LMTP client will be absorbed
 into the SMTP client, so there is no reason to keep adding features
 to the LMTP client. 
      
 
 
    •  
       The SMTP server now requires that IPv6 addresses in SMTP
-commands are specified as [ipv6:ipv6address], as
+commands are specified as [ipv6:ipv6address], as
 described in RFC 2821. 
      
 
 
    •  
       The IPv6 network address matching code was rewritten from
@@ -258,9 +268,9 @@ following steps: 
      
 Postfix needs this information to avoid mailer loops and to find out
 if mail for user@[ipaddress] is a local or remote destination. 
      
 
-
       If your system has the getifaddrs() routine then add
+
       If your system has the getifaddrs() routine then add
 the following to your platform-specific section in
-src/util/sys_defs.h:  
      
+src/util/sys_defs.h:  
      
 
 
      
 
      @@ -271,9 +281,9 @@ the following to your platform-specific section in
 
      
 
      
 
-
       Otherwise, if your system has the SIOCGLIF ioctl()
-command in /usr/include/*/*.h, add the following to your
-platform-specific section in src/util/sys_defs.h: 
      
+
       Otherwise, if your system has the SIOCGLIF ioctl()
+command in /usr/include/*/*.h, add the following to your
+platform-specific section in src/util/sys_defs.h: 
      
 
 
      
 
      @@ -286,9 +296,9 @@ platform-specific section in src/util/sys_defs.h: 
      
 
 
       Otherwise, Postfix will have to use the old SIOCGIF commands
 and get along with reduced IPv6 functionality (it won't be able to
-figure out your IPv6 netmasks, which are needed for "mynetworks_style
-= subnet". Add this to your platform-specific section in
-src/util/sys_defs.h: 
      
+figure out your IPv6 netmasks, which are needed for "mynetworks_style
+= subnet". Add this to your platform-specific section in
+src/util/sys_defs.h: 
      
 
 
      
 
      @@ -301,7 +311,7 @@ figure out your IPv6 netmasks, which are needed for "mynetworks_style
 
    •  
       Test if Postfix can figure out its interface information. 
      
 
 
       After compiling Postfix in the usual manner, step into the
-src/util directory and type "make inet_addr_local".
+src/util directory and type "make inet_addr_local".
 Running this file by hand should produce all the interface addresses
 and network masks, for example: 
      
 
diff --git a/postfix/proto/OVERVIEW.html b/postfix/proto/OVERVIEW.html
index 7429f6ece..ddb2ad631 100644
--- a/postfix/proto/OVERVIEW.html
+++ b/postfix/proto/OVERVIEW.html
@@ -449,7 +449,7 @@ postfix-script(1)  
 request rate
 limiting for all smtpd(8) servers.  The TUNING_README document
 provides guidance for dealing with mis-behaving SMTP clients. The
-anvil(8) service is not included with Postfix version 2.1 or earlier.
+anvil(8) service is available in Postfix version 2.2 and later.
 
      
 
 
@@ -592,7 +592,7 @@ client or smtpd(8) server. This process has two duties: 
    •  
       Maintain the pseudo-random number generator (PRNG) that
 is used to seed the TLS engines in Postfix smtp(8) client or smtpd(8)
-server processes.  The state of this PRNG is saved periodically to
+server processes.  The state of this PRNG is periodically saved to
 a file, and is read when tlsmgr(8) starts up. 
      
 
 
    •  
       Maintain the optional Postfix smtp(8) client or smtpd(8)
diff --git a/postfix/proto/TLS_README.html b/postfix/proto/TLS_README.html
index 395ea4e6a..c284b7513 100644
--- a/postfix/proto/TLS_README.html
+++ b/postfix/proto/TLS_README.html
@@ -27,16 +27,55 @@ code.  Assuming that OpenSSL is written as carefully as Wietse's
 own code, every 1000 lines introduce one additional bug into
 Postfix.  
      
 
-
       Introduction 
      
+
       What Postfix TLS support does for you 
      
 
-
       This document requires Postfix version 2.2 or later. 
      
-
-
       Postfix may be built with Transport Layer Security (TLS, formerly
-called SSL) protocol support as described in RFC 3207. This provides
-certificate-based authentication, and encrypted sessions.  An
+
       Transport Layer Security (TLS, formerly called SSL) provides
+certificate-based authentication and encrypted sessions.  An
 encrypted session protects the information that is transmitted with
-SMTP mail or with SASL authentication.  The main elements of the
-Postfix TLS architecture are:  
      
+SMTP mail or with SASL authentication.
+
+
       Postfix version 2.2 introduces support for TLS as described in
+RFC 3207.  TLS Support for older Postfix versions was available as
+an add-on patch.  The section "Compatibility with
+Postfix < 2.2 TLS support" below discusses the differences
+between these implementations.  
      
+
+
       Topics covered in this document: 
      
+
+
+
+
       And last but not least, for the impatient: 
      
+
+
+
+
      How Postfix TLS support works
      
+
+
       The diagram below shows the main elements of the Postfix TLS
+architecture and their relationships.  Colored boxes with numbered
+names represent Postfix daemon programs. Other colored boxes
+represent storage elements. 
      
 
 
        
 
@@ -48,14 +87,11 @@ side. 
        
 
 
      •  
         The tlsmgr(8) server maintains the pseudo-random number
 generator (PRNG) that seeds the TLS engines in the smtpd(8) server
-and smtp(8) client processes, and maintains the TLS session cache
-files with TLS session keys. 
        
+and smtp(8) client processes, and maintains the TLS session key
+cache files. 
        
 
 
      
 
-
       The following diagram shows the relationship between these
-architecture elements. 
      
-
 
      • 
 
 
      
 
 
       Network->    
       tlsmgr(8) 
       
          
 
    
-smtpd
       session
       cache     session
       key cache     PRNG
       state 
      file     smtp
       session
       cache 
+align="center" bgcolor="#f0f0ff"> smtp
       session
       key cache
+
 
   
 
 
 
-
       Topics covered in this document: 
      
-
-
-
-
       And last but not least, for the impatient: 
      
-
-
-
 
      Building Postfix with TLS support
      
 
 
       To build Postfix with TLS support, first we need to generate
@@ -1407,22 +1416,22 @@ patch by Lutz Jänicke, but differs in a few minor ways. 
      
 
 
        
 
-
      •  
         main.cf: Use btree instead of sdbm for TLS
+
      •  
         main.cf: Specify "btree" instead of "sdbm" for TLS
 session cache databases. 
        
 
 
         TLS session cache databases are now accessed only by the
 tlsmgr(8) process, so there are no more concurrency issues. Although
-Postfix has an sdbm client, the sdbm library (1000
+Postfix has an sdbm client, the sdbm library (1000
 lines of code) is not included with Postfix. 
        
 
 
         TLS session caches can use any database that can store objects
 of several kbytes or more, and that implements the sequence operation.
-In most cases, btree databases should be adequate.  
        
+In most cases, btree databases should be adequate.  
        
 
-
         NOTE:  You cannot use dbm databases. TLS session objects
+
         NOTE:  You cannot use dbm databases. TLS session objects
 are too large. 
        
 
-
      •  
         master.cf: Specify unix instead of fifo as
+
      •  
         master.cf: Specify "unix" instead of "fifo" as
 the tlsmgr service type. 
        
 
 
         The smtp(8) and smtpd(8) processes now use a client-server
diff --git a/postfix/proto/access b/postfix/proto/access
index cadcfdb81..405ba1f3f 100644
--- a/postfix/proto/access
+++ b/postfix/proto/access
@@ -2,7 +2,7 @@
 # NAME
 #	access 5
 # SUMMARY
-#	format of Postfix access table
+#	Postfix access table format
 # SYNOPSIS
 #	\fBpostmap /etc/postfix/access\fR
 #
@@ -10,7 +10,7 @@
 #
 #	\fBpostmap -q - /etc/postfix/access <\fIinputfile\fR
 # DESCRIPTION
-#	The optional \fBaccess\fR table directs the Postfix SMTP server
+#	The optional \fBaccess\fR(5) table directs the Postfix SMTP server
 #	to selectively reject or accept mail. Access can be allowed or
 #	denied for specific host names, domain names, networks, host
 #	addresses or mail addresses.
@@ -18,7 +18,7 @@
 #	For an example, see the EXAMPLE section at the end of this
 #	manual page.
 #
-#	Normally, the \fBaccess\fR table is specified as a text file
+#	Normally, the \fBaccess\fR(5) table is specified as a text file
 #	that serves as input to the \fBpostmap\fR(1) command.
 #	The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
 #	is used for fast searching by the mail system. Execute the command
@@ -110,7 +110,7 @@
 #	Address information must not be enclosed with "[]" characters.
 #
 #	NOTE 2: use the \fBcidr\fR lookup table type to specify
-#	network/netmask patterns. See cidr_table(5) for details.
+#	network/netmask patterns. See \fBcidr_table\fR(5) for details.
 # .IP \fInet:work:addr:ess\fR
 # .IP \fInet:work:addr\fR
 # .IP \fInet:work\fR
@@ -133,7 +133,7 @@
 #	Address information must not be enclosed with "[]" characters.
 #
 #	NOTE 3: use the \fBcidr\fR lookup table type to specify
-#	network/netmask patterns. See cidr_table(5) for details.
+#	network/netmask patterns. See \fBcidr_table\fR(5) for details.
 #
 #	IPv6 support is available in Postfix 2.2 and later.
 # ACCEPT ACTIONS
@@ -194,7 +194,8 @@
 # .IP "\fBFILTER \fItransport:destination\fR"
 #	After the message is queued, send the entire message through
 #       the specified external content filter. The \fItransport:destination\fR
-#	syntax is described in the transport(5) manual page.  More information
+#	syntax is described in the \fBtransport\fR(5) manual page.
+#	More information
 #	about external content filters is in the Postfix FILTER_README file.
 # .sp
 #	Note: this action overrides the \fBmain.cf content_filter\fR setting,
@@ -267,7 +268,7 @@
 #	This section describes how the table lookups change when lookups
 #	are directed to a TCP-based server. For a description of the TCP
 #	client/server lookup protocol, see \fBtcp_table\fR(5).
-#	This feature is not available in Postfix version 2.1.
+#	This feature is not available up to and including Postfix version 2.2.
 #
 #	Each lookup operation uses the entire query string once.
 #	Depending on the application, that string is an entire client
diff --git a/postfix/proto/aliases b/postfix/proto/aliases
index 1abbddc13..d7d18c035 100644
--- a/postfix/proto/aliases
+++ b/postfix/proto/aliases
@@ -2,16 +2,16 @@
 # NAME
 #	aliases 5
 # SUMMARY
-#	format of the Postfix alias database
+#	Postfix local alias database format
 # SYNOPSIS
 # .fi
 #	\fBnewaliases\fR
 # DESCRIPTION
-#	The \fBaliases\fR table provides a system-wide mechanism to
+#	The \fBaliases\fR(5) table provides a system-wide mechanism to
 #	redirect mail for local recipients. The redirections are
 #	processed by the Postfix \fBlocal\fR(8) delivery agent.
 #
-#	Normally, the \fBaliases\fR table is specified as a text file
+#	Normally, the \fBaliases\fR(5) table is specified as a text file
 #	that serves as input to the \fBpostalias\fR(1) command. The
 #	result, an indexed file in \fBdbm\fR or \fBdb\fR format, is
 #	used for fast lookup by the mail system. Execute the command
@@ -25,7 +25,7 @@
 #	Users can control delivery of their own mail by setting
 #	up \fB.forward\fR files in their home directory.
 #	Lines in per-user \fB.forward\fR files have the same syntax
-#	as the right-hand side of \fBaliases\fR entries.
+#	as the right-hand side of \fBaliases\fR(5) entries.
 #
 #	The format of the alias database input file is as follows:
 # .IP \(bu
@@ -107,7 +107,7 @@
 # .fi
 #	The following \fBmain.cf\fR parameters are especially relevant.
 #	The text below provides only a parameter summary. See
-#	postconf(5) for more details including examples.
+#	\fBpostconf\fR(5) for more details including examples.
 # .IP \fBalias_database\fR
 #	List of alias databases that are updated by the
 #	\fBnewaliases\fR(1) command.
diff --git a/postfix/proto/canonical b/postfix/proto/canonical
index 9ba1d3015..93916ee60 100644
--- a/postfix/proto/canonical
+++ b/postfix/proto/canonical
@@ -2,7 +2,7 @@
 # NAME
 #	canonical 5
 # SUMMARY
-#	format of Postfix canonical table
+#	Postfix canonical table format
 # SYNOPSIS
 #	\fBpostmap /etc/postfix/canonical\fR
 #
@@ -10,15 +10,15 @@
 #
 #	\fBpostmap -q - /etc/postfix/canonical <\fIinputfile\fR
 # DESCRIPTION
-#	The optional \fBcanonical\fR table specifies an address mapping for
+#	The optional \fBcanonical\fR(5) table specifies an address mapping for
 #	local and non-local addresses. The mapping is used by the
 #	\fBcleanup\fR(8) daemon.  The address mapping is recursive.
 #
-#	Normally, the \fBcanonical\fR table is specified as a text file
+#	Normally, the \fBcanonical\fR(5) table is specified as a text file
 #	that serves as input to the \fBpostmap\fR(1) command.
 #	The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
 #	is used for fast searching by the mail system. Execute the command
-#	\fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
+#	"\fBpostmap /etc/postfix/canonical\fR" in order to rebuild the indexed
 #	file after changing the text file.
 #
 #	When the table is provided via other means such as NIS, LDAP
@@ -30,26 +30,26 @@
 #	done in a slightly different way as described below under
 #	"REGULAR EXPRESSION TABLES" and "TCP-BASED TABLES".
 #
-#	By default the \fBcanonical\fR mapping affects both message
+#	By default the \fBcanonical\fR(5) mapping affects both message
 #	header addresses (i.e. addresses that appear inside messages)
 #	and message envelope addresses (for example, the addresses
 #	that are used in SMTP protocol commands). Think Sendmail
 #	rule set \fBS3\fR, if you like.  This is controlled with
 #	the \fBcanonical_classes\fR parameter.
 #
-#	Typically, one would use the \fBcanonical\fR table to replace login
+#	Typically, one would use the \fBcanonical\fR(5) table to replace login
 #	names by \fIFirstname.Lastname\fR, or to clean up addresses produced
 #	by legacy mail systems.
 #
-#	The \fBcanonical\fR mapping is not to be confused with \fIvirtual
+#	The \fBcanonical\fR(5) mapping is not to be confused with \fIvirtual
 #	domain\fR support. Use the \fBvirtual\fR(5) map for that purpose.
 #
-#	The \fBcanonical\fR mapping is not to be confused with local aliasing.
+#	The \fBcanonical\fR(5) mapping is not to be confused with local aliasing.
 #	Use the \fBaliases\fR(5) map for that purpose.
 # TABLE FORMAT
 # .ad
 # .fi
-#	The input format for the \fBpostmap\fR(1) command is as follows:
+make#	The input format for the \fBpostmap\fR(1) command is as follows:
 # .IP "\fIpattern result\fR"
 #	When \fIpattern\fR matches a mail address, replace it by the
 #	corresponding \fIresult\fR.
@@ -120,7 +120,7 @@
 #	This section describes how the table lookups change when lookups
 #	are directed to a TCP-based server. For a description of the TCP
 #	client/server lookup protocol, see \fBtcp_table\fR(5).
-#	This feature is not available in Postfix version 2.1.
+#	This feature is not available up to and including Postfix version 2.2.
 #	
 #	Each lookup operation uses the entire address once.  Thus,
 #	\fIuser@domain\fR mail addresses are not broken up into their
@@ -135,7 +135,7 @@
 # .fi
 #	The following \fBmain.cf\fR parameters are especially relevant.  
 #	The text below provides only a parameter summary. See
-#	postconf(5) for more details including examples.
+#	\fBpostconf\fR(5) for more details including examples.
 # .IP \fBcanonical_classes\fR
 #	What addresses are subject to canonical address mapping.
 # .IP \fBcanonical_maps\fR
diff --git a/postfix/proto/cidr_table b/postfix/proto/cidr_table
index 7e9cef1a9..341f516a9 100644
--- a/postfix/proto/cidr_table
+++ b/postfix/proto/cidr_table
@@ -14,9 +14,9 @@
 #	(Classless Inter-Domain Routing) form.
 #
 #	To find out what types of lookup tables your Postfix system
-#	supports use the \fBpostconf -m\fR command.
+#	supports use the "\fBpostconf -m\fR" command.
 #
-#	To test lookup tables, use the \fBpostmap\fR command as
+#	To test lookup tables, use the "\fBpostmap -q\fR" command as
 #	described in the SYNOPSIS above.
 # TABLE FORMAT
 # .ad
@@ -68,8 +68,8 @@
 # .in -4
 # SEE ALSO
 #	postmap(1), Postfix lookup table manager
-#	regexp_table(5) format of regular expression tables
-#	pcre_table(5) format of PCRE tables
+#	regexp_table(5), format of regular expression tables
+#	pcre_table(5), format of PCRE tables
 # README FILES
 # .ad
 # .fi
diff --git a/postfix/proto/header_checks b/postfix/proto/header_checks
index db78644d2..289acac25 100644
--- a/postfix/proto/header_checks
+++ b/postfix/proto/header_checks
@@ -62,7 +62,7 @@
 #	best performance is obtained with \fBpcre\fR (Perl Compatible Regular
 #	Expression) tables, but the slower \fBregexp\fR (POSIX regular
 #	expressions) support is more widely available.
-#	Use the command \fBpostconf -m\fR to find out what lookup table
+#	Use the command "\fBpostconf -m\fR" to find out what lookup table
 #	types your Postfix system supports.
 #
 #	The general format of Postfix regular expression tables is
@@ -107,9 +107,10 @@
 # .fi
 #	Substitution of substrings from the matched expression into the
 #	\fIaction\fR
-#	string is possible using the conventional Perl syntax ($1, $2, etc.).
-#	The macros in the result string may need to be written as ${n}
-#	or $(n) if they aren't followed by whitespace.
+#	string is possible using the conventional Perl syntax
+#	(\fB$1\fR, \fB$2\fR, etc.).
+#	The macros in the result string may need to be written as \fB${n}\fR
+#	or \fB$(n)\fR if they aren't followed by whitespace.
 #
 #	Note: since negated patterns (those preceded by \fB!\fR) return a
 #	result when the expression does not match, substitutions are not
@@ -173,12 +174,18 @@
 #	Prepend one line with the specified text and inspect the next
 #	input line.
 # .sp
-#	Note: the prepended text is output immediately before the
-#	input that triggered the \fBPREPEND\fR action. A body action
-#	cannot prepend a message header.
-# .sp
-#	Note: this action cannot be used to prepend multi-line text.
-# .sp
+#	Notes: 
+# .RS
+# .IP \(bu
+#	The prepended text is output on a separate line, immediately
+#	before the input that triggered the \fBPREPEND\fR action.
+# .IP \(bu
+#	When prepending text before a message header line, the prepended
+#	text must begin with a valid message header label.
+# .IP \(bu
+#	This action cannot be used to prepend multi-line text.
+# .RE
+# .IP
 #	This feature is available in Postfix 2.1 and later.
 # .IP "\fBREDIRECT \fIuser@domain\fR"
 #	Write a message redirection request to the queue file and
@@ -191,6 +198,14 @@
 #	fire, only the last one is executed.
 # .sp
 #	This feature is available in Postfix 2.1 and later.
+# .IP "\fBREPLACE \fItext...\fR"
+#	Replace the current line with the specified text and inspect the next
+#	input line.
+# .sp
+#	Note: when replacing a message header line, the replacement text
+#	must begin with a valid header label.
+# .sp
+#	This feature is available in Postfix 2.2 and later.
 # .IP "\fBREJECT \fIoptional text...\fR
 #	Reject the entire message. Reply with \fIoptional text...\fR when
 #	the optional text is specified, otherwise reply with a generic error
diff --git a/postfix/proto/master b/postfix/proto/master
index 2ea8235ba..bc037dfa9 100644
--- a/postfix/proto/master
+++ b/postfix/proto/master
@@ -104,7 +104,7 @@
 #	configuration variable in the main.cf file).
 # .sp
 #	Chroot should not be used with the \fBlocal\fR(8),
-#	\fBpipe\fR(8), \fBspawn\fR(8), and virtual(8) daemons.
+#	\fBpipe\fR(8), \fBspawn\fR(8), and \fBvirtual\fR(8) daemons.
 #	Although the
 #	\fBproxymap\fR(8) server can run chrooted, doing so defeats
 #	most of the purpose of having that service in the first
diff --git a/postfix/proto/nisplus_table b/postfix/proto/nisplus_table
index 9ae21966f..268b8bcdc 100644
--- a/postfix/proto/nisplus_table
+++ b/postfix/proto/nisplus_table
@@ -16,7 +16,7 @@
 #	To find out what types of lookup tables your Postfix system
 #	supports use the "\fBpostconf -m\fR" command.
 #
-#	To test Postfix NIS+ lookup tables, use the \fBpostmap\fR
+#	To test Postfix NIS+ lookup tables, use the "\fBpostmap -q\fR"
 #	command as described in the SYNOPSIS above.
 # QUERY SYNTAX
 # .ad
diff --git a/postfix/proto/pcre_table b/postfix/proto/pcre_table
index 9c836d054..55eaa2b59 100644
--- a/postfix/proto/pcre_table
+++ b/postfix/proto/pcre_table
@@ -18,9 +18,9 @@
 #	corresponding result is returned.
 #
 #	To find out what types of lookup tables your Postfix system
-#	supports use the \fBpostconf -m\fR command.
+#	supports use the "\fBpostconf -m\fR" command.
 #
-#	To test lookup tables, use the \fBpostmap -fq\fR command as
+#	To test lookup tables, use the "\fBpostmap -fq\fR" command as
 #	described in the SYNOPSIS above.
 # TABLE FORMAT
 # .ad
diff --git a/postfix/proto/postconf.html.prolog b/postfix/proto/postconf.html.prolog
index b80ecaaa4..9efb2372a 100644
--- a/postfix/proto/postconf.html.prolog
+++ b/postfix/proto/postconf.html.prolog
@@ -64,7 +64,7 @@ not matter. 
        
 
         The remainder of this document is a description of all Postfix
 configuration parameters. Default values are shown after the
 parameter name in parentheses, and can be looked up with the
-postconf -d command. 
        
+"postconf -d" command. 
        
 
 
         Note: this is not an invitation to make changes to Postfix
 configuration parameters. Unnecessary changes are likely to impair
diff --git a/postfix/proto/postconf.man.epilog b/postfix/proto/postconf.man.epilog
index fedf47b1e..d6c20b8c4 100644
--- a/postfix/proto/postconf.man.epilog
+++ b/postfix/proto/postconf.man.epilog
@@ -1,8 +1,8 @@
 .SH SEE ALSO
 .na
 .nf
-postconf(1) Postfix configuration parameter maintenance
-master(5) Postfix daemon configuration maintenance
+postconf(1), Postfix configuration parameter maintenance
+master(5), Postfix daemon configuration maintenance
 .SH LICENSE
 .ad
 .fi
diff --git a/postfix/proto/postconf.man.prolog b/postfix/proto/postconf.man.prolog
index 76438a80d..702d3206e 100644
--- a/postfix/proto/postconf.man.prolog
+++ b/postfix/proto/postconf.man.prolog
@@ -50,7 +50,7 @@ Otherwise, the order of main.cf parameter definitions does not matter.
 The remainder of this document is a description of all Postfix
 configuration parameters. Default values are shown after the 
 parameter name in parentheses, and can be looked up with the
-\fBpostconf -d\fR command. 
+"\fBpostconf -d\fR" command. 
 .PP
 Note: this is not an invitation to make changes to Postfix
 configuration parameters. Unnecessary changes can impair the
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 9db5ca23d..e610373a9 100644
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -614,7 +614,7 @@ notification with the UNIX command "biff y".
 
        
 For compatibility reasons this feature is on by default.  On systems
 with lots of interactive users, the biff service can be a performance
-drain.  Specify "biff = no" to disable.
+drain.  Specify "biff = no" in main.cf to disable.
 
        
 
 %PARAM body_checks 
@@ -941,7 +941,7 @@ The template is subject to exactly one level of $name substitution:
 
 
        $client_name
        
 
-
        The client hostname or "unknown". 
        
+
        The client hostname or "unknown". 
        
 
 
        $helo_name
        
 
@@ -1187,12 +1187,12 @@ is unavailable. 
        
 
 
          
 
-
        •  In main.cf specify "relay_transport = relay",
+
        •  In main.cf specify "relay_transport = relay",
 
-
        •  In master.cf specify "-o fallback_relay =" at the
-end of the relay entry.
+
        •  In master.cf specify "-o fallback_relay =" (i.e., empty) at
+the end of the relay entry.
 
-
        •  In transport maps, specify "relay:nexthop..."
+
        •  In transport maps, specify "relay:nexthop..."
 as the right-hand side for backup or primary MX domain entries.
 
 
        
@@ -1222,7 +1222,8 @@ lookup table is matched when the domain or its parent domain appears
 as lookup key.  
        
 
 
        
-Specify "fast_flush_domains =" to disable the feature altogether.
+Specify "fast_flush_domains =" (i.e., empty) to disable the feature
+altogether.
 
        
 
 %PARAM fast_flush_purge_time 7d
@@ -1520,7 +1521,7 @@ the Postfix SMTP client defers delivery and tries again after some
 delay.  This behavior is required by the SMTP standard.  
        
 
 
        
-Specify "ignore_mx_lookup_error = yes" to force a DNS A record
+Specify "ignore_mx_lookup_error = yes" to force a DNS A record
 lookup instead. This violates the SMTP standard and can result in
 mis-delivery of mail.
 
        
@@ -1565,8 +1566,8 @@ turned on by default (it's disabled on SCO UNIX due to an SCO bug).
 
        
 
 
        
-With the default 100 SMTP server process limit, "in_flow_delay
-= 1s" limits the mail inflow to 100 messages per second above the
+With the default 100 SMTP server process limit, "in_flow_delay
+= 1s" limits the mail inflow to 100 messages per second above the
 number of messages delivered per second.
 
        
 
@@ -1577,10 +1578,11 @@ Specify 0 to disable the feature. Valid delays are 0..10.
 %PARAM inet_interfaces all
 
 
         The network interface addresses that this mail system receives
-mail on.  By default, the software claims all active interfaces on
-the machine; with Postfix 2.2 and later, specify "loopback-only"
-to select only local interfaces.  The parameter also controls
-delivery of mail to user@[ip.address].  
        
+mail on. Specify "all" to receive mail on all network
+interfaces (default), and "loopback-only" to receive mail
+on loopback network interfaces only (Postfix 2.2 and later).  The
+parameter also controls delivery of mail to user@[ip.address].
+
        
 
 
        
 Note: you need to stop and start Postfix when this parameter changes.
@@ -1601,8 +1603,8 @@ for IPv6. 
        
 
 
        
 A better solution for multi-homed firewalls is to leave inet_interfaces
-at the default value
-and instead use explicit IP addresses in master.cf. This preserves SMTP
+at the default value and instead use explicit IP addresses in
+the master.cf SMTP server definitions.  This preserves the SMTP client's
 loop detection, by ensuring that each side of the firewall knows that the
 other IP address is still the same host. Setting $inet_interfaces to a
 single IPv4 and/or IPV6 address is primarily useful with virtual
@@ -1621,17 +1623,18 @@ Examples:
 
 
         inet_interfaces = all (DEFAULT)
-inet_interfaces = loopback-only
+inet_interfaces = loopback-only (Postfix 2.2 and later)
 inet_interfaces = 127.0.0.1
+inet_interfaces = 127.0.0.1, [::1] (Postfix 2.2 and later)
 inet_interfaces = 192.168.1.2, 127.0.0.1
 
        
 
 %PARAM inet_protocols ipv4
 
 
         The Internet protocols Postfix will attempt to use when making
-or accepting connections. Specify one or more of "ipv4" or "ipv6",
-separated by whitespace or commas. The form "all" is equivalent to
-"ipv4, ipv6". 
        
+or accepting connections. Specify one or more of "ipv4"
+or "ipv6", separated by whitespace or commas. The form
+"all" is equivalent to "ipv4, ipv6". 
        
 
 
         This feature is available in Postfix version 2.2 and later. 
        
 
@@ -1986,7 +1989,7 @@ local_recipient_maps setting if:
 
 
      • You redefine the local delivery agent in master.cf.
 
-
      •  You redefine the "local_transport" setting in main.cf.
+
      • You redefine the "local_transport" setting in main.cf.
 
 
      • You use the "luser_relay", "mailbox_transport", or "fallback_transport"
 feature of the Postfix local(8) delivery agent.
@@ -2103,7 +2106,7 @@ Note: luser_relay works only for the Postfix local(8) delivery agent.
 
 
        
 NOTE: if you use this feature for accounts not in the UNIX password
-file, then you must specify "local_recipient_maps =" (i.e. empty)
+file, then you must specify "local_recipient_maps =" (i.e. empty)
 in the main.cf file, otherwise the Postfix SMTP server will reject mail
 for non-UNIX accounts with "User unknown in local recipient table".
 
        
@@ -3083,7 +3086,7 @@ recipient_delimiter = +
 
 
        
 The numerical Postfix SMTP server response code when a remote SMTP
-client request is rejected by the "reject" restriction.
+client request is rejected by the "reject" restriction.
 
        
 
 
        
@@ -3237,7 +3240,8 @@ address localpart as per RFC 822, so that additional @ or % or !
 operators remain visible. This behavior is safe but it is also
 technically incorrect.  
        
 
-
         If you specify "resolve_dequoted_address = no", then the Postfix
+
         If you specify "resolve_dequoted_address = no", then
+the Postfix
 resolver will not know about additional @ etc. operators in the
 address localpart. This opens opportunities for obscure mail relay
 attacks with user@domain@domain addresses when Postfix provides
@@ -4456,16 +4460,15 @@ rejected requests (default: 554).
 
 
        Pause for the specified number of seconds and proceed with
 the next restriction in the list, if any. This may stop zombie
-mail when used as:  
        
+mail when used as:
 
-
        
 
         /etc/postfix/main.cf:
     smtpd_client_restrictions = 
         sleep 1, reject_unauth_pipelining
     smtpd_delay_reject = no
 
        
-
        
+This feature is available in Postfix 2.3. 
 
 
        warn_if_reject
        
 
@@ -5935,7 +5938,7 @@ This feature is available in Postfix 2.2 and later.
 
 
        
 Produce additional bounce(8) logfile records that can be read by
-older Postfix versions. The current and more extensible "name =
+Postfix versions before 2.0. The current and more extensible "name =
 value" format is needed in order to implement more sophisticated
 functionality.
 
        
@@ -5973,7 +5976,7 @@ version 5.0.
 
        
 
 
        
-Specify "broken_sasl_auth_clients = yes" to have Postfix advertise
+Specify "broken_sasl_auth_clients = yes" to have Postfix advertise
 AUTH support in a non-standard way.
 
        
 
@@ -5997,8 +6000,7 @@ logs peak usage information.
 
        
 
 
        
-This feature is implemented by the anvil(8) service which is not
-part of the stable Postfix 2.1 release.
+This feature is available in Postfix 2.2 and later.
 
        
 
 
        
@@ -6010,15 +6012,15 @@ The default time unit is s (seconds).
 
 
         Report mail delivery errors to the address specified with the
 non-standard Errors-To: message header, instead of the envelope
-sender address.  This support is disabled by default with Postfix
-2.1 and later, and is always turned on with older Postfix versions.
-
        
+sender address (this feature is removed with Postfix 2.2, is
+turned off by default with Postfix 2.1, and is always turned on
+with older Postfix versions).  
        
 
 %PARAM extract_recipient_limit 10240
 
 
        
 The maximal number of recipient addresses that Postfix will extract
-from message headers when mail is submitted with "sendmail -t".
+from message headers when mail is submitted with "sendmail -t".
 
        
 
 
        
@@ -6820,7 +6822,8 @@ The default time unit is s (seconds).
 
        
 The group ownership of set-gid Postfix commands and of group-writable
 Postfix directories. When this parameter value is changed you need
-to re-run "post-install set-permissions".
+to re-run "postfix set-permissions" (with Postfix 2.0 and
+earlier: "/etc/postfix/post-install set-permissions".
 
        
 
 %PARAM show_user_unknown_table_name yes
@@ -7161,7 +7164,7 @@ This feature is available in Postfix 2.0 and later.
 
 
        
 Obsolete SUN mailtool compatibility feature. Instead, use
-"mailbox_delivery_lock = dotlock".
+"mailbox_delivery_lock = dotlock".
 
        
 
 %PARAM trace_service_name trace
@@ -7373,7 +7376,7 @@ virtual(8) delivery agent will terminate with a fatal error.
 
 
        
 The minimum user ID value that the virtual(8) delivery agent accepts
-as a result from $virtual_uid_maps table lookup.  Returned
+as a result from $virtual_uid_maps table lookup.  Returned
 values less than this will be rejected, and the message will be
 deferred.
 
        
@@ -7487,12 +7490,12 @@ case insensitive lists of EHLO keywords (pipelining, starttls,
 auth, etc.) that the SMTP server will not send in the EHLO response
 to a remote SMTP client. 
        
 
-%PARAM session_cache_service scache
+%PARAM connection_cache_service scache
 
 
         The name of the scache(8) connection cache service.  This service
 maintains a limited pool of cached sessions.  
        
 
-%PARAM session_cache_ttl_limit 2s
+%PARAM connection_cache_ttl_limit 2s
 
 
         The maximal time-to-live value that the connection cache server
 allows. Requests that specify a larger TTL will be stored with the
@@ -7500,7 +7503,7 @@ maximum allowed TTL. The purpose of this additional control is to
 protect the infrastructure against careless people. The cache TTL
 is already bounded by $max_idle.  
        
 
-%PARAM session_cache_status_update_time 600s
+%PARAM connection_cache_status_update_time 600s
 
 
         How frequently the scache(8) server logs usage statistics with
 connection cache hit and miss rates for logical destinations and for
@@ -7558,7 +7561,7 @@ default. 
 client IP address matches any network or network address listed in
 $mynetworks. This setting will not prevent remote mail header
 address rewriting when mail from a remote client is forwarded by
-a neighboring system.  
        
+a neighboring system.  
 
 
         permit_sasl_authenticated 
        
 
@@ -7763,7 +7766,7 @@ that was recorded by the final destination can be trusted. 
        
 
         Opportunistic mode: announce STARTTLS support to SMTP clients,
 but do not require that clients use TLS encryption. 
        
 
-
         Note: when invoked via "sendmail -bs", Postfix will never offer
+
         Note: when invoked via "sendmail -bs", Postfix will never offer
 STARTTLS due to insufficient privileges to access the server private
 key. This is intended behavior. 
        
 
@@ -7777,7 +7780,7 @@ dedicated servers. 
        
 
 
         Note 1: this mode implies "smtpd_tls_auth_only = yes". 
        
 
-
         Note 2: when invoked via "sendmail -bs", Postfix will never offer
+
         Note 2: when invoked via "sendmail -bs", Postfix will never offer
 STARTTLS due to insufficient privileges to access the server private  
 key. This is intended behavior. 
        
 
diff --git a/postfix/proto/regexp_table b/postfix/proto/regexp_table
index 3dcd43b26..0785fd285 100644
--- a/postfix/proto/regexp_table
+++ b/postfix/proto/regexp_table
@@ -18,9 +18,9 @@
 #	result is returned.
 #
 #	To find out what types of lookup tables your Postfix system
-#	supports use the \fBpostconf -m\fR command.
+#	supports use the "\fBpostconf -m\fR" command.
 #
-#	To test lookup tables, use the \fBpostmap -fq\fR command as
+#	To test lookup tables, use the "\fBpostmap -fq\fR" command as
 #	described in the SYNOPSIS above.
 # TABLE FORMAT
 # .ad
@@ -54,8 +54,8 @@
 # .PP
 #	Each pattern is a POSIX regular expression enclosed by a pair of
 #	delimiters. The regular expression syntax is documented in
-#	re_format(7) with 4.4BSD, in regex(5) with Solaris, and in
-#	regex(7) with Linux. Other systems may use other document names.
+#	\fBre_format\fR(7) with 4.4BSD, in \fBregex\fR(5) with Solaris, and in
+#	\fBregex\fR(7) with Linux. Other systems may use other document names.
 #
 #	The expression delimiter can be any character, except whitespace
 #	or characters that have special meaning (traditionally the forward
diff --git a/postfix/proto/relocated b/postfix/proto/relocated
index ea4245fc3..b8f2d148b 100644
--- a/postfix/proto/relocated
+++ b/postfix/proto/relocated
@@ -2,18 +2,18 @@
 # NAME
 #	relocated 5
 # SUMMARY
-#	format of Postfix relocated table
+#	Postfix relocated table format
 # SYNOPSIS
 #	\fBpostmap /etc/postfix/relocated\fR
 # DESCRIPTION
-#	The optional \fBrelocated\fR table provides the information that is
+#	The optional \fBrelocated\fR(5) table provides the information that is
 #	used in "user has moved to \fInew_location\fR" bounce messages.
 #
-#	Normally, the \fBrelocated\fR table is specified as a text file
+#	Normally, the \fBrelocated\fR(5) table is specified as a text file
 #	that serves as input to the \fBpostmap\fR(1) command.
 #	The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
 #	is used for fast searching by the mail system. Execute the command
-#	\fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
+#	"\fBpostmap /etc/postfix/relocated\fR" in order to rebuild the indexed
 #	file after changing the relocated table.
 #
 #	When the table is provided via other means such as NIS, LDAP
@@ -91,7 +91,7 @@
 #	This section describes how the table lookups change when lookups
 #	are directed to a TCP-based server. For a description of the TCP
 #	client/server lookup protocol, see \fBtcp_table\fR(5).
-#	This feature is not available in Postfix version 2.1.
+#	This feature is not available up to and including Postfix version 2.2.
 #
 #	Each lookup operation uses the entire address once.  Thus,
 #	\fIuser@domain\fR mail addresses are not broken up into their
@@ -106,7 +106,7 @@
 # .fi
 #	The following \fBmain.cf\fR parameters are especially relevant.  
 #	The text below provides only a parameter summary. See
-#	postconf(5) for more details including examples.
+#	\fBpostconf\fR(5) for more details including examples.
 # .IP \fBrelocated_maps\fR
 #	List of lookup tables for relocated users or sites.
 # .PP
diff --git a/postfix/proto/tcp_table b/postfix/proto/tcp_table
index 9e986d04c..9b91db600 100644
--- a/postfix/proto/tcp_table
+++ b/postfix/proto/tcp_table
@@ -14,9 +14,9 @@
 #       can be directed to a TCP server.
 #
 #       To find out what types of lookup tables your Postfix system
-#       supports use the \fBpostconf -m\fR command.
+#       supports use the "\fBpostconf -m\fR" command.
 #
-#       To test lookup tables, use the \fBpostmap\fR command as
+#       To test lookup tables, use the "\fBpostmap -q\fR" command as
 #       described in the SYNOPSIS above.
 # PROTOCOL DESCRIPTION
 # .ad
@@ -76,9 +76,9 @@
 #	a long time.
 # SEE ALSO
 #	postmap(1), Postfix lookup table manager
-#	regexp_table(5) format of regular expression tables
-#	pcre_table(5) format of PCRE tables
-#	cidr_table(5) format of CIDR tables
+#	regexp_table(5), format of regular expression tables
+#	pcre_table(5), format of PCRE tables
+#	cidr_table(5), format of CIDR tables
 # README FILES
 # .ad
 # .fi
diff --git a/postfix/proto/transport b/postfix/proto/transport
index c16d0a878..9bd3cf376 100644
--- a/postfix/proto/transport
+++ b/postfix/proto/transport
@@ -2,7 +2,7 @@
 # NAME
 #	transport 5
 # SUMMARY
-#	format of Postfix transport table
+#	Postfix transport table format
 # SYNOPSIS
 #	\fBpostmap /etc/postfix/transport\fR
 #
@@ -10,7 +10,7 @@
 #
 #	\fBpostmap -q - /etc/postfix/transport <\fIinputfile\fR
 # DESCRIPTION
-#	The optional \fBtransport\fR table specifies a mapping from email
+#	The optional \fBtransport\fR(5) table specifies a mapping from email
 #	addresses to message delivery transports and/or relay hosts. The
 #	mapping is used by the \fBtrivial-rewrite\fR(8) daemon.
 #
@@ -30,11 +30,11 @@
 #	Mail for any other destination is by default delivered via
 #	\fB$default_transport\fR.
 # .PP
-#	Normally, the \fBtransport\fR table is specified as a text file
+#	Normally, the \fBtransport\fR(5) table is specified as a text file
 #	that serves as input to the \fBpostmap\fR(1) command.
 #	The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used
 #	for fast searching by the mail system. Execute the command
-#	\fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
+#	"\fBpostmap /etc/postfix/transport\fR" in order to rebuild the indexed
 #	file after changing the transport table.
 #
 #	When the table is provided via other means such as NIS, LDAP
@@ -213,7 +213,7 @@
 #	This section describes how the table lookups change when lookups
 #	are directed to a TCP-based server. For a description of the TCP
 #	client/server lookup protocol, see \fBtcp_table\fR(5).
-#	This feature is not available in Postfix version 2.1.
+#	This feature is not available up to and including Postfix version 2.2.
 #
 #	Each lookup operation uses the entire recipient address once.  Thus,
 #	\fIsome.domain.hierarchy\fR is not looked up via its parent domains,
@@ -225,7 +225,7 @@
 # .fi
 #       The following \fBmain.cf\fR parameters are especially relevant.
 #       The text below provides only a parameter summary. See
-#       postconf(5) for more details including examples.
+#       \fBpostconf\fR(5) for more details including examples.
 # .IP \fBempty_address_recipient\fR
 #	The address that is looked up instead of the null sender address.
 # .IP \fBparent_domain_matches_subdomains\fR
diff --git a/postfix/proto/virtual b/postfix/proto/virtual
index 20816a036..01a3d381a 100644
--- a/postfix/proto/virtual
+++ b/postfix/proto/virtual
@@ -2,7 +2,7 @@
 # NAME
 #	virtual 5
 # SUMMARY
-#	format of Postfix virtual alias table
+#	Postfix virtual alias table format
 # SYNOPSIS
 #	\fBpostmap /etc/postfix/virtual\fR
 #
@@ -10,7 +10,7 @@
 #
 #	\fBpostmap -q - /etc/postfix/virtual <\fIinputfile\fR
 # DESCRIPTION
-#	The optional \fBvirtual\fR alias table specifies address aliasing
+#	The optional \fBvirtual\fR(5) alias table specifies address aliasing
 #	for arbitrary local or non-local recipient addresses. Virtual aliasing
 #	is recursive, and is done by the Postfix \fBcleanup\fR(8) daemon.
 #
@@ -31,11 +31,11 @@
 #	Think Sendmail rule set \fBS0\fR, if you like. Use \fBcanonical\fR(5)
 #	mapping to rewrite header and envelope addresses in general.
 #
-#	Normally, the \fBvirtual\fR alias table is specified as a text file
+#	Normally, the \fBvirtual\fR(5) alias table is specified as a text file
 #	that serves as input to the \fBpostmap\fR(1) command.
 #	The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
 #	is used for fast searching by the mail system. Execute the command
-#	\fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
+#	"\fBpostmap /etc/postfix/virtual\fR" in order to rebuild the indexed
 #	file after changing the text file.
 #
 #	When the table is provided via other means such as NIS, LDAP
@@ -73,7 +73,7 @@
 #	or $\fBproxy_interfaces\fR.
 #	.sp
 #	This functionality overlaps with functionality of the local
-#	\fIaliases\fR(5) database. The difference is that \fBvirtual\fR
+#	\fIaliases\fR(5) database. The difference is that \fBvirtual\fR(5)
 #	mapping can be applied to non-local addresses.
 # .IP "@\fIdomain address, address, ...\fR"
 #	Mail for any user in \fIdomain\fR is redirected to \fIaddress\fR.
@@ -118,7 +118,7 @@
 #	virtual_alias_maps = hash:/etc/postfix/virtual
 #
 #	Note: some systems use \fBdbm\fR databases instead of \fBhash\fR.
-#	See the output from \fBpostconf -m\fR for available database types.
+#	See the output from "\fBpostconf -m\fR" for available database types.
 #
 # .ti -4
 #	/etc/postfix/virtual:
@@ -175,7 +175,7 @@
 #	This section describes how the table lookups change when lookups
 #	are directed to a TCP-based server. For a description of the TCP
 #	client/server lookup protocol, see \fBtcp_table\fR(5).
-#	This feature is not available in Postfix version 2.1.
+#	This feature is not available up to and including Postfix version 2.2.
 #
 #	Each lookup operation uses the entire address once.  Thus,
 #	\fIuser@domain\fR mail addresses are not broken up into their
@@ -190,7 +190,7 @@
 # .fi
 #	The following \fBmain.cf\fR parameters are especially relevant to
 #	this topic. See the Postfix \fBmain.cf\fR file for syntax details
-#	and for default values. Use the \fBpostfix reload\fR command after
+#	and for default values. Use the "\fBpostfix reload\fR" command after
 #	a configuration change.
 # .IP \fBvirtual_alias_maps\fR
 #	List of virtual aliasing tables.
diff --git a/postfix/src/anvil/anvil.c b/postfix/src/anvil/anvil.c
index d99611d83..8d40180d7 100644
--- a/postfix/src/anvil/anvil.c
+++ b/postfix/src/anvil/anvil.c
@@ -6,21 +6,21 @@
 /* SYNOPSIS
 /*	\fBanvil\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The Postfix \fBanvil\fR server maintains short-term statistics
+/*	The Postfix \fBanvil\fR(8) server maintains short-term statistics
 /*	to defend against clients that hammer a server with either too
 /*	many simultaneous sessions, or with too many successive requests
 /*	within a configurable time interval.
 /*	This server is designed to run under control by the Postfix
-/*	master server.
+/*	\fBmaster\fR(8) server.
 /*
-/*	The \fBanvil\fR server maintains no persistent database. Standard
+/*	The \fBanvil\fR(8) server maintains no persistent database. Standard
 /*	library utilities do not meet Postfix performance and robustness
 /*	requirements.
 /* CONNECTION COUNT/RATE LIMITING
 /* .ad
 /* .fi
 /*	When a remote client connects, a connection count (or rate) limited
-/*	server should send the following request to the \fBanvil\fR server:
+/*	server should send the following request to the \fBanvil\fR(8) server:
 /* .PP
 /* .in +4
 /*	\fBrequest=connect\fR
@@ -29,7 +29,7 @@
 /* .in
 /* .PP
 /*	This registers a new connection for the (service, client)
-/*	combination specified with \fBident\fR. The \fBanvil\fR server
+/*	combination specified with \fBident\fR. The \fBanvil\fR(8) server
 /*	answers with the number of simultaneous connections and the
 /*	number of connections per unit time for that (service, client)
 /*	combination:
@@ -48,7 +48,7 @@
 /*	exceeds the connection count (or rate) limit.
 /* .PP
 /*	When a remote client disconnects, a connection count (or rate) limited
-/*	server should send the following request to the \fBanvil\fR server:
+/*	server should send the following request to the \fBanvil\fR(8) server:
 /* .PP
 /* .in +4
 /*	\fBrequest=disconnect\fR
@@ -57,7 +57,7 @@
 /* .in
 /* .PP
 /*	This registers a disconnect event for the (service, client)
-/*	combination specified with \fBident\fR. The \fBanvil\fR
+/*	combination specified with \fBident\fR. The \fBanvil\fR(8)
 /*	server replies with:
 /* .PP
 /* .ti +4
@@ -67,7 +67,7 @@
 /* .fi
 /*	When a remote client sends a message delivery request, a
 /*	message rate limited server should send the following
-/*	request to the \fBanvil\fR server:
+/*	request to the \fBanvil\fR(8) server:
 /* .PP
 /* .in +4
 /*	\fBrequest=message\fR
@@ -76,7 +76,7 @@
 /* .in
 /* .PP
 /*	This registers a message delivery request for the (service, client)
-/*	combination specified with \fBident\fR. The \fBanvil\fR server
+/*	combination specified with \fBident\fR. The \fBanvil\fR(8) server
 /*	answers with the number of message delivery requests per unit time
 /*	for that (service, client) combination:
 /* .PP
@@ -86,17 +86,15 @@
 /*	\fBrate=\fInumber\fR
 /* .in
 /* .PP
-/*	In order prevent the anvil server from discarding client
+/*	In order to prevent the \fBanvil\fR(8) server from discarding client
 /*	request rates too early or too late, a message rate limited
 /*	service should also register connect/disconnect events.
-/* .PP
-/*	This feature is available in Postfix 2.2 and later.
 /* RECIPIENT RATE LIMITING
 /* .ad
 /* .fi
 /*	When a remote client sends a recipient address, a recipient
 /*	rate limited server should send the following request to
-/*	the \fBanvil\fR server:
+/*	the \fBanvil\fR(8) server:
 /* .PP
 /* .in +4
 /*	\fBrequest=recipient\fR
@@ -104,8 +102,8 @@
 /*	\fBident=\fIstring\fR
 /* .in
 /* .PP
-/*	This registers a recipient address for the (service, client)
-/*	combination specified with \fBident\fR. The \fBanvil\fR server
+/*	This registers a recipient request for the (service, client)
+/*	combination specified with \fBident\fR. The \fBanvil\fR(8) server
 /*	answers with the number of recipient addresses per unit time
 /*	for that (service, client) combination:
 /* .PP
@@ -115,18 +113,16 @@
 /*	\fBrate=\fInumber\fR
 /* .in
 /* .PP
-/*	In order prevent the anvil server from discarding client
+/*	In order to prevent the \fBanvil\fR(8) server from discarding client
 /*	request rates too early or too late, a recipient rate limited
 /*	service should also register connect/disconnect events.
-/* .PP
-/*	This feature is available in Postfix 2.2 and later.
 /* SECURITY
 /* .ad
 /* .fi
-/*	The \fBanvil\fR server does not talk to the network or to local
+/*	The \fBanvil\fR(8) server does not talk to the network or to local
 /*	users, and can run chrooted at fixed low privilege.
 /*
-/*	The \fBanvil\fR server maintains an in-memory table with information
+/*	The \fBanvil\fR(8) server maintains an in-memory table with information
 /*	about recent clients of a connection count (or rate) limited service.
 /*	Although state is kept only temporarily, this may require a lot of
 /*	memory on systems that handle connections from many remote clients.
@@ -154,17 +150,17 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically as anvil(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically as \fBanvil\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBanvil_rate_time_unit (60s)\fR"
 /*	The time unit over which client connection rates and other rates
 /*	are calculated.
 /* .IP "\fBanvil_status_update_time (600s)\fR"
-/*	How frequently the anvil(8) connection and rate limiting server
+/*	How frequently the \fBanvil\fR(8) connection and rate limiting server
 /*	logs peak usage information.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
@@ -209,7 +205,7 @@
 /* HISTORY
 /* .ad
 /* .fi
-/*	The anvil service was introduced with Postfix 2.1.
+/*	The anvil service is available in Postfix 2.2 and later.
 /* AUTHOR(S)
 /*	Wietse Venema
 /*	IBM T.J. Watson Research
diff --git a/postfix/src/bounce/bounce.c b/postfix/src/bounce/bounce.c
index a1066ec31..4d7c4371c 100644
--- a/postfix/src/bounce/bounce.c
+++ b/postfix/src/bounce/bounce.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBbounce\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBbounce\fR daemon maintains per-message log files with
+/*	The \fBbounce\fR(8) daemon maintains per-message log files with
 /*	non-delivery status information. Each log file is named after the
 /*	queue file that it corresponds to, and is kept in a queue subdirectory
 /*	named after the service name in the \fBmaster.cf\fR file (either
@@ -14,7 +14,7 @@
 /*	This program expects to be run from the \fBmaster\fR(8) process
 /*	manager.
 /*
-/*	The \fBbounce\fR daemon processes two types of service requests:
+/*	The \fBbounce\fR(8) daemon processes two types of service requests:
 /* .IP \(bu
 /*	Append a recipient (non-)delivery status record to a per-message
 /*	log file.
@@ -40,18 +40,18 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically, as bounce(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically, as \fBbounce\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fB2bounce_notice_recipient (postmaster)\fR"
 /*	The recipient of undeliverable mail that cannot be returned to
 /*	the sender.
 /* .IP "\fBbackwards_bounce_logfile_compatibility (yes)\fR"
-/*	Produce additional bounce(8) logfile records that can be read by
-/*	older Postfix versions.
+/*	Produce additional \fBbounce\fR(8) logfile records that can be read by
+/*	Postfix versions before 2.0.
 /* .IP "\fBbounce_notice_recipient (postmaster)\fR"
 /*	The recipient of postmaster notifications with the message headers
 /*	of mail that Postfix did not deliver and of SMTP conversation
@@ -71,10 +71,10 @@
 /*	units.
 /* .IP "\fBdeliver_lock_attempts (20)\fR"
 /*	The maximal number of attempts to acquire an exclusive lock on a
-/*	mailbox file or bounce(8) logfile.
+/*	mailbox file or \fBbounce\fR(8) logfile.
 /* .IP "\fBdeliver_lock_delay (1s)\fR"
 /*	The time between attempts to acquire an exclusive lock on a mailbox
-/*	file or bounce(8) logfile.
+/*	file or \fBbounce\fR(8) logfile.
 /* .IP "\fBipc_timeout (3600s)\fR"
 /*	The time limit for sending or receiving information over an internal
 /*	communication channel.
diff --git a/postfix/src/cleanup/cleanup.c b/postfix/src/cleanup/cleanup.c
index f72deda00..574b66d80 100644
--- a/postfix/src/cleanup/cleanup.c
+++ b/postfix/src/cleanup/cleanup.c
@@ -6,11 +6,11 @@
 /* SYNOPSIS
 /*	\fBcleanup\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBcleanup\fR daemon processes inbound mail, inserts it
+/*	The \fBcleanup\fR(8) daemon processes inbound mail, inserts it
 /*	into the \fBincoming\fR mail queue, and informs the queue
 /*	manager of its arrival.
 /*
-/*	The \fBcleanup\fR daemon always performs the following transformations:
+/*	The \fBcleanup\fR(8) daemon always performs the following transformations:
 /* .IP \(bu
 /*	Insert missing message headers: (\fBResent-\fR) \fBFrom:\fR,
 /*	\fBTo:\fR, \fBMessage-Id:\fR, and \fBDate:\fR.
@@ -36,11 +36,11 @@
 /*	Optionally, expand envelope recipients according to information
 /*	found in the \fBvirtual\fR(5) lookup tables.
 /* .PP
-/*	The \fBcleanup\fR daemon performs sanity checks on the content of
+/*	The \fBcleanup\fR(8) daemon performs sanity checks on the content of
 /*	each message. When it finds a problem, by default it returns a
 /*	diagnostic status to the client, and leaves it up to the client
 /*	to deal with the problem. Alternatively, the client can request
-/*	the \fBcleanup\fR daemon to bounce the message back to the sender
+/*	the \fBcleanup\fR(8) daemon to bounce the message back to the sender
 /*	in case of trouble.
 /* STANDARDS
 /*	RFC 822 (ARPA Internet Text Messages)
@@ -54,17 +54,18 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically, as cleanup(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically, as
+/*	\fBcleanup\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* COMPATIBILITY CONTROLS
 /* .ad
 /* .fi
 /* .IP "\fBundisclosed_recipients_header (To: undisclosed-recipients:;)\fR"
-/*	Message header that the Postfix cleanup(8) server inserts when a
+/*	Message header that the Postfix \fBcleanup\fR(8) server inserts when a
 /*	message contains no To: or Cc: message header.
 /* .PP
 /*	Available in Postfix version 2.1 and later:
@@ -75,10 +76,10 @@
 /*	worms or viruses. It is not a general content filter.
 /* .IP "\fBbody_checks (empty)\fR"
 /*	Optional lookup tables for content inspection as specified in
-/*	the body_checks(5) manual page.
+/*	the \fBbody_checks\fR(5) manual page.
 /* .IP "\fBheader_checks (empty)\fR"
 /*	Optional lookup tables for content inspection of primary non-MIME
-/*	message headers, as specified in the header_checks(5) manual page.
+/*	message headers, as specified in the \fBheader_checks\fR(5) manual page.
 /* .PP
 /*	Available in Postfix version 2.0 and later:
 /* .IP "\fBbody_checks_size_limit (51200)\fR"
@@ -86,10 +87,10 @@
 /*	prefer to use that term) is subjected to body_checks inspection.
 /* .IP "\fBmime_header_checks ($header_checks)\fR"
 /*	Optional lookup tables for content inspection of MIME related
-/*	message headers, as described in the header_checks(5) manual page.
+/*	message headers, as described in the \fBheader_checks\fR(5) manual page.
 /* .IP "\fBnested_header_checks ($header_checks)\fR"
 /*	Optional lookup tables for content inspection of non-MIME message
-/*	headers in attached messages, as described in the header_checks(5)
+/*	headers in attached messages, as described in the \fBheader_checks\fR(5)
 /*	manual page.
 /* MIME PROCESSING CONTROLS
 /* .ad
@@ -130,8 +131,8 @@
 /* ADDRESS TRANSFORMATION CONTROLS
 /* .ad
 /* .fi
-/*	Address rewriting is delegated to the trivial-rewrite(8) daemon.
-/*	The cleanup(8) server implements table driven address mapping.
+/*	Address rewriting is delegated to the \fBtrivial-rewrite\fR(8) daemon.
+/*	The \fBcleanup\fR(8) server implements table driven address mapping.
 /* .IP "\fBempty_address_recipient (MAILER-DAEMON)\fR"
 /*	The recipient of mail addressed to the null address.
 /* .IP "\fBcanonical_maps (empty)\fR"
@@ -185,8 +186,8 @@
 /* .fi
 /* .IP "\fBduplicate_filter_limit (1000)\fR"
 /*	The maximal number of addresses remembered by the address
-/*	duplicate filter for aliases(5) or virtual(5) alias expansion, or
-/*	for showq(8) queue displays.
+/*	duplicate filter for \fBaliases\fR(5) or \fBvirtual\fR(5) alias expansion, or
+/*	for \fBshowq\fR(8) queue displays.
 /* .IP "\fBheader_size_limit (102400)\fR"
 /*	The maximal amount of memory in bytes for storing a message header.
 /* .IP "\fBhopcount_limit (50)\fR"
diff --git a/postfix/src/cleanup/cleanup_message.c b/postfix/src/cleanup/cleanup_message.c
index 575e68426..7a813eb5d 100644
--- a/postfix/src/cleanup/cleanup_message.c
+++ b/postfix/src/cleanup/cleanup_message.c
@@ -338,6 +338,20 @@ static int cleanup_act(CLEANUP_STATE *state, char *context, const char *buf,
 	}
 	return (CLEANUP_ACT_KEEP);
     }
+    if (STREQUAL(value, "REPLACE", command_len)) {
+	if (*optional_text == 0) {
+	    msg_warn("REPLACE action without text in %s map", map_class);
+	} else if (strcmp(context, CLEANUP_ACT_CTXT_HEADER) == 0
+		   && !is_header(optional_text)) {
+	    msg_warn("bad REPLACE header text \"%s\" in %s map, "
+		     "need \"headername: headervalue\"",
+		     optional_text, map_class);
+	} else {
+	    cleanup_act_log(state, "replace", context, buf, optional_text);
+	    cleanup_out_string(state, REC_TYPE_NORM, optional_text);
+	}
+	return (CLEANUP_ACT_DROP);
+    }
     if (STREQUAL(value, "REDIRECT", command_len)) {
 	if (strchr(optional_text, '@') == 0) {
 	    msg_warn("bad REDIRECT target \"%s\" in %s map, need user@domain",
diff --git a/postfix/src/discard/discard.c b/postfix/src/discard/discard.c
index 142dea5e6..09b562745 100644
--- a/postfix/src/discard/discard.c
+++ b/postfix/src/discard/discard.c
@@ -6,14 +6,15 @@
 /* SYNOPSIS
 /*	\fBdiscard\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The Postfix discard delivery agent processes delivery requests from
+/*	The Postfix \fBdiscard\fR(8) delivery agent processes
+/*	delivery requests from
 /*	the queue manager. Each request specifies a queue file, a sender
 /*	address, a domain or host name that is treated as the reason for
 /*	discarding the mail, and recipient information.
 /*	This program expects to be run from the \fBmaster\fR(8) process
 /*	manager.
 /*
-/*	The discard delivery agent pretends to deliver all recipients
+/*	The \fBdiscard\fR(8) delivery agent pretends to deliver all recipients
 /*	in the delivery request, logs the "next-hop" domain or host
 /*	information as the reason for discarding the mail, updates the
 /*	queue file and marks recipients as finished or informs the
@@ -24,7 +25,7 @@
 /* SECURITY
 /* .ad
 /* .fi
-/*	The discard mailer is not security-sensitive. It does not talk
+/*	The \fBdiscard\fR(8) mailer is not security-sensitive. It does not talk
 /*	to the network, and can be run chrooted at fixed low privilege.
 /* STANDARDS
 /*	None.
@@ -36,12 +37,12 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically as discard(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically as \fBdiscard\fR(8)
 /*      processes run for only a limited amount of time. Use the command
 /*      "\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
diff --git a/postfix/src/error/error.c b/postfix/src/error/error.c
index f2cf4a9ab..5166bf177 100644
--- a/postfix/src/error/error.c
+++ b/postfix/src/error/error.c
@@ -6,14 +6,15 @@
 /* SYNOPSIS
 /*	\fBerror\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The Postfix error delivery agent processes delivery requests from
+/*	The Postfix \fBerror\fR(8) delivery agent processes delivery
+/*	requests from
 /*	the queue manager. Each request specifies a queue file, a sender
 /*	address, a domain or host name that is treated as the reason for
 /*	non-delivery, and recipient information.
 /*	This program expects to be run from the \fBmaster\fR(8) process
 /*	manager.
 /*
-/*	The error delivery agent bounces all recipients in the delivery
+/*	The \fBerror\fR(8) delivery agent bounces all recipients in the delivery
 /*	request using the "next-hop"
 /*	domain or host information as the reason for non-delivery, updates
 /*	the queue file and marks recipients as finished or informs the
@@ -24,7 +25,7 @@
 /* SECURITY
 /* .ad
 /* .fi
-/*	The error mailer is not security-sensitive. It does not talk
+/*	The \fBerror\fR(8) mailer is not security-sensitive. It does not talk
 /*	to the network, and can be run chrooted at fixed low privilege.
 /* STANDARDS
 /*	None.
@@ -36,12 +37,12 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically as error(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically as \fBerror\fR(8)
 /*      processes run for only a limited amount of time. Use the command
 /*      "\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fB2bounce_notice_recipient (postmaster)\fR"
 /*	The recipient of undeliverable mail that cannot be returned to
 /*	the sender.
diff --git a/postfix/src/flush/flush.c b/postfix/src/flush/flush.c
index 190a2630a..ffdf81a41 100644
--- a/postfix/src/flush/flush.c
+++ b/postfix/src/flush/flush.c
@@ -6,7 +6,8 @@
 /* SYNOPSIS
 /*	\fBflush\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The flush server maintains a record of deferred mail by destination.
+/*	The \fBflush\fR(8) server maintains a record of deferred
+/*	mail by destination.
 /*	This information is used to improve the performance of the SMTP
 /*	\fBETRN\fR request, and of its command-line equivalent,
 /*	"\fBsendmail -qR\fR" or "\fBpostqueue -f\fR".
@@ -27,7 +28,7 @@
 /*
 /*	This server implements the following requests:
 /* .IP "\fBadd\fI sitename queueid\fR"
-/*	Inform the fast flush server that the message with the specified
+/*	Inform the \fBflush\fR(8) server that the message with the specified
 /*	queue ID is queued for the specified destination.
 /* .IP "\fBsend\fI sitename\fR"
 /*	Request delivery of mail that is queued for the specified
@@ -46,7 +47,7 @@
 /* SECURITY
 /* .ad
 /* .fi
-/*	The fast flush server is not security-sensitive. It does not
+/*	The \fBflush\fR(8) server is not security-sensitive. It does not
 /*	talk to the network, and it does not talk to local users.
 /*	The fast flush server can run chrooted at fixed low privilege.
 /* DIAGNOSTICS
@@ -60,7 +61,7 @@
 /*	\fBmaster.cf\fR configuration file.
 /*
 /*	Upon receipt of a request to deliver mail for an eligible
-/*	destination, the \fBflush\fR server requests delivery of all messages
+/*	destination, the \fBflush\fR(8) server requests delivery of all messages
 /*	that are listed in that destination's logfile, regardless of the
 /*	recipients of those messages. This is not an issue for mail
 /*	that is sent to a \fBrelay_domains\fR destination because
@@ -68,12 +69,12 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically as flush(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically as \fBflush\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index d90d4892d..d02e0211d 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only.
   */
-#define MAIL_RELEASE_DATE	"20050203"
+#define MAIL_RELEASE_DATE	"20050205"
 #define MAIL_VERSION_NUMBER	"2.2"
 
 #define VAR_MAIL_VERSION	"mail_version"
diff --git a/postfix/src/lmtp/lmtp.c b/postfix/src/lmtp/lmtp.c
index 64bd981ce..e9078e551 100644
--- a/postfix/src/lmtp/lmtp.c
+++ b/postfix/src/lmtp/lmtp.c
@@ -64,12 +64,12 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically, as lmtp(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically, as \fBlmtp\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* COMPATIBILITY CONTROLS
 /* .ad
 /* .fi
diff --git a/postfix/src/local/local.c b/postfix/src/local/local.c
index 226642742..88f0e9ff4 100644
--- a/postfix/src/local/local.c
+++ b/postfix/src/local/local.c
@@ -6,14 +6,14 @@
 /* SYNOPSIS
 /*	\fBlocal\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBlocal\fR daemon processes delivery requests from the
+/*	The \fBlocal\fR(8) daemon processes delivery requests from the
 /*	Postfix queue manager to deliver mail to local recipients.
 /*	Each delivery request specifies a queue file, a sender address,
 /*	a domain or host to deliver to, and one or more recipients.
 /*	This program expects to be run from the \fBmaster\fR(8) process
 /*	manager.
 /*
-/*	The \fBlocal\fR daemon updates queue files and marks recipients
+/*	The \fBlocal\fR(8) daemon updates queue files and marks recipients
 /*	as finished, or it informs the queue manager that delivery should
 /*	be tried again at a later time. Delivery status reports are sent
 /*	to the \fBbounce\fR(8), \fBdefer\fR(8) or \fBtrace\fR(8) daemon as
@@ -115,7 +115,7 @@
 /*	for recipients that are not found in the UNIX passwd database.
 /*
 /*	In the case of UNIX-style mailbox delivery,
-/*	the \fBlocal\fR daemon prepends a "\fBFrom \fIsender time_stamp\fR"
+/*	the \fBlocal\fR(8) daemon prepends a "\fBFrom \fIsender time_stamp\fR"
 /*	envelope header to each message, prepends an
 /*	\fBX-Original-To:\fR header with the recipient address as given to
 /*	Postfix, prepends an
@@ -224,7 +224,7 @@
 /*
 /*	The current working directory is the mail queue directory.
 /*
-/*	The \fBlocal\fR daemon prepends a "\fBFrom \fIsender time_stamp\fR"
+/*	The \fBlocal\fR(8) daemon prepends a "\fBFrom \fIsender time_stamp\fR"
 /*	envelope header to each message, prepends an
 /*	\fBX-Original-To:\fR header with the recipient address as given to
 /*	Postfix, prepends an
@@ -244,7 +244,7 @@
 /*	forward\fR) forbids file destinations in \fB:include:\fR files.
 /*
 /*	In the case of UNIX-style mailbox delivery,
-/*	the \fBlocal\fR daemon prepends a "\fBFrom \fIsender time_stamp\fR"
+/*	the \fBlocal\fR(8) daemon prepends a "\fBFrom \fIsender time_stamp\fR"
 /*	envelope header to each message, prepends an
 /*	\fBX-Original-To:\fR header with the recipient address as given to
 /*	Postfix, prepends an
@@ -280,7 +280,7 @@
 /*	to the mailbox owned by the user \fIname\fR, or it is sent back as
 /*	undeliverable.
 /*
-/*	In all cases the \fBlocal\fR daemon prepends an optional
+/*	In all cases the \fBlocal\fR(8) daemon prepends an optional
 /*	`\fBDelivered-To:\fR header line with the final recipient
 /*	address.
 /* DELIVERY RIGHTS
@@ -288,7 +288,7 @@
 /* .fi
 /*	Deliveries to external files and external commands are made with
 /*	the rights of the receiving user on whose behalf the delivery is made.
-/*	In the absence of a user context, the \fBlocal\fR daemon uses the
+/*	In the absence of a user context, the \fBlocal\fR(8) daemon uses the
 /*	owner rights of the \fB:include:\fR file or alias database.
 /*	When those files are owned by the superuser, delivery is made with
 /*	the rights specified with the \fBdefault_privs\fR configuration
@@ -336,7 +336,7 @@
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* COMPATIBILITY CONTROLS
 /* .ad
 /* .fi
@@ -360,49 +360,49 @@
 /*	mailbox_command, home_mailbox, mail_spool_directory, fallback_transport
 /*	and luser_relay.
 /* .IP "\fBalias_maps (see 'postconf -d' output)\fR"
-/*	The alias databases that are used for local(8) delivery.
+/*	The alias databases that are used for \fBlocal\fR(8) delivery.
 /* .IP "\fBforward_path (see 'postconf -d' output)\fR"
-/*	The local(8) delivery agent search list for finding a .forward
+/*	The \fBlocal\fR(8) delivery agent search list for finding a .forward
 /*	file with user-specified delivery methods.
 /* .IP "\fBmailbox_transport (empty)\fR"
-/*	Optional message delivery transport that the local(8) delivery
+/*	Optional message delivery transport that the \fBlocal\fR(8) delivery
 /*	agent should use for mailbox delivery to all local recipients,
 /*	whether or not they are found in the UNIX passwd database.
 /* .IP "\fBmailbox_command_maps (empty)\fR"
 /*	Optional lookup tables with per-recipient external commands to use
-/*	for local(8) mailbox delivery.
+/*	for \fBlocal\fR(8) mailbox delivery.
 /* .IP "\fBmailbox_command (empty)\fR"
-/*	Optional external command that the local(8) delivery agent should
+/*	Optional external command that the \fBlocal\fR(8) delivery agent should
 /*	use for mailbox delivery.
 /* .IP "\fBhome_mailbox (empty)\fR"
-/*	Optional pathname of a mailbox file relative to a local(8) user's
+/*	Optional pathname of a mailbox file relative to a \fBlocal\fR(8) user's
 /*	home directory.
 /* .IP "\fBmail_spool_directory (see 'postconf -d' output)\fR"
-/*	The directory where local(8) UNIX-style mailboxes are kept.
+/*	The directory where \fBlocal\fR(8) UNIX-style mailboxes are kept.
 /* .IP "\fBfallback_transport (empty)\fR"
-/*	Optional message delivery transport that the local(8) delivery
-/*	agent should use for names that are not found in the aliases(5)
+/*	Optional message delivery transport that the \fBlocal\fR(8) delivery
+/*	agent should use for names that are not found in the \fBaliases\fR(5)
 /*	database or in the UNIX passwd database.
 /* .IP "\fBluser_relay (empty)\fR"
-/*	Optional catch-all destination for unknown local(8) recipients.
+/*	Optional catch-all destination for unknown \fBlocal\fR(8) recipients.
 /* .PP
 /*	Available in Postfix version 2.2 and later:
 /* .IP "\fBcommand_execution_directory (empty)\fR"
-/*	The local(8) delivery agent working directory for delivery to
+/*	The \fBlocal\fR(8) delivery agent working directory for delivery to
 /*	external command.
 /* MAILBOX LOCKING CONTROLS
 /* .ad
 /* .fi
 /* .IP "\fBdeliver_lock_attempts (20)\fR"
 /*	The maximal number of attempts to acquire an exclusive lock on a
-/*	mailbox file or bounce(8) logfile.
+/*	mailbox file or \fBbounce\fR(8) logfile.
 /* .IP "\fBdeliver_lock_delay (1s)\fR"
 /*	The time between attempts to acquire an exclusive lock on a mailbox
-/*	file or bounce(8) logfile.
+/*	file or \fBbounce\fR(8) logfile.
 /* .IP "\fBstale_lock_time (500s)\fR"
 /*	The time after which a stale exclusive mailbox lockfile is removed.
 /* .IP "\fBmailbox_delivery_lock (see 'postconf -d' output)\fR"
-/*	How to lock a UNIX-style local(8) mailbox before attempting delivery.
+/*	How to lock a UNIX-style \fBlocal\fR(8) mailbox before attempting delivery.
 /* RESOURCE AND RATE CONTROLS
 /* .ad
 /* .fi
@@ -410,8 +410,8 @@
 /*	Time limit for delivery to external commands.
 /* .IP "\fBduplicate_filter_limit (1000)\fR"
 /*	The maximal number of addresses remembered by the address
-/*	duplicate filter for aliases(5) or virtual(5) alias expansion, or
-/*	for showq(8) queue displays.
+/*	duplicate filter for \fBaliases\fR(5) or \fBvirtual\fR(5) alias expansion, or
+/*	for \fBshowq\fR(8) queue displays.
 /* .IP "\fBlocal_destination_concurrency_limit (2)\fR"
 /*	The maximal number of parallel deliveries via the local mail
 /*	delivery transport to the same recipient (when
@@ -422,28 +422,28 @@
 /*	The maximal number of recipients per message delivery via the
 /*	local mail delivery transport.
 /* .IP "\fBmailbox_size_limit (51200000)\fR"
-/*	The maximal size of any local(8) individual mailbox or maildir
+/*	The maximal size of any \fBlocal\fR(8) individual mailbox or maildir
 /*	file, or zero (no limit).
 /* SECURITY CONTROLS
 /* .ad
 /* .fi
 /* .IP "\fBallow_mail_to_commands (alias, forward)\fR"
-/*	Restrict local(8) mail delivery to external commands.
+/*	Restrict \fBlocal\fR(8) mail delivery to external commands.
 /* .IP "\fBallow_mail_to_files (alias, forward)\fR"
-/*	Restrict local(8) mail delivery to external files.
+/*	Restrict \fBlocal\fR(8) mail delivery to external files.
 /* .IP "\fBcommand_expansion_filter (see 'postconf -d' output)\fR"
-/*	Restrict the characters that the local(8) delivery agent allows in
+/*	Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
 /*	$name expansions of $mailbox_command.
 /* .IP "\fBdefault_privs (nobody)\fR"
-/*	The default rights used by the local(8) delivery agent for delivery
+/*	The default rights used by the \fBlocal\fR(8) delivery agent for delivery
 /*	to external file or command.
 /* .IP "\fBforward_expansion_filter (see 'postconf -d' output)\fR"
-/*	Restrict the characters that the local(8) delivery agent allows in
+/*	Restrict the characters that the \fBlocal\fR(8) delivery agent allows in
 /*	$name expansions of $forward_path.
 /* .PP
 /*	Available in Postfix version 2.2 and later:
 /* .IP "\fBexecution_directory_expansion_filter (see 'postconf -d' output)\fR"
-/*	Restrict the characters that the local(8) delivery agent allows
+/*	Restrict the characters that the \fBlocal\fR(8) delivery agent allows
 /*	in $name expansions of $command_execution_directory.
 /* MISCELLANEOUS CONTROLS
 /* .ad
@@ -461,7 +461,7 @@
 /*	The time limit for sending or receiving information over an internal
 /*	communication channel.
 /* .IP "\fBlocal_command_shell (empty)\fR"
-/*	Optional shell program for local(8) delivery to non-Postfix command.
+/*	Optional shell program for \fBlocal\fR(8) delivery to non-Postfix command.
 /* .IP "\fBmax_idle (100s)\fR"
 /*	The maximum amount of time that an idle Postfix daemon process
 /*	waits for the next service request before exiting.
@@ -469,7 +469,7 @@
 /*	The maximal number of connection requests before a Postfix daemon
 /*	process terminates.
 /* .IP "\fBprepend_delivered_header (command, file, forward)\fR"
-/*	The message delivery contexts where the Postfix local(8) delivery
+/*	The message delivery contexts where the Postfix \fBlocal\fR(8) delivery
 /*	agent prepends a Delivered-To:  message header.
 /* .IP "\fBprocess_id (read-only)\fR"
 /*	The process ID of a Postfix command or daemon process.
@@ -483,7 +483,7 @@
 /* .IP "\fBrecipient_delimiter (empty)\fR"
 /*	The separator between user names and address extensions (user+foo).
 /* .IP "\fBrequire_home_directory (no)\fR"
-/*	Whether or not a local(8) recipient's home directory must exist
+/*	Whether or not a \fBlocal\fR(8) recipient's home directory must exist
 /*	before mail delivery is attempted.
 /* .IP "\fBsyslog_facility (mail)\fR"
 /*	The syslog facility of Postfix logging.
diff --git a/postfix/src/master/master.c b/postfix/src/master/master.c
index f98893331..8e498555f 100644
--- a/postfix/src/master/master.c
+++ b/postfix/src/master/master.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBmaster\fR [\fB-Dtv\fR] [\fB-c \fIconfig_dir\fR] [\fB-e \fIexit_time\fR]
 /* DESCRIPTION
-/*	The \fBmaster\fR daemon is the resident process that runs Postfix
+/*	The \fBmaster\fR(8) daemon is the resident process that runs Postfix
 /*	daemons on demand: daemons to send or receive messages via the
 /*	network, daemons to deliver mail locally, etc.  These daemons are
 /*	created on demand up to a configurable maximum number per service.
@@ -14,10 +14,11 @@
 /*	Postfix daemons terminate voluntarily, either after being idle for
 /*	a configurable amount of time, or after having serviced a
 /*	configurable number of requests. Exceptions to this rule are the
-/*	resident queue manager and the resident address verification server.
+/*	resident queue manager, address verification server, and the TLS
+/*	session cache and pseudo-random number server.
 /*
-/*	The behavior of the \fBmaster\fR daemon is controlled by the
-/*	\fBmaster.cf\fR configuration file, as described in master(5).
+/*	The behavior of the \fBmaster\fR(8) daemon is controlled by the
+/*	\fBmaster.cf\fR configuration file, as described in \fBmaster\fR(5).
 /*
 /*	Options:
 /* .IP "\fB-c \fIconfig_dir\fR"
@@ -35,7 +36,7 @@
 /* .IP \fB-t\fR
 /*	Test mode. Return a zero exit status when the \fBmaster.pid\fR lock
 /*	file does not exist or when that file is not locked.  This is evidence
-/*	that the \fBmaster\fR daemon is not running.
+/*	that the \fBmaster\fR(8) daemon is not running.
 /* .IP \fB-v\fR
 /*	Enable verbose logging for debugging purposes. This option
 /*	is passed on to child processes. Multiple \fB-v\fR options
@@ -43,7 +44,7 @@
 /* .PP
 /*	Signals:
 /* .IP \fBSIGHUP\fR
-/*	Upon receipt of a \fBHUP\fR signal (e.g., after \fBpostfix reload\fR),
+/*	Upon receipt of a \fBHUP\fR signal (e.g., after "\fBpostfix reload\fR"),
 /*	the master process re-reads its configuration files. If a service has
 /*	been removed from the \fBmaster.cf\fR file, its running processes
 /*	are terminated immediately.
@@ -51,11 +52,11 @@
 /*	as is convenient, so that changes in configuration settings
 /*	affect only new service requests.
 /* .IP \fBSIGTERM\fR
-/*	Upon receipt of a \fBTERM\fR signal (e.g., after \fBpostfix abort\fR),
+/*	Upon receipt of a \fBTERM\fR signal (e.g., after "\fBpostfix abort\fR"),
 /*	the master process passes the signal on to its child processes and
 /*	terminates.
 /*	This is useful for an emergency shutdown. Normally one would
-/*	terminate only the master (\fBpostfix stop\fR) and allow running
+/*	terminate only the master ("\fBpostfix stop\fR") and allow running
 /*	processes to finish what they are doing.
 /* DIAGNOSTICS
 /*	Problems are reported to \fBsyslogd\fR(8).
@@ -71,10 +72,10 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Unlike most Postfix daemon processes, the master(8) server does
+/*	Unlike most Postfix daemon processes, the \fBmaster\fR(8) server does
 /*	not automatically pick up changes to \fBmain.cf\fR. Changes
 /*	to \fBmaster.cf\fR are never picked up automatically.
-/*	Use the \fBpostfix reload\fR command after a configuration change.
+/*	Use the "\fBpostfix reload\fR" command after a configuration change.
 /* RESOURCE AND RATE CONTROLS
 /* .ad
 /* .fi
@@ -88,7 +89,7 @@
 /*	The maximal number of connection requests before a Postfix daemon
 /*	process terminates.
 /* .IP "\fBservice_throttle_time (60s)\fR"
-/*	How long the Postfix master(8) waits before forking a server that
+/*	How long the Postfix \fBmaster\fR(8) waits before forking a server that
 /*	appears to be malfunctioning.
 /* MISCELLANEOUS CONTROLS
 /* .ad
diff --git a/postfix/src/oqmgr/qmgr.c b/postfix/src/oqmgr/qmgr.c
index e17379eed..5264e8f7e 100644
--- a/postfix/src/oqmgr/qmgr.c
+++ b/postfix/src/oqmgr/qmgr.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBqmgr\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBqmgr\fR daemon awaits the arrival of incoming mail
+/*	The \fBqmgr\fR(8) daemon awaits the arrival of incoming mail
 /*	and arranges for its delivery via Postfix delivery processes.
 /*	The actual mail routing strategy is delegated to the
 /*	\fBtrivial-rewrite\fR(8) daemon.
@@ -19,10 +19,10 @@
 /* MAIL QUEUES
 /* .ad
 /* .fi
-/*	The \fBqmgr\fR daemon maintains the following queues:
+/*	The \fBqmgr\fR(8) daemon maintains the following queues:
 /* .IP \fBincoming\fR
 /*	Inbound mail from the network, or mail picked up by the
-/*	local \fBpickup\fR agent from the \fBmaildrop\fR directory.
+/*	local \fBpickup\fR(8) agent from the \fBmaildrop\fR directory.
 /* .IP \fBactive\fR
 /*	Messages that the queue manager has opened for delivery. Only
 /*	a limited number of messages is allowed to enter the \fBactive\fR
@@ -39,7 +39,7 @@
 /* DELIVERY STATUS REPORTS
 /* .ad
 /* .fi
-/*	The \fBqmgr\fR daemon keeps an eye on per-message delivery status
+/*	The \fBqmgr\fR(8) daemon keeps an eye on per-message delivery status
 /*	reports in the following directories. Each status report file has
 /*	the same name as the corresponding message file:
 /* .IP \fBbounce\fR
@@ -53,7 +53,7 @@
 /*	Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv\fR" command.
 /*	These files are maintained by the \fBtrace\fR(8) daemon.
 /* .PP
-/*	The \fBqmgr\fR daemon is responsible for asking the
+/*	The \fBqmgr\fR(8) daemon is responsible for asking the
 /*	\fBbounce\fR(8), \fBdefer\fR(8) or \fBtrace\fR(8) daemons to
 /*	send delivery reports.
 /* STRATEGIES
@@ -109,7 +109,7 @@
 /*	servers that should not go away forever. The action is to start
 /*	an incoming queue scan.
 /* .PP
-/*	The \fBqmgr\fR daemon reads an entire buffer worth of triggers.
+/*	The \fBqmgr\fR(8) daemon reads an entire buffer worth of triggers.
 /*	Multiple identical trigger requests are collapsed into one, and
 /*	trigger requests are sorted so that \fBA\fR and \fBF\fR precede
 /*	\fBD\fR and \fBI\fR. Thus, in order to force a deferred queue run,
@@ -118,17 +118,17 @@
 /* STANDARDS
 /* .ad
 /* .fi
-/*	None. The \fBqmgr\fR daemon does not interact with the outside world.
+/*	None. The \fBqmgr\fR(8) daemon does not interact with the outside world.
 /* SECURITY
 /* .ad
 /* .fi
-/*	The \fBqmgr\fR daemon is not security sensitive. It reads
+/*	The \fBqmgr\fR(8) daemon is not security sensitive. It reads
 /*	single-character messages from untrusted local users, and thus may
-/*	be susceptible to denial of service attacks. The \fBqmgr\fR daemon
+/*	be susceptible to denial of service attacks. The \fBqmgr\fR(8) daemon
 /*	does not talk to the outside world, and it can be run at fixed low
 /*	privilege in a chrooted environment.
 /* DIAGNOSTICS
-/*	Problems and transactions are logged to the syslog daemon.
+/*	Problems and transactions are logged to the \fBsyslog\fR(8) daemon.
 /*	Corrupted message files are saved to the \fBcorrupt\fR queue
 /*	for further inspection.
 /*
@@ -136,17 +136,18 @@
 /*	the postmaster is notified of bounces and of other trouble.
 /* BUGS
 /*	A single queue manager process has to compete for disk access with
-/*	multiple front-end processes such as \fBsmtpd\fR. A sudden burst of
+/*	multiple front-end processes such as \fBcleanup\fR(8). A sudden burst of
 /*	inbound mail can negatively impact outbound delivery rates.
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are not picked up automatically, as qmgr(8)
+/*	Changes to \fBmain.cf\fR are not picked up automatically,
+/*	as \fBqmgr\fR(8)
 /*	is a persistent process. Use the command "\fBpostfix reload\fR" after
 /*	a configuration change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /*
 /*	In the text below, \fItransport\fR is the first field in a
 /*	\fBmaster.cf\fR entry.
@@ -251,7 +252,7 @@
 /*	postconf(5), configuration parameters
 /*	master(5), generic daemon options
 /*	master(8), process manager
-/*	syslogd(8) system logging
+/*	syslogd(8), system logging
 /* README FILES
 /* .ad
 /* .fi
diff --git a/postfix/src/pickup/pickup.c b/postfix/src/pickup/pickup.c
index 145eb8165..2272a3c74 100644
--- a/postfix/src/pickup/pickup.c
+++ b/postfix/src/pickup/pickup.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBpickup\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBpickup\fR daemon waits for hints that new mail has been
+/*	The \fBpickup\fR(8) daemon waits for hints that new mail has been
 /*	dropped into the \fBmaildrop\fR directory, and feeds it into the
 /*	\fBcleanup\fR(8) daemon.
 /*	Ill-formatted files are deleted without notifying the originator.
@@ -15,32 +15,33 @@
 /* STANDARDS
 /* .ad
 /* .fi
-/*	None. The \fBpickup\fR daemon does not interact with the outside world.
+/*	None. The \fBpickup\fR(8) daemon does not interact with
+/*	the outside world.
 /* SECURITY
 /* .ad
 /* .fi
-/*	The \fBpickup\fR daemon is moderately security sensitive. It runs
+/*	The \fBpickup\fR(8) daemon is moderately security sensitive. It runs
 /*	with fixed low privilege and can run in a chrooted environment.
 /*	However, the program reads files from potentially hostile users.
-/*	The \fBpickup\fR daemon opens no files for writing, is careful about
+/*	The \fBpickup\fR(8) daemon opens no files for writing, is careful about
 /*	what files it opens for reading, and does not actually touch any data
 /*	that is sent to its public service endpoint.
 /* DIAGNOSTICS
 /*	Problems and transactions are logged to \fBsyslogd\fR(8).
 /* BUGS
-/*	The \fBpickup\fR daemon copies mail from file to the \fBcleanup\fR(8)
+/*	The \fBpickup\fR(8) daemon copies mail from file to the \fBcleanup\fR(8)
 /*	daemon.  It could avoid message copying overhead by sending a file
 /*	descriptor instead of file data, but then the already complex
 /*	\fBcleanup\fR(8) daemon would have to deal with unfiltered user data.
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	As the pickup(8) daemon is a relatively long-running process, up
+/*	As the \fBpickup\fR(8) daemon is a relatively long-running process, up
 /*	to an hour may pass before a \fBmain.cf\fR change takes effect.
 /*	Use the command "\fBpostfix reload\fR" command to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* CONTENT INSPECTION CONTROLS
 /* .ad
 /* .fi
diff --git a/postfix/src/pipe/pipe.c b/postfix/src/pipe/pipe.c
index ef304c256..8aae15f4d 100644
--- a/postfix/src/pipe/pipe.c
+++ b/postfix/src/pipe/pipe.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBpipe\fR [generic Postfix daemon options] command_attributes...
 /* DESCRIPTION
-/*	The \fBpipe\fR daemon processes requests from the Postfix queue
+/*	The \fBpipe\fR(8) daemon processes requests from the Postfix queue
 /*	manager to deliver messages to external commands.
 /*	This program expects to be run from the \fBmaster\fR(8) process
 /*	manager.
@@ -15,7 +15,7 @@
 /*	next-hop host name can be specified as command-line macros that are
 /*	expanded before the external command is executed.
 /*
-/*	The \fBpipe\fR daemon updates queue files and marks recipients
+/*	The \fBpipe\fR(8) daemon updates queue files and marks recipients
 /*	as finished, or it informs the queue manager that delivery should
 /*	be tried again at a later time. Delivery status reports are sent
 /*	to the \fBbounce\fR(8), \fBdefer\fR(8) or \fBtrace\fR(8) daemon as
@@ -90,7 +90,7 @@
 /*	This is recommended for delivery via \fBUUCP\fR or \fBBSMTP\fR.
 /* .sp
 /*	The result is compatible with the address parsing of command-line
-/*	recipients by the Postfix \fBsendmail\fR mail submission command.
+/*	recipients by the Postfix \fBsendmail\fR(1) mail submission command.
 /* .sp
 /*	The \fBq\fR flag affects only entire addresses, not the partial
 /*	address information from the \fB$user\fR, \fB$extension\fR or
@@ -227,12 +227,12 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically as pipe(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically as \fBpipe\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* RESOURCE AND RATE CONTROLS
 /* .ad
 /* .fi
diff --git a/postfix/src/postalias/postalias.c b/postfix/src/postalias/postalias.c
index c0b1c725c..a29b4e75f 100644
--- a/postfix/src/postalias/postalias.c
+++ b/postfix/src/postalias/postalias.c
@@ -9,7 +9,7 @@
 /*	[\fB-d \fIkey\fR] [\fB-q \fIkey\fR]
 /*		[\fIfile_type\fR:]\fIfile_name\fR ...
 /* DESCRIPTION
-/*	The \fBpostalias\fR command creates or queries one or more Postfix
+/*	The \fBpostalias\fR(1) command creates or queries one or more Postfix
 /*	alias databases, or updates an existing one. The input and output
 /*	file formats are expected to be compatible with Sendmail version 8,
 /*	and are expected to be suitable for the use as NIS alias maps.
@@ -41,19 +41,21 @@
 /*	a map.
 /* .IP \fB-i\fR
 /*	Incremental mode. Read entries from standard input and do not
-/*	truncate an existing database. By default, \fBpostalias\fR creates
+/*	truncate an existing database. By default, \fBpostalias\fR(1) creates
 /*	a new database from the entries in \fIfile_name\fR.
 /* .IP \fB-N\fR
 /*	Include the terminating null character that terminates lookup keys
-/*	and values. By default, Postfix does whatever is the default for
+/*	and values. By default, \fBpostalias\fR(1) does whatever
+/*	is the default for
 /*	the host operating system.
 /* .IP \fB-n\fR
 /*	Don't include the terminating null character that terminates lookup
-/*	keys and values. By default, Postfix does whatever is the default for
+/*	keys and values. By default, \fBpostalias\fR(1) does whatever
+/*	is the default for
 /*	the host operating system.
 /* .IP \fB-o\fR
 /*	Do not release root privileges when processing a non-root
-/*	input file. By default, \fBpostalias\fR drops root privileges
+/*	input file. By default, \fBpostalias\fR(1) drops root privileges
 /*	and runs as the source file owner instead.
 /* .IP \fB-p\fR
 /*	Do not inherit the file access permissions from the input file
@@ -90,7 +92,7 @@
 /*	The database type. To find out what types are supported, use
 /*	the "\fBpostconf -m\fR" command.
 /*
-/*	The \fBpostalias\fR command can query any supported file type,
+/*	The \fBpostalias\fR(1) command can query any supported file type,
 /*	but it can create only the following file types:
 /* .RS
 /* .IP \fBbtree\fR
@@ -124,8 +126,8 @@
 /*	no problems were detected. Duplicate entries are skipped and are
 /*	flagged with a warning.
 /*
-/*	\fBpostalias\fR terminates with zero exit status in case of success
-/*	(including successful \fBpostalias -q\fR lookup) and terminates
+/*	\fBpostalias\fR(1) terminates with zero exit status in case of success
+/*	(including successful "\fBpostalias -q\fR" lookup) and terminates
 /*	with non-zero exit status in case of failure.
 /* ENVIRONMENT
 /* .ad
@@ -141,9 +143,9 @@
 /*	this program.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBalias_database (see 'postconf -d' output)\fR"
-/*	The alias databases for local(8) delivery that are updated with
+/*	The alias databases for \fBlocal\fR(8) delivery that are updated with
 /*	"\fBnewaliases\fR" or with "\fBsendmail -bi\fR".
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
@@ -155,8 +157,8 @@
 /*	The per-table I/O buffer size for programs that read Berkeley DB
 /*	hash or btree tables.
 /* .IP "\fBdefault_database_type (see 'postconf -d' output)\fR"
-/*	The default database type for use in newaliases(1), postalias(1)
-/*	and postmap(1) commands.
+/*	The default database type for use in \fBnewaliases\fR(1), \fBpostalias\fR(1)
+/*	and \fBpostmap\fR(1) commands.
 /* .IP "\fBsyslog_facility (mail)\fR"
 /*	The syslog facility of Postfix logging.
 /* .IP "\fBsyslog_name (postfix)\fR"
diff --git a/postfix/src/postcat/postcat.c b/postfix/src/postcat/postcat.c
index 20595357a..411c01f2e 100644
--- a/postfix/src/postcat/postcat.c
+++ b/postfix/src/postcat/postcat.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBpostcat\fR [\fB-oqv\fR] [\fB-c \fIconfig_dir\fR] [\fIfiles\fR...]
 /* DESCRIPTION
-/*	The \fBpostcat\fR command prints the contents of the named
+/*	The \fBpostcat\fR(1) command prints the contents of the named
 /*	\fIfiles\fR in human-readable form. The files are expected
 /*	to be in Postfix queue file format. If no
 /*	\fIfiles\fR are specified on the command line, the program
@@ -40,7 +40,7 @@
 /*	this program.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
diff --git a/postfix/src/postconf/postconf.c b/postfix/src/postconf/postconf.c
index feb7f3ab5..67377f130 100644
--- a/postfix/src/postconf/postconf.c
+++ b/postfix/src/postconf/postconf.c
@@ -11,7 +11,7 @@
 /*	\fBpostconf\fR [\fB-ev\fR] [\fB-c \fIconfig_dir\fR]
 /*	[\fIparameter=value ...\fR]
 /* DESCRIPTION
-/*	The \fBpostconf\fR command prints the actual value of
+/*	The \fBpostconf\fR(1) command prints the actual value of
 /*	\fIparameter\fR (all known parameters by default) one
 /*	parameter per line, changes its value, or prints other
 /*	information about the Postfix mail system.
@@ -103,7 +103,7 @@
 /*	result.
 /* .IP "\fBtcp\fR (read-only)"
 /*	Perform lookups using a simple request-reply protocol that is
-/*	described in tcp_table(5).
+/*	described in \fBtcp_table\fR(5).
 /*	This feature is not included with Postfix 2.1.
 /* .IP "\fBunix\fR (read-only)"
 /*	A limited way to query the UNIX authentication database. The
@@ -111,10 +111,10 @@
 /* .RS
 /*. IP \fBunix:passwd.byname\fR
 /*	The table is the UNIX password database. The key is a login name.
-/*	The result is a password file entry in passwd(5) format.
+/*	The result is a password file entry in \fBpasswd\fR(5) format.
 /* .IP \fBunix:group.byname\fR
 /*	The table is the UNIX group database. The key is a group name.
-/*	The result is a group file entry in group(5) format.
+/*	The result is a group file entry in \fBgroup\fR(5) format.
 /* .RE
 /* .RE
 /* .sp
@@ -139,7 +139,7 @@
 /*	this program.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
diff --git a/postfix/src/postdrop/postdrop.c b/postfix/src/postdrop/postdrop.c
index 9dcf9dd08..d52e1e86b 100644
--- a/postfix/src/postdrop/postdrop.c
+++ b/postfix/src/postdrop/postdrop.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBpostdrop\fR [\fB-rv\fR] [\fB-c \fIconfig_dir\fR]
 /* DESCRIPTION
-/*	The \fBpostdrop\fR command creates a file in the \fBmaildrop\fR
+/*	The \fBpostdrop\fR(1) command creates a file in the \fBmaildrop\fR
 /*	directory and copies its standard input to the file.
 /*
 /*	Options:
@@ -52,7 +52,7 @@
 /*	The following \fBmain.cf\fR parameters are especially relevant to
 /*	this program.
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBalternate_config_directories (empty)\fR"
 /*	A list of non-default Postfix configuration directories that may
 /*	be specified with "-c config_directory" on the command line, or
@@ -72,12 +72,12 @@
 /*	records, so that "smtpd" becomes, for example, "postfix/smtpd".
 /* .IP "\fBtrigger_timeout (10s)\fR"
 /*	The time limit for sending a trigger to a Postfix daemon (for
-/*	example, the pickup(8) or qmgr(8) daemon).
+/*	example, the \fBpickup\fR(8) or \fBqmgr\fR(8) daemon).
 /* .PP
 /*	Available in Postfix version 2.2 and later:
 /* .IP "\fBauthorized_submit_users (static:anyone)\fR"
-/*	List of users who are authorized to submit mail with the sendmail(1)
-/*	command (and with the privileged postdrop(1) helper command).
+/*	List of users who are authorized to submit mail with the \fBsendmail\fR(1)
+/*	command (and with the privileged \fBpostdrop\fR(1) helper command).
 /* FILES
 /*	/var/spool/postfix/maildrop, maildrop queue
 /* SEE ALSO
diff --git a/postfix/src/postfix/postfix.c b/postfix/src/postfix/postfix.c
index 78f785643..03f320ab8 100644
--- a/postfix/src/postfix/postfix.c
+++ b/postfix/src/postfix/postfix.c
@@ -8,13 +8,13 @@
 /*	\fBpostfix\fR [\fB-Dv\fR] [\fB-c \fIconfig_dir\fR] \fIcommand\fR
 /* DESCRIPTION
 /*	This command is reserved for the superuser. To submit mail,
-/*	use the Postfix \fBsendmail\fR command.
+/*	use the Postfix \fBsendmail\fR(1) command.
 /*
-/*	The \fBpostfix\fR command controls the operation of the Postfix
-/*	mail system: start or stop the \fBmaster\fR daemon, do a health
+/*	The \fBpostfix\fR(1) command controls the operation of the Postfix
+/*	mail system: start or stop the \fBmaster\fR(8) daemon, do a health
 /*	check, and other maintenance.
 /*
-/*	The \fBpostfix\fR command sets up a standardized environment and
+/*	The \fBpostfix\fR(1) command sets up a standardized environment and
 /*	runs the \fBpostfix-script\fR shell script to do the actual work.
 /*
 /*	The following commands are implemented:
@@ -80,7 +80,7 @@
 /* ENVIRONMENT
 /* .ad
 /* .fi
-/*	The \fBpostfix\fR command exports the following environment
+/*	The \fBpostfix\fR(1) command exports the following environment
 /*	variables before executing the \fBpostfix-script\fR file:
 /* .IP \fBMAIL_CONFIG\fR
 /*	This is set when the -c command-line option is present.
@@ -110,13 +110,13 @@
 /*	Postfix directories.
 /* .IP "\fBsendmail_path (see 'postconf -d' output)\fR"
 /*	A Sendmail compatibility feature that specifies the location of
-/*	the Postfix sendmail(1) command.
+/*	the Postfix \fBsendmail\fR(1) command.
 /* .IP "\fBnewaliases_path (see 'postconf -d' output)\fR"
 /*	Sendmail compatibility feature that specifies the location of the
-/*	newaliases(1) command.
+/*	\fBnewaliases\fR(1) command.
 /* .IP "\fBmailq_path (see 'postconf -d' output)\fR"
 /*	Sendmail compatibility feature that specifies where the Postfix
-/*	mailq(1) command is installed.
+/*	\fBmailq\fR(1) command is installed.
 /* .IP "\fBhtml_directory (see 'postconf -d' output)\fR"
 /*	The location of Postfix HTML files that describe how to build,
 /*	configure or operate a specific Postfix subsystem or feature.
@@ -148,6 +148,7 @@
 /*	Commands:
 /*	postalias(1), create/update/query alias database
 /*	postcat(1), examine Postfix queue file
+/*	postconf(1), Postfix configuration utility
 /*	postkick(1), trigger Postfix daemon
 /*	postlock(1), Postfix-compatible locking
 /*	postlog(1), Postfix-compatible logging
diff --git a/postfix/src/postkick/postkick.c b/postfix/src/postkick/postkick.c
index 18b001160..721e9ac8e 100644
--- a/postfix/src/postkick/postkick.c
+++ b/postfix/src/postkick/postkick.c
@@ -8,7 +8,7 @@
 /*	\fBpostkick\fR [\fB-c \fIconfig_dir\fR] [\fB-v\fR]
 /*	\fIclass service request\fR
 /* DESCRIPTION
-/*	The \fBpostkick\fR command sends \fIrequest\fR to the
+/*	The \fBpostkick\fR(1) command sends \fIrequest\fR to the
 /*	specified \fIservice\fR over a local transport channel.
 /*	This command makes Postfix private IPC accessible
 /*	for use in, for example, shell scripts.
@@ -46,12 +46,12 @@
 /*	The following \fBmain.cf\fR parameters are especially relevant to
 /*	this program.
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
 /* .IP "\fBapplication_event_drain_time (100s)\fR"
-/*	How long the postkick(1) command waits for a request to enter the
+/*	How long the \fBpostkick\fR(1) command waits for a request to enter the
 /*	server's input buffer before giving up.
 /* .IP "\fBqueue_directory (see 'postconf -d' output)\fR"
 /*	The location of the Postfix top-level queue directory.
diff --git a/postfix/src/postlock/postlock.c b/postfix/src/postlock/postlock.c
index 37aa7b844..dcd2b9d00 100644
--- a/postfix/src/postlock/postlock.c
+++ b/postfix/src/postlock/postlock.c
@@ -8,7 +8,7 @@
 /*	\fBpostlock\fR [\fB-c \fIconfig_dir\fB] [\fB-l \fIlock_style\fB]
 /*		[\fB-v\fR] \fIfile command...\fR
 /* DESCRIPTION
-/*	The \fBpostlock\fR command locks \fIfile\fR for exclusive
+/*	The \fBpostlock\fR(1) command locks \fIfile\fR for exclusive
 /*	access, and executes \fIcommand\fR. The locking method is
 /*	compatible with the Postfix UNIX-style local delivery agent.
 /*
@@ -31,7 +31,7 @@
 /*	access.  The command is executed directly, i.e. without
 /*	interpretation by a shell command interpreter.
 /* DIAGNOSTICS
-/*	The result status is 75 (EX_TEMPFAIL) when \fBpostlock\fR
+/*	The result status is 75 (EX_TEMPFAIL) when \fBpostlock\fR(1)
 /*	could not perform the requested operation.  Otherwise, the
 /*	exit status is the exit status from the command.
 /* BUGS
@@ -51,20 +51,20 @@
 /*	The following \fBmain.cf\fR parameters are especially relevant to
 /*	this program. 
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* LOCKING CONTROLS
 /* .ad
 /* .fi
 /* .IP "\fBdeliver_lock_attempts (20)\fR"
 /*	The maximal number of attempts to acquire an exclusive lock on a
-/*	mailbox file or bounce(8) logfile.
+/*	mailbox file or \fBbounce\fR(8) logfile.
 /* .IP "\fBdeliver_lock_delay (1s)\fR"
 /*	The time between attempts to acquire an exclusive lock on a mailbox
-/*	file or bounce(8) logfile.
+/*	file or \fBbounce\fR(8) logfile.
 /* .IP "\fBstale_lock_time (500s)\fR"
 /*	The time after which a stale exclusive mailbox lockfile is removed.
 /* .IP "\fBmailbox_delivery_lock (see 'postconf -d' output)\fR"
-/*	How to lock a UNIX-style local(8) mailbox before attempting delivery.
+/*	How to lock a UNIX-style \fBlocal\fR(8) mailbox before attempting delivery.
 /* RESOURCE AND RATE CONTROLS
 /* .ad
 /* .fi
diff --git a/postfix/src/postlog/postlog.c b/postfix/src/postlog/postlog.c
index 76311858f..c882376cc 100644
--- a/postfix/src/postlog/postlog.c
+++ b/postfix/src/postlog/postlog.c
@@ -8,12 +8,12 @@
 /*	\fBpostlog\fR [\fB-iv\fR] [\fB-c \fIconfig_dir\fR]
 /*		[\fB-p \fIpriority\fB] [\fB-t \fItag\fR] [\fItext...\fR]
 /* DESCRIPTION
-/*	The \fBpostlog\fR command implements a Postfix-compatible logging
+/*	The \fBpostlog\fR(1) command implements a Postfix-compatible logging
 /*	interface for use in, for example, shell scripts.
 /*
-/*	By default, \fBpostlog\fR logs the \fItext\fR given on the command
+/*	By default, \fBpostlog\fR(1) logs the \fItext\fR given on the command
 /*	line as one record. If no \fItext\fR is specified on the command
-/*	line, \fBpostlog\fR reads from standard input and logs each input
+/*	line, \fBpostlog\fR(1) reads from standard input and logs each input
 /*	line as one record.
 /*
 /*	Logging is sent to \fBsyslogd\fR(8); when the standard error stream
@@ -47,7 +47,7 @@
 /*	this program.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
diff --git a/postfix/src/postmap/postmap.c b/postfix/src/postmap/postmap.c
index 0d3ad44c2..a033a02f5 100644
--- a/postfix/src/postmap/postmap.c
+++ b/postfix/src/postmap/postmap.c
@@ -9,7 +9,7 @@
 /*	[\fB-d \fIkey\fR] [\fB-q \fIkey\fR]
 /*		[\fIfile_type\fR:]\fIfile_name\fR ...
 /* DESCRIPTION
-/*	The \fBpostmap\fR command creates or queries one or more Postfix
+/*	The \fBpostmap\fR(1) command creates or queries one or more Postfix
 /*	lookup tables, or updates an existing one. The input and output
 /*	file formats are expected to be compatible with:
 /*
@@ -62,19 +62,21 @@
 /*	a map.
 /* .IP \fB-i\fR
 /*	Incremental mode. Read entries from standard input and do not
-/*	truncate an existing database. By default, \fBpostmap\fR creates
+/*	truncate an existing database. By default, \fBpostmap\fR(1) creates
 /*	a new database from the entries in \fBfile_name\fR.
 /* .IP \fB-N\fR
 /*	Include the terminating null character that terminates lookup keys
-/*	and values. By default, Postfix does whatever is the default for
+/*	and values. By default, \fBpostmap\fR(1) does whatever is
+/*	the default for
 /*	the host operating system.
 /* .IP \fB-n\fR
 /*	Don't include the terminating null character that terminates lookup
-/*	keys and values. By default, Postfix does whatever is the default for
+/*	keys and values. By default, \fBpostmap\fR(1) does whatever
+/*	is the default for
 /*	the host operating system.
 /* .IP \fB-o\fR
 /*	Do not release root privileges when processing a non-root
-/*	input file. By default, \fBpostmap\fR drops root privileges
+/*	input file. By default, \fBpostmap\fR(1) drops root privileges
 /*	and runs as the source file owner instead.
 /* .IP \fB-p\fR
 /*	Do not inherit the file access permissions from the input file
@@ -111,7 +113,7 @@
 /*	The database type. To find out what types are supported, use
 /*	the "\fBpostconf -m\fR" command.
 /*
-/*	The \fBpostmap\fR command can query any supported file type,
+/*	The \fBpostmap\fR(1) command can query any supported file type,
 /*	but it can create only the following file types:
 /* .RS
 /* .IP \fBbtree\fR
@@ -144,8 +146,8 @@
 /*	No output means that no problems were detected. Duplicate entries are
 /*	skipped and are flagged with a warning.
 /*
-/*	\fBpostmap\fR terminates with zero exit status in case of success
-/*	(including successful \fBpostmap -q\fR lookup) and terminates
+/*	\fBpostmap\fR(1) terminates with zero exit status in case of success
+/*	(including successful "\fBpostmap -q\fR" lookup) and terminates
 /*	with non-zero exit status in case of failure.
 /* ENVIRONMENT
 /* .ad
@@ -160,7 +162,7 @@
 /*	The following \fBmain.cf\fR parameters are especially relevant to
 /*	this program.
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBberkeley_db_create_buffer_size (16777216)\fR"
 /*	The per-table I/O buffer size for programs that create Berkeley DB
 /*	hash or btree tables.
@@ -171,8 +173,8 @@
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
 /* .IP "\fBdefault_database_type (see 'postconf -d' output)\fR"
-/*	The default database type for use in newaliases(1), postalias(1)
-/*	and postmap(1) commands.
+/*	The default database type for use in \fBnewaliases\fR(1), \fBpostalias\fR(1)
+/*	and \fBpostmap\fR(1) commands.
 /* .IP "\fBsyslog_facility (mail)\fR"
 /*	The syslog facility of Postfix logging.
 /* .IP "\fBsyslog_name (postfix)\fR"
diff --git a/postfix/src/postqueue/postqueue.c b/postfix/src/postqueue/postqueue.c
index 1d991ea49..200079ea2 100644
--- a/postfix/src/postqueue/postqueue.c
+++ b/postfix/src/postqueue/postqueue.c
@@ -10,7 +10,7 @@
 /* .br
 /*	\fBpostqueue\fR [\fB-c \fIconfig_dir\fR] \fB-s \fIsite\fR
 /* DESCRIPTION
-/*	The \fBpostqueue\fR program implements the Postfix user interface
+/*	The \fBpostqueue\fR(1) command implements the Postfix user interface
 /*	for queue management. It implements operations that are
 /*	traditionally available via the \fBsendmail\fR(1) command.
 /*	See the \fBpostsuper\fR(1) command for queue operations
@@ -25,7 +25,7 @@
 /* .IP \fB-f\fR
 /*	Flush the queue: attempt to deliver all queued mail.
 /*
-/*	This option implements the traditional \fBsendmail -q\fR command,
+/*	This option implements the traditional "\fBsendmail -q\fR" command,
 /*	by contacting the Postfix \fBqmgr\fR(8) daemon.
 /*
 /*	Warning: flushing undeliverable mail frequently will result in
@@ -57,7 +57,7 @@
 /*	See \fBflush\fR(8) for more information about the "fast flush"
 /*	service.
 /*
-/*	This option implements the traditional \fBsendmail -qR\fIsite\fR
+/*	This option implements the traditional "\fBsendmail -qR\fIsite\fR"
 /*	command, by contacting the Postfix \fBflush\fR(8) daemon.
 /* .IP \fB-v\fR
 /*	Enable verbose logging for debugging purposes. Multiple \fB-v\fR
@@ -90,7 +90,7 @@
 /*	The following \fBmain.cf\fR parameters are especially relevant to
 /*	this program.
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBalternate_config_directories (empty)\fR"
 /*	A list of non-default Postfix configuration directories that may
 /*	be specified with "-c config_directory" on the command line, or
@@ -115,7 +115,7 @@
 /*	records, so that "smtpd" becomes, for example, "postfix/smtpd".
 /* .IP "\fBtrigger_timeout (10s)\fR"
 /*	The time limit for sending a trigger to a Postfix daemon (for
-/*	example, the pickup(8) or qmgr(8) daemon).
+/*	example, the \fBpickup\fR(8) or \fBqmgr\fR(8) daemon).
 /* .PP
 /*	Available in Postfix version 2.2 and later:
 /* .IP "\fBauthorized_flush_users (static:anyone)\fR"
diff --git a/postfix/src/postsuper/postsuper.c b/postfix/src/postsuper/postsuper.c
index 7c5a21179..f523a5dfe 100644
--- a/postfix/src/postsuper/postsuper.c
+++ b/postfix/src/postsuper/postsuper.c
@@ -10,12 +10,13 @@
 /*		[\fB-h \fIqueue_id\fR] [\fB-H \fIqueue_id\fR]
 /*		[\fB-r \fIqueue_id\fR] [\fIdirectory ...\fR]
 /* DESCRIPTION
-/*	The \fBpostsuper\fR command does maintenance jobs on the Postfix
+/*	The \fBpostsuper\fR(1) command does maintenance jobs on the Postfix
 /*	queue. Use of the command is restricted to the superuser.
-/*	See the \fBpostqueue\fR command for unprivileged queue operations
+/*	See the \fBpostqueue\fR(1) command for unprivileged queue operations
 /*	such as listing or flushing the mail queue.
 /*
-/*	By default, \fBpostsuper\fR performs the operations requested with the
+/*	By default, \fBpostsuper\fR(1) performs the operations
+/*	requested with the
 /*	\fB-s\fR and \fB-p\fR command-line options on all Postfix queue
 /*	directories - this includes the \fBincoming\fR, \fBactive\fR and
 /*	\fBdeferred\fR directories with mail files and the \fBbounce\fR,
@@ -32,11 +33,15 @@
 /*	\fBdeferred\fR).
 /*	If a \fIqueue_id\fR of \fB-\fR is specified, the program reads
 /*	queue IDs from standard input. For example, to delete all mail
-/*	from or to \fBuser@example.com\fR:
+/*	with exactly one recipient \fBuser@example.com\fR:
 /* .sp
-/*	mailq | tail +2 | awk  \'BEGIN { RS = "" } \e
+/*	mailq | tail +2 | awk  \'BEGIN { RS = "" }
 /* .ti +4
-/*	/ user@example\e.com$/ { print $1 } \e
+/*	# $7=sender, $8=recipient1, $9=recipient2
+/* .ti +4
+/*	{ if ($8 == "user@example.com" && $9 == "")
+/* .ti +6
+/*	print $1 }
 /* .br
 /*	\' | tr -d '*!' | postsuper -d -
 /* .sp
@@ -53,17 +58,17 @@
 /*	The scenario is as follows:
 /* .RS
 /* .IP 1)
-/*	The Postfix queue manager deletes the message that \fBpostsuper\fR
+/*	The Postfix queue manager deletes the message that \fBpostsuper\fR(1)
 /*	is asked to delete, because Postfix is finished with the
 /*	message (it is delivered, or it is returned to the sender).
 /* .IP 2)
 /*	New mail arrives, and the new message is given the same queue ID
-/*	as the message that \fBpostsuper\fR is supposed to delete.
+/*	as the message that \fBpostsuper\fR(1) is supposed to delete.
 /*	The probability for reusing a deleted queue ID is about 1 in 2**15
 /*	(the number of different microsecond values that the system clock
 /*	can distinguish within a second).
 /* .IP 3)
-/*	\fBpostsuper\fR deletes the new message, instead of the old
+/*	\fBpostsuper\fR(1) deletes the new message, instead of the old
 /*	message that it should have deleted.
 /* .RE
 /* .IP "\fB-h \fIqueue_id\fR"
@@ -120,7 +125,7 @@
 /*	mappings have changed.
 /* .sp
 /*	Warning: Postfix queue IDs are reused.
-/*	There is a very small possibility that \fBpostsuper\fR requeues
+/*	There is a very small possibility that \fBpostsuper\fR(1) requeues
 /*	the wrong message file when it is executed while the Postfix mail
 /*	system is running, but no harm should be done.
 /* .IP \fB-s\fR
@@ -145,7 +150,7 @@
 /*	Problems are reported to the standard error stream and to
 /*	\fBsyslogd\fR(8).
 /*
-/*	\fBpostsuper\fR reports the number of messages deleted with \fB-d\fR,
+/*	\fBpostsuper\fR(1) reports the number of messages deleted with \fB-d\fR,
 /*	the number of messages requeued with \fB-r\fR, and the number of
 /*	messages whose queue file name was fixed with \fB-s\fR. The report
 /*	is written to the standard error stream and to \fBsyslogd\fR(8).
@@ -163,14 +168,14 @@
 /*	The following \fBmain.cf\fR parameters are especially relevant to
 /*	this program.
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
 /* .IP "\fBhash_queue_depth (1)\fR"
 /*	The number of subdirectory levels for queue directories listed with
 /*	the hash_queue_names parameter.
-/* .IP "\fBhash_queue_names (see 'postconf -d' output)\fR"
+/* .IP "\fBhash_queue_names (deferred, defer)\fR"
 /*	The names of queue directories that are split across multiple
 /*	subdirectory levels.
 /* .IP "\fBqueue_directory (see 'postconf -d' output)\fR"
diff --git a/postfix/src/proxymap/proxymap.c b/postfix/src/proxymap/proxymap.c
index 75c802219..e1ffd7e54 100644
--- a/postfix/src/proxymap/proxymap.c
+++ b/postfix/src/proxymap/proxymap.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBproxymap\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBproxymap\fR server provides read-only table
+/*	The \fBproxymap\fR(8) server provides read-only table
 /*	lookup service to Postfix processes. The purpose
 /*	of the service is:
 /* .IP \(bu
@@ -32,7 +32,7 @@
 /*	The total number of connections is limited by the number of
 /*	proxymap server processes.
 /* .PP
-/*	The proxymap server implements the following requests:
+/*	The \fBproxymap\fR(8) server implements the following requests:
 /* .IP "\fBopen\fR \fImaptype:mapname flags\fR"
 /*	Open the table with type \fImaptype\fR and name \fImapname\fR,
 /*	as controlled by \fIflags\fR. The reply includes the \fImaptype\fR
@@ -51,23 +51,24 @@
 /* SERVER PROCESS MANAGEMENT
 /* .ad
 /* .fi
-/*	\fBproxymap\fR servers run under control by the Postfix \fBmaster\fR
+/*	\fBproxymap\fR(8) servers run under control by the Postfix
+/*	\fBmaster\fR(8)
 /*	server.  Each server can handle multiple simultaneous connections.
-/*	When all servers are busy while a client connects, the \fBmaster\fR
-/*	creates a new \fBproxymap\fR server process, provided that the
+/*	When all servers are busy while a client connects, the \fBmaster\fR(8)
+/*	creates a new \fBproxymap\fR(8) server process, provided that the
 /*	process limit is not exceeded.
 /*	Each server terminates after serving at least \fB$max_use\fR clients
 /*	or after \fB$max_idle\fR seconds of idle time.
 /* SECURITY
 /* .ad
 /* .fi
-/*	The proxymap server opens only tables that are approved via the
+/*	The \fBproxymap\fR(8) server opens only tables that are approved via the
 /*	\fBproxy_read_maps\fR configuration parameter, does not talk to
 /*	users, and can run at fixed low privilege, chrooted or not.
 /*	However, running the proxymap server chrooted severely limits
 /*	usability, because it can open only chrooted tables.
 /*
-/*	The proxymap server is not a trusted daemon process, and must
+/*	The \fBproxymap\fR(8) server is not a trusted daemon process, and must
 /*	not be used to look up sensitive information such as user or
 /*	group IDs, mailbox file/directory names or external commands.
 /*
@@ -78,18 +79,19 @@
 /* DIAGNOSTICS
 /*	Problems and transactions are logged to \fBsyslogd\fR(8).
 /* BUGS
-/*	The proxymap server provides service to multiple clients,
+/*	The \fBproxymap\fR(8) server provides service to multiple clients,
 /*	and must therefore not be used for tables that have high-latency
 /*	lookups.
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	On busy mail systems a long time may pass before proxymap(8) relevant
+/*	On busy mail systems a long time may pass before
+/*	\fBproxymap\fR(8) relevant
 /*	changes to \fBmain.cf\fR are picked up. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
@@ -110,7 +112,7 @@
 /* .IP "\fBprocess_name (read-only)\fR"
 /*	The process name of a Postfix command or daemon process.
 /* .IP "\fBproxy_read_maps (see 'postconf -d' output)\fR"
-/*	The lookup tables that the proxymap(8) server is allowed to access.
+/*	The lookup tables that the \fBproxymap\fR(8) server is allowed to access.
 /* SEE ALSO
 /*	postconf(5), configuration parameters
 /*	master(5), generic daemon options
diff --git a/postfix/src/qmgr/qmgr.c b/postfix/src/qmgr/qmgr.c
index d590943ae..e1cab39d1 100644
--- a/postfix/src/qmgr/qmgr.c
+++ b/postfix/src/qmgr/qmgr.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBqmgr\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBqmgr\fR daemon awaits the arrival of incoming mail
+/*	The \fBqmgr\fR(8) daemon awaits the arrival of incoming mail
 /*	and arranges for its delivery via Postfix delivery processes.
 /*	The actual mail routing strategy is delegated to the
 /*	\fBtrivial-rewrite\fR(8) daemon.
@@ -19,10 +19,10 @@
 /* MAIL QUEUES
 /* .ad
 /* .fi
-/*	The \fBqmgr\fR daemon maintains the following queues:
+/*	The \fBqmgr\fR(8) daemon maintains the following queues:
 /* .IP \fBincoming\fR
 /*	Inbound mail from the network, or mail picked up by the
-/*	local \fBpickup\fR agent from the \fBmaildrop\fR directory.
+/*	local \fBpickup\fR(8) daemon from the \fBmaildrop\fR directory.
 /* .IP \fBactive\fR
 /*	Messages that the queue manager has opened for delivery. Only
 /*	a limited number of messages is allowed to enter the \fBactive\fR
@@ -39,7 +39,7 @@
 /* DELIVERY STATUS REPORTS
 /* .ad
 /* .fi
-/*	The \fBqmgr\fR daemon keeps an eye on per-message delivery status
+/*	The \fBqmgr\fR(8) daemon keeps an eye on per-message delivery status
 /*	reports in the following directories. Each status report file has
 /*	the same name as the corresponding message file:
 /* .IP \fBbounce\fR
@@ -53,7 +53,7 @@
 /*	Postfix "\fBsendmail -v\fR" or "\fBsendmail -bv\fR" command.
 /*	These files are maintained by the \fBtrace\fR(8) daemon.
 /* .PP
-/*	The \fBqmgr\fR daemon is responsible for asking the
+/*	The \fBqmgr\fR(8) daemon is responsible for asking the
 /*	\fBbounce\fR(8), \fBdefer\fR(8) or \fBtrace\fR(8) daemons to
 /*	send delivery reports.
 /* STRATEGIES
@@ -113,7 +113,7 @@
 /*	servers that should not go away forever. The action is to start
 /*	an incoming queue scan.
 /* .PP
-/*	The \fBqmgr\fR daemon reads an entire buffer worth of triggers.
+/*	The \fBqmgr\fR(8) daemon reads an entire buffer worth of triggers.
 /*	Multiple identical trigger requests are collapsed into one, and
 /*	trigger requests are sorted so that \fBA\fR and \fBF\fR precede
 /*	\fBD\fR and \fBI\fR. Thus, in order to force a deferred queue run,
@@ -122,13 +122,13 @@
 /* STANDARDS
 /* .ad
 /* .fi
-/*	None. The \fBqmgr\fR daemon does not interact with the outside world.
+/*	None. The \fBqmgr\fR(8) daemon does not interact with the outside world.
 /* SECURITY
 /* .ad
 /* .fi
-/*	The \fBqmgr\fR daemon is not security sensitive. It reads
+/*	The \fBqmgr\fR(8) daemon is not security sensitive. It reads
 /*	single-character messages from untrusted local users, and thus may
-/*	be susceptible to denial of service attacks. The \fBqmgr\fR daemon
+/*	be susceptible to denial of service attacks. The \fBqmgr\fR(8) daemon
 /*	does not talk to the outside world, and it can be run at fixed low
 /*	privilege in a chrooted environment.
 /* DIAGNOSTICS
@@ -140,17 +140,18 @@
 /*	the postmaster is notified of bounces and of other trouble.
 /* BUGS
 /*	A single queue manager process has to compete for disk access with
-/*	multiple front-end processes such as \fBsmtpd\fR. A sudden burst of
+/*	multiple front-end processes such as \fBcleanup\fR(8). A sudden burst of
 /*	inbound mail can negatively impact outbound delivery rates.
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are not picked up automatically as qmgr(8)
-/*	is a persistent process. Use the \fBpostfix reload\fR command after
+/*	Changes to \fBmain.cf\fR are not picked up automatically
+/*	as \fBqmgr\fR(8)
+/*	is a persistent process. Use the "\fBpostfix reload\fR" command after
 /*	a configuration change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /*
 /*	In the text below, \fItransport\fR is the first field in a
 /*	\fBmaster.cf\fR entry.
@@ -286,7 +287,7 @@
 /*	postconf(5), configuration parameters
 /*	master(5), generic daemon options
 /*	master(8), process manager
-/*	syslogd(8) system logging
+/*	syslogd(8), system logging
 /* README FILES
 /* .ad
 /* .fi
diff --git a/postfix/src/qmqpd/qmqpd.c b/postfix/src/qmqpd/qmqpd.c
index 76fdceaf1..4ff79341c 100644
--- a/postfix/src/qmqpd/qmqpd.c
+++ b/postfix/src/qmqpd/qmqpd.c
@@ -35,12 +35,12 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically, as qmqpd(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically, as \fBqmqpd\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* CONTENT INSPECTION CONTROLS
 /* .ad
 /* .fi
@@ -115,7 +115,7 @@
 /*	records, so that "smtpd" becomes, for example, "postfix/smtpd".
 /* .IP "\fBverp_delimiter_filter (-=+)\fR"
 /*	The characters Postfix accepts as VERP delimiter characters on the
-/*	Postfix sendmail(1) command line and in SMTP commands.
+/*	Postfix \fBsendmail\fR(1) command line and in SMTP commands.
 /* SEE ALSO
 /*	http://cr.yp.to/proto/qmqp.html, QMQP protocol
 /*	cleanup(8), message canonicalization
diff --git a/postfix/src/scache/scache.c b/postfix/src/scache/scache.c
index cbf9e4c24..3a1f5112c 100644
--- a/postfix/src/scache/scache.c
+++ b/postfix/src/scache/scache.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBscache\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBscache\fR server maintains a shared multi-connection
+/*	The \fBscache\fR(8) server maintains a shared multi-connection
 /*	cache. This information can be used by, for example, Postfix
 /*	SMTP clients or other Postfix delivery agents.
 /*
@@ -24,11 +24,11 @@
 /*	one endpoint may refer to zero or more connections.
 /*
 /*	The exact syntax of a logical destination or endpoint name
-/*	is application dependent; the \fBscache\fR service does
+/*	is application dependent; the \fBscache\fR(8) server does
 /*	not care.  A connection is stored as a file descriptor together
 /*	with application-dependent information that is needed to
-/*	re-activate a connection object. Again, the \fBscache\fR
-/*	service is completely unaware about the details of that
+/*	re-activate a connection object. Again, the \fBscache\fR(8)
+/*	server is completely unaware of the details of that
 /*	information.
 /*
 /*	All information is stored with a finite time to live (ttl).
@@ -56,28 +56,28 @@
 /* SECURITY
 /* .ad
 /* .fi
-/*	The connection cache server is not security-sensitive. It does not
+/*	The \fBscache\fR(8) server is not security-sensitive. It does not
 /*	talk to the network, and it does not talk to local users.
-/*	The scache server can run chrooted at fixed low privilege.
+/*	The \fBscache\fR(8) server can run chrooted at fixed low privilege.
 /*
-/*	The connection cache server is not a trusted process. It must
+/*	The \fBscache\fR(8) server is not a trusted process. It must
 /*	not be used to store information that is security sensitive.
 /* DIAGNOSTICS
 /*	Problems and transactions are logged to \fBsyslogd\fR(8).
 /* BUGS
-/*	Sessions cannot be cached across multiple machines.
+/*	The session cache cannot be shared among multiple machines.
 /*
-/*	When a connection expires from the cache it is closed without
-/*	protocol specific handshake.
+/*	When a connection expires from the cache, it is closed without
+/*	the appropriate protocol specific handshake.
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically as scache(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically as \fBscache\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* RESOURCE CONTROLS
 /* .ad
 /* .fi
@@ -85,7 +85,7 @@
 /*	The maximal time-to-live value that the connection cache server
 /*	allows.
 /* .IP "\fBconnection_cache_status_update_time (600s)\fR"
-/*	How frequently the scache(8) server logs usage statistics with
+/*	How frequently the \fBscache\fR(8) server logs usage statistics with
 /*	connection cache hit and miss rates for logical destinations and for
 /*	physical endpoints.
 /* MISCELLANEOUS CONTROLS
diff --git a/postfix/src/sendmail/sendmail.c b/postfix/src/sendmail/sendmail.c
index 9406751bb..b36aa904c 100644
--- a/postfix/src/sendmail/sendmail.c
+++ b/postfix/src/sendmail/sendmail.c
@@ -12,14 +12,15 @@
 /*	\fBnewaliases\fR
 /*	\fBsendmail -I\fR
 /* DESCRIPTION
-/*	The Postfix \fBsendmail\fR command implements the Postfix to Sendmail
-/*	compatibility interface.
+/*	The Postfix \fBsendmail\fR(1) command implements the Postfix
+/*	to Sendmail compatibility interface.
 /*	For the sake of compatibility with existing applications, some
 /*	Sendmail command-line options are recognized but silently ignored.
 /*
-/*	By default, Postfix \fBsendmail\fR reads a message from standard input
+/*	By default, Postfix \fBsendmail\fR(1) reads a message from
+/*	standard input
 /*	until EOF or until it reads a line with only a \fB.\fR character,
-/*	and arranges for delivery.  Postfix \fBsendmail\fR relies on the
+/*	and arranges for delivery.  Postfix \fBsendmail\fR(1) relies on the
 /*	\fBpostdrop\fR(1) command to create a queue file in the \fBmaildrop\fR
 /*	directory.
 /*
@@ -41,7 +42,7 @@
 /*	command.
 /* .sp
 /*	Note: it may take a minute or so before an alias database update
-/*	becomes visible. Use the \fBpostfix reload\fR command to eliminate
+/*	becomes visible. Use the "\fBpostfix reload\fR" command to eliminate
 /*	this delay.
 /* .PP
 /*	These and other features can be selected by specifying the
@@ -57,7 +58,7 @@
 /*	The message body MIME type: \fB7BIT\fR or \fB8BITMIME\fR.
 /* .IP \fB-bd\fR
 /*	Go into daemon mode. This mode of operation is implemented by
-/*	executing the \fBpostfix start\fR command.
+/*	executing the "\fBpostfix start\fR" command.
 /* .IP "\fB-bh\fR (ignored)"
 /* .IP "\fB-bH\fR (ignored)"
 /*	Postfix has no persistent host status database.
@@ -92,8 +93,8 @@
 /*	have no \fBFrom:\fR message header.
 /* .IP "\fB-f \fIsender\fR"
 /*	Set the envelope sender address. This is the address where
-/*	delivery problems are sent to, unless the message contains an
-/*	\fBErrors-To:\fR message header.
+/*	delivery problems are sent to. With Postfix versions before 2.1, the
+/*	\fBErrors-To:\fR message header overrides the error return address.
 /* .IP "\fB-G\fR (ignored)"
 /*	Gateway (relay) submission, as opposed to initial user submission.
 /* .IP "\fB-h \fIhop_count\fR (ignored)"
@@ -135,8 +136,8 @@
 /*	configuration parameter in \fBmain.cf\fR instead.
 /* .IP "\fB-r \fIsender\fR"
 /*	Set the envelope sender address. This is the address where
-/*	delivery problems are sent to, unless the message contains an
-/*	\fBErrors-To:\fR message header.
+/*	delivery problems are sent to. With Postfix versions before 2.1, the
+/*	\fBErrors-To:\fR message header overrides the error return address.
 /* .IP "\fB-R \fIreturn_limit\fR (ignored)"
 /*	Limit the size of bounced mail. Use the \fBbounce_size_limit\fR
 /*	configuration parameter instead.
@@ -157,7 +158,7 @@
 /*	See \fBflush\fR(8) for more information about the "fast flush"
 /*	service.
 /* .IP \fB-qS\fIsite\fR
-/*	This command is not implemented. Use the slower \fBsendmail -q\fR
+/*	This command is not implemented. Use the slower "\fBsendmail -q\fR"
 /*	command instead.
 /* .IP \fB-t\fR
 /*	Extract recipients from message headers. These are added to any
@@ -217,7 +218,7 @@
 /*	The following \fBmain.cf\fR parameters are especially relevant to
 /*	this program.
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* TROUBLE SHOOTING CONTROLS
 /* .ad
 /* .fi
@@ -242,8 +243,8 @@
 /* .IP "\fBauthorized_mailq_users (static:anyone)\fR"
 /*	List of users who are authorized to view the queue.
 /* .IP "\fBauthorized_submit_users (static:anyone)\fR"
-/*	List of users who are authorized to submit mail with the sendmail(1)
-/*	command (and with the privileged postdrop(1) helper command).
+/*	List of users who are authorized to submit mail with the \fBsendmail\fR(1)
+/*	command (and with the privileged \fBpostdrop\fR(1) helper command).
 /* RESOURCE AND RATE CONTROLS
 /* .ad
 /* .fi
@@ -277,12 +278,12 @@
 /*	The two default VERP delimiter characters.
 /* .IP "\fBverp_delimiter_filter (-=+)\fR"
 /*	The characters Postfix accepts as VERP delimiter characters on the
-/*	Postfix sendmail(1) command line and in SMTP commands.
+/*	Postfix \fBsendmail\fR(1) command line and in SMTP commands.
 /* MISCELLANEOUS CONTROLS
 /* .ad
 /* .fi
 /* .IP "\fBalias_database (see 'postconf -d' output)\fR"
-/*	The alias databases for local(8) delivery that are updated with
+/*	The alias databases for \fBlocal\fR(8) delivery that are updated with
 /*	"\fBnewaliases\fR" or with "\fBsendmail -bi\fR".
 /* .IP "\fBcommand_directory (see 'postconf -d' output)\fR"
 /*	The location of all postfix administrative commands.
@@ -292,11 +293,17 @@
 /* .IP "\fBdaemon_directory (see 'postconf -d' output)\fR"
 /*	The directory with Postfix support programs and daemon programs.
 /* .IP "\fBdefault_database_type (see 'postconf -d' output)\fR"
-/*	The default database type for use in newaliases(1), postalias(1)
-/*	and postmap(1) commands.
+/*	The default database type for use in \fBnewaliases\fR(1), \fBpostalias\fR(1)
+/*	and \fBpostmap\fR(1) commands.
 /* .IP "\fBdelay_warning_time (0h)\fR"
 /*	The time after which the sender receives the message headers of
 /*	mail that is still queued.
+/* .IP "\fBenable_errors_to (no)\fR"
+/*	Report mail delivery errors to the address specified with the
+/*	non-standard Errors-To: message header, instead of the envelope
+/*	sender address (this feature is removed with Postfix 2.2, is
+/*	turned off by default with Postfix 2.1, and is always turned on
+/*	with older Postfix versions).
 /* .IP "\fBmail_owner (postfix)\fR"
 /*	The UNIX system account that owns the Postfix queue and most Postfix
 /*	daemon processes.
@@ -309,7 +316,7 @@
 /*	records, so that "smtpd" becomes, for example, "postfix/smtpd".
 /* .IP "\fBtrigger_timeout (10s)\fR"
 /*	The time limit for sending a trigger to a Postfix daemon (for
-/*	example, the pickup(8) or qmgr(8) daemon).
+/*	example, the \fBpickup\fR(8) or \fBqmgr\fR(8) daemon).
 /* FILES
 /*	/var/spool/postfix, mail queue
 /*	/etc/postfix, configuration files
@@ -521,6 +528,7 @@ static void output_header(void *context, int header_class,
 		offset += var_line_limit;
 	    } else {
 		output_text(context, REC_TYPE_NORM, line, len, offset);
+		offset += len;
 		break;
 	    }
 	} while (len > 0);
diff --git a/postfix/src/showq/showq.c b/postfix/src/showq/showq.c
index 8a659f234..fcd6bf27d 100644
--- a/postfix/src/showq/showq.c
+++ b/postfix/src/showq/showq.c
@@ -6,38 +6,39 @@
 /* SYNOPSIS
 /*	\fBshowq\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBshowq\fR daemon reports the Postfix mail queue status.
+/*	The \fBshowq\fR(8) daemon reports the Postfix mail queue status.
 /*	It is the program that emulates the sendmail `mailq' command.
 /*
-/*	The \fBshowq\fR daemon can also be run in stand-alone mode
+/*	The \fBshowq\fR(8) daemon can also be run in stand-alone mode
 /*	by the superuser. This mode of operation is used to emulate
 /*	the `mailq' command while the Postfix mail system is down.
 /* SECURITY
 /* .ad
 /* .fi
-/*	The \fBshowq\fR daemon can run in a chroot jail at fixed low
+/*	The \fBshowq\fR(8) daemon can run in a chroot jail at fixed low
 /*	privilege, and takes no input from the client. Its service port
 /*	is accessible to local untrusted users, so the service can be
 /*	susceptible to denial of service attacks.
 /* STANDARDS
 /* .ad
 /* .fi
-/*	None. The showq daemon does not interact with the outside world.
+/*	None. The \fBshowq\fR(8) daemon does not interact with the
+/*	outside world.
 /* DIAGNOSTICS
 /*	Problems and transactions are logged to \fBsyslogd\fR(8).
 /* BUGS
-/*	The \fBshowq\fR daemon runs at a fixed low privilege; consequently,
+/*	The \fBshowq\fR(8) daemon runs at a fixed low privilege; consequently,
 /*	it cannot extract information from queue files in the
 /*	\fBmaildrop\fR directory.
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically as showq(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically as \fBshowq\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* .IP "\fBconfig_directory (see 'postconf -d' output)\fR"
 /*	The default location of the Postfix main.cf and master.cf
 /*	configuration files.
@@ -46,8 +47,8 @@
 /*	request before it is terminated by a built-in watchdog timer.
 /* .IP "\fBduplicate_filter_limit (1000)\fR"
 /*	The maximal number of addresses remembered by the address
-/*	duplicate filter for aliases(5) or virtual(5) alias expansion, or
-/*	for showq(8) queue displays.
+/*	duplicate filter for \fBaliases\fR(5) or \fBvirtual\fR(5) alias expansion, or
+/*	for \fBshowq\fR(8) queue displays.
 /* .IP "\fBempty_address_recipient (MAILER-DAEMON)\fR"
 /*	The recipient of mail addressed to the null address.
 /* .IP "\fBipc_timeout (3600s)\fR"
diff --git a/postfix/src/smtp/smtp.c b/postfix/src/smtp/smtp.c
index b87b1f18e..3b76ba90c 100644
--- a/postfix/src/smtp/smtp.c
+++ b/postfix/src/smtp/smtp.c
@@ -2,11 +2,11 @@
 /* NAME
 /*	smtp 8
 /* SUMMARY
-/*	Postfix remote delivery via SMTP
+/*	Postfix SMTP client
 /* SYNOPSIS
 /*	\fBsmtp\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The SMTP client processes message delivery requests from
+/*	The Postfix SMTP client processes message delivery requests from
 /*	the queue manager. Each request specifies a queue file, a sender
 /*	address, a domain or host to deliver to, and recipient information.
 /*	This program expects to be run from the \fBmaster\fR(8) process
@@ -27,7 +27,7 @@
 /*	deliver the mail to an alternate host.
 /*
 /*	After a successful mail transaction, a connection may be saved
-/*	to the \fBscache(8)\fR connection cache server, so that it
+/*	to the \fBscache\fR(8) connection cache server, so that it
 /*	may be used by any SMTP client for a subsequent transaction.
 /*
 /*	By default, connection caching is enabled temporarily for
@@ -70,12 +70,12 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically, as smtp(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically, as \fBsmtp\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* COMPATIBILITY CONTROLS
 /* .ad
 /* .fi
@@ -210,8 +210,8 @@
 /*	The expiration time of Postfix SMTP client TLS session cache
 /*	information.
 /* .IP "\fBtls_daemon_random_bytes (32)\fR"
-/*	The number of pseudo-random bytes that an smtp(8) or smtpd(8)
-/*	process requests from the tlsmgr(8) server in order to seed its
+/*	The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
+/*	process requests from the \fBtlsmgr\fR(8) server in order to seed its
 /*	internal pseudo random number generator (PRNG).
 /* RESOURCE AND RATE CONTROLS
 /* .ad
diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index caeb1bd0e..a220b5c34 100644
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -49,12 +49,12 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically, as smtpd(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically, as \fBsmtpd\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* COMPATIBILITY CONTROLS
 /* .ad
 /* .fi
@@ -250,8 +250,8 @@
 /*	Run the Postfix SMTP server in the non-standard "wrapper" mode,
 /*	instead of using the STARTTLS command.
 /* .IP "\fBtls_daemon_random_bytes (32)\fR"
-/*	The number of pseudo-random bytes that an smtp(8) or smtpd(8)
-/*	process requests from the tlsmgr(8) server in order to seed its
+/*	The number of pseudo-random bytes that an \fBsmtp\fR(8) or \fBsmtpd\fR(8)
+/*	process requests from the \fBtlsmgr\fR(8) server in order to seed its
 /*	internal pseudo random number generator (PRNG).
 /* VERP SUPPORT CONTROLS
 /* .ad
@@ -268,7 +268,7 @@
 /*	The two default VERP delimiter characters.
 /* .IP "\fBverp_delimiter_filter (-=+)\fR"
 /*	The characters Postfix accepts as VERP delimiter characters on the
-/*	Postfix sendmail(1) command line and in SMTP commands.
+/*	Postfix \fBsendmail\fR(1) command line and in SMTP commands.
 /* .PP
 /*	Available in Postfix version 1.1 and 2.0:
 /* .IP "\fBauthorized_verp_clients ($mynetworks)\fR"
@@ -406,7 +406,7 @@
 /*	before it is flushed upon receipt of EHLO, RSET, or end of DATA.
 /* .PP
 /*	The per SMTP client connection count and request rate limits are
-/*	implemented in co-operation with the anvil(8) service, and
+/*	implemented in co-operation with the \fBanvil\fR(8) service, and
 /*	are available in Postfix version 2.2 and later.
 /* .IP "\fBsmtpd_client_connection_count_limit (50)\fR"
 /*	How many simultaneous connections any client is allowed to
@@ -507,7 +507,7 @@
 /* .IP "\fBsmtpd_restriction_classes (empty)\fR"
 /*	User-defined aliases for groups of access restrictions.
 /* .IP "\fBsmtpd_null_access_lookup_key (<>)\fR"
-/*	The lookup key to be used in SMTP access(5) tables instead of the
+/*	The lookup key to be used in SMTP \fBaccess\fR(5) tables instead of the
 /*	null sender address.
 /* .IP "\fBpermit_mx_backup_networks (empty)\fR"
 /*	Restrict the use of the permit_mx_backup SMTP access feature to
@@ -543,12 +543,12 @@
 /*	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.
+/*	verification probes is maintained by the \fBverify\fR(8) server.
 /*	See the file ADDRESS_VERIFICATION_README for information
 /*	about how to configure and operate the Postfix sender/recipient
 /*	address verification service.
 /* .IP "\fBaddress_verify_poll_count (3)\fR"
-/*	How many times to query the verify(8) service for the completion
+/*	How many times to query the \fBverify\fR(8) service for the completion
 /*	of an address verification request in progress.
 /* .IP "\fBaddress_verify_poll_delay (3s)\fR"
 /*	The delay between queries for the completion of an address
@@ -568,7 +568,7 @@
 /*	and/or text responses.
 /* .IP "\fBaccess_map_reject_code (554)\fR"
 /*	The numerical Postfix SMTP server response code when a client
-/*	is rejected by an access(5) map restriction.
+/*	is rejected by an \fBaccess\fR(5) map restriction.
 /* .IP "\fBdefer_code (450)\fR"
 /*	The numerical Postfix SMTP server response code when a remote SMTP
 /*	client request is rejected by the "defer" restriction.
@@ -586,7 +586,7 @@
 /*	or reject_non_fqdn_recipient restriction.
 /* .IP "\fBreject_code (554)\fR"
 /*	The numerical Postfix SMTP server response code when a remote SMTP
-/*	client request is rejected by the "\fBreject\fR" restriction.
+/*	client request is rejected by the "reject" restriction.
 /* .IP "\fBrelay_domains_reject_code (554)\fR"
 /*	The numerical Postfix SMTP server response code when a client
 /*	request is rejected by the reject_unauth_destination recipient
@@ -781,9 +781,7 @@
 #include 
 #include 
 #include 
-#ifdef SNAPSHOT
 #include 
-#endif
 #include 
 #include 			/* ehlo filter */
 #include 			/* ehlo filter */
@@ -892,16 +890,11 @@ char   *var_xforward_hosts;
 bool    var_smtpd_rej_unl_from;
 bool    var_smtpd_rej_unl_rcpt;
 char   *var_smtpd_forbid_cmds;
-
-#ifdef SNAPSHOT
 int     var_smtpd_crate_limit;
 int     var_smtpd_cconn_limit;
 int     var_smtpd_cmail_limit;
 int     var_smtpd_crcpt_limit;
 char   *var_smtpd_hoggers;
-
-#endif
-
 char   *var_local_rwr_clients;
 char   *var_smtpd_ehlo_dis_words;
 char   *var_smtpd_ehlo_dis_maps;
@@ -957,12 +950,9 @@ static int xforward_allowed;		/* XXX should be SMTPD_STATE member */
  /*
   * Client connection and rate limiting.
   */
-#ifdef SNAPSHOT
 ANVIL_CLNT *anvil_clnt;
 static NAMADR_LIST *hogger_list;
 
-#endif
-
  /*
   * Other application-specific globals.
   */
@@ -1493,7 +1483,6 @@ static int mail_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
      * of client address information in connect and disconnect events. For
      * now we exclude xclient authorized hosts from event count/rate control.
      */
-#ifdef SNAPSHOT
     if (SMTPD_STAND_ALONE(state) == 0
 	&& !xclient_allowed
 	&& anvil_clnt
@@ -1508,7 +1497,6 @@ static int mail_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
 		 rate, state->namaddr, state->service);
 	return (-1);
     }
-#endif
     if (argv[2].tokval == SMTPD_TOK_ERROR) {
 	state->error_mask |= MAIL_ERROR_PROTOCOL;
 	smtpd_chat_reply(state, "501 Bad sender address syntax");
@@ -1704,7 +1692,6 @@ static int rcpt_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
      * of client address information in connect and disconnect events. For
      * now we exclude xclient authorized hosts from event count/rate control.
      */
-#ifdef SNAPSHOT
     if (SMTPD_STAND_ALONE(state) == 0
 	&& !xclient_allowed
 	&& anvil_clnt
@@ -1719,7 +1706,6 @@ static int rcpt_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
 		 rate, state->namaddr, state->service);
 	return (-1);
     }
-#endif
     if (argv[2].tokval == SMTPD_TOK_ERROR) {
 	state->error_mask |= MAIL_ERROR_PROTOCOL;
 	smtpd_chat_reply(state, "501 Bad recipient address syntax");
@@ -2984,7 +2970,6 @@ static void smtpd_proto(SMTPD_STATE *state, const char *service)
 	 * will discard client message or recipient rate information too
 	 * early or too late.
 	 */
-#ifdef SNAPSHOT
 	if (SMTPD_STAND_ALONE(state) == 0
 	    && !xclient_allowed
 	    && anvil_clnt
@@ -3006,7 +2991,6 @@ static void smtpd_proto(SMTPD_STATE *state, const char *service)
 		break;
 	    }
 	}
-#endif
 	/* XXX We use the real client for connect access control. */
 	if (SMTPD_STAND_ALONE(state) == 0
 	    && var_smtpd_delay_reject == 0
@@ -3097,13 +3081,11 @@ static void smtpd_proto(SMTPD_STATE *state, const char *service)
      * will discard client message or recipient rate information too early or
      * too late.
      */
-#ifdef SNAPSHOT
     if (SMTPD_STAND_ALONE(state) == 0
 	&& !xclient_allowed
 	&& anvil_clnt
 	&& !namadr_list_match(hogger_list, state->name, state->addr))
 	anvil_clnt_disconnect(anvil_clnt, service, state->addr);
-#endif
 
     /*
      * Log abnormal session termination, in case postmaster notification has
@@ -3237,9 +3219,7 @@ static void pre_jail_init(char *unused_name, char **unused_argv)
     verp_clients = namadr_list_init(MATCH_FLAG_NONE, var_verp_clients);
     xclient_hosts = namadr_list_init(MATCH_FLAG_NONE, var_xclient_hosts);
     xforward_hosts = namadr_list_init(MATCH_FLAG_NONE, var_xforward_hosts);
-#ifdef SNAPSHOT
     hogger_list = namadr_list_init(MATCH_FLAG_NONE, var_smtpd_hoggers);
-#endif
     if (getuid() == 0 || getuid() == var_owner_uid)
 	smtpd_check_init();
     debug_peer_init();
@@ -3315,11 +3295,9 @@ static void post_jail_init(char *unused_name, char **unused_argv)
     /*
      * Connection rate management.
      */
-#ifdef SNAPSHOT
     if (var_smtpd_crate_limit || var_smtpd_cconn_limit
 	|| var_smtpd_cmail_limit || var_smtpd_crcpt_limit)
 	anvil_clnt = anvil_clnt_create();
-#endif
 }
 
 /* main - the main program */
@@ -3352,12 +3330,10 @@ int     main(int argc, char **argv)
 	VAR_VIRT_MAILBOX_CODE, DEF_VIRT_MAILBOX_CODE, &var_virt_mailbox_code, 0, 0,
 	VAR_RELAY_RCPT_CODE, DEF_RELAY_RCPT_CODE, &var_relay_rcpt_code, 0, 0,
 	VAR_VERIFY_POLL_COUNT, DEF_VERIFY_POLL_COUNT, &var_verify_poll_count, 1, 0,
-#ifdef SNAPSHOT
 	VAR_SMTPD_CRATE_LIMIT, DEF_SMTPD_CRATE_LIMIT, &var_smtpd_crate_limit, 0, 0,
 	VAR_SMTPD_CCONN_LIMIT, DEF_SMTPD_CCONN_LIMIT, &var_smtpd_cconn_limit, 0, 0,
 	VAR_SMTPD_CMAIL_LIMIT, DEF_SMTPD_CMAIL_LIMIT, &var_smtpd_cmail_limit, 0, 0,
 	VAR_SMTPD_CRCPT_LIMIT, DEF_SMTPD_CRCPT_LIMIT, &var_smtpd_crcpt_limit, 0, 0,
-#endif
 #ifdef USE_TLS
 	VAR_SMTPD_TLS_CCERT_VD, DEF_SMTPD_TLS_CCERT_VD, &var_smtpd_tls_ccert_vd, 0, 0,
 #endif
@@ -3436,9 +3412,7 @@ int     main(int argc, char **argv)
 	VAR_INPUT_TRANSP, DEF_INPUT_TRANSP, &var_input_transp, 0, 0,
 	VAR_XCLIENT_HOSTS, DEF_XCLIENT_HOSTS, &var_xclient_hosts, 0, 0,
 	VAR_XFORWARD_HOSTS, DEF_XFORWARD_HOSTS, &var_xforward_hosts, 0, 0,
-#ifdef SNAPSHOT
 	VAR_SMTPD_HOGGERS, DEF_SMTPD_HOGGERS, &var_smtpd_hoggers, 0, 0,
-#endif
 	VAR_LOC_RWR_CLIENTS, DEF_LOC_RWR_CLIENTS, &var_local_rwr_clients, 0, 0,
 	VAR_SMTPD_EHLO_DIS_WORDS, DEF_SMTPD_EHLO_DIS_WORDS, &var_smtpd_ehlo_dis_words, 0, 0,
 	VAR_SMTPD_EHLO_DIS_MAPS, DEF_SMTPD_EHLO_DIS_MAPS, &var_smtpd_ehlo_dis_maps, 0, 0,
diff --git a/postfix/src/smtpstone/smtp-sink.c b/postfix/src/smtpstone/smtp-sink.c
index c5e9c0905..c7336c9a7 100644
--- a/postfix/src/smtpstone/smtp-sink.c
+++ b/postfix/src/smtpstone/smtp-sink.c
@@ -77,7 +77,7 @@
 /*	Listen on the UNIX-domain socket at \fIpathname\fR.
 /* .IP \fIbacklog\fR
 /*	The maximum length the queue of pending connections,
-/*	as defined by the listen(2) call.
+/*	as defined by the \fBlisten\fR(2) system call.
 /* SEE ALSO
 /*	smtp-source(1), SMTP/LMTP message generator
 /* LICENSE
diff --git a/postfix/src/spawn/spawn.c b/postfix/src/spawn/spawn.c
index f60ef39ec..9f07e0094 100644
--- a/postfix/src/spawn/spawn.c
+++ b/postfix/src/spawn/spawn.c
@@ -6,7 +6,8 @@
 /* SYNOPSIS
 /*	\fBspawn\fR [generic Postfix daemon options] command_attributes...
 /* DESCRIPTION
-/*	The \fBspawn\fR daemon provides the Postfix equivalent of \fBinetd\fR.
+/*	The \fBspawn\fR(8) daemon provides the Postfix equivalent
+/*	of \fBinetd\fR.
 /*	It listens on a port as specified in the Postfix \fBmaster.cf\fR file
 /*	and spawns an external command whenever a connection is established.
 /*	The connection can be made over local IPC (such as UNIX-domain
@@ -27,7 +28,7 @@
 /*	specified \fIusername\fR.  The software refuses to execute
 /*	commands with root privileges, or with the privileges of the
 /*	mail system owner. If \fIgroupname\fR is specified, the
-/*	corresponding group ID is used instead of the group ID of
+/*	corresponding group ID is used instead of the group ID
 /*	of \fIusername\fR.
 /* .IP "\fBargv\fR=\fIcommand\fR... (required)"
 /*	The command to be executed. This must be specified as the
@@ -36,29 +37,29 @@
 /*	shell meta characters by a shell command interpreter.
 /* BUGS
 /*	In order to enforce standard Postfix process resource controls,
-/*	the \fBspawn\fR daemon runs only one external command at a time.
+/*	the \fBspawn\fR(8) daemon runs only one external command at a time.
 /*	As such, it presents a noticeable overhead by wasting precious
-/*	process resources. The \fBspawn\fR daemon is expected to be
+/*	process resources. The \fBspawn\fR(8) daemon is expected to be
 /*	replaced by a more structural solution.
 /* DIAGNOSTICS
-/*	The \fBspawn\fR daemon reports abnormal child exits.
+/*	The \fBspawn\fR(8) daemon reports abnormal child exits.
 /*	Problems are logged to \fBsyslogd\fR(8).
 /* SECURITY
 /* .fi
 /* .ad
 /*	This program needs root privilege in order to execute external
 /*	commands as the specified user. It is therefore security sensitive.
-/*	However the \fBspawn\fR daemon does not talk to the external command
+/*	However the \fBspawn\fR(8) daemon does not talk to the external command
 /*	and thus is not vulnerable to data-driven attacks.
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically as spawn(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically as \fBspawn\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /*
 /*	In the text below, \fItransport\fR is the first field of the entry
 /*	in the \fBmaster.cf\fR file.
diff --git a/postfix/src/tlsmgr/tlsmgr.c b/postfix/src/tlsmgr/tlsmgr.c
index 365bb9098..cd2b1d927 100644
--- a/postfix/src/tlsmgr/tlsmgr.c
+++ b/postfix/src/tlsmgr/tlsmgr.c
@@ -6,36 +6,37 @@
 /* SYNOPSIS
 /*	\fBtlsmgr\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The tlsmgr(8) manages the TLS session caches for Postfix
-/*	SMTP client and server processes.  It stores and retrieves
-/*	cache entries on request by smtpd(8) and smtp(8) processes,
-/*	and periodically removes entries that have expired.
+/*	The \fBtlsmgr\fR(8) manages the Postfix TLS session caches.
+/*	It stores and retrieves cache entries on request by
+/*	\fBsmtpd\fR(8) and \fBsmtp\fR(8) processes, and periodically
+/*	removes entries that have expired.
 /*
-/*	The tlsmgr(8) also manages the PRNG (pseudo random number
-/*	generator) pool. It answers queries by the smtpd(8) and smtp(8)
+/*	The \fBtlsmgr\fR(8) also manages the PRNG (pseudo random number
+/*	generator) pool. It answers queries by the \fBsmtpd\fR(8)
+/*	and \fBsmtp\fR(8)
 /*	processes to seed their internal PRNG pools.
 /*
-/*	The tlsmgr(8)'s PRNG pool is initially seeded from
+/*	The \fBtlsmgr\fR(8)'s PRNG pool is initially seeded from
 /*	an external source (EGD, /dev/urandom, or regular file).
 /*	It is updated at configurable pseudo-random intervals with
 /*	data from the external source. It is updated periodically
 /*	with data from TLS session cache entries and with the time
 /*	of day, and is updated with the time of day whenever a
-/*	process requests tlsmgr(8) service.
+/*	process requests \fBtlsmgr\fR(8) service.
 /*
-/*	The tlsmgr(8) saves the PRNG state to an exchange file
+/*	The \fBtlsmgr\fR(8) saves the PRNG state to an exchange file
 /*	periodically and when the process terminates, and reads
 /*	the exchange file when initializing its PRNG.
 /* SECURITY
 /* .ad
 /* .fi
-/*	tlsmgr(8) is not security-sensitive. The code that maintains
+/*	The \fBtlsmgr\fR(8) is not security-sensitive. The code that maintains
 /*	the external and internal PRNG pools does not "trust" the
 /*	data that it manipulates, and the code that maintains the
 /*	TLS session cache does not touch the contents of the cached
 /*	entries, except for seeding its internal PRNG pool.
 /*
-/*	The tlsmgr(8) can be run chrooted and with reduced privileges.
+/*	The \fBtlsmgr\fR(8) can be run chrooted and with reduced privileges.
 /*	At process startup it connects to the entropy source and
 /*	exchange file, and creates or truncates the optional TLS
 /*	session cache files.
@@ -48,11 +49,11 @@
 /* .ad
 /* .fi
 /*	Changes to \fBmain.cf\fR are not picked up automatically,
-/*	because tlsmgr(8) is a persistent processes.  Use the
+/*	because \fBtlsmgr\fR(8) is a persistent processes.  Use the
 /*	command "\fBpostfix reload\fR" after a configuration change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* TLS SESSION CACHE
 /* .ad
 /* .fi
@@ -72,21 +73,21 @@
 /* .ad
 /* .fi
 /* .IP "\fBtls_random_source (see 'postconf -d' output)\fR"
-/*	The external entropy source for the in-memory tlsmgr(8) pseudo
+/*	The external entropy source for the in-memory \fBtlsmgr\fR(8) pseudo
 /*	random number generator (PRNG) pool.
 /* .IP "\fBtls_random_bytes (32)\fR"
-/*	The number of bytes that tlsmgr(8) reads from $tls_random_source
+/*	The number of bytes that \fBtlsmgr\fR(8) reads from $tls_random_source
 /*	when (re)seeding the in-memory pseudo random number generator (PRNG)
 /*	pool.
 /* .IP "\fBtls_random_exchange_name (${config_directory}/prng_exch)\fR"
 /*	Name of the pseudo random number generator (PRNG) state file
-/*	that is maintained by tlsmgr(8).
+/*	that is maintained by \fBtlsmgr\fR(8).
 /* .IP "\fBtls_random_prng_update_period (3600s)\fR"
-/*	The time between attempts by tlsmgr(8) to save the state of
+/*	The time between attempts by \fBtlsmgr\fR(8) to save the state of
 /*	the pseudo random number generator (PRNG) to the file specified
 /*	with $tls_random_exchange_name.
 /* .IP "\fBtls_random_reseed_period (3600s)\fR"
-/*	The maximal time between attempts by tlsmgr(8) to re-seed the
+/*	The maximal time between attempts by \fBtlsmgr\fR(8) to re-seed the
 /*	in-memory pseudo random number generator (PRNG) pool from external
 /*	sources.
 /* MISCELLANEOUS CONTROLS
@@ -108,8 +109,8 @@
 /*	The mail system name that is prepended to the process name in syslog
 /*	records, so that "smtpd" becomes, for example, "postfix/smtpd".
 /* SEE ALSO
-/*	smtp(8) Postfix SMTP client
-/*	smtpd(8) Postfix SMTP server
+/*	smtp(8), Postfix SMTP client
+/*	smtpd(8), Postfix SMTP server
 /*	postconf(5), configuration parameters
 /*	master(5), generic daemon options
 /*	master(8), process manager
diff --git a/postfix/src/trivial-rewrite/trivial-rewrite.c b/postfix/src/trivial-rewrite/trivial-rewrite.c
index b4602628f..6bb9f0238 100644
--- a/postfix/src/trivial-rewrite/trivial-rewrite.c
+++ b/postfix/src/trivial-rewrite/trivial-rewrite.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBtrivial-rewrite\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The \fBtrivial-rewrite\fR daemon processes three types of client
+/*	The \fBtrivial-rewrite\fR(8) daemon processes three types of client
 /*	service requests:
 /* .IP "\fBrewrite \fIcontext address\fR"
 /*	Rewrite an address to standard form, according to the
@@ -47,7 +47,8 @@
 /* SERVER PROCESS MANAGEMENT
 /* .ad
 /* .fi
-/*	The trivial-rewrite servers run under control by the Postfix master
+/*	The \fBtrivial-rewrite\fR(8) servers run under control by
+/*	the Postfix master
 /*	server.  Each server can handle multiple simultaneous connections.
 /*	When all servers are busy while a client connects, the master
 /*	creates a new server process, provided that the trivial-rewrite
@@ -62,7 +63,7 @@
 /* SECURITY
 /* .ad
 /* .fi
-/*	The \fBtrivial-rewrite\fR daemon is not security sensitive.
+/*	The \fBtrivial-rewrite\fR(8) daemon is not security sensitive.
 /*	By default, this daemon does not talk to remote or local users.
 /*	It can run at a fixed low privilege in a chrooted environment.
 /* DIAGNOSTICS
@@ -71,11 +72,11 @@
 /* .ad
 /* .fi
 /*	On busy mail systems a long time may pass before a \fBmain.cf\fR
-/*	change affecting trivial_rewrite(8) is picked up. Use the command
+/*	change affecting \fBtrivial-rewrite\fR(8) is picked up. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* COMPATIBILITY CONTROLS
 /* .ad
 /* .fi
@@ -135,7 +136,7 @@
 /*	instead of requiring an explicit ".domain.tld" pattern.
 /* .IP "\fBrelayhost (empty)\fR"
 /*	The default host to send non-local mail to when no entry is matched
-/*	in the optional transport(5) table.
+/*	in the optional \fBtransport\fR(5) table.
 /* .IP "\fBtransport_maps (empty)\fR"
 /*	Optional lookup tables with mappings from recipient address to
 /*	(message delivery transport, next-hop destination).
diff --git a/postfix/src/verify/verify.c b/postfix/src/verify/verify.c
index 6101d964d..71f32dcb0 100644
--- a/postfix/src/verify/verify.c
+++ b/postfix/src/verify/verify.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*	\fBverify\fR [generic Postfix daemon options]
 /* DESCRIPTION
-/*	The Postfix address verification server maintains a record
+/*	The \fBverify\fR(8) address verification server maintains a record
 /*	of what recipient addresses are known to be deliverable or
 /*	undeliverable.
 /*
@@ -19,13 +19,14 @@
 /*	MTA for the specified address, and will therefore not detect
 /*	all undeliverable addresses.
 /*
-/*	This server is designed to run under control by the Postfix
+/*	The \fBverify\fR(8) server is designed to run under control
+/*	by the Postfix
 /*	master server. It maintains an optional persistent database.
 /*	To avoid being interrupted by "postfix stop" in the middle
 /*	of a database update, the process runs in a separate process
 /*	group.
 /*
-/*	This server implements the following requests:
+/*	The \fBverify\fR(8) server implements the following requests:
 /* .IP "\fBupdate\fI address status text\fR"
 /*	Update the status and text of the specified address.
 /* .IP "\fBquery\fI address\fR"
@@ -58,12 +59,13 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are not picked up automatically, as verify(8)
+/*	Changes to \fBmain.cf\fR are not picked up automatically,
+/*	as \fBverify\fR(8)
 /*	processes are persistent. Use the command "\fBpostfix reload\fR" after
 /*	a configuration change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* CACHE CONTROLS
 /* .ad
 /* .fi
diff --git a/postfix/src/virtual/virtual.c b/postfix/src/virtual/virtual.c
index 982ec322f..ceeabd8a0 100644
--- a/postfix/src/virtual/virtual.c
+++ b/postfix/src/virtual/virtual.c
@@ -7,7 +7,8 @@
 /*	\fBvirtual\fR [generic Postfix daemon options]
 /* DESCRIPTION
 /*	The \fBvirtual\fR(8) delivery agent is designed for virtual mail
-/*	hosting services. Originally based on the Postfix local(8) delivery
+/*	hosting services. Originally based on the Postfix \fBlocal\fR(8)
+/*	delivery
 /*	agent, this agent looks up recipients with map lookups of their
 /*	full recipient address, instead of using hard-coded unix password
 /*	file lookups of the address local part only.
@@ -36,7 +37,7 @@
 /*	is delivered in UNIX mailbox format.   This format stores multiple
 /*	messages in one textfile.
 /*
-/*	The \fBvirtual\fR delivery agent prepends a "\fBFrom \fIsender
+/*	The \fBvirtual\fR(8) delivery agent prepends a "\fBFrom \fIsender
 /*	time_stamp\fR" envelope header to each message, prepends a
 /*	\fBDelivered-To:\fR message header with the envelope recipient
 /*	address,
@@ -55,7 +56,7 @@
 /*	When the mailbox location ends in \fB/\fR, the message is delivered
 /*	in qmail \fBmaildir\fR format. This format stores one message per file.
 /*
-/*	The \fBvirtual\fR delivery agent daemon prepends a \fBDelivered-To:\fR
+/*	The \fBvirtual\fR(8) delivery agent prepends a \fBDelivered-To:\fR
 /*	message header with the final envelope recipient address,
 /*	prepends an \fBX-Original-To:\fR header with the recipient address as
 /*	given to Postfix, and prepends a
@@ -106,16 +107,16 @@
 /* SECURITY
 /* .ad
 /* .fi
-/*	The virtual delivery agent is not security sensitive, provided
+/*	The \fBvirtual\fR(8) delivery agent is not security sensitive, provided
 /*	that the lookup tables with recipient user/group ID information are
 /*	adequately protected. This program is not designed to run chrooted.
 /*
-/*	The virtual delivery agent disallows regular expression
+/*	The \fBvirtual\fR(8) delivery agent disallows regular expression
 /*	substitution of $1 etc. in regular expression lookup tables,
 /*	because that would open a security hole.
 /*
-/*	The virtual delivery agent will silently ignore requests
-/*	to use the proxymap(8) server. Instead it will open the
+/*	The \fBvirtual\fR(8) delivery agent will silently ignore requests
+/*	to use the \fBproxymap\fR(8) server. Instead it will open the
 /*	table directly. Before Postfix version 2.2, the virtual
 /*	delivery agent will terminate with a fatal error.
 /* STANDARDS
@@ -142,29 +143,30 @@
 /* CONFIGURATION PARAMETERS
 /* .ad
 /* .fi
-/*	Changes to \fBmain.cf\fR are picked up automatically, as virtual(8)
+/*	Changes to \fBmain.cf\fR are picked up automatically, as
+/*	\fBvirtual\fR(8)
 /*	processes run for only a limited amount of time. Use the command
 /*	"\fBpostfix reload\fR" to speed up a change.
 /*
 /*	The text below provides only a parameter summary. See
-/*	postconf(5) for more details including examples.
+/*	\fBpostconf\fR(5) for more details including examples.
 /* MAILBOX DELIVERY CONTROLS
 /* .ad
 /* .fi
 /* .IP "\fBvirtual_mailbox_base (empty)\fR"
-/*	A prefix that the virtual(8) delivery agent prepends to all pathname
+/*	A prefix that the \fBvirtual\fR(8) delivery agent prepends to all pathname
 /*	results from $virtual_mailbox_maps table lookups.
 /* .IP "\fBvirtual_mailbox_maps (empty)\fR"
 /*	Optional lookup tables with all valid addresses in the domains that
 /*	match $virtual_mailbox_domains.
 /* .IP "\fBvirtual_minimum_uid (100)\fR"
-/*	The minimum user ID value that the virtual(8) delivery agent accepts
-/*	as a result from \fB$virtual_uid_maps\fR table lookup.
+/*	The minimum user ID value that the \fBvirtual\fR(8) delivery agent accepts
+/*	as a result from $virtual_uid_maps table lookup.
 /* .IP "\fBvirtual_uid_maps (empty)\fR"
-/*	Lookup tables with the per-recipient user ID that the virtual(8)
+/*	Lookup tables with the per-recipient user ID that the \fBvirtual\fR(8)
 /*	delivery agent uses while writing to the recipient's mailbox.
 /* .IP "\fBvirtual_gid_maps (empty)\fR"
-/*	Lookup tables with the per-recipient group ID for virtual(8) mailbox
+/*	Lookup tables with the per-recipient group ID for \fBvirtual\fR(8) mailbox
 /*	delivery.
 /* .PP
 /*	Available in Postfix version 2.0 and later:
@@ -178,14 +180,14 @@
 /* .ad
 /* .fi
 /* .IP "\fBvirtual_mailbox_lock (see 'postconf -d' output)\fR"
-/*	How to lock a UNIX-style virtual(8) mailbox before attempting
+/*	How to lock a UNIX-style \fBvirtual\fR(8) mailbox before attempting
 /*	delivery.
 /* .IP "\fBdeliver_lock_attempts (20)\fR"
 /*	The maximal number of attempts to acquire an exclusive lock on a
-/*	mailbox file or bounce(8) logfile.
+/*	mailbox file or \fBbounce\fR(8) logfile.
 /* .IP "\fBdeliver_lock_delay (1s)\fR"
 /*	The time between attempts to acquire an exclusive lock on a mailbox
-/*	file or bounce(8) logfile.
+/*	file or \fBbounce\fR(8) logfile.
 /* .IP "\fBstale_lock_time (500s)\fR"
 /*	The time after which a stale exclusive mailbox lockfile is removed.
 /* RESOURCE AND RATE CONTROLS