mu-law and A-law spelling;

mu-law and u-law are the same, so used mu-law for consistency;

ok jason@

4 files changed, 17 insertions, 17 deletions

diff --git a/regress/sys/dev/audio/autest.1 b/regress/sys/dev/audio/autest.1
index 1673e485ea6..95617122e00 100644
--- a/regress/sys/dev/audio/autest.1
+++ b/regress/sys/dev/audio/autest.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: autest.1,v 1.3 2003/02/04 07:58:19 jason Exp $
+.\"	$OpenBSD: autest.1,v 1.4 2003/03/28 09:47:21 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -57,14 +57,14 @@ The tone should sound almost identical in each of the formats.
 can produce tones in any of the following formats and will skip other
 formats if supported by the device:
 .Bl -tag -width XXXXXXXXXX
-.It Cm mulaw
-8bit U-Law companded
-.It Cm alaw
-8bit A-Law companded
+.It Cm mu-law
+8bit mu-law companded
+.It Cm A-law
+8bit A-law companded
 .It Cm adpcm
 4 bit adaptive differential pulse code modulation
 .It Cm ulinear
-8 bit unsigned linear.
+8 bit unsigned linear
 .It Cm ulinear_le
 16 bit unsigned linear little endian
 .It Cm ulinear_be
diff --git a/share/man/man4/audio.4 b/share/man/man4/audio.4
index ce5d1cc3142..449f5a61873 100644
--- a/share/man/man4/audio.4
+++ b/share/man/man4/audio.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: audio.4,v 1.29 2003/03/14 10:07:35 jmc Exp $
+.\"	$OpenBSD: audio.4,v 1.30 2003/03/28 09:47:20 jmc Exp $
 .\"	$NetBSD: audio.4,v 1.20 1998/05/28 17:27:15 augustss Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@ while it is in use.
 When
 .Pa /dev/audio
 is opened, it automatically directs the underlying driver to manipulate
-monaural 8-bit mulaw samples.
+monaural 8-bit mu-law samples.
 In addition, if it is opened read-only
 (write-only) the device is set to half-duplex record (play) mode with
 recording (playing) unpaused and playing (recording) paused.
@@ -368,9 +368,9 @@ property is set.
 The encoding parameter can have the following values:
 .Bl -tag -width indent -compact
 .It Dv AUDIO_ENCODING_ULAW
-mulaw encoding, 8 bits/sample
+mu-law encoding, 8 bits/sample
 .It Dv AUDIO_ENCODING_ALAW
-alaw encoding, 8 bits/sample
+A-law encoding, 8 bits/sample
 .It Dv AUDIO_ENCODING_SLINEAR
 two's complement signed linear encoding with the platform byte order
 .It Dv AUDIO_ENCODING_ULINEAR
diff --git a/share/man/man9/audio.9 b/share/man/man9/audio.9
index a8bee33fac6..914406fce80 100644
--- a/share/man/man9/audio.9
+++ b/share/man/man9/audio.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: audio.9,v 1.11 2003/03/08 23:17:18 jmc Exp $
+.\"	$OpenBSD: audio.9,v 1.12 2003/03/28 09:47:21 jmc Exp $
 .\"	$NetBSD: audio.9,v 1.14 2000/02/11 22:56:15 kleink Exp $
 .\"
 .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@ struct audio_hw_if {
 
 struct audio_params {
 	u_long	sample_rate;		/* sample rate */
-	u_int	encoding;		/* ulaw, linear, etc */
+	u_int	encoding;		/* mu-law, linear, etc */
 	u_int	precision;		/* bits/sample */
 	u_int	channels;		/* mono(1), stereo(2) */
 	/* Software en/decode functions, set if SW coding required by HW */
@@ -208,11 +208,11 @@ and
 .Va rec
 structures contain the encoding parameters that should be set.
 If the hardware requires software assistance with some encoding
-(e.g., it might be lacking mulaw support) it should fill the
+(e.g., it might be lacking mu-law support) it should fill the
 .Va sw_code
 and
 .Va factor
-fields of these structures. 
+fields of these structures.
 See
 .Pa /usr/src/sys/dev/auconv.h
 for available software support.
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index bab25f460cd..8d5c2f8b3fd 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: audio_if.h,v 1.21 2003/01/25 06:14:33 jason Exp $	*/
+/*	$OpenBSD: audio_if.h,v 1.22 2003/03/28 09:47:21 jmc Exp $	*/
 /*	$NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $	*/
 
 /*
@@ -50,7 +50,7 @@ struct mixer_ctrl;
 
 struct audio_params {
 	u_long	sample_rate;			/* sample rate */
-	u_int	encoding;			/* e.g. ulaw, linear, etc */
+	u_int	encoding;			/* mu-law, linear, etc */
 	u_int	precision;			/* bits/sample */
 	u_int	channels;			/* mono(1), stereo(2) */
 	/* Software en/decode functions, set if SW coding required by HW */
@@ -58,7 +58,7 @@ struct audio_params {
 	int	factor;				/* coding space change */
 };
 
-/* The default audio mode: 8 kHz mono ulaw */
+/* The default audio mode: 8 kHz mono mu-law */
 extern struct audio_params audio_default;
 
 struct audio_hw_if {