From ecb20c5f7e728693bcb67981fdde44832f1ed028 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 1 Jan 2009 18:36:47 +0100 Subject: mixer: renamed mix_* options to mixer_* There is no reason to use the shortcut "mix" instead of "mixer". --- doc/mpd.conf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/mpd.conf.5') diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index 935bd9b2f..cced775a7 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -166,13 +166,13 @@ and mixer_control will apply. .B mixer_device This specifies which mixer to use. The default for oss is "/dev/mixer"; the default for alsa is "default". This option is deprecated and should not be -used. Look at the mix_device option of corresponding output device instead. +used. Look at the mixer_device option of corresponding output device instead. .TP .B mixer_control This specifies which mixer control to use (sometimes referred to as the "device"). Examples of mixer controls are PCM, Line1, Master, etc. An example for OSS is "Pcm", and an example for alsa is "PCM". This option is deprecated -and should not be used. Look at the mix_control option of corresponding +and should not be used. Look at the mixer_control option of corresponding output device instead. .TP .B replaygain @@ -281,11 +281,11 @@ whatever audio format is passed to the audio output. .B device This specifies the device to use for audio output. The default is "default". .TP -.B mix_device +.B mixer_device This specifies which mixer to use. The default for oss is "/dev/mixer"; the default for alsa is "default". .TP -.B mix_control +.B mixer_control This specifies which mixer control to use (sometimes referred to as the "device"). Examples of mixer controls are PCM, Line1, Master, etc. An example for OSS is "Pcm", and an example for alsa is "PCM". -- cgit v1.2.3