Last minute cleaning:

- add the kmem(4) -> mem(4) link
- remove gm(4) superseded by gem(4)
- more .Xr
- fix .Cd lines
- bring akbd(4) contents in sync with reality (blatantly inspired from
  pckbd(4))
- the usual intro(4) update

ok deraadt@

12 files changed, 205 insertions, 109 deletions

diff --git a/share/man/man4/man4.macppc/Makefile b/share/man/man4/man4.macppc/Makefile
index af328fa65a6..1cb879bae29 100644
--- a/share/man/man4/man4.macppc/Makefile
+++ b/share/man/man4/man4.macppc/Makefile
@@ -1,10 +1,11 @@
-#	$OpenBSD: Makefile,v 1.4 2001/10/09 00:01:56 drahn Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/10/01 20:59:48 miod Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
 #	Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
-MAN= abtn.4 adb.4 aed.4 akbd.4 ams.4 apm.4 autoconf.4 awacs.4 bm.4 gm.4
-MAN+= intro.4 mem.4 zs.4
-MLINKS= zs.4 zsc.4 zs.4 zstty.4
+MAN=	abtn.4 adb.4 aed.4 akbd.4 ams.4 apm.4 autoconf.4 awacs.4 bm.4 \
+	intro.4 mem.4 zs.4
+MLINKS= mem.4 kmem.4
+MLINKS+= zs.4 zsc.4 zs.4 zstty.4
 
 MANSUBDIR=macppc
 
diff --git a/share/man/man4/man4.macppc/abtn.4 b/share/man/man4/man4.macppc/abtn.4
index f10a70a8a8d..6de6e7e8af4 100644
--- a/share/man/man4/man4.macppc/abtn.4
+++ b/share/man/man4/man4.macppc/abtn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: abtn.4,v 1.6 2002/06/19 06:32:44 miod Exp $
+.\" $OpenBSD: abtn.4,v 1.7 2002/10/01 20:59:48 miod Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" All rights reserved.
@@ -43,7 +43,8 @@ Sound, numlock and eject buttons are also handled by this driver but
 are silently ignored.
 .Sh SEE ALSO
 .Xr adb 4 ,
-.Xr aed 4
+.Xr aed 4 ,
+.Xr intro 4
 .Sh AUTHORS
 The
 .Nm
diff --git a/share/man/man4/man4.macppc/adb.4 b/share/man/man4/man4.macppc/adb.4
index 673a3db5d08..b1a0170305b 100644
--- a/share/man/man4/man4.macppc/adb.4
+++ b/share/man/man4/man4.macppc/adb.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: adb.4,v 1.4 2001/10/05 14:45:54 mpech Exp $
+.\" $OpenBSD: adb.4,v 1.5 2002/10/01 20:59:48 miod Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" Copyright (c) 1997 Colin Wood
@@ -38,6 +38,11 @@
 .Nd Apple Desktop Bus driver
 .Sh SYNOPSIS
 .Cd "adb at macobio?"
+.Cd "abtn* at adb?"
+.Cd "aed* at adb?"
+.Cd "akbd* at adb ?"
+.Cd "ams* at adb?"
+.Cd "apm0 at adb?"
 .Sh DESCRIPTION
 The Apple Desktop Bus
 .Pq Tn ADB
@@ -56,25 +61,29 @@ event device was split into many smaller subsystems, namely:
 .Bl -enum -compact
 .It
 Apple Event Device driver
-.Xr aed 4 .
+.Pq Xr aed 4 .
 .It
 Apple Keyboard driver
-.Xr akbd 4 .
+.Pq Xr akbd 4 .
 .It 
 Apple Mouse Support driver
-.Xr ams 4 .
+.Pq Xr ams 4 .
 .El
 .Pp
 New
 .Nm
 devices such as the Apple Brightness / Volume Control Button
-.Xr abtn 4 
+.Pq Xr abtn 4 
+and some energy control
+.Pq Xr apm 4
 were added to the PowerPC port later to complement the ADB system.
 .Sh SEE ALSO
 .Xr abtn 4 ,
 .Xr aed 4 ,
 .Xr akbd 4 ,
-.Xr ams 4 
+.Xr ams 4 ,
+.Xr apm 4 ,
+.Xr intro 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/man4.macppc/aed.4 b/share/man/man4/man4.macppc/aed.4
index 8fab7a4131c..8b270a58a8e 100644
--- a/share/man/man4/man4.macppc/aed.4
+++ b/share/man/man4/man4.macppc/aed.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aed.4,v 1.3 2002/08/29 07:34:31 wcobb Exp $
+.\" $OpenBSD: aed.4,v 1.4 2002/10/01 20:59:48 miod Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" All rights reserved.
@@ -40,7 +40,8 @@ driver handles events on the
 .Xr adb 4 
 Desktop Bus.
 .Sh SEE ALSO
-.Xr adb 4
+.Xr adb 4 ,
+.Xr intro 4
 .Sh AUTHORS
 The 
 .Nm
diff --git a/share/man/man4/man4.macppc/akbd.4 b/share/man/man4/man4.macppc/akbd.4
index 47c5977c01d..8ddac10edfb 100644
--- a/share/man/man4/man4.macppc/akbd.4
+++ b/share/man/man4/man4.macppc/akbd.4
@@ -29,7 +29,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.
 .\"
-.\"	$OpenBSD: akbd.4,v 1.1 2001/10/03 04:32:37 drahn Exp $
+.\"	$OpenBSD: akbd.4,v 1.2 2002/10/01 20:59:48 miod Exp $
 .\"	$NetBSD: adb.4,v 1.1 1997/07/18 02:13:42 ender Exp $
 .\"
 .Dd July 17, 1997
@@ -40,7 +40,17 @@
 .Nd Apple Keyboard Device
 .Sh SYNOPSIS
 .Cd "akbd* at adb?"
+.Cd "wskbd* at akbd? console ? mux 1"
+.Cd "option AKBD_LAYOUT=XXX"
 .Sh DESCRIPTION
+This driver supports ADB keyboards within the
+.Xr wscons 4
+console framework.
+It doesn't provide direct device driver entry points but makes its
+functions available via the internal
+.Xr wskbd 4
+interface.
+.Pp
 The following is a partial list of supported
 .Tn AKBD
 devices:
@@ -51,14 +61,84 @@ Apple Standard Keyboard
 .It
 Apple Extended Keyboard
 .It
-Apple Adjustable Keyboard
+Apple Keyboard II
 .It
 Apple PowerBook Keyboard
 .It
+Apple Adjustable Keyboard
+.It
+Apple PowerBook extended Keyboard
+.It
+Apple PowerBook G3 Keyboard
+.It
+Apple PowerBook G4 Keyboard
+.It
 Apple iBook Keyboard
 .It
 .El
 .Ed
+.Pp
+The
+.Nm
+driver supports a number of different key mappings which
+can be choosen from with the kernel option
+.Dq AKBD_LAYOUT
+at compile time or with the utility
+.Xr wsconsctl 8
+(variable:
+.Dq keyboard.encoding
+) at runtime.
+Other mappings can be used if the whole keymap is replaced by means of
+.Xr wsconsctl 8 .
+The built-in mappings are at this time:
+.Bl -hang
+.It KB_DE
+(
+.Dq de
+) German with
+.Dq dead accents .
+.It KB_FR
+(
+.Dq fr
+) French.
+.It KB_JP
+(
+.Dq jp
+) Japanese.
+.It KB_SV
+(
+.Dq sv
+) Swedish with
+.Dq dead accents .
+.It KB_UK
+(
+.Dq uk
+) British.
+.It KB_US
+(
+.Dq us
+) English / US keyboard mapping (default).
+.El
+.Pp
+The KB_DE and KB_SV mappings can be used in the KB_NODEAD (
+.Dq .nodead
+) variant.
+This switches off the
+.Dq dead accents .
+.Sh EXAMLPSE
+To set a german keyboard layout without
+.Dq dead accents ,
+use
+.Ic wsconsctl -w keyboard.encoding=de.nodead .
+To set it at kernel build time, add
+.Em option AKBD_LAYOUT="KB_DE|KB_NODEAD"
+to the kernel configuration file.
+.Sh SEE ALSO
+.Xr adb 4 ,
+.Xr intro 4 ,
+.Xr ukbd 4 ,
+.Xr wskbd 4 ,
+.Xr wsconsctl 8
 .Sh HISTORY
 The
 .Nm
@@ -72,3 +152,6 @@ driver, including the
 .Tn MRG
 support.
 The hardware direct interface was written by John P. Wittkowski.
+.Sh BUGS
+The list of built-in mappings doesn't follow any logics.
+It grew as people submitted what they needed.
diff --git a/share/man/man4/man4.macppc/ams.4 b/share/man/man4/man4.macppc/ams.4
index f65b966269c..d0d480329b8 100644
--- a/share/man/man4/man4.macppc/ams.4
+++ b/share/man/man4/man4.macppc/ams.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ams.4,v 1.3 2002/08/29 07:34:31 wcobb Exp $
+.\" $OpenBSD: ams.4,v 1.4 2002/10/01 20:59:48 miod Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" All rights reserved.
@@ -33,6 +33,7 @@
 .Nd Apple Mouse Support
 .Sh SYNOPSIS
 .Cd "ams* at adb?"
+.Cd "wsmouse at ams? mux 0"
 .Sh DESCRIPTION
 The 
 .Nm 
@@ -57,7 +58,10 @@ Logitech non-EMP Mouseman
 TrackMan trackball
 .El
 .Sh SEE ALSO
-.Xr adb 4
+.Xr adb 4 ,
+.Xr intro 4 ,
+.Xr ums 4 ,
+.Xr wsmouse 4
 .Sh AUTHORS
 The 
 .Nm
diff --git a/share/man/man4/man4.macppc/apm.4 b/share/man/man4/man4.macppc/apm.4
index ac830b71475..d518ca6d730 100644
--- a/share/man/man4/man4.macppc/apm.4
+++ b/share/man/man4/man4.macppc/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.3 2001/11/14 22:54:27 miod Exp $
+.\"	$OpenBSD: apm.4,v 1.4 2002/10/01 20:59:48 miod Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -16,7 +16,7 @@
 .Nm apm
 .Nd advanced power management device interface
 .Sh SYNOPSIS
-.Cd apm0 at adb0
+.Cd apm0 at adb?
 .Sh DESCRIPTION
 The
 .Nm
@@ -271,6 +271,8 @@ An attempt to open the file when in use will fail, returning
 .Er EBUSY .
 .El
 .Sh SEE ALSO
+.Xr adb 4 ,
+.Xr intro 4 ,
 .Xr sysctl.conf 5 ,
 .Xr apm 8 ,
 .Xr apmd 8 ,
diff --git a/share/man/man4/man4.macppc/awacs.4 b/share/man/man4/man4.macppc/awacs.4
index 7fe19db947c..510ec55ec67 100644
--- a/share/man/man4/man4.macppc/awacs.4
+++ b/share/man/man4/man4.macppc/awacs.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: awacs.4,v 1.1 2001/10/03 04:32:37 drahn Exp $
+.\" $OpenBSD: awacs.4,v 1.2 2002/10/01 20:59:48 miod Exp $
 .\" $NetBSD: awacs.4,v 1.2 2001/05/09 22:16:12 he Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 .Nm awacs
 .Nd Apple audio device driver
 .Sh SYNOPSIS
-.Cd "awacs* at obio?"
+.Cd "awacs* at macobio?"
 .Cd "audio* at awacs?"
 .Sh DESCRIPTION
 The
@@ -47,18 +47,19 @@ The
 (audio waveform amplifier and converter for sound)
 driver provides support for the audio hardware found in many Apple
 PowerMacs.
-.Sh BUGS
-This driver needs more testing.
-.Pp
-This manual page needs more precision and detail.
-.Sh AUTHORS
-The
-.Nm
-driver was written by Tsubai Masanari.
 .Sh SEE ALSO
