summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2014-09-29 20:56:48 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2014-09-29 20:56:48 +0000
commit7d239991862cac0a08acde37678e02d7375e2145 (patch)
tree9ed7f0b791dee72e6f593a2040ec3325f845bb25
parentc2d9c91463e699d7699dbc5d5c21f72843487955 (diff)
lightly document mailq; ok gilles
-rw-r--r--usr.sbin/smtpd/smtpctl.814
-rw-r--r--usr.sbin/smtpd/smtpctl/Makefile3
2 files changed, 13 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/smtpctl.8 b/usr.sbin/smtpd/smtpctl.8
index 54c46b80aea..6b1b3c94ca3 100644
--- a/usr.sbin/smtpd/smtpctl.8
+++ b/usr.sbin/smtpd/smtpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpctl.8,v 1.48 2014/07/08 07:58:01 sobrado Exp $
+.\" $OpenBSD: smtpctl.8,v 1.49 2014/09/29 20:56:46 jmc Exp $
.\"
.\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
.\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
@@ -15,16 +15,18 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 8 2014 $
+.Dd $Mdocdate: September 29 2014 $
.Dt SMTPCTL 8
.Os
.Sh NAME
-.Nm smtpctl
+.Nm smtpctl ,
+.Nm mailq
.Nd control the Simple Mail Transfer Protocol daemon
.Sh SYNOPSIS
.Nm
.Ar command
.Op Ar argument ...
+.Nm mailq
.Sh DESCRIPTION
The
.Nm
@@ -35,6 +37,12 @@ Commands may be abbreviated to the minimum unambiguous prefix; for example,
for
.Cm show stats .
.Pp
+The
+.Nm mailq
+command is provided for compatibility with other MTAs
+and is simply a shortcut for
+.Cm show queue .
+.Pp
The following commands are available:
.Bl -tag -width Ds
.It Cm encrypt Op Ar string
diff --git a/usr.sbin/smtpd/smtpctl/Makefile b/usr.sbin/smtpd/smtpctl/Makefile
index ecaa63a72c1..8f675be9963 100644
--- a/usr.sbin/smtpd/smtpctl/Makefile
+++ b/usr.sbin/smtpd/smtpctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2014/04/01 23:14:25 fgsch Exp $
+# $OpenBSD: Makefile,v 1.37 2014/09/29 20:56:47 jmc Exp $
.PATH: ${.CURDIR}/..
@@ -9,6 +9,7 @@ BINMODE?=555
BINDIR= /usr/sbin
MAN= smtpctl.8
+MLINKS= smtpctl.8 mailq.8
CFLAGS+= -I${.CURDIR}/..
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes