Update sound-related manpages to account for the recent change in

device and module naming.  The following files were repo-copied:

	csa.4 -> snd_csa.4
	gusc.4 -> snd_gusc.4
	maestro3.4 -> snd_maestro3.4
	sbc.4 -> snd_sbc.4
	uaudio.4 -> snd_uaudio.4

The pcm(4) manpage wasn't renamed to sound(4) as there are nearby
plans to rename "device sound" to "device snd", to address the
ambiguity in naming, so pcm.4 is linked to sound.4 for the moment.
(We also mumble something about the future plans in the manpage.)

Removed links from pcm.4 to als4000.4 and emu10k1.4 -- they now
have their own snd_*.4 manpages.

Fixes for recent snd_*.4 manpages: added missing "device sound"
to the SYNOPSIS, fixed hints (they are still "hint.pcm.<unit>"
in most cases).

MT5 after:	3 days

20 files changed, 74 insertions, 444 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 5f2219a..6a492e3 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -40,7 +40,6 @@ MAN=	aac.4 \
 	ciss.4 \
 	cm.4 \
 	crypto.4 \
-	csa.4 \
 	cue.4 \
 	cy.4 \
 	da.4 \
@@ -80,7 +79,6 @@ MAN=	aac.4 \
 	geom.4 \
 	gif.4 \
 	gre.4 \
-	gusc.4 \
 	gx.4 \
 	harp.4 \
 	hatm.4 \
@@ -136,7 +134,6 @@ MAN=	aac.4 \
 	mac_seeotheruids.4 \
 	mac_stub.4 \
 	mac_test.4 \
-	maestro3.4 \
 	md.4 \
 	mem.4 \
 	meteor.4 \
@@ -239,7 +236,6 @@ MAN=	aac.4 \
 	sa.4 \
 	sab.4 \
 	safe.4 \
-	sbc.4 \
 	sbp.4 \
 	sbp_targ.4 \
 	sbsh.4 \
@@ -261,10 +257,15 @@ MAN=	aac.4 \
 	snd_als4000.4 \
 	snd_cmi.4 \
 	snd_cs4281.4 \
+	snd_csa.4 \
 	snd_ds1.4 \
 	snd_emu10k1.4 \
 	snd_es137x.4 \
+	snd_gusc.4 \
+	snd_maestro3.4 \
+	snd_sbc.4 \
 	snd_solo.4 \
+	snd_uaudio.4 \
 	snp.4 \
 	spic.4 \
 	splash.4 \
@@ -293,7 +294,6 @@ MAN=	aac.4 \
 	tx.4 \
 	txp.4 \
 	uart.4 \
-	uaudio.4 \
 	ubsa.4 \
 	ubsec.4 \
 	ubser.4 \
@@ -394,9 +394,8 @@ MLINKS+=nge.4 if_nge.4
 MLINKS+=oldcard.4 card.4
 MLINKS+=patm.4 if_patm.4
 MLINKS+=pccbb.4 cbb.4
-MLINKS+=pcm.4 als4000.4 \
-	pcm.4 emu10k1.4 \
-	pcm.4 snd.4
+MLINKS+=pcm.4 snd.4 \
+	pcm.4 sound.4
 MLINKS+=pcn.4 if_pcn.4
 MLINKS+=pcvt.4 vt.4
 MLINKS+=ppp.4 if_ppp.4
