17 files changed, 358 insertions, 437 deletions

diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index 78b95fff5cd2..33d207513bd2 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,22 +22,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4b.4,v 1.9 1999/12/13 22:11:55 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Dec 13 23:09:12 1999]
+.\"	last edit-date: [Sun Jul 28 12:07:13 2002]
 .\"
-.Dd February 3, 1998
+.Dd July 28,2002
 .Dt I4B 4
 .Os
 .Sh NAME
 .Nm i4b
 .Nd isdn4bsd call control ISDN driver
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4b\&"
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4b\&"
 .Sh DESCRIPTION
 The
 .Nm
@@ -45,13 +41,16 @@ device driver is used by the
 .Xr isdnd 8
 daemon to exchange messages with the isdn4bsd kernel part for the purpose
 of call establishment, control and disconnection and to access various
-control and status informations.
+control and status informations. The
+.Nm
+device can only be opened by a single process and is not meant to be used
+by user programs. 
 .Pp
 The messages and message parameters are documented in the include
 file
 .Em /usr/include/machine/i4b_ioctl.h .
 .Pp
-The available ioctl's are:
+The most important available ioctl's are:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
 .It Ar I4B_CDID_REQ
@@ -107,4 +106,4 @@ Charging information from the kernel.
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/i4bctl.4 b/usr.sbin/i4b/man/i4bctl.4
index 77983fe2b781..20b42e83edbb 100644
--- a/usr.sbin/i4b/man/i4bctl.4
+++ b/usr.sbin/i4b/man/i4bctl.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,25 +22,22 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4bctl.4,v 1.7 1999/12/13 22:11:55 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Dec 13 23:09:46 1999]
+.\"	last edit-date: [Sun Jul 28 12:21:03 2002]
 .\"
-.Dd February 3, 1998
+.Dd July 28, 2002
 .Dt I4BCTL 4
 .Os
 .Sh NAME
 .Nm i4bctl
 .Nd control device for the isdn4bsd kernel part
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4bctl\&"
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4bctl\&"
 .Sh DESCRIPTION
+The
 .Nm
-is used by the
+device is used by the
 .Xr isdndebug 8
 utility to get and set the current debugging level and other information
 of the isdn4bsd package kernel ISDN handling layers.
diff --git a/usr.sbin/i4b/man/i4bing.4 b/usr.sbin/i4b/man/i4bing.4
index b846d2b5915c..8ba3619b3c6c 100644
--- a/usr.sbin/i4b/man/i4bing.4
+++ b/usr.sbin/i4b/man/i4bing.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2000 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 2000, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,20 +22,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4bing.4,v 1.1 2000/01/10 19:14:18 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Jan 10 20:13:11 2000]
+.\"	last edit-date: [Sun Jul 28 12:21:13 2002]
 .\"
-.Dd January 10, 2000
+.Dd July 28, 2002
 .Dt I4BING 4
 .Os
 .Sh NAME
 .Nm i4bing
 .Nd isdn4bsd NetGraph ISDN B-channel interface driver
 .Sh SYNOPSIS
-.Cd pseudo-device \&"i4bing\&" Op count
+.Cd device \&"i4bing\&" Op count
 .Sh DESCRIPTION
 The
 .Nm
@@ -48,13 +46,9 @@ The driver just packs packets received from the NetGraph subsystem without
 anything appended or prepended into raw HDLC packets on the B channel and
 transfers them to a remote site.
 Packets received from the remote site are queued into the NetGraph
-subsystem
-.Pp
-The format of the resulting packet on the B channel is:
-.Pp
-.Dl (HDLC opening flag) (Packet) (CRC) (HDLC closing flag)
+subsystem.
 .Pp
-In the case where a Packet for a remote site arrives in the driver and no
+In the case where a packet for a remote site arrives in the driver and no
 connection has been established yet, the driver communicates with the
 .Xr isdnd 8
 daemon to establish a connection.
@@ -66,4 +60,4 @@ daemon to establish a connection.
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/i4bipr.4 b/usr.sbin/i4b/man/i4bipr.4
index a0b35892c211..3a1821e488a5 100644
--- a/usr.sbin/i4b/man/i4bipr.4
+++ b/usr.sbin/i4b/man/i4bipr.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,22 +22,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4bipr.4,v 1.11 1999/12/13 22:11:55 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Dec 13 23:10:25 1999]
+.\"	last edit-date: [Sun Jul 28 14:29:08 2002]
 .\"
-.Dd July 6, 1998
+.Dd July 28, 2002
 .Dt I4BIPR 4
 .Os
 .Sh NAME
 .Nm i4bipr
 .Nd isdn4bsd IP over ISDN B-channel network driver
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4bipr\&" Op count
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4bipr\&" Op count
 .Sh DESCRIPTION
 The
 .Nm
@@ -97,4 +93,4 @@ for
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/i4bisppp.4 b/usr.sbin/i4b/man/i4bisppp.4
index aea1b67d329b..5e1f4000bef0 100644
--- a/usr.sbin/i4b/man/i4bisppp.4
+++ b/usr.sbin/i4b/man/i4bisppp.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,22 +22,19 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4bisppp.4,v 1.13 2000/08/31 08:45:07 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Thu Aug 31 10:40:17 2000]
+.\"	last edit-date: [Sun Jul 28 12:43:22 2002]
 .\"
-.Dd August 31, 2000
+.Dd July 28, 2002
 .Dt I4BISPPP 4
 .Os
 .Sh NAME
 .Nm i4bisppp
 .Nd isdn4bsd synchronous PPP over ISDN B-channel network driver
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4bisppp\&" Op count
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4bisppp\&" Op count
+.Cd device sppp
 .Sh DESCRIPTION
 The
 .Nm
