summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2015-09-03 12:23:24 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2015-09-03 12:23:24 +0000
commit95841434dd208f3af9b6e6485f8fb41d23a1371d (patch)
tree02246b97567377c058fdd7c5a0b4ef443af0e2d7
parentc16d8717596e2c0df7ecd88683dad062f039eb7d (diff)
Document spool dir in smtpd's FILES section and be consistent with
using compact lists for FILES in the other manual pages. OK gilles@
-rw-r--r--usr.sbin/smtpd/aliases.56
-rw-r--r--usr.sbin/smtpd/smtpd.88
-rw-r--r--usr.sbin/smtpd/smtpd.conf.56
3 files changed, 11 insertions, 9 deletions
diff --git a/usr.sbin/smtpd/aliases.5 b/usr.sbin/smtpd/aliases.5
index bda2ba5eb91..c9d72e4cfb8 100644
--- a/usr.sbin/smtpd/aliases.5
+++ b/usr.sbin/smtpd/aliases.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aliases.5,v 1.8 2014/02/04 16:32:36 eric Exp $
+.\" $OpenBSD: aliases.5,v 1.9 2015/09/03 12:23:23 millert Exp $
.\"
.\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: February 4 2014 $
+.Dd $Mdocdate: September 3 2015 $
.Dt ALIASES 5
.Os
.Sh NAME
@@ -87,7 +87,7 @@ starting 4XX (TempFail) or 5XX (PermFail).
The message must be present and can be freely chosen.
.El
.Sh FILES
-.Bl -tag -width "/etc/mail/aliasesXXX"
+.Bl -tag -width "/etc/mail/aliasesXXX" -compact
.It Pa /etc/mail/aliases
Default
.Nm
diff --git a/usr.sbin/smtpd/smtpd.8 b/usr.sbin/smtpd/smtpd.8
index 11fb2d04589..a375dd9d28c 100644
--- a/usr.sbin/smtpd/smtpd.8
+++ b/usr.sbin/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd.8,v 1.25 2014/03/13 14:47:44 tedu Exp $
+.\" $OpenBSD: smtpd.8,v 1.26 2015/09/03 12:23:23 millert Exp $
.\"
.\" Copyright (c) 2012, Eric Faurot <eric@openbsd.org>
.\" Copyright (c) 2008, Gilles Chehade <gilles@poolp.org>
@@ -16,7 +16,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: March 13 2014 $
+.Dd $Mdocdate: September 3 2015 $
.Dt SMTPD 8
.Os
.Sh NAME
@@ -88,7 +88,7 @@ Do not listen on SMTP sockets.
Produce more verbose output.
.El
.Sh FILES
-.Bl -tag -width "/var/run/smtpd.sockXXX" -compact
+.Bl -tag -width "/etc/mail/smtpd.confXXX" -compact
.It Pa /etc/mail/mailname
Alternate server name to use.
.It Pa /etc/mail/smtpd.conf
@@ -99,6 +99,8 @@ configuration file.
.Ux Ns -domain
socket used for communication with
.Xr smtpctl 8 .
+.It Pa /var/spool/smtpd/
+Spool directories for mail during processing.
.El
.Sh SEE ALSO
.Xr smtpd.conf 5 ,
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 264cfa2a3b1..3f7a9bf4205 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.128 2015/08/15 16:09:25 gilles Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.129 2015/09/03 12:23:23 millert 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: August 15 2015 $
+.Dd $Mdocdate: September 3 2015 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
@@ -899,7 +899,7 @@ For example, with recipient
.It %{rcpt:raw} Ta expands to Dq user+t?g@example.org
.El
.Sh FILES
-.Bl -tag -width "/etc/mail/smtpd.confXXX"
+.Bl -tag -width "/etc/mail/smtpd.confXXX" -compact
.It Pa /etc/mail/smtpd.conf
Default
.Xr smtpd 8