diff --git a/share/man/man4/csa.4 b/share/man/man4/csa.4
deleted file mode 100644
index 4a535b8..0000000
--- a/share/man/man4/csa.4
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Seigo Tanimura
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd December 18, 1999
-.Dt CSA 4
-.Os
-.Sh NAME
-.Nm csa
-.Nd Crystal Semiconductor CS461x/462x/4280 PCI bridge device driver
-.Sh SYNOPSIS
-.Cd "device csa"
-.Sh DESCRIPTION
-The
-.Nm
-bridge driver allows the generic audio drivers including
-.Xr pcm 4
-to attach to the following PCI sound cards:
-.Bl -bullet -width 2m
-.It
-Crystal Semiconductor CS461x/462x Audio Accelerator
-.It
-Crystal Semiconductor CS4280 Audio Controller
-.El
-.Pp
-Some onboard CS4610 chips are accompanied by the CS423x ISA codec
-instead of the CS4297 AC97 codec.
-Such configurations are not
-supported by
-.Nm
-yet.
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 4.0 .
-.Sh SEE ALSO
-.Xr pcm 4
-.Sh AUTHORS
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/gusc.4 b/share/man/man4/gusc.4
deleted file mode 100644
index 05b71c8..0000000
--- a/share/man/man4/gusc.4
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Seigo Tanimura
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd December 18, 1999
-.Dt GUSC 4
-.Os
-.Sh NAME
-.Nm gusc
-.Nd Gravis UltraSound ISA bridge device driver
-.Sh SYNOPSIS
-.Cd "device pcm"
-.Cd "device gusc"
-.Pp
-For non-PnP cards, add the following lines in
-.Pa /boot/device.hints .
-.Cd hint.gusc.0.at="isa"
-.Cd hint.gusc.0.port="0x220"
-.Cd hint.gusc.0.irq="5"
-.Cd hint.gusc.0.drq="1"
-.Cd hint.gusc.0.flags="0x13"
-.Sh DESCRIPTION
-The
-.Nm
-bridge driver allows the generic audio drivers including
-.Xr pcm 4
-to attach to the following ISA sound cards:
-.Bl -bullet -width 2m
-.It
-Gravis UltraSound PnP
-.It
-Gravis UltraSound MAX
-.El
-.Pp
-The value of flags specifies the secondary DMA channel.
-If the secondary
-DMA channel is C, set the flags to (C | 0x10).
-For a sound card without the
-secondary DMA channel, the flags should be set to zero.
-.Sh DIAGNOSTICS
-.Bl -diag
-.It xxx: gus pcm not attached, out of memory
-There are not enough memory to drive the device.
-.El
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 4.0 .
-.Sh SEE ALSO
-.Xr pcm 4
-.Sh AUTHORS
-.An Ville-Pertti Keinonen Aq will@iki.fi
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
-.Sh BUGS
-Recording pcm sound data is not supported yet.
diff --git a/share/man/man4/maestro3.4 b/share/man/man4/maestro3.4
deleted file mode 100644
index 29a8014..0000000
--- a/share/man/man4/maestro3.4
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" Copyright (c) 2001 Scott Long
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd October 14, 2001
-.Dt MAESTRO3 4
-.Os
-.Sh NAME
-.Nm maestro3
-.Nd FreeBSD audio sub-driver for ESS Maestro3/Allegro-1 hardware
-.Sh SYNOPSIS
-.Li "kldload snd_maestro3"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the ESS Maestro3 and Allegro-1 sound chips
-under the PCM framework.
-These chips are mostly found in laptop computers and feature an AC97 mixer,
-a multi-channel sample rate converter that can mix up to four digital audio
-streams in hardware, recording support, and external volume control buttons.
-.Pp
-The firmware for the sound processor is licensed under the GNU Public
-License, and thus this driver is not included in the default
-.Pa GENERIC
-kernel, nor is it compiled into the kernel when
-.Cd "device pcm"
-is specified in the kernel config file.
-A convenient way to automatically load the driver is to add the line
-.Pp
-.Dl snd_maestro3_load="YES"
-.Pp
-to the file
-.Pa /boot/loader.conf .
-.Sh DIAGNOSTICS
-The hardware volume control buttons can be connected to two different pin
-sets on the chip, depending on the manufacturer.
-The driver has no way of determining this configuration, so a hint may be
-used to override the default guess.
-Add the line
-.Dq Li hint.pcm.0.hwvol_config="0"
-to the file
-.Pa /boot/device.hints
-to override the default setting.
-.Sh SEE ALSO
-.Xr pcm 4 ,
-.Xr loader.conf 5
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Fx 4.3 .
-.Sh AUTHORS
-.An Scott Long Aq scottl@FreeBSD.org
-.An Darrel Anderson Aq anderson@cs.duke.edu
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index d89beb1..fbc5427 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -25,10 +25,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 24, 2004
-.Dt PCM 4
+.Dd August 28, 2004
+.Dt SOUND 4
 .Os
 .Sh NAME