@@ -45,20 +42,19 @@ driver interfaces the IP subsystem of the operating system with the
 isdn4bsd package so that a transport of IP packets over an ISDN link
 is possible.
 .Pp
-The driver is just a glue layer between Serge Vakulenko's sppp
-backend and the ISDN4BSD package.
+The driver is just a glue layer between the
+.Xr sppp 4
+backend and the ISDN4BSD package and needs the
+.Xr sppp 4
+driver configured into the kernel.
 .Pp
-Beginning with i4b version 0.95 (and only for
-.Fx ) ,
-the sppp
-subsystem was integrated into the
-.Nm
-driver to support more i4b/ISDN specific options. As a consequence it is no
-longer necessary to add a "options sppp" to your kernel
-.Xr config 8
-file. For configuration of the i4bsppp driver, either the
-.Xr ispppcontrol 8
-utility is used or it is configured via
+The network interfaces provided by this driver are named
+.Em isp<n> ,
+where <n> is a number between 0 and count-1 from the kernel config line.
+.Pp
+For configuration of the i4bsppp driver, either the
+.Xr spppcontrol 8
+utility is used or the driver can be configured via
 .Xr isdnd 1
 and its associated
 .Xr isdnd.rc 5
@@ -77,10 +73,6 @@ with the
 .Nm isp
 interfaces.
 .Pp
-The
-.Xr ispppcontrol 8
-utility is used to configure all aspects of PPP required to connect to a
-remote site.
 .Sh LINK0 and LINK1
 The
 .Em link0
@@ -89,7 +81,7 @@ and
 flags given as parameters to
 .Xr ifconfig 8
 have the following meaning for the
-.Nm isp
+.Em isp<n>
 devices:
 .Bl -tag -width link0 -compact
 .Pp
@@ -110,14 +102,14 @@ by default.
 .Pp
 See
 .Xr sppp 4
-for a more detailed discussion of the flags,
+for a more detailed discussion of the flags.
 .Sh SEE ALSO
 .Xr tcpdump 1 ,
 .Xr bpf 4 ,
 .Xr sppp 4 ,
 .Xr isdnd.rc 5 ,
 .Xr isdnd 8 ,
-.Xr ispppcontrol 8
+.Xr spppcontrol 8
 .Sh AUTHORS
 .An -nosplit
 The
@@ -128,4 +120,4 @@ and then added to ISDN4BSD by
 .An Gary Jennejohn Aq gj@FreeBSD.org .
 .Pp
 This manpage was written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/i4bq921.4 b/usr.sbin/i4b/man/i4bq921.4
index 1c499a97ccad..0daef42c717d 100644
--- a/usr.sbin/i4b/man/i4bq921.4
+++ b/usr.sbin/i4b/man/i4bq921.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,22 +22,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4bq921.4,v 1.8 1999/12/13 22:11:55 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Dec 13 23:11:55 1999]
+.\"	last edit-date: [Sun Jul 28 12:49:44 2002]
 .\"
-.Dd February 3, 1998
+.Dd July 28, 2002
 .Dt I4BQ921 4
 .Os
 .Sh NAME
 .Nm i4bq921
 .Nd isdn4bsd pseudo device driver handling the Q.921 protocol
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4bq921\&"
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4bq921\&"
 .Sh DESCRIPTION
 .Nm
 is the ISDN D channel layer 2 handler.
@@ -49,4 +45,4 @@ ITU Recommendation Q.920 and Q.921
 The
 .Nm
 driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/i4bq931.4 b/usr.sbin/i4b/man/i4bq931.4
index 49c12ec2a651..85e298f258c9 100644
--- a/usr.sbin/i4b/man/i4bq931.4
+++ b/usr.sbin/i4b/man/i4bq931.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,25 +22,21 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4bq931.4,v 1.8 1999/12/13 22:11:55 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Dec 13 23:12:33 1999]
+.\"	last edit-date: [Sun Jul 28 14:11:55 2002]
 .\"
-.Dd February 3, 1998
+.Dd July 28, 2002
 .Dt I4BQ931 4
 .Os
 .Sh NAME
 .Nm i4bq931
 .Nd isdn4bsd pseudo device driver handling the Q.931 protocol
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4bq931\&"
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4bq931\&"
 .Sh DESCRIPTION
 .Nm
-is the ISDN D channel layer 2 handler.
+is the ISDN D channel layer 3 handler.
 .Sh STANDARDS
 ITU Recommendation Q.930 and Q.931
 .Sh SEE ALSO
@@ -49,4 +45,4 @@ ITU Recommendation Q.930 and Q.931
 The
 .Nm
 driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/i4brbch.4 b/usr.sbin/i4b/man/i4brbch.4
index 90d513821811..05e948f117d0 100644
--- a/usr.sbin/i4b/man/i4brbch.4
+++ b/usr.sbin/i4b/man/i4brbch.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,22 +22,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4brbch.4,v 1.8 1999/12/13 22:11:55 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Dec 13 23:13:04 1999]
+.\"	last edit-date: [Sun Jul 28 12:52:34 2002]
 .\"
-.Dd February 3, 1998
+.Dd July 28, 2002
 .Dt I4BRBCH 4
 .Os
 .Sh NAME
 .Nm i4brbch
 .Nd isdn4bsd ISDN Raw B-CHannel access driver
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4brbch\&" Op count
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4brbch\&" Op count
 .Sh DESCRIPTION
 The
 .Nm
@@ -50,4 +46,4 @@ part of the isdn4bsd package.
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/i4btel.4 b/usr.sbin/i4b/man/i4btel.4
index b1075e90d630..462d4220f73c 100644
--- a/usr.sbin/i4b/man/i4btel.4
+++ b/usr.sbin/i4b/man/i4btel.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,26 +22,22 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4btel.4,v 1.9 1999/12/13 22:11:55 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Dec 13 23:13:39 1999]
+.\"	last edit-date: [Sun Jul 28 14:14:06 2002]
 .\"
