From: Sascha Wildner <saw@online.de>
Date: Thu, 10 May 2012 18:52:36 +0000 (+0200)
Subject: Remove some AppleTalk remains.
X-Git-Tag: v3.2.0~985
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/b911de4f74914339980815f8ab0aa737d31cb752

Remove some AppleTalk remains.
---

diff --git a/sbin/route/keywords b/sbin/route/keywords
index 75ad0485c7..e4adb54692 100644
--- a/sbin/route/keywords
+++ b/sbin/route/keywords
@@ -1,9 +1,7 @@
 #	@(#)keywords	8.2 (Berkeley) 3/19/94
 # $FreeBSD: src/sbin/route/keywords,v 1.4.2.1 2001/10/02 10:04:01 ru Exp $
-# $DragonFly: src/sbin/route/keywords,v 1.4 2008/07/07 22:02:09 nant Exp $
 
 add
-atalk
 blackhole
 change
 cloning
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 44b6de06a6..a87f7a20b8 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -31,7 +31,6 @@
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
 .\" $FreeBSD: src/sbin/route/route.8,v 1.17.2.9 2003/02/24 00:56:43 trhodes Exp $
-.\" $DragonFly: src/sbin/route/route.8,v 1.7 2008/07/19 13:43:03 swildner Exp $
 .\"
 .Dd June 8, 2001
 .Dt ROUTE 8
@@ -138,7 +137,6 @@ will ``flush'' the routing tables of all gateway entries.
 When the address family may is specified by any of the
 .Fl osi ,
 .Fl xns ,
-.Fl atalk ,
 .Fl inet6 ,
 or
 .Fl inet
@@ -229,15 +227,13 @@ The optional modifiers
 .Fl mpls ,
 .Fl xns ,
 .Fl osi ,
-.Fl atalk ,
 and
 .Fl link
 specify that all subsequent addresses are in the
 .Tn MPLS ,
 .Tn XNS ,
-.Tn OSI ,
 or
-.Tn AppleTalk
+.Tn OSI
 address families,
 or are specified as link-level addresses,
 and the names must be numeric specifications rather than
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index 02ff3d86e0..bf2368aa23 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -35,7 +35,6 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/gre.4,v 1.7 2006/10/19 07:41:47 danger Exp $
-.\" $DragonFly: src/share/man/man4/gre.4,v 1.6 2007/11/12 19:07:40 swildner Exp $
 .\"
 .Dd November 11, 2007
 .Dt GRE 4
@@ -85,7 +84,7 @@ Encapsulated datagrams are
 prepended an outer datagram and a GRE header.
 The GRE header specifies
 the type of the encapsulated datagram and thus allows for tunneling other
-protocols than IP like e.g.\& AppleTalk.
+protocols than IP.
 GRE mode is also the default tunnel mode on Cisco routers.
 This is also the default mode of operation of the
 .Nm
@@ -173,8 +172,7 @@ Query operation mode.
 Note that the IP addresses of the tunnel endpoints may be the same as the
 ones defined with
 .Xr ifconfig 8
-for the interface (as if IP is encapsulated), but need not be, as e.g.\& when
-encapsulating AppleTalk.
+for the interface (as if IP is encapsulated), but need not be.
 .Sh EXAMPLES
 Configuration example:
 .Bd -literal
@@ -297,7 +295,6 @@ The kernel must be set to forward datagrams by setting the
 .Xr sysctl 8
 variable to non-zero.
 .Sh SEE ALSO
-.\".Xr atalk 4 ,
 .Xr gif 4 ,
 .Xr inet 4 ,
 .Xr ip 4 ,
diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc
index 441a35abc4..994fd0101f 100644
--- a/sys/kern/Make.tags.inc
+++ b/sys/kern/Make.tags.inc
@@ -38,7 +38,6 @@ COMM=	${SYS}/conf/*.[ch] \
 	${SYS}/vfs/union/*.[ch] \
 	${SYS}/vfs/msdosfs/*.[ch] \
 	${SYS}/net/*.[ch] \
-	${SYS}/netproto/atalk/*.[ch] \
 	${SYS}/netproto/atm/*.[ch] \
 	${SYS}/netinet/*.[ch] \
 	${SYS}/netproto/ipx/*.[ch] \