diff options
| author |   jmc <jmc@openbsd.org> | 2007-05-29 20:00:06 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2007-05-29 20:00:06 +0000 |
| commit | 2369f81da2aa5d7e5fe0ef46986e088108faebbc (patch) | |
| tree | 5c466d191a7be5a7687f80b4a0394a562cb42c3a | |
| parent | set UDCF_DEBUG to 1 when USB_DEBUG is defined. (diff) | |
| download | wireguard-openbsd-2369f81da2aa5d7e5fe0ef46986e088108faebbc.tar.xz wireguard-openbsd-2369f81da2aa5d7e5fe0ef46986e088108faebbc.zip | |
zap token ring bits; ok claudio
| -rw-r--r-- | share/man/man4/atalk.4 | 3 | ||||
| -rw-r--r-- | share/man/man4/ifmedia.4 | 35 | ||||
| -rw-r--r-- | share/man/man4/man4.hppa/io.4 | 5 |
3 files changed, 4 insertions, 39 deletions
diff --git a/share/man/man4/atalk.4 b/share/man/man4/atalk.4 index a59772d7210..d8403e4ae47 100644 --- a/share/man/man4/atalk.4 +++ b/share/man/man4/atalk.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: atalk.4,v 1.14 2003/06/06 10:29:41 jmc Exp $ +.\" $OpenBSD: atalk.4,v 1.15 2007/05/29 20:00:06 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: @@ -52,7 +52,6 @@ AppleTalk Remote Access or .Tn PPP ) . Currently, this AppleTalk implementation supports only Ethernet. -.\" and Token Ring? .Pp AppleTalk packets are encapsulated on the Ethernet using the EtherTalk Link Access Protocol (ELAP). diff --git a/share/man/man4/ifmedia.4 b/share/man/man4/ifmedia.4 index e271e4936b2..10c1fd3e249 100644 --- a/share/man/man4/ifmedia.4 +++ b/share/man/man4/ifmedia.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ifmedia.4,v 1.14 2007/04/12 14:29:04 jmc Exp $ +.\" $OpenBSD: ifmedia.4,v 1.15 2007/05/29 20:00:06 jmc Exp $ .\" $NetBSD: ifmedia.4,v 1.14 2001/06/30 17:57:56 bjh21 Exp $ .\" .\" Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -55,14 +55,12 @@ The media is typically set using the .Xr ifconfig 8 command. .Pp -There are currently four link types supported by +There are currently three link types supported by .Nm ifmedia : .Pp .Bl -tag -offset indent -width IFM_IEEE80211 -compact .It Dv IFM_ETHER Ethernet -.It Dv IFM_TOKEN -Token Ring .It Dv IFM_FDDI FDDI .It Dv IFM_IEEE80211 @@ -168,35 +166,6 @@ The following media option is defined for Ethernet: .It Dv IFM_ETH_MASTER Configure a 1000BASE-T PHY as a MASTER PHY. .El -.Sh MEDIA TYPES AND OPTIONS FOR TOKEN RING -The following media types are defined for Token Ring: -.Bl -tag -offset indent -width IFM_TOK_UTP16 -.It Dv IFM_TOK_STP4 -4Mb/s, shielded twisted pair, DB9 connector. -[DB9/4Mbit, 4STP] -.It Dv IFM_TOK_STP16 -16Mb/s, shielded twisted pair, DB9 connector. -[DB9/16Mbit, 16STP] -.It Dv IFM_TOK_UTP4 -4Mb/s, unshielded twisted pair, RJ45 connector. -[UTP/4Mbit, 4UTP] -.It Dv IFM_TOK_UTP16 -16Mb/s, unshielded twisted pair, RJ45 connector. -[UTP/16Mbit, 16UTP] -.El -.Pp -The following media options are defined for Token Ring: -.Bl -tag -offset indent -width IFM_TOK_SRCRT -.It Dv IFM_TOK_ETR -Early token release. -[EarlyTokenRelease, ETR] -.It Dv IFM_TOK_SRCRT -Enable source routing features. -[SourceRouting, SRCRT] -.It Dv IFM_TOK_ALLR -All routes vs. single route broadcast. -[AllRoutes, ALLR] -.El .Sh MEDIA TYPES AND OPTIONS FOR FDDI The following media types are defined for FDDI: .Pp diff --git a/share/man/man4/man4.hppa/io.4 b/share/man/man4/man4.hppa/io.4 index efe576dbb42..96422755b22 100644 --- a/share/man/man4/man4.hppa/io.4 +++ b/share/man/man4/man4.hppa/io.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: io.4,v 1.11 2004/09/16 21:34:44 jmc Exp $ +.\" $OpenBSD: io.4,v 1.12 2007/05/29 20:00:06 jmc Exp $ .\" .\" Copyright (c) 2003,2004 Paul Weissmann .\" All rights reserved. @@ -142,9 +142,6 @@ interface speed: .It FDDI .Tn Am78830 Formac+ FDDI, -.It TR -.Tn TMS380C26 -4/16 Mb/s TokenRing. .El .Sh SEE ALSO .Xr asp 4 , |