remove more atalk bits

4 files changed, 6 insertions, 188 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index d167ad19151..c7d5f969f82 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.527 2011/07/03 21:37:19 kettenis Exp $
+#	$OpenBSD: Makefile,v 1.528 2011/07/09 04:01:30 deraadt Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -10,7 +10,7 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	aha.4 ahb.4 ahc.4 ahci.4 ahd.4 aibs.4 aic.4 \
 	akbd.4 alipm.4 amas.4 amdiic.4 amdpm.4 ami.4 amphy.4 \
 	ams.4 an.4 andl.4 aps.4 arc.4 art.4 \
-	asbtm.4 ast.4 atalk.4 atapiscsi.4 atphy.4 ath.4 athn.4 atu.4 atw.4 \
+	asbtm.4 ast.4 atapiscsi.4 atphy.4 ath.4 athn.4 atu.4 atw.4 \
 	auacer.4 audio.4 \
 	aue.4 auglx.4 auich.4 auixp.4 autri.4 auvia.4 axe.4 az.4 azalia.4 \
 	bce.4 berkwdt.4 bge.4 bha.4 bio.4 bktr.4 bluetooth.4 bmtphy.4 bnx.4 \
diff --git a/share/man/man4/atalk.4 b/share/man/man4/atalk.4
deleted file mode 100644
index 64b71adfb33..00000000000
--- a/share/man/man4/atalk.4
+++ /dev/null
@@ -1,176 +0,0 @@
-.\"	$OpenBSD: atalk.4,v 1.16 2007/05/31 19:19:49 jmc Exp $
-.\"
-.\" This file is derived from the atalk.4 man page in the Netatalk 1.4b2
-.\" distribution. That distribution is covered by the following copyright:
-.\"
-.\" Copyright (c) 1990,1996 Regents of The University of Michigan.
-.\" All Rights Reserved.
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby granted,
-.\" provided that the above copyright notice appears in all copies and
-.\" that both that copyright notice and this permission notice appear
-.\" in supporting documentation, and that the name of The University
-.\" of Michigan not be used in advertising or publicity pertaining to
-.\" distribution of the software without specific, written prior
-.\" permission. This software is supplied as is without expressed or
-.\" implied warranties of any kind.
-.\"
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\"
-.\"	Research Systems Unix Group
-.\"	The University of Michigan
-.\"	c/o Wesley Craig
-.\"	535 W. William Street
-.\"	Ann Arbor, Michigan
-.\"	+1-313-764-2278
-.\"	netatalk@umich.edu
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt ATALK 4
-.Os
-.Sh NAME
-.Nm atalk
-.Nd AppleTalk Protocol Family
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netatalk/at.h>
-.Sh DESCRIPTION
-The
-.Tn AppleTalk
-Protocol Family provides presentation layer support for the AppleTalk
-Datagram Delivery Protocol (DDP), using the SOCK_DGRAM socket type.
-In addition, access to in-kernel AppleTalk routing tables and network
-interface configurations is provided.
-.Pp
-The AppleTalk Protocol Suite provides support for four kinds of
-physical media: LocalTalk (230kbps wire-or'd serial), Ethernet,
-Token Ring, and asynchronous serial connections (using either
-AppleTalk Remote Access
-.Pq Tn ARA
-or
-.Tn PPP ) .
-Currently, this AppleTalk implementation supports only Ethernet.
-.Pp
-AppleTalk packets are encapsulated on the Ethernet using the EtherTalk
-Link Access Protocol (ELAP).
-Local network address resolution is handled using the
-AppleTalk Address Resolution Protocol (AARP).
-Neither of these protocols is exposed to user-mode applications.
-.Sh ADDRESSING
-AppleTalk addresses are three byte quantities, stored in network
-byte order.
-The include file
-.Aq Pa netatalk/at.h
-defines the AppleTalk address format.
-.Pp
-Sockets in the AppleTalk protocol family use the following address
-structure:
-.Bd -literal -offset indent
-struct sockaddr_at {
-	u_int8_t	sat_len;
-	u_int8_t	sat_family;
-	u_int8_t	sat_port;
-	struct at_addr	sat_addr;
-	union {
-		struct netrange r_netrange;
-		char		r_zero[8];
-	} sat_range;
-};
-.Ed
-.Pp
-The port of a socket may be set with
-.Xr bind 2 .
-The node for
-.Xr bind 2
-must always be
-.Dv ATADDR_ANYNODE :
-``this node.'' The net
-.\"may
-must
-be
-.Dv ATADDR_ANYNET .
-.\"or
-.\".Dv ATADDR_LATENET .
-.Dv ATADDR_ANYNET
-corresponds to the machine's ``primary'' address (the first
-configured).
-.\".Dv ATADDR_LATENET
-.\"causes the address in outgoing packets to be determined when a packet
-.\"is sent, i.e., determined late.
-.\".Dv ATADDR_LATENET
-.\"is equivalent to opening one socket for each network interface.
-The port of a socket and
-.\"either
-the primary address
-.\"or
-.\".Dv ATADDR_LATENET
-are returned with
-.Xr getsockname 2 .
-.Sh PROTOCOLS
-The AppleTalk protocol family is comprised of the
-.Tn DDP
-datagram delivery protocol,
-AppleTalk Data Stream Protocol
-.Pq Tn ADSP ,
-AppleTalk Echo Protocol
-.Pq Tn AEP ,
-AppleTalk Filing Protocol
-.Pq Tn AFP ,
-AppleTalk Session Protocol
-.Pq Tn ASP ,
-AppleTalk Transaction Protocol
-.Pq Tn ATP ,
-Name Binding Protocol
-.Pq Tn NBP ,
-Printer Access Protocol
-.Pq Tn PAP ,
-and Zone Information Protocol
-.Pq Tn ZIP .
-.Pp
-.Tn DDP
-is implemented in the kernel as
-.Dv SOCK_DGRAM
-sockets in the
-.Dv AF_APPLETALK
-address family.
-All other
-.Tn AppleTalk
-protocols are implemented using the
-.Tn Netatalk
-package.
-.Tn Netatalk
-implements all functions except for
-.Tn ADSP
-and an
-.Tn AFP
-client.
-.Tn AEP ,
-.Tn NBP ,
-and
-.Tn ZIP
-services are provided by the
-.Tn atalkd
-daemon.
-.Tn ASP
-and
-.Tn ATP
-services are provided by a user library.
-.Tn PAP
-and
-.Tn AFP
-services are provided by user programs and daemons.
-.Sh SEE ALSO
-.\" .BR ddp (4P),
-.\" .BR atp (3N),
-.\" .BR asp (3N),
-.Xr bind 2 ,
-.Xr getsockname 2
-.\" .Xr atalkd 8
-.Rs
-.%B Inside AppleTalk, second edition
-.%A Gursharan S. Sidhu
-.%A Richard F. Andrews
-.%A Alan B. Oppenheimer
-.Re
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index ef0a4582c4d..329a79e6cbc 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gre.4,v 1.33 2011/04/04 15:54:07 claudio Exp $
+.\" $OpenBSD: gre.4,v 1.34 2011/07/09 04:01:30 deraadt Exp $
 .\" $NetBSD: gre.4,v 1.10 1999/12/22 14:55:49 kleink Exp $
 .\"
 .\" Copyright 1998 (c) The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 4 2011 $
+.Dd $Mdocdate: July 9 2011 $
 .Dt GRE 4
 .Os
 .Sh NAME
@@ -229,7 +229,6 @@ Some magic with the packet filter configuration
 and a caching proxy like squid are needed to do anything useful with
 these packets.
 .Sh SEE ALSO
-.Xr atalk 4 ,
 .Xr inet 4 ,
 .Xr ip 4 ,
 .Xr netintro 4 ,
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 795119b8b78..d36cf72886a 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.223 2011/07/08 23:17:33 jmc Exp $
+.\"	$OpenBSD: options.4,v 1.224 2011/07/09 04:01:30 deraadt Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -34,7 +34,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: July 8 2011 $
+.Dd $Mdocdate: July 9 2011 $
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -555,11 +555,6 @@ for debugging IPv6 neighbor discovery protocol handling.
 See
 .Xr sysctl 3
 for details.
-.It Cd option NETATALK
-Include kernel support for the AppleTalk family of protocols.
-This suite of supporting code is sometimes called
-.Em netatalk
-support.
 .It Cd option PIPEX
 Includes PIPEX in-kernel acceleration for PPPoE, L2TP or PPTP.
 .It Cd option PPP_BSDCOMP