summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtpd.conf.5
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2012-08-29 18:10:29 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2012-08-29 18:10:29 +0000
commit466cc960b98f4409437736a328c6097a68a15818 (patch)
tree9e90ae875ce073b3f163fac6880608050be2ef52 /usr.sbin/smtpd/smtpd.conf.5
parentfc2d1b410f156ff5629550712411de61e1b77f19 (diff)
tweak previous;
Diffstat (limited to 'usr.sbin/smtpd/smtpd.conf.5')
-rw-r--r--usr.sbin/smtpd/smtpd.conf.516
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index a2e3c651c90..c90cb76c68f 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.62 2012/08/29 16:48:40 gilles Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.63 2012/08/29 18:10:28 jmc Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -199,14 +199,14 @@ The argument may contain a multiplier, as documented in
.Xc
Enable transparent deflating and inflating of all envelopes
and messages.
-Only supported algorithm at the moment is gzip.
+The only supported algorithm at the moment is gzip.
Envelopes and messages may be inspected using
.Xr gzcat 1 .
.It Xo
.Ic queue encryption
.Ic key Ar key
-.Ic Op cipher Ar algorithm
-.Ic Op digest Ar digest
+.Op Ic cipher Ar algorithm
+.Op Ic digest Ar digest
.Xc
Enable transparent encryption of all envelopes and messages
using cipher
@@ -224,14 +224,14 @@ This option is compatible with compression and will perform
both in the appropriate order.
.Pp
.Xr smtpd 8
-will prepend an encrypted random IV before encryption and will strip
+prepends an encrypted random IV before encryption and strips
it before decryption to ensure identical envelopes and messages
produce different output.
.Pp
-Note that you cannot change any of the encryption parameters
-without making sure that queue has been emptied as
+Note that the encryption parameters cannot be changed
+without making sure that the queue has been emptied, as
.Xr smtpd 8
-would be unable to decrypt older envelopes and messages with new key.
+would be unable to decrypt older envelopes and messages with the new key.
.It Ic accept | reject
.Xr smtpd 8
accepts and rejects messages