+.Nm sound ,
 .Nm pcm ,
 .Nm snd
 .Nd
@@ -36,7 +37,7 @@
 PCM audio device infrastructure
 .Sh SYNOPSIS
 For a card with bridge driver support, and a PnP card:
-.Cd "device pcm"
+.Cd "device sound"
 .Pp
 For a card without bridge driver support, and a non-PnP card,
 the following lines may be required in
@@ -46,6 +47,16 @@ the following lines may be required in
 .Cd hint.pcm.0.drq="1"
 .Cd hint.pcm.0.flags="0x0"
 .Sh DESCRIPTION
+.Bf -emphasis
+Note: There exists some ambiguity in the naming at the moment
+.Pq Nm sound , pcm , snd .
+It will be resolved soon by renaming
+.Cd "device sound"
+to
+.Cd "device snd" ,
+and doing associated changes.
+.Ef
+.Pp
 The
 .Nm
 driver provides support for
@@ -109,7 +120,7 @@ in
 In general, the module
 .Pa snd_foo
 corresponds to
-.Cd "device foo"
+.Cd "device snd_foo"
 and can be
 loaded by the boot
 .Xr loader 8
@@ -338,6 +349,8 @@ The
 .Nm
 device driver first appeared in
 .Fx 2.2.6
+as
+.Nm pcm ,
 written by
 .An Luigi Rizzo .
 It was later
@@ -348,9 +361,9 @@ by
 The API evolved from the VOXWARE
 standard which later became OSS standard.
 .Sh SEE ALSO
-.Xr csa 4 ,
-.Xr gusc 4 ,
-.Xr sbc 4 ,
+.Xr snd_csa 4 ,
+.Xr snd_gusc 4 ,
+.Xr snd_sbc 4 ,
 .Xr devfs 5 ,
 .Xr loader.conf 5 ,
 .Xr dmesg 8 ,
@@ -364,7 +377,7 @@ standard which later became OSS standard.
 .An -nosplit
 .An Luigi Rizzo Aq luigi@iet.unipi.it
 initially wrote the
-.Nm
+.Nm pcm
 device driver and this manual page.
 .An Cameron Grant Aq gandalf@vilnya.demon.co.uk
 later revised the device driver for
diff --git a/share/man/man4/sbc.4 b/share/man/man4/sbc.4
deleted file mode 100644
index 5f724b0..0000000
--- a/share/man/man4/sbc.4
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Seigo Tanimura
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd December 18, 1999
-.Dt SBC 4
-.Os
-.Sh NAME
-.Nm sbc
-.Nd Creative Sound Blaster ISA and compatible bridge device driver
-.Sh SYNOPSIS
-.Cd "device sbc"
-.Pp
-Non-PnP cards require the following lines in
-.Pa /boot/device.hints :
-.Cd hint.sbc.0.at="isa"
-.Cd hint.sbc.0.port="0x220"
-.Cd hint.sbc.0.irq="5"
-.Cd hint.sbc.0.drq="1"
-.Cd hint.sbc.0.flags="0x15"
-.Sh DESCRIPTION
-The
-.Nm
-bridge driver allows the generic audio drivers including
-.Xr pcm 4
-to attach to the following ISA sound cards:
-.Bl -bullet -width 2m
-.It
-Creative SB16, SB32, SB AWE64 (including Gold) and ViBRA16
-.It
-Advance Asound 100, 110 and Logic ALS120
-.It
-ESS ES1868, ES1869, ES1879 and ES1888
-.El
-.Pp
-The value of flags specifies the secondary DMA channel.
-If the secondary
-DMA channel is C, set the flags to (C | 0x10).
-For a sound card without the
-secondary DMA channel, the flags should be set to zero.
-.Sh DIAGNOSTICS
-.Bl -diag
-.It sb_dspwr(XX) timed out.
-A command to the DSP has timed out.
-Check the I/O port configuration.
-.It bad irq XX (5/7/9/10 valid)
-The IRQ given to the driver is not valid.
-.El
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 4.0 .
-.Sh SEE ALSO
-.Xr pcm 4
-.Sh AUTHORS
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_ad1816.4 b/share/man/man4/snd_ad1816.4
index d4e1cb8..4412a71 100644
--- a/share/man/man4/snd_ad1816.4
+++ b/share/man/man4/snd_ad1816.4
@@ -31,12 +31,13 @@
 .Nm snd_ad1816
 .Nd "Analog Devices AD1816 ISA bridge device driver"
 .Sh SYNOPSIS
