point out that the "junk" filter decision adds the X-Spam header

from Ryan Kavanagh

1 files changed, 13 insertions, 5 deletions

diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 11340310429..c543c6627a2 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.249 2020/02/12 14:46:36 schwarze Exp $
+.\"	$OpenBSD: smtpd.conf.5,v 1.250 2020/04/25 09:20:38 eric 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: February 12 2020 $
+.Dd $Mdocdate: April 25 2020 $
 .Dt SMTPD.CONF 5
 .Os
 .Sh NAME
@@ -141,8 +141,14 @@ may contain format specifiers that are expanded before use
 .Pp
 If the
 .Cm junk
-argument is provided, the message will be moved to the Junk
-folder if it contains a positive X-Spam header.
+argument is provided, the message will be moved to the
+.Ql Junk
+folder if it contains a positive
+.Ql X-Spam
+header.
+This folder will be created under
+.Ar pathname
+if it does not yet exist.
 .It Cm mbox
 Deliver the message to the user's mbox with
 .Xr mail.local 8 .
@@ -1001,7 +1007,9 @@ Finally, a number of decisions may be taken:
 .Bl -column XXXXXXXXXXXXXXXXXXXXX -offset indent
 .It bypass                Ta the session or transaction bypasses filters
 .It disconnect Ar message Ta the session is disconnected with message
-.It junk                  Ta the session or transaction is junked
+.It junk                  Ta the session or transaction is junked, i.e., an
+.Ql X-Spam: yes
+header is added to any messages
 .It reject Ar message     Ta the command is rejected with message
 .It rewrite Ar value      Ta the command parameter is rewritten with value
 .El