summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2015-12-12 21:13:40 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2015-12-12 21:13:40 +0000
commit6544b59f1676e7b61a1b2052b6541cb6cf0340f0 (patch)
tree9a6eaf1bf849123713ad55d1cf3d5783da4219a8 /usr.sbin
parent3ed284c4b013094f024769fbe29cad2955158859 (diff)
tweaks;
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/smtpd.conf.511
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index c59942bdb74..3dbc9443593 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.142 2015/12/12 20:02:31 gilles Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.143 2015/12/12 21:13:39 jmc Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -575,11 +575,9 @@ Associate a custom CA certificate located in
.Ar cafile
with
.Ar hostname .
-.It Xo
-.Ic ciphers Ar cipher-list
-.Xc
+.It Ic ciphers Ar cipher-list
Specify an alternate ciphers list to use when establishing TLS sessions.
-It is highly recommanded to avoid making use of this option unless there
+It is highly recommended to avoid making use of this option unless there
is a good understanding of the implications.
.Pp
When not specified, only ciphers considered safe are chosen.
@@ -752,7 +750,8 @@ parameter is used, then
will look up a mapping of username to email addresses to see whether
the authenticated user is allowed to submit mail
as the sender that was provided in the SMTP session.
-In addition, if the masquerade option is provided, the From header will be rewritten
+In addition, if the masquerade option is provided,
+the From header will be rewritten
to match the sender provided in the SMTP session.
.Pp
If the