+.Cd "device sound"
 .Cd "device snd_ad1816"
 .Pp
-.Cd hint.snd_ad1816.0.at="isa"
-.Cd hint.snd_ad1816.0.irq="10"
-.Cd hint.snd_ad1816.0.drq="1"
-.Cd hint.snd_ad1816.0.flags="0x0"
+.Cd hint.pcm.0.at="isa"
+.Cd hint.pcm.0.irq="10"
+.Cd hint.pcm.0.drq="1"
+.Cd hint.pcm.0.flags="0x0"
 .Pp
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/snd_als4000.4 b/share/man/man4/snd_als4000.4
index ee70579..c614c34 100644
--- a/share/man/man4/snd_als4000.4
+++ b/share/man/man4/snd_als4000.4
@@ -31,6 +31,7 @@
 .Nm snd_als4000
 .Nd "Avance Logic ALS4000 PCI bridge device driver"
 .Sh SYNOPSIS
+.Cd "device sound"
 .Cd "device snd_als4000"
 .Pp
 .Sh DESCRIPTION
diff --git a/share/man/man4/snd_cmi.4 b/share/man/man4/snd_cmi.4
index 2fd6939..5181f9b 100644
--- a/share/man/man4/snd_cmi.4
+++ b/share/man/man4/snd_cmi.4
@@ -31,6 +31,7 @@
 .Nm snd_cmi
 .Nd "CMedia CMI8338/CMI8738 PCI bridge device driver"
 .Sh SYNOPSIS
+.Cd "device sound"
 .Cd "device snd_cmi"
 .Pp
 .Sh DESCRIPTION
diff --git a/share/man/man4/snd_cs4281.4 b/share/man/man4/snd_cs4281.4
index ea82d72..14ad71c 100644
--- a/share/man/man4/snd_cs4281.4
+++ b/share/man/man4/snd_cs4281.4
@@ -31,6 +31,7 @@
 .Nm snd_cs4281
 .Nd "Crystal Semiconductor CS4281 PCI bridge device driver"
 .Sh SYNOPSIS
+.Cd "device sound"
 .Cd "device snd_cs4281"
 .Pp
 .Sh DESCRIPTION
diff --git a/share/man/man4/snd_csa.4 b/share/man/man4/snd_csa.4
index 4a535b8..a0547c2 100644
--- a/share/man/man4/snd_csa.4
+++ b/share/man/man4/snd_csa.4
@@ -25,19 +25,20 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 18, 1999
-.Dt CSA 4
+.Dd August 28, 2004
+.Dt SND_CSA 4
 .Os
 .Sh NAME
-.Nm csa
+.Nm snd_csa
 .Nd Crystal Semiconductor CS461x/462x/4280 PCI bridge device driver
 .Sh SYNOPSIS
-.Cd "device csa"
+.Cd "device sound"
+.Cd "device snd_csa"
 .Sh DESCRIPTION
 The
 .Nm
 bridge driver allows the generic audio drivers including
-.Xr pcm 4
+.Xr sound 4
 to attach to the following PCI sound cards:
 .Bl -bullet -width 2m
 .It
@@ -58,6 +59,6 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh SEE ALSO
-.Xr pcm 4
+.Xr sound 4
 .Sh AUTHORS
 .An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_ds1.4 b/share/man/man4/snd_ds1.4
index b1a50e6..acc06e3 100644
--- a/share/man/man4/snd_ds1.4
+++ b/share/man/man4/snd_ds1.4
@@ -31,6 +31,7 @@
 .Nm snd_ds1
 .Nd "Yamaha DS-1 PCI bridge device driver"
 .Sh SYNOPSIS
+.Cd "device sound"
 .Cd "device snd_ds1"
 .Pp
 .Sh DESCRIPTION