-.Dd April 21, 1999
+.Dd July 28, 2002
 .Dt I4BTEL 4
 .Os
 .Sh NAME
 .Nm i4btel
 .Nd isdn4bsd ISDN B-channel telephony interface driver
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4btel\&" Op count
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4btel\&" Op count
 .Sh DESCRIPTION
 The
 .Nm
-driver provides an interface to the B-channel for telephony applications
+driver provides an interface to the ISDN B-channel for telephony applications
 and is currently used by the
 .Xr isdnd 8
 for answering machine support. The driver is part of the isdn4bsd package.
@@ -133,4 +129,4 @@ A-Law and u-Law are specified in ITU Recommendation G.711.
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/i4btrc.4 b/usr.sbin/i4b/man/i4btrc.4
index a97b8c65e38a..a0579a92c67f 100644
--- a/usr.sbin/i4b/man/i4btrc.4
+++ b/usr.sbin/i4b/man/i4btrc.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,11 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: i4btrc.4,v 1.9 1999/12/13 22:11:55 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Mon Dec 13 23:14:19 1999]
+.\"	last edit-date: [Sun Jul 28 14:21:03 2002]
 .\"
 .Dd July 30, 1999
 .Dt I4BTRC 4
@@ -34,22 +32,23 @@
 .Sh NAME
 .Nm i4btrc
 .Nd "isdn4bsd ISDN interface driver for D and B channel tracing
-.Sh FreeBSD SYNOPSIS
-.Cd pseudo-device \&"i4btrc\&" Op count
-.Sh NetBSD SYNOPSIS
-none
+.Sh SYNOPSIS
+.Cd device \&"i4btrc\&" Op count
 .Sh DESCRIPTION
 The
 .Nm
 driver is used to add a header to the data got from the D and/or B channel
 and queues it to be read and further processed by the
 .Xr isdntrace 8
-utility.
+or
+.Xr isdndecode 8
+utilities.
 .Sh SEE ALSO
 .Xr isdnd 8 ,
 .Xr isdntrace 8
+.Xr isdndecode 8
 .Sh AUTHORS
 The
 .Nm
 device driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/iavc.4 b/usr.sbin/i4b/man/iavc.4
index 575859bac1d6..93e5cdfeb759 100644
--- a/usr.sbin/i4b/man/iavc.4
+++ b/usr.sbin/i4b/man/iavc.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2001 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 2001, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -24,9 +24,9 @@
 .\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Fri May 25 09:45:35 2001]
+.\"	last edit-date: [Sun Jul 28 16:37:51 2002]
 .\"
-.Dd May 22, 2001
+.Dd July 28, 2002
 .Dt IAVC 4
 .Os
 .Sh NAME
@@ -34,9 +34,10 @@
 .Nd isdn4bsd AVM B1/T1 driver
 .Sh SYNOPSIS
 .Cd "device iavc"
+.Cd device \&"i4bcapi\&"
 .Pp
 NOTE:
-For the B1 ISA card
+For the B1 ISA card, something like
 .Pp
 .Bd -literal -offset indent
 hint.iavc.0.at="isa"
diff --git a/usr.sbin/i4b/man/ifpi.4 b/usr.sbin/i4b/man/ifpi.4
index 400323107492..b260e7853f42 100644
--- a/usr.sbin/i4b/man/ifpi.4
+++ b/usr.sbin/i4b/man/ifpi.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2000 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 2000, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,28 +22,27 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ifpi.4,v 1.1 2000/03/16 15:25:05 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Thu Mar 16 16:27:40 2000]
+.\"	last edit-date: [Sun Jul 28 16:38:40 2002]
 .\"
-.Dd July 30, 1999
+.Dd July 28, 2002
 .Dt IFPI 4
 .Os
 .Sh NAME
 .Nm ifpi
-.Nd isdn4bsd AVM Fritz!Card PCI driver
+.Nd isdn4bsd AVM Fritz!Card PCI Version 1 driver
 .Sh SYNOPSIS
-.Cd "device ifpi0"
+.Cd device ifpi
 .Sh DESCRIPTION
 The
 .Nm
-driver provides D-channel layer 1 supports as specified in ITU Recommendation
+driver provides D-channel layer 1 support as specified in ITU Recommendation
 I.430 and layer 1 support for the B-channel.
 .Pp
-The driver supports passive PCI ISDN cards from AVM based on the proprietary
-B-channel controller and PCI interface chip from AVM, Berlin, Germany.
+The driver supports passive PCI ISDN Version 1.0 cards from AVM based on the
+proprietary B-channel controller and PCI interface chip from AVM, Berlin, 
+Germany.
 .Sh CAVEATS
 The driver is still in a somewhat experimental state.
 .Sh BUGS
@@ -51,6 +50,7 @@ Always at least one left.
 .Sh STANDARDS
 CCITT Recommendation I.430
 .Sh SEE ALSO
+.Xr ifpi2 4 ,
 .Xr i4bq921 4 ,
 .Xr i4bq931 4
 .Sh AUTHORS
@@ -61,4 +61,4 @@ driver was written by
 .An Gary Jennejohn Aq gj@FreeBSD.org .
 .Pp
 This manpage was written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
diff --git a/usr.sbin/i4b/man/ifpi2.4 b/usr.sbin/i4b/man/ifpi2.4
index 3d8010609e9e..f83a8f27d8c5 100644
--- a/usr.sbin/i4b/man/ifpi2.4
+++ b/usr.sbin/i4b/man/ifpi2.4
@@ -22,13 +22,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Wed Dec 19 21:23:10 2001]
+.\"	last edit-date: [Sun Jul 28 16:38:22 2002]
 .\"