-.Xr audio 4
+.Xr audio 4 ,
+.Xr intro 4
 .Sh HISTORY
 The
 .Nm
 device driver appeared in
 .Nx 1.5.1 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by Tsubai Masanari.
+.Sh BUGS
+This driver needs more testing.
+.Pp
+This manual page needs more precision and detail.
diff --git a/share/man/man4/man4.macppc/bm.4 b/share/man/man4/man4.macppc/bm.4
index ac74bb439b9..58eee71857b 100644
--- a/share/man/man4/man4.macppc/bm.4
+++ b/share/man/man4/man4.macppc/bm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bm.4,v 1.3 2001/11/13 13:54:26 mpech Exp $
+.\" $OpenBSD: bm.4,v 1.4 2002/10/01 20:59:48 miod Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" All rights reserved.
@@ -37,6 +37,13 @@
 The 
 .Nm
 device driver supports Apple BMAC and compatible Ethernet devices.
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr netintro 4 ,
+.Xr hostname.if 5 ,
+.Xr ifconfig 8
 .Sh AUTHORS
 The
 .Nm
diff --git a/share/man/man4/man4.macppc/gm.4 b/share/man/man4/man4.macppc/gm.4
deleted file mode 100644
index 677b7f0a323..00000000000
--- a/share/man/man4/man4.macppc/gm.4
+++ /dev/null
@@ -1,54 +0,0 @@
-.\" $OpenBSD: gm.4,v 1.4 2001/11/13 13:54:26 mpech Exp $
-.\"
-.\" Copyright (c) 2001 Peter Philipp
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (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 July 30, 2001
-.Dt GM 4 macppc
-.Os 
-.Sh NAME
-.Nm gm
-.Nd Apple GMAC ethernet
-.Sh SYNOPSIS
-.Cd "gm* at pci? dev ? function ?"
-.Sh DESCRIPTION
-The 
-.Nm
-device driver supports Apple GMAC and compatible Ethernet devices.
-.Sh DIAGNOSTICS
-.Bl -diag
-.It "gm0: reset timeout"
-driver was not able to be reset the device after 10 tries.
-.It "gm0: device timeout"
-watchdog timeout.
-.El
-.Sh AUTHORS
-The
-.Nm
-Ethernet driver was written by Tsubai Masanari.
-.Sh HISTORY
-Support for newer ``GMAC2'' cards found in newer Apple iBooks was added in
-.Ox
-3.0.
diff --git a/share/man/man4/man4.macppc/intro.4 b/share/man/man4/man4.macppc/intro.4
index 602e775bef7..6f3bc0e11ce 100644
--- a/share/man/man4/man4.macppc/intro.4
+++ b/share/man/man4/man4.macppc/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.8 2002/06/15 19:37:24 pvalchev Exp $
+.\"	$OpenBSD: intro.4,v 1.9 2002/10/01 20:59:48 miod Exp $
 .\"
 .\" Copyright (c) 2001 Peter Valchev.
 .\" All rights reserved.
@@ -114,39 +114,77 @@ ADMtek AN986-based USB Ethernet adapters.
 Apple audio device.
 .It Xr bm 4
 BMAC ethernet.
+.It Xr de 4
+DEC tulip-based ethernet cards.
+.It Xr em 4
+Intel i82542, i82543, and i82544 Pro/1000 Gigabit ethernet.
 .It Xr gem 4
 GMAC ethernet.
 .It Xr gpio 4
 PMU interrupt router.
+.It Xr hifn 4
+Hifn 7751 crypto accelerator.
+.It Xr hme 4
+National DP83840 ethernet cards.
 .It Xr iop 4
-I2O processor, arrays, SCSI pass-through.
+I2O adapter.
 .It Xr kue 4
-Kawasaki KL5KUSB101B.
-.It Xr ohci 4
-Open Host Controller, Opti RM861HA.
-.It Xr ugen 4
-USB Generic Driver.
-.It Xr uhid 4
-USB Generic HID devices.
+Kawasaki LSI KL5KUSB101B-based USB ethernet.
+.It Xr siop 4
+LSI/Symbios Logic/NCR 53c8xx SCSI adapter boards.
+.It Xr uaudio 4
+USB audio devices.
 .It Xr ukbd 4
-USB HID Keyboard devices.
+USB keyboard.
 .It Xr ulpt 4
-USB Printer.
+USB printers.
 .It Xr umass 4
-USB Mass Storage Device.
+USB mass storage.
 .It Xr ums 4
-USB Mice.
+USB mouse.
+.It Xr uplcom 4
+I/O Data USB-RSAQ2 USB serial adapters.
 .It Xr uscanner 4
-USB Scanner.
+USB scanners
 .It Xr usscanner 4
-USB SCSI Scanner.
+SCSI-over-USB scanners.
 .It Xr vgafb 4
 PCI VGA graphics.
 .It Xr wi 4
 WaveLAN/IEEE and PRISM-II 802.11DS wireless network adapters.
+.It Xr zs 4
+Zilog 8530 serial controller.
 .El
 .Sh SEE ALSO
+.Xr abtn 4 ,
+.Xr aed 4 ,
+.Xr akbd 4 ,
+.Xr ams 4 ,
+.Xr an 4 ,
+.Xr aue 4 ,
 .Xr autoconf 4 ,
+.Xr awacs 4 ,
+.Xr bm 4 ,
+.Xr de 4 ,
+.Xr em 4 ,
+.Xr gem 4 ,
+.Xr gpio 4 ,
+.Xr hifn 4 ,
+.Xr hme 4 ,
+.Xr iop 4 ,
+.Xr kue 4 ,
+.Xr siop 4 ,
+.Xr uaudio 4 ,
+.Xr ukbd 4 ,
+.Xr ulpt 4 ,
+.Xr umass 4 ,
+.Xr ums 4 ,
+.Xr uplcom 4 ,
+.Xr uscanner 4 ,
+.Xr usscanner 4 ,
+.Xr vgafb 4 ,
+.Xr wi 4 ,
+.Xr zs 4 ,
 .Xr config 8
 .Sh HISTORY
 The
diff --git a/share/man/man4/man4.macppc/zs.4 b/share/man/man4/man4.macppc/zs.4
index c246f602aef..8add9664f72 100644
--- a/share/man/man4/man4.macppc/zs.4
+++ b/share/man/man4/man4.macppc/zs.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zs.4,v 1.2 2001/10/05 14:45:54 mpech Exp $
+.\"	$OpenBSD: zs.4,v 1.3 2002/10/01 20:59:48 miod Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project
 .\" All rights reserved.
@@ -11,19 +11,21 @@
 .Nm zs
 .Nd Zilog 8530 (ZSCC) serial communications driver
 .Sh SYNOPSIS
-.Cd "zsc0 at macobio0 irq X,Y"
-.Cd "zstty0 at zsc0 channel 0"
-.Cd "zstty1 at zsc0 channel 1"
+.Cd "zsc* at macobio?"
+.Cd "zstty* at zsc? channel ?"
 .Sh DESCRIPTION
 The
 .Nm
-is a Zilog 8530 serial interface chip used in Sun workstations and
-Apple Macintosh systems.
-Most newer Macintosh systems the first port
+is a Zilog 8530 serial interface chip used in
+.Tn Sun
+workstations and
+.Tn Apple
+Macintosh systems.
+On most newer Macintosh systems, the first port
 tty00
 is connected to the internal modem.
 The second port is either not connected, or may be connected to
-a IRDA device (untested).
+an IRDA device (untested).
 It is possible to replace the internal modem on some system with
 a real serial port using third party hardware adapters.
 .Pp
@@ -55,6 +57,7 @@ The hung getty apparently prevents the cua device from being re-opened.
 .El
 .Sh SEE ALSO
 .Xr ioctl 2 ,
+.Xr intro 4 ,
 .Xr tty 4
 .Sh HISTORY
 The