diff --git a/share/man/man4/snd_emu10k1.4 b/share/man/man4/snd_emu10k1.4
index de5c5b8..daea26a 100644
--- a/share/man/man4/snd_emu10k1.4
+++ b/share/man/man4/snd_emu10k1.4
@@ -31,6 +31,7 @@
 .Nm snd_emu10k1
 .Nd "SoundBlaster Live! and Audigy PCI bridge device driver"
 .Sh SYNOPSIS
+.Cd "device sound"
 .Cd "device snd_emu10k1"
 .Pp
 .Sh DESCRIPTION
diff --git a/share/man/man4/snd_es137x.4 b/share/man/man4/snd_es137x.4
index 2ff972a..e19e1c9 100644
--- a/share/man/man4/snd_es137x.4
+++ b/share/man/man4/snd_es137x.4
@@ -31,6 +31,7 @@
 .Nm snd_es137x
 .Nd "Ensoniq AudioPCI ES137x bridge device driver"
 .Sh SYNOPSIS
+.Cd "device sound"
 .Cd "device snd_es137x"
 .Pp
 .Sh DESCRIPTION
diff --git a/share/man/man4/snd_gusc.4 b/share/man/man4/snd_gusc.4
index 05b71c8..10b3530 100644
--- a/share/man/man4/snd_gusc.4
+++ b/share/man/man4/snd_gusc.4
@@ -25,15 +25,15 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 18, 1999
-.Dt GUSC 4
+.Dd August 28, 2004
+.Dt SND_GUSC 4
 .Os
 .Sh NAME
-.Nm gusc
+.Nm snd_gusc
 .Nd Gravis UltraSound ISA bridge device driver
 .Sh SYNOPSIS
-.Cd "device pcm"
-.Cd "device gusc"
+.Cd "device sound"
+.Cd "device snd_gusc"
 .Pp
 For non-PnP cards, add the following lines in
 .Pa /boot/device.hints .
@@ -46,7 +46,7 @@ For non-PnP cards, add the following lines in
 The
 .Nm
 bridge driver allows the generic audio drivers including
-.Xr pcm 4
+.Xr sound 4
 to attach to the following ISA sound cards:
 .Bl -bullet -width 2m
 .It
@@ -71,7 +71,7 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh SEE ALSO
-.Xr pcm 4
+.Xr sound 4
 .Sh AUTHORS
 .An Ville-Pertti Keinonen Aq will@iki.fi
 .An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_maestro3.4 b/share/man/man4/snd_maestro3.4
index 29a8014..9fe340e 100644
--- a/share/man/man4/snd_maestro3.4
+++ b/share/man/man4/snd_maestro3.4
@@ -24,14 +24,15 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 14, 2001
-.Dt MAESTRO3 4
+.Dd August 28, 2004
+.Dt SND_MAESTRO3 4
 .Os
 .Sh NAME
-.Nm maestro3
+.Nm snd_maestro3
 .Nd FreeBSD audio sub-driver for ESS Maestro3/Allegro-1 hardware
 .Sh SYNOPSIS
-.Li "kldload snd_maestro3"
+.Cd "device sound"
+.Cd "device snd_maestro3"
 .Sh DESCRIPTION
 The
 .Nm
@@ -45,7 +46,7 @@ The firmware for the sound processor is licensed under the GNU Public
 License, and thus this driver is not included in the default
 .Pa GENERIC
 kernel, nor is it compiled into the kernel when
-.Cd "device pcm"
+.Cd "device sound"
 is specified in the kernel config file.
 A convenient way to automatically load the driver is to add the line
 .Pp
@@ -64,7 +65,7 @@ to the file
 .Pa /boot/device.hints
 to override the default setting.
 .Sh SEE ALSO
-.Xr pcm 4 ,
+.Xr sound 4 ,
 .Xr loader.conf 5
 .Sh HISTORY
 The
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index 5f724b0..ea847a1 100644
--- a/share/man/man4/snd_sbc.4
+++ b/share/man/man4/snd_sbc.4
@@ -25,14 +25,15 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 18, 1999
-.Dt SBC 4
+.Dd August 28, 2004
+.Dt SND_SBC 4
 .Os
 .Sh NAME
