Merge branch 'master' into portable

1 files changed, 19 insertions, 9 deletions

diff --git a/smtpd/smtpd.conf.5 b/smtpd/smtpd.conf.5
index adcf09bc..b7ddd403 100644
--- a/smtpd/smtpd.conf.5
+++ b/smtpd/smtpd.conf.5
@@ -536,19 +536,29 @@ With the
 option, clients must also provide a valid certificate
 to establish an SMTP session.
 .El
-.It Ic listen on Cm socket Oo Ar mask-src Oc Op Cm tag Ar tag
+.It Ic listen on Cm socket Oc Op Ar options
 Listen for incoming SMTP connections on the Unix domain socket
 .Pa /var/run/smtpd.sock .
 This is done by default, even if the directive is absent.
-If the
-.Cm mask-src
-option is specified, printing of the HELO name, hostname, and IP
-address of the originating host is suppressed in Received: header lines.
-If the
-.Cm tag
-option is specified,
-sessions initiated from the socket will be tagged
+.Pp
+The
+.Ar options
+are as follows:
+.Bl -tag -width Ds
+.It Ic filter Ar name
+Apply filter
+.Ar name
+on connections handled by this listener.
+.It Cm mask-src
+Omit the
+.Sy from
+part when prepending
+.Dq Received
+headers.
+.It Cm tag Ar tag
+Clients connecting to the listener are tagged with the given
 .Ar tag .
+.El
 .It Ic match Ar options Cm action Ar name
 If at least one mail envelope matches the
 .Ar options