summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2014-03-27 13:53:40 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2014-03-27 13:53:40 +0000
commit303e653b058b7cf9b989915042cfeaa5e5e2c66e (patch)
tree7431c97c86a0954fa2ea7961c614fbd67a4f0443
parent7a66a2ba9fa73cfed1c6fd37e03256e56f027f30 (diff)
switch smtpd and sendmail examples now that smtpd is the default
ok jmc@ tedu@
-rw-r--r--usr.sbin/mailwrapper/mailer.conf.534
1 files changed, 17 insertions, 17 deletions
diff --git a/usr.sbin/mailwrapper/mailer.conf.5 b/usr.sbin/mailwrapper/mailer.conf.5
index 901ed9f4a42..0f5fe60be95 100644
--- a/usr.sbin/mailwrapper/mailer.conf.5
+++ b/usr.sbin/mailwrapper/mailer.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mailer.conf.5,v 1.13 2013/07/16 11:13:33 schwarze Exp $
+.\" $OpenBSD: mailer.conf.5,v 1.14 2014/03/27 13:53:39 gilles Exp $
.\" $NetBSD: mailer.conf.5,v 1.1 1999/03/25 16:40:17 is Exp $
.\"
.\" Copyright (c) 1998
@@ -30,7 +30,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: March 27 2014 $
.Dt MAILER.CONF 5
.Os
.Sh NAME
@@ -62,9 +62,22 @@ character in the first column of any line.
.Sh EXAMPLES
The following is an example of how to set up
.Nm
-for traditional
+for the default
+.Xr smtpd 8
+MTA suite .
+.Bd -literal
+# Emulate sendmail using smtpd
+sendmail /usr/sbin/smtpctl
+send-mail /usr/sbin/smtpctl
+mailq /usr/sbin/smtpctl
+makemap /usr/libexec/smtpd/makemap
+newaliases /usr/libexec/smtpd/makemap
+.Ed
+.Pp
+This example shows how to invoke the traditional
.Xr sendmail 8
-invocation behavior.
+MTA suite in place of
+.Xr smtpd 8 .
.Bd -literal
# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
sendmail /usr/libexec/sendmail/sendmail
@@ -75,19 +88,6 @@ newaliases /usr/libexec/sendmail/sendmail
hoststat /usr/libexec/sendmail/sendmail
purgestat /usr/libexec/sendmail/sendmail
.Ed
-.Pp
-This example shows how to invoke the
-.Xr smtpd 8
-MTA suite in place of
-.Xr sendmail 8 .
-.Bd -literal
-# Emulate sendmail using smtpd
-sendmail /usr/sbin/smtpctl
-send-mail /usr/sbin/smtpctl
-mailq /usr/sbin/smtpctl
-makemap /usr/libexec/smtpd/makemap
-newaliases /usr/libexec/smtpd/makemap
-.Ed
.Sh SEE ALSO
.Xr mail 1 ,
.Xr mailq 8 ,