summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2013-07-20 06:49:18 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2013-07-20 06:49:18 +0000
commitd7a4fe68373b71c4e4bec9c27af2d346d28920df (patch)
tree524b97e72d80c74037bc3722dc07d82021797363 /usr.sbin
parent0ee3cf4352070e2d3f7f43c4010ab29a1b0ca02c (diff)
tweak previous;
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/smtpd.conf.512
1 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index e8a00535cca..c8c92eed899 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.102 2013/07/19 21:14:52 eric Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.103 2013/07/20 06:49:17 jmc Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.Dd $Mdocdate: July 19 2013 $
+.Dd $Mdocdate: July 20 2013 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
@@ -450,17 +450,15 @@ expire 4d # expire after 4 days
expire 10h # expire after 10 hours
.Ed
.It Xo
-.Bk -words
.Ic limit mta
.Op Ic for Ic domain Ar domain
.Ar family
-.Ek
.Xc
Instruct
.Xr smtpd 8
to only use the specified address
.Ar family
-for out-going connections.
+for outgoing connections.
Accepted values are
.Ic inet4
and
@@ -582,9 +580,9 @@ utilities.
.It Ic queue encryption key Ar key
Enable transparent encryption of envelopes and messages.
.Ar key
-must be a 16 bytes random key in hexadecimal representation.
+must be a 16-byte random key in hexadecimal representation.
It can be obtained using the
-.Xr openssl
+.Xr openssl 1
utility as follow:
.Bd -literal -offset indent
$ openssl rand -hex 16