clean up some newly created lies now that tftpd doesnt run out of inetd.

poke by deraadt@

3 files changed, 8 insertions, 23 deletions

diff --git a/libexec/tcpd/tcpd/tcpd.8 b/libexec/tcpd/tcpd/tcpd.8
index c1f321f3868..40f41cee595 100644
--- a/libexec/tcpd/tcpd/tcpd.8
+++ b/libexec/tcpd/tcpd/tcpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpd.8,v 1.19 2007/05/31 19:19:41 jmc Exp $
+.\"	$OpenBSD: tcpd.8,v 1.20 2012/03/06 01:25:46 dlg Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: March 6 2012 $
 .Dt TCPD 8
 .Os
 .Sh NAME
@@ -37,7 +37,6 @@ program can be set up to monitor incoming requests for
 .Xr finger 1 ,
 .Xr ftp 1 ,
 .Xr rsh 1 ,
-.Xr tftp 1 ,
 .Xr talk 1 ,
 .Xr comsat 8 ,
 and other services that have a one-to-one mapping onto executable files.
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 052e63095bb..bf56eebdcf9 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: diskless.8,v 1.59 2012/01/28 02:20:46 william Exp $
+.\"	$OpenBSD: diskless.8,v 1.60 2012/03/06 01:25:47 dlg Exp $
 .\"	$NetBSD: diskless.8,v 1.7.4.1 1996/05/30 18:58:10 cgd Exp $
 .\"
 .\"
@@ -27,7 +27,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: January 28 2012 $
+.Dd $Mdocdate: March 6 2012 $
 .Dt DISKLESS 8
 .Os
 .Sh NAME
@@ -175,10 +175,8 @@ Assign an IP address for myclient in
 If booting an Alpha, AMD64, newer HPPA, HPPA64, i386, Mips64, Motorola,
 Sun, or Vax client,
 ensure that
-.Pa /etc/inetd.conf
-is configured to run
 .Xr tftpd 8
-in the directory
+is configured to run in the directory
 .Pa /tftpboot .
 .Pp
 If booting an HP 300 or older HPPA machine, ensure that
@@ -372,8 +370,6 @@ and
 For Alpha, AMD64, newer HPPA, HPPA64, i386, Mips64, Motorola,
 Sun, and Vax clients:
 .Xr tftpd 8
-via
-.Xr inetd 8
 .Pp
 For HP 300 and older HPPA clients:
 .Xr rbootd 8
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index ace5bb7a27f..360821537e2 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inetd.8,v 1.34 2009/12/29 10:25:43 sobrado Exp $
+.\"	$OpenBSD: inetd.8,v 1.35 2012/03/06 01:25:47 dlg Exp $
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     from: @(#)inetd.8	6.7 (Berkeley) 3/16/91
 .\"
-.Dd $Mdocdate: December 29 2009 $
+.Dd $Mdocdate: March 6 2012 $
 .Dt INETD 8
 .Os
 .Sh NAME
@@ -240,15 +240,6 @@ and
 .Xr talkd 8
 are both examples of the latter type of
 datagram server.
-.Xr tftpd 8
-is an exception; it is a datagram server that establishes pseudo-connections.
-It must be listed as
-.Dq wait
-in order to avoid a race;
-the server reads the first packet, creates a new socket,
-and then forks and exits to allow
-.Nm inetd
-to check for new service requests to spawn new servers.
 The optional
 .Dq max
 suffix (separated from
@@ -383,8 +374,7 @@ only IPv6 traffic will be routed to the server.
 .Xr ftpd 8 ,
 .Xr identd 8 ,
 .Xr rshd 8 ,
-.Xr talkd 8 ,
-.Xr tftpd 8
+.Xr talkd 8
 .Sh HISTORY
 The
 .Nm