-.Nm sbc
+.Nm snd_sbc
 .Nd Creative Sound Blaster ISA and compatible bridge device driver
 .Sh SYNOPSIS
-.Cd "device sbc"
+.Cd "device sound"
+.Cd "device snd_sbc"
 .Pp
 Non-PnP cards require the following lines in
 .Pa /boot/device.hints :
@@ -45,7 +46,7 @@ Non-PnP cards require the following lines in
 The
 .Nm
 bridge driver allows the generic audio drivers including
-.Xr pcm 4
+.Xr sound 4
 to attach to the following ISA sound cards:
 .Bl -bullet -width 2m
 .It
@@ -75,6 +76,6 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh SEE ALSO
-.Xr pcm 4
+.Xr sound 4
 .Sh AUTHORS
 .An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_solo.4 b/share/man/man4/snd_solo.4
index f7955f7..c36f6d6 100644
--- a/share/man/man4/snd_solo.4
+++ b/share/man/man4/snd_solo.4
@@ -31,6 +31,7 @@
 .Nm snd_solo
 .Nd "ESS Solo-1/1E PCI bridge device driver"
 .Sh SYNOPSIS
+.Cd "device sound"
 .Cd "device snd_solo"
 .Pp
 .Sh DESCRIPTION
diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4
index 3207909..bf84b04 100644
--- a/share/man/man4/snd_uaudio.4
+++ b/share/man/man4/snd_uaudio.4
@@ -36,15 +36,16 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 10, 2003
-.Dt UAUDIO 4
+.Dd August 28, 2004
+.Dt SND_UAUDIO 4
 .Os
 .Sh NAME
-.Nm uaudio
+.Nm snd_uaudio
 .Nd USB audio device driver
 .Sh SYNOPSIS
-.Cd "device pcm"
+.Cd "device sound"
 .Cd "device usb"
+.Cd "device snd_uaudio"
 .Sh DESCRIPTION
 The
 .Nm
@@ -62,7 +63,7 @@ Refer to the
 .Ql USB Audio Class Specification
 for more information.
 .Sh SEE ALSO
-.Xr pcm 4 ,
+.Xr sound 4 ,
 .Xr usb 4
 .Rs
 .%T "USB Audio Class Specifications"
diff --git a/share/man/man4/uaudio.4 b/share/man/man4/uaudio.4
deleted file mode 100644
index 3207909..0000000
--- a/share/man/man4/uaudio.4
+++ /dev/null
@@ -1,96 +0,0 @@
-.\" $NetBSD: uaudio.4,v 1.15 2002/02/12 19:53:57 jdolecek Exp $
-.\"
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Lennart Augustsson.
-.\"
-.\" 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. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``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 FOUNDATION OR CONTRIBUTORS
-.\" 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd November 10, 2003
-.Dt UAUDIO 4
-.Os
-.Sh NAME
-.Nm uaudio
-.Nd USB audio device driver
-.Sh SYNOPSIS
-.Cd "device pcm"
-.Cd "device usb"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for
-.Tn USB
-audio class devices.
-.Pp
-A
-.Tn USB
-audio device consists of a number of components:
-input terminals (e.g.\& USB digital input), output terminals (e.g.\&
-speakers), and a number of units in between (e.g.\& volume control).
-.Pp
-Refer to the
-.Ql USB Audio Class Specification
-for more information.
-.Sh SEE ALSO
-.Xr pcm 4 ,
-.Xr usb 4
-.Rs
-.%T "USB Audio Class Specifications"
-.%O http://www.usb.org/developers/devclass_docs/
-.Re
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Fx 4.7 .
-.Sh AUTHORS
-This manual page was adopted from
-.Nx 1.6
-and modified for
-.Fx
-by
-.An Hiten Pandya Aq hmp@FreeBSD.org .
-.Sh BUGS
-The
-.Tn PCM
-framework in
-.Fx ,
-as of this writing, does not handle device un-registrations in a properly
-abstracted manner, i.e., a detach request is refused by the
-.Tn PCM
-framework if the device is in use.
-For
-.Tn USB
-and supposedly other detach-able busses, it is necessary to allow the
-device un-registration to complete successfully, otherwise the driver
-leaves wild pointers to invalid data structures and thus leading to a panic.