-.Dd December 19, 2001
+.Dd July 28, 2002
 .Dt IFPI2 4
 .Os
 .Sh NAME
@@ -39,11 +37,12 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides D-channel layer 1 supports as specified in ITU Recommendation
+driver provides D-channel layer 1 support as specified in ITU Recommendation
 I.430 and layer 1 support for the B-channel.
 .Pp
-The driver supports version 2 passive PCI ISDN cards from AVM based on the proprietary
-B-channel controller and PCI interface chip from AVM, Berlin, Germany.
+The driver supports the version 2 passive PCI ISDN cards from AVM based on 
+the proprietary B-channel controller and PCI interface chip from AVM, Berlin,
+Germany.
 .Sh CAVEATS
 The driver is still in a somewhat experimental state.
 .Sh BUGS
@@ -51,6 +50,7 @@ Always at least one left.
 .Sh STANDARDS
 CCITT Recommendation I.430
 .Sh SEE ALSO
+.Xr ifpi 4 ,
 .Xr i4bq921 4 ,
 .Xr i4bq931 4
 .Sh AUTHORS
diff --git a/usr.sbin/i4b/man/ifpnp.4 b/usr.sbin/i4b/man/ifpnp.4
index 647c15442d2b..46239eb8f56f 100644
--- a/usr.sbin/i4b/man/ifpnp.4
+++ b/usr.sbin/i4b/man/ifpnp.4
@@ -22,19 +22,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ifpnp.4,v 1.2 2000/04/25 13:01:20 hm Exp $
 .\"	$Ust: src/i4b/man/ifpnp.4,v 1.4 2000/04/18 08:26:31 ust Exp $
 .\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Tue Apr 25 15:03:27 2000]
+.\"	last edit-date: [Sun Jul 28 16:39:35 2002]
 .\"
-.Dd April 18, 2000
+.Dd July 28, 2002
 .Dt IFPNP 4
 .Os
 .Sh NAME
 .Nm ifpnp
-.Nd isdn4bsd AVM Fritz!Card PnP driver
+.Nd isdn4bsd AVM Fritz!Card ISA PnP driver
 .Sh SYNOPSIS
 .Cd "device ifpnp"
 .Sh DESCRIPTION
@@ -63,6 +62,6 @@ driver was written by
 .An Udo Schweigert Aq ust@cert.siemens.de .
 .Pp
 This manpage was written by
-.An Hellmuth Michaelis Aq hm@kts.org
+.An Hellmuth Michaelis Aq hm@freebsd.org
 and
 .An Udo Schweigert .
diff --git a/usr.sbin/i4b/man/ihfc.4 b/usr.sbin/i4b/man/ihfc.4
index 51351020060d..1b5d7511a39d 100644
--- a/usr.sbin/i4b/man/ihfc.4
+++ b/usr.sbin/i4b/man/ihfc.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2000 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 2000, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -24,46 +24,35 @@
 .\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Fri Jan 12 09:54:31 2001]
+.\"	last edit-date: [Sun Jul 28 16:47:55 2002]
 .\"
-.Dd January 12, 2001
+.Dd July 28, 2002
 .Dt IHFC 4
 .Os
 .Sh NAME
 .Nm ihfc
-.Nd isdn4bsd Cologne Chip Designs HFC[-S][-SP] 2B[DS0] driver
+.Nd isdn4bsd ISA Cologne Chip HFC[-S][-SP] 2B[DS0] driver
 .Sh SYNOPSIS
-All PnP cards (AcerISDN P10, Teles 16.3c PnP),
-.Fx
-4.x/5.x:
 .Cd "device ihfc"
 .Pp
-Non-PnP cards (TELEINT ISDN SPEED No.1):
-.Pp
-.Fx
-4.x:
-.Cd "device ihfc0 at isa?"
-.Pp
-.Fx
-5.x:
-.Cd "device ihfc"
 NOTE:
+.Pp
+Something like:
 .Li hint.ihfc.0.at="isa"
 must be added to
 .Pa /boot/device.hints
-.Pp
-NOTE: The driver will automatically probe for io-base and irq.
+The driver will automatically probe for io-base and irq.
 .Sh DESCRIPTION
 The
 .Nm
 driver provides D-channel layer 1 supports as specified in ITU Recommendation
 I.430 and layer 1 support for the B-channel.
 .Pp
-The driver supports passive ISA ISDN cards based on the HFC[-S][-SP] 2B[DS0]
-chips from Cologne Chip Designs such as the Teles 16.3c and
-the AcerISDN P10.
+The driver supports some passive ISA ISDN cards based on the 
+HFC[-S][-SP] 2B[DS0] chips from Cologne Chip, currenly this are the 
+Teles 16.3c ISA PnP, the AcerISDN P10 ISA PnP and the TELEINT ISDN SPEED No.1.
 .Sh CAVEATS
-The driver is still in a somewhat experimental state.
+The driver is still in an experimental state.
 .Sh BUGS
 Always at least one left.
 .Sh STANDARDS
diff --git a/usr.sbin/i4b/man/isic.4 b/usr.sbin/i4b/man/isic.4
index fd3a3c134a7e..b242f827a348 100644
--- a/usr.sbin/i4b/man/isic.4
+++ b/usr.sbin/i4b/man/isic.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -24,333 +24,314 @@
 .\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Fri Jan 26 14:32:33 2001]
+.\"	last edit-date: [Sun Jul 28 20:14:24 2002]
 .\"
-.Dd January 26, 2001
+.Dd July 28, 2002
 .Dt ISIC 4
 .Os
 .Sh NAME
 .Nm isic
 .Nd isdn4bsd Siemens ISDN Chipset device driver
 .Sh SYNOPSIS
-.Ss FreeBSD (FreeBSD >= 4.0)
-.Pp
-Asuscom ISDNLink 128K (ISA PnP):
-.Cd options \&"ASUSCOM_IPAC\&"
-.Cd "device isic0"
-.Pp
-AVM A1 or AVM Fritz!Card classic:
-.Cd options \&"AVM_A1\&"
-.Cd "device isic0 at isa? port 0x340 irq 5 flags 4"
-.Pp
-Dr. Neuhaus Niccy Go@ (PnP):
-.Cd options \&"DRN_NGO\&"
-.Cd "device isic0"
-.Pp
-ELSA QuickStep 1000pro ISA (PnP):
-.Cd options \&"ELSA_QS1ISA\&"
-.Cd "device isic0"
-.Pp
-ELSA MicroLink ISDN/PCI (ELSA QuickStep 1000pro PCI):
-.Cd options \&"ELSA_QS1PCI\&"
-.Cd "device isic0"
-.Pp
-ELSA PCC-16:
-.Cd options \&"ELSA_PCC16\&"
-.Cd "device isic0 at isa? port 0x360 irq 10 flags 20"
-.Pp
-Sedlbauer Win Speed card (PnP):
-.Cd options \&"SEDLBAUER\&"
-.Cd "device isic0"
-.Pp
-Siemens I-Surf 2.0 PnP:
-.Cd options \&"SIEMENS_ISURF2\&"
-.Cd "device isic0"
-.Pp
-Teles S0/8 or Niccy 1008 card:
-.Cd options \&"TEL_S0_8\&"
-.Cd "device isic0 at isa? iomem 0xd0000 irq 5 flags 1"
-.Pp
-Teles S0/16 or Creatix ISDN-S0 or Niccy 1016 card:
-.Cd options \&"TEL_S0_16\&"
-.Cd "device isic0 at isa? port 0xd80 iomem 0xd0000 irq 5 flags 2"
-.Pp
-Teles S0/16.3 card:
-.Cd options \&"TEL_S0_16_3\&"
-.Cd "device isic0 at isa? port 0xd80 irq 5 flags 3"
-.Pp
-Teles S0/16.3 PnP card (PnP) or
-Creatix ISDN-S0 P&P card (PnP):
-.Cd options \&"TEL_S0_16_3_P\&"
-.Cd "device isic0"
-.Pp
-USRobotics Sportster ISDN TA internal or Stollmann Tina-pp card:
-.Cd options \&"USR_STI\&"
-.Cd "device isic0 at isa? port 0x268 irq 5 flags 7"
-.Pp
-Eicon.Diehl DIVA 2.0 and 2.02 ISA PnP card:
-.Cd options \&"EICON_DIVA\&"
-.Cd "device isic0"
-.Pp
-.Ss NetBSD
-On the ISA bus:
-.Pp
-Teles S0/8 or Niccy 1008 card:
-.Cd options \&"TEL_S0_8\&"
-.Cd "isic0 at isa? iomem 0xd0000 irq 5"
-.Pp
-Teles S0/16 or Creatix ISDN-S0 or Niccy 1016 card:
-.Cd options \&"TEL_S0_16\&"
-.Cd "isic0 at isa? port 0xd80 iomem 0xd0000 irq 5"
-.Pp
-Teles S0/16.3 card:
-.Cd options \&"TEL_S0_16_3\&"
-.Cd "isic0 at isa? port 0xd80 irq 5"
-.Pp
-AVM A1 or AVM Fritz card:
-.Cd options \&"AVM_A1\&"
-.Cd "isic0 at isa? port 0x340 irq 5"
-.Pp
-USRobotics Sportster ISDN TA internal or Stollmann Tina-pp card:
-.Cd options \&"USR_STI\&"
-.Cd "isic0 at isa? port 0x268 irq 5"
-.Pp
-ITK ix1 micro card:
-.Cd options \&"ITKIX1\&"
-.Cd "isic0 at isa? port 0x398 irq 10"
-.Pp
-On the ISAPNP bus:
-.Pp
-Teles S0/16.3 PnP card
-.Cd options \&"TEL_S0_16_3_P\&"
-.Cd "isic* at isapnp?"
-.Pp
-Creatix ISDN-S0 P&P card
-.Cd options \&"CRTX_S0_P\&"
-.Cd "isic* at isapnp?"
-.Pp
-Dr. Neuhaus Niccy GO@
-.Cd options \&"DRN_NGO\&"
-.Cd "isic* at isapnp?"
-.Pp
-ELSA QuickStep 1000pro (ISA version):
-.Cd options \&"ELSA_QS1ISA\&"
-.Cd "isic* at isapnp?"
-.Pp
-Sedlbauer WinSpeed:
-.Cd options \&"SEDLBAUER\&"
-.Cd "isic* at isapnp?"
-.Pp
-Dynalink IS64PH:
-.Cd options \&"DYNALINK\&"
-.Cd "isic* at isapnp?"
-.Pp
-Cards on the PCI bus:
-.Pp
-ELSA QuickStep 1000pro (PCI version)
-.Cd options \&"ELSA_QS1PCI\&"
-.Cd "isic* at pci?"
-.Pp
-Cards on the PCMCIA or PCCARD bus:
-.Pp
-AVM Fritz!Card PCMCIA
-.Cd options \&"AVM_A1_PCMCIA\&"
-.Cd "isic* at pcmcia? function ?"
-.Pp
-ELSA MicroLink ISDN/MC
-.Cd options \&"ELSA_ISDNMC\&"
-.Cd "isic* at pcmcia? function ?"
-.Pp
-ELSA MicroLink MC/all
-.Cd options \&"ELSA_MCALL\&"
-.Cd "isic* at pcmcia? function ?"
-.Pp
-Cards on the Amiga Zorro bus:
-.Pp
-BSC/ITH ISDN Master, ITH ISDN MasterII or VMC ISDN Blaster
-.Cd "aster* at zbus?"
-.Cd "isic* at aster? port ?"
+.Cd "device isic"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides D-channel layer 1 supports as specified in ITU Recommendation
 I.430 and layer 1 support for the B-channel.
 .Pp
