summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2018-09-03 13:27:44 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2018-09-03 13:27:44 +0000
commitcb50de890898071446e619e7a029cb0582e20a51 (patch)
tree4f9c5d0cca47cb89ce2f105fd5647a48ce9a52ff
parent591e998040a39a9172fe320f19e5245082a0fd8a (diff)
document "wrapper" in the local section; from matt schwartz
ok gilles while here, fix some spelling at eol whitespace introduced in previous;
-rw-r--r--usr.sbin/smtpd/smtpd.conf.511
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 45850b76afc..6f2b5a6b751 100644
--- a/usr.sbin/smtpd/smtpd.conf.5
+++ b/usr.sbin/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd.conf.5,v 1.200 2018/09/03 11:30:14 eric Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.201 2018/09/03 13:27:43 jmc Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -205,6 +205,9 @@ Use the mapping
for virtual expansion.
The aliasing table format is described in
.Xr table 5 .
+.It Cm wrapper Ar name
+Use the wrapper specified in
+.Cm mda wrapper .
.El
.Pp
The relay delivery methods also support additional options:
@@ -228,7 +231,7 @@ to advertise during the HELO phase.
.It Cm host Ar relay-url
Do not perform MX lookups but relay messages to the relay host described by
.Ar relay-url .
-The format for
+The format for
.Ar relay-url
is
.Sm off
@@ -256,9 +259,9 @@ protocol is used.
.Pp
Specifying an auth label toggles authentication.
An auth table must also be defined for this action.
-The protocol must explicitely require TLS.
+The protocol must explicitly require TLS.
.Pp
-If TLS is explicitely required, the server certificate
+If TLS is explicitly required, the server certificate
will be verified by default.
.It Cm tls no-verify
Do not require a valid certificate for the specified host.