2 files changed, 52 insertions, 32 deletions
diff --git a/libexec/smtpd/smtpd/smtpd.8 b/libexec/smtpd/smtpd/smtpd.8
index 7a3840e305e..67226560772 100644
--- a/libexec/smtpd/smtpd/smtpd.8
+++ b/libexec/smtpd/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\"	$Id: smtpd.8,v 1.4 1997/12/13 00:51:40 mickey Exp $
+.\"	$Id: smtpd.8,v 1.5 1997/12/13 20:19:43 deraadt Exp $
 .Dd Dec 10, 1997
 .Dt SMTPD 8
 .Os OpenBSD
@@ -17,13 +17,15 @@ Obtuse Systems SMTPD message storing daemon
 .Op Fl s Ar maxsize
 .Sh DESCRIPTION
 The
-.Nmsmtpd
+.Nm smtpd
 daemon talks the Simple Mail Transfer Protocol (SMTP) with
 other SMTP daemons to receive mail from them, and saves it into a spool
 directory for later processing. It is the store portion of an SMTP
-store and forward proxy. The symbiotic companion program smtpfwdd is
-used to forward the spooled mail on to its eventual destination.
-smtpd is normally invoked from a super-server such as 
+store and forward proxy. The symbiotic companion program
+.Xr smtpfwdd 8
+is used to forward the spooled mail on to its eventual destination.
+.Nm smtpd
+is normally invoked from a super-server such as 
 .Xr inetd 8 . 
 .Sh OPTIONS
 .Bl -tag -width Ds
@@ -33,29 +35,35 @@ Specify a different
 directory to chroot into on startup. The default is 
 .Pa /var/spool/smtpd.  
 This directory should be readable and writable only to the user that
-smtpd runs as.
+.Nm smtpd
+runs as.
 .It Fl d
 Specify a different spool
 .Ar directory
-within the chrooted subtree. The default is ".", making smtpd spool
-files to the directory it chroots itself to.
+within the chrooted subtree. The default is ".", making
+.Nm smtpd
+spool files to the directory it chroots itself to.
 .It Fl D
-Tells smtpd to run as a daemon, listening on port 25. The
-default is not to run as a daemon
+Tells
+.Nm smtpd
+to run as a daemon, listening on port 25.
+The default is not to run as a daemon.
 .It Fl g 
 Specify a 
 .Ar group 
 to run as. Same as user above.
 .It Fl H
-Disable host checking against the DNS. By default smtpd checks
-and will complain in the syslogs if the DNS information on a host
-seems to indicate a possible spoof or misconfiguration.
+Disable host checking against the DNS. By default
+.Nm smtpd
+checks and will complain in the syslogs if the DNS information for
+a host seems to indicate a possible spoof or misconfiguration.
 .It Fl L
 Suppress children in daemon mode (above) from doing an
 openlog() call. This means your syslogs won't have pid
 information, but is useful if you don't want to have to set up
-your chroot jail for smtpd in a manner that an openlog() call will
-work in it.
+your chroot jail for
+.Nm smtpd
+in a manner that an openlog() call will work in it.
 .It Fl m
 Specify
 .Ar myname ,
@@ -63,11 +71,12 @@ the hostname the daemon should announce itself
 as. the default is whatever gethostname() returns.
 .It Fl P
 Enable paranoid mode of operation, in this mode connections are
-dropped from any client feeding smtpd a suspicious hostname,
-FROM:, or RCPT: line containing characters indicative of an
-attempt to do something evil, or any message headers that aren't
-8bit clean. The default is to log such occuurances and substitute
-for the offending characters, but not drop the connection.
+dropped from any client feeding
+.Nm smtpd
+a suspicious hostname, FROM:, or RCPT: line containing characters
+indicative of an attempt to do something evil, or any message headers
+that aren't 8bit clean. The default is to log such occuurances and
+substitute for the offending characters, but not drop the connection.
 .It Fl s
 Specify 
 .Ar maxsize
@@ -107,8 +116,11 @@ want and no more.
 .Pp
 If 
 .Xr sendmail 8
-is not run as a daemon when using smtpd and
-smtpfwdd, one must use cron to periodically invoke sendmail -q so that
+is not run as a daemon when using
+.Xr smtpd 8
+and
+.Xr smtpfwdd 8 ,
+one must use cron to periodically invoke sendmail -q so that
 queued messages are retried for eventual delivery. Alternatively sendmail
 may be run as a daemon but not listening to the network.
 .Pp
diff --git a/libexec/smtpd/smtpfwdd/smtpfwdd.8 b/libexec/smtpd/smtpfwdd/smtpfwdd.8
index bfe5bc80add..78b09f9ab34 100644
--- a/libexec/smtpd/smtpfwdd/smtpfwdd.8
+++ b/libexec/smtpd/smtpfwdd/smtpfwdd.8
@@ -1,4 +1,4 @@
-.\"	$Id: smtpfwdd.8,v 1.3 1997/12/12 21:50:11 beck Exp $
+.\"	$Id: smtpfwdd.8,v 1.4 1997/12/13 20:19:45 deraadt Exp $
 .Dd Dec 10, 1997
 .Dt SMTPFWDD 8
 .Os OpenBSD
@@ -34,8 +34,9 @@ is a standalone daemon, usually invoked at system startup.
 .It Fl d
 Specify a different spool
 .Ar directory .
-This should be the same directory in which smtpd is spooling files.
-(usually
+This should be the same directory in which
+.Xr smtpd 8
+is spooling files (usually
 .Pa /var/spool/smtpd )
 .It Fl g
 Specify a 
@@ -44,13 +45,15 @@ to run as. Same as user above.
 .It Fl M
 Specifies 
 .Ar maxchildren
-as the maximum number of children smtpfwdd should be
-allowed to spawn at once when delivering mail. Default is 10
+as the maximum number of children
+.Nm smtpfwdd
+should be allowed to spawn at once when delivering mail. Default is 10
 .It Fl P
 specifies a polling interval of
 .Ar polltime
-seconds indicating how often the master smtpfwdd process
-should wake up and check the spool directory for new mail
+seconds indicating how often the master
+.Nm smtpfwdd
+process should wake up and check the spool directory for new mail
 to forward. Default is 10 seconds.
 .It Fl s
 Specify a different mail program to use to forward
@@ -73,8 +76,11 @@ and use the -f option to specify the sender of a mail message.
 .Sh BUGS
 Since 
 .Xr sendmail 8
-is not normally running as a daemon when using smtpd and
-smtpfwdd, one must use cron to periodically invoke sendmail -q so that
+is not normally running as a daemon when using
+.Xr smtpd 8
+and
+.Xr smtpfwdd 8 ,
+one must use cron to periodically invoke sendmail -q so that
 queued messages are retried for eventual delivery, alternatively sendmail
 may be run standalone, but not listening to the network if your version
 of sendmail supports doing this correctly.
@@ -88,6 +94,8 @@ using real unadulterated Berkeley sendmail of a recent vintage, you may
 need to disable the exit status checking at compile time.
 .Pp
 sendmail can't handle a . on one line in a message body. This problem
-is bypassed in smtpfwdd by giving sendmail the option -oitrue. Again,
+is bypassed in
+.Nm smtpfwdd
+by giving sendmail the option -oitrue. Again,
 if you aren't using genuine sendmail, you may need to disable this at
 compile time.