-The driver supports several 8 and 16bit passive ISDN cards from various
-manufacturers which are all based upon the popular Siemens ISDN chipset
-consisting of the ISDN Subscriber Access Controller ISAC (such as the
-PEB2085 or PSB 2186) and the High-Level Serial Communications Controller
-Extended HSCX (such as the SAB82525 or PSB21525). The newer IPAC chip
-(which integrates an ISAC and a HSCX in one chip, with the added benefit
-of larger FIFO buffers) is also supported.
-.Sh SUPPORTED CARDS
+The driver supports several 8 and 16bit passive ISA, ISA PnP and PCI 
+ISDN cards from various manufacturers which are all based upon the 
+popular Siemens ISDN chipset consisting of the ISDN Subscriber Access 
+Controller ISAC (such as the PEB2085 or PSB 2186) and the High-Level 
+Serial Communications Controller Extended HSCX (such as the SAB82525 
+or PSB21525). 
+The newer IPAC chip (which integrates an ISAC and a HSCX in one chip,
+with the added benefit of larger FIFO buffers) is also supported.
+.Sh SUPPORTED CARDS: ISA bus, NON-PnP
 .Bl -tag -width Ds -compact
 .It Ar Teles S0/8, Dr. Neuhaus Niccy 1008, Creatix ISDN-S0/8
 .Pp
-The required (optional for
-.Nx )
-.Em flag
-value is 1.
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options TEL_S0_8
+.Ed
+.Pp
+The required entry in 
+.Xr device.hints 5
+file is:
+.Pp
+.Bd -literal -offset indent
+hint.isic.0.at="isa"
+hint.isic.0.maddr="0xd0000"
+hint.isic.0.irq="5"
+hint.isic.0.flags="1"
+.Ed
 .Pp
 Notice that this cards must not have a
 .Em port
-value in the config line.
+value.
 .Pp
-Valid interrupts are 2, 3, 4, 5, 6 and 7.
+Valid values for hint.isic.N.irq are 2, 3, 4, 5, 6 and 7.
 .Pp
-The i/o ports are memory mapped and the memory start address may
-be in the range 0xA0000 to 0xDF000 and uses 4kB of memory.
+The i/o ports are memory mapped and the memory start address (hint.isic.N.maddr)
+may be in the range 0xA0000 to 0xDF000 and use a region of 4kB of memory.
 .Pp
 .It Ar Teles S0/16, Creatix ISDN-S0, Dr. Neuhaus Niccy 1016
 .Pp
-The required (optional under
-.Nx )
-.Em flag
-value is 2.
-.Pp
-These boards have a jumper which specifies an i/o base address of either
-0xd80, 0xe80 or 0xf80. The remaining necessary configuration values are then
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options TEL_S0_16
+.Ed
+.Pp
+The required entry in 
+.Xr device.hints 5
+file is:
+.Pp
+.Bd -literal -offset indent
+hint.isic.0.at="isa"
+hint.isic.0.port="0xd80"
+hint.isic.0.maddr="0xd0000"
+hint.isic.0.irq="5"
+hint.isic.0.flags="2"
+.Ed
+.Pp
+These boards have a jumper which specifies an i/o base address
+(hint.isic.N.port) of either 0xd80, 0xe80 or 0xf80. 
+The remaining necessary configuration values are then
 programmed at run time by accessing this i/o port.
 .Pp
-Valid interrupts are 2, 3, 4, 5, 10, 11, 12 or 15.
+Valid interrupts (hint.isic.N.irq) are 2, 3, 4, 5, 10, 11, 12 or 15.
 .Pp
-Valid memory start
-addresses are 0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000,
-0xCE000, 0xD0000, 0xD2000, 0xD4000, 0xD6000, 0xD8000, 0xDA000, 0xDC000 and
+Valid memory start addresses (hint.isic.N.maddr) are 
+0xC0000, 0xC2000, 0xC4000, 0xC6000, 0xC8000, 0xCA000, 0xCC000, 0xCE000, 
+0xD0000, 0xD2000, 0xD4000, 0xD6000, 0xD8000, 0xDA000, 0xDC000 and
 0xDE000.
 .Pp
-Notice: Although the Jumpers are labeled 0xd80, 0xe80 or 0xf80, they
+Notice: Although the jumpers are labeled 0xd80, 0xe80 or 0xf80, they
 also require i/o space at addresses 0x180, 0x280 or 0x380.
 .Pp
 .It Ar Teles S0/16.3
 .Pp
-The required (optional under
-.Nx )
-.Em flag
-value is 3.
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options TEL_S0_16_3
+.Ed
+.Pp
+The required entry in 
+.Xr device.hints 5
+file is:
+.Pp
+.Bd -literal -offset indent
+hint.isic.0.at="isa"
+hint.isic.0.port="0xd80"
+hint.isic.0.irq="5"
+hint.isic.0.flags="3"
+.Ed
 .Pp
 This card is completely i/o mapped and must not have an
-.Em iomem
-statement in the config line.
+.Em maddr
+statement in the hints file.
+.Pp
+Valid interrupts (hint.isic.N.irq) are 2, 5, 9, 10, 12 or 15.
 .Pp
-Valid interrupts are 2, 5, 9, 10, 12 or 15.
+These boards have a jumper which specifies an i/o base address
+(hint.isic.N.port) of either 0xd80, 0xe80 or 0xf80.
 .Pp
 Notice: Although the switch positions are labeled 0x180, 0x280 and 0x380,
 the card is to be configured at 0xd80, 0xe80 or 0xf80 respectively!
 .Pp
