summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2022-03-31 17:27:33 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2022-03-31 17:27:33 +0000
commit58a6bdb2eecf165eb39e1ff5a8082c4bd6ec1211 (patch)
treec631dd0d4ac59c3286cbf5b06d00e840263d40da /usr.sbin/smtpd
parenta7df80ab7071480723f6f681dc3bbfcda8caffb5 (diff)
man pages: add missing commas between subordinate and main clauses
jmc@ dislikes a comma before "then" in a conditional, so leave those untouched. ok jmc@
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/smtpd-filters.76
-rw-r--r--usr.sbin/smtpd/smtpd.conf.56
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/smtpd-filters.7 b/usr.sbin/smtpd/smtpd-filters.7
index dbc990c1ce9..313404c111c 100644
--- a/usr.sbin/smtpd/smtpd-filters.7
+++ b/usr.sbin/smtpd/smtpd-filters.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd-filters.7,v 1.8 2021/11/21 06:48:15 jmc Exp $
+.\" $OpenBSD: smtpd-filters.7,v 1.9 2022/03/31 17:27:31 naddy 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: November 21 2021 $
+.Dd $Mdocdate: March 31 2022 $
.Dt SMTPD-FILTERS 7
.Os
.Sh NAME
@@ -181,7 +181,7 @@ config|subsystem|smtp-in
.Pp
When
.Xr smtpd 8
-has sent all configuration keys it emits the following line:
+has sent all configuration keys, it emits the following line:
.Bd -literal -offset indent
config|ready
.Ed
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 1c0e6415188..38fd85b08e3 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.262 2021/11/21 06:48:15 jmc Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.263 2022/03/31 17:27:31 naddy 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: November 21 2021 $
+.Dd $Mdocdate: March 31 2022 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
@@ -339,7 +339,7 @@ in such a way that traffic is routed as efficiently as possible.
The Administrative Management Domain this mail server belongs to.
The authservid will be forwarded to filters using it to identify or mark
authentication-results headers.
-If omitted it defaults to the server name.
+If omitted, it defaults to the server name.
.It Ic bounce Cm warn-interval Ar delay Op , Ar delay ...
Send warning messages to the envelope sender when temporary delivery
failures cause a message to remain in the queue for longer than