-.It Ar AVM A1, AVM Fritz!Card
+.It Ar AVM A1 and AVM Fritz!Card
 .Pp
-The required (optional under
-.Nx )
-.Em flag
-value is 4.
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options AVM_A1
+.Ed
 .Pp
-These boards have a jumper which specifies an i/o base address of either
-0x200, 0x240, 0x300 or 0x340.
+The required entry in 
+.Xr device.hints 5
+file is:
 .Pp
-Valid interrupt configurations are 3, 4, 5, 6, 7, 10, 11, 12 or 15.
+.Bd -literal -offset indent
+hint.isic.0.at="isa" 
+hint.isic.0.port="0x340"
+hint.isic.0.irq="5"
+hint.isic.0.flags="4"
+.Ed
+.Pp
+These boards have a jumper which specifies an i/o base address (hint.isic.N.port)
+of either 0x200, 0x240, 0x300 or 0x340.
+.Pp
+Valid interrupt (hint.isic.N.irq) values are 3, 4, 5, 6, 7, 10, 11, 12 or 15.
 .Pp
 Older Versions of the AVM A1 also require setting of an IRQ jumper, newer
 versions of this and the Fritz!Card only have an i/o base jumper and the
 interrupt is setup at runtime by reprogramming a register.
 .Pp
-This card is completely i/o mapped and must not have an
-.Em iomem
-statement in the config line.
+.It Ar USRobotics Sportster ISDN TA intern and Stollmann Tina pp
 .Pp
-.It Ar Teles S0/16.3 PnP
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options USR_STI
+.Ed
 .Pp
-Possible i/o port values are 0x580, 0x500 and 0x680.
-Possible interrupt configurations are 3, 5, 7, 10, 11 and 12.
+The required entry in 
+.Xr device.hints 5
+file is:
 .Pp
-The the card is auto-configured by the PnP kernel subsystem.
+.Bd -literal -offset indent
+hint.isic.0.at="isa"   
+hint.isic.0.port="0x268"
+hint.isic.0.irq="5"
+hint.isic.0.flags="7"
+.Ed
 .Pp
-.It Ar Creatix ISDN-S0 P&P
+Valid i/o port values (hint.isic.N.port) are 0x200, 0x208, 0x210, 0x218, 
+0x220, 0x228, 0x230, 0x238, 0x240, 0x248, 0x250, 0x258, 0x260, 0x268, 
+0x270 and 0x278.
 .Pp
-Valid i/o port values are 0x120, 0x180 and 0x100.
+Valid interrupt (hint.isic.N.irq) values are 5, 7, 10, 11, 12, 14, 15.
 .Pp
-Valid interrupt configurations are 3, 5, 7, 10, 11 and 12.
+Notice: this card has a strange address decoding scheme resulting in 
+occupying 64 windows of some bytes length over the whole i/o address
+range.
 .Pp
-The card is auto-configured by the PnP kernel subsystem.
+.It Ar ITK ix1 Micro ( < V.3, non-PnP version )
 .Pp
-.It Ar "3Com USRobotics Sportster ISDN TA intern and Stollmann Tina pp"
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options ITKIX1
+.Ed
 .Pp
-The required (optional for
-.Nx )
-.Em flag
-value is 7.
+The required entry in 
+.Xr device.hints 5
+file is:
 .Pp
-Valid i/o port values are 0x200, 0x208, 0x210, 0x218, 0x220, 0x228, 0x230,
-0x238, 0x240, 0x248, 0x250, 0x258, 0x260, 0x268, 0x270 and 0x278.
+.Bd -literal -offset indent
+hint.isic.0.at="isa" 
+hint.isic.0.port="0x398"
+hint.isic.0.irq="10"
+hint.isic.0.flags="18" 
+.Ed
 .Pp
-Valid interrupt configurations are 5, 7, 10, 11, 12, 14, 15.
+Valid i/o port values must be in the range (<unknown>).
 .Pp
-Notice: this card has a strange address decoding scheme resulting in 64
-windows of some bytes length. Anyway, support for this card is good because
-the manufacturer gave out technical docs for this card!
+Valid interrupt configurations are (<unknown>).
 .Pp
+.It Ar ELSA MicroLink ISDN/PCC-16 and ELSA PCFpro
 .Pp
-.It Ar "Dr. Neuhaus Niccy Go@"
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options ELSA_PCC16
+.Ed
 .Pp
-Valid i/o port values must be in the range 0x200 ... 0x3e0.
+The required entry in 
+.Xr device.hints 5
+file is:
 .Pp
-Valid interrupt configurations are 3, 4, 5, 9, 10, 11, 12, 15.
+.Bd -literal -offset indent
+hint.isic.0.at="isa" 
+hint.isic.0.port="0x360"
+hint.isic.0.irq="10"
+hint.isic.0.flags="20"
+.Ed
 .Pp
-The card is auto-configured by the PnP kernel subsystem.
+Valid i/o port (hint.isic.N.port) values are 0x160, 0x170, 0x260 and 0x360.
 .Pp
-.It Ar "Sedlbauer Win Speed"
+Valid interrupt (hint.isic.N.irq) values are 2, 3, 5, 10, 11 and 15.
+.Pp
+The LED's are not supported and are off.
+.Pp
+.El
+.Sh SUPPORTED CARDS: ISA bus, PnP (Plug 'n Pray)
+.Bl -tag -width Ds -compact
+.It Ar Teles S0/16.3 PnP
 .Pp
-Valid i/o port values must be in the range 0x100 ... 0x3f0. (alignment 0x8,
-len 0x8)
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options TEL_S0_16_3_P
+.Ed
 .Pp
-Valid interrupt configurations are 3, 4, 5, 7, 10, 11, 12, 13, 15.
+.It Ar Creatix ISDN-S0 P&P
 .Pp
-The card is auto-configured by the PnP kernel subsystem.
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options CRTX_S0_P
+.Ed
 .Pp
-.It Ar "ELSA QuickStep 1000pro (ISA)"
+.It Ar "Dr. Neuhaus Niccy Go@"
 .Pp
-I/O port in the range 0x160 ... 0x360 (occupies 8 bytes).
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options DRN_NGO
+.Ed
 .Pp
-Valid interrupt configurations are 3, 4, 5, 7, 10, 11, 12, 15.
+.It Ar "Sedlbauer Win Speed"
 .Pp
-The card is auto-configured by the PnP kernel subsystem.
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options SEDLBAUER
+.Ed
 .Pp
+.It Ar "Dynalink IS64PH"
 .Pp
-.It Ar "ELSA QuickStep 1000pro-PCI"
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options DYNALINK
+.Ed
 .Pp
-The card is auto-configured by the PCI kernel subsystem.
+.It Ar "ELSA QuickStep 1000pro ISA"
 .Pp
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options ELSA_QS1ISA
+.Ed
 .Pp
-.It Ar "ITK ix1 micro"
+The LED's are not supported and are off.
 .Pp
-The required (optional under
-.Nx )
-.Em flag
-value is 18.
+.It Ar "Siemens I-Surf 2.0"
 .Pp
-Valid i/o port values must be in the range (<unknown>).
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options SIEMENS_ISURF2
+.Ed
 .Pp
-Valid interrupt configurations are (<unknown>).
+.It Ar "Asuscom ISDNlink 128K ISA"
+.Pp
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options ASUSCOM_IPAC
+.Ed
+.Pp
+.It Ar "Eicon Diehl DIVA 2.0 and 2.02"
 .Pp
-.It Ar "BSC ISDN Master"
-.It Ar "ITH ISDN MasterII"
-.It Ar "VMC ISDN Blaster"
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options EICON_DIVA
+.Ed
 .Pp
-The card addresses are auto-configured by the Zorro bus kernel subsystem.
-The ISDN functions of the boards are at known (to the driver) relative
-addresses.
+.It Ar "Compaq Microcom 610 ISDN card (Compaq series PSB2222I)"
 .Pp
-Note that currently, you have to jumper the card interupt for
-.Em IPL 2
-instead of IPL 6 (which is used by most AmigaOS software).
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options COMPAQ_M610
+.Ed
+.Pp
+.El
+.Sh SUPPORTED CARDS: PCI bus
+.Bl -tag -width Ds -compact
+.It Ar "ELSA QuickStep 1000pro-PCI"
+.Pp
+The required entry in the kernel config file is:
+.Bd -literal -offset indent
+options ELSA_QS1PCI
+.Ed
+.Pp
+The LED's are not supported and are off.
 .Pp
-Note that the ITH ISDN MasterII doesn't work in the DraCo Zorro bus. This
-is no
-.Nx
-problem, but general.
 .El
 .Sh CAVEATS
-Note that all of the boards with I/O ports actually use several ranges
+Note that all of ISA boards with i/o ports actually use several ranges
 of port addresses; Teles happen to refer to the 0xd80 range in their
 documentation (the board also uses 0x180 etc.), while AVM happen to refer
 to the 0x200 range in their documentation (the board also uses 0x600 etc.)
@@ -358,8 +339,8 @@ The driver matches the manufacturers' description for the purposes of
 configuration, but of course makes use of all the ports in order to
 operate the card.
 .Sh BUGS
-Since there is no hardware documentation available from several manufacturers
-for their boards, it is likely that there are many, many bugs left.
+Since there is no hardware documentation available from the manufacturers
+of several boards, it is likely that there are many bugs left.
 .Sh STANDARDS
 CCITT Recommendation I.430
 .Sh SEE ALSO
@@ -370,19 +351,11 @@ CCITT Recommendation I.430
 The
 .Nm
 driver and this manpage were written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .
 It is based on earlier work of
 .An Arne Helme ,
 .An Andrew Gordon
 and
-.An Gary Jennejohn .
-.Pp
-The complete porting to and maintenance of
-.Nx
-was done by
-.An Martin Husemann Aq martin@rumolt.teuto.de .
-.Pp
-The
-.Nx Ns /Amiga
-ISDN Blaster/Master/MasterII driver was written by
-.An Ignatios Souvatzis Aq is@netbsd.org .
+.An Gary Jennejohn Aq gj@freebsd.org .
+
+
diff --git a/usr.sbin/i4b/man/iwic.4 b/usr.sbin/i4b/man/iwic.4
index 4eac92845d0c..3391550bd7d5 100644
--- a/usr.sbin/i4b/man/iwic.4
+++ b/usr.sbin/i4b/man/iwic.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2000 Hellmuth Michaelis. All rights reserved.
+.\" Copyright (c) 2000, 2002 Hellmuth Michaelis. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -22,13 +22,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: iwic.4,v 1.2 2000/03/16 15:25:05 hm Exp $
-.\"
 .\" $FreeBSD$
 .\"
-.\"	last edit-date: [Thu Mar 16 16:27:46 2000]
+.\"	last edit-date: [Sun Jul 28 16:49:47 2002]
 .\"
-.Dd July 30, 1999
+.Dd July 28, 2002
 .Dt IWIC 4
 .Os
 .Sh NAME
@@ -67,4 +65,4 @@ driver was written by
 .An Dave Boyce Aq dave@abyss.demon.co.uk .
 .Pp
 This manpage was written by
-.An Hellmuth Michaelis Aq hm@kts.org .
+.An Hellmuth Michaelis Aq hm@freebsd.org .