diff options
| -rw-r--r-- | share/man/man5/mixerctl.conf.5 | 10 | ||||
| -rw-r--r-- | usr.bin/mixerctl/mixerctl.1 | 24 |
2 files changed, 19 insertions, 15 deletions
diff --git a/share/man/man5/mixerctl.conf.5 b/share/man/man5/mixerctl.conf.5 index b7e2c59885d..ef00d62be1d 100644 --- a/share/man/man5/mixerctl.conf.5 +++ b/share/man/man5/mixerctl.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mixerctl.conf.5,v 1.2 2007/05/31 19:19:58 jmc Exp $ +.\" $OpenBSD: mixerctl.conf.5,v 1.3 2008/10/19 06:11:03 jmc Exp $ .\" .\" Copyright (c) 2004 Jonathan Gray <jsg@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: October 19 2008 $ .Dt MIXERCTL.CONF 5 .Os .Sh NAME @@ -35,8 +35,10 @@ variable assignments with comments designated by a hash mark .Pq Sq # . .Sh FILES -.Bl -tag -width /etc/mixerctl.conf -compact -.It Pa /etc/mixerctl.conf +.Bl -tag -width "/etc/mixerctl.confXXX" -compact +.It /etc/mixerctl.conf +.Xr mixerctl 1 +configuration file. .El .Sh EXAMPLES To turn on the line in input, use the following line: diff --git a/usr.bin/mixerctl/mixerctl.1 b/usr.bin/mixerctl/mixerctl.1 index 045628cc1b8..d17545bde07 100644 --- a/usr.bin/mixerctl/mixerctl.1 +++ b/usr.bin/mixerctl/mixerctl.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mixerctl.1,v 1.31 2008/06/26 05:42:21 ray Exp $ +.\" $OpenBSD: mixerctl.1,v 1.32 2008/10/19 06:11:03 jmc Exp $ .\" $NetBSD: mixerctl.1,v 1.8 1998/05/09 12:41:16 augustss Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: October 19 2008 $ .Dt MIXERCTL 1 .Os .Sh NAME @@ -58,11 +58,8 @@ command displays or sets various audio system mixing variables. If a list of variables is present on the command line, .Nm prints the current value of those variables for the specified device. -By default, -.Nm -operates on the -.Pa /dev/mixer -device. +Variables can also be set at system startup using the configuration file +.Xr mixerctl.conf 5 . .Pp The options are as follows: .Bl -tag -width "-f file" @@ -72,6 +69,8 @@ This is the default, if no parameters are given to .Nm . .It Fl f Ar file Specify an alternative audio mixing device. +The default is +.Pa /dev/mixer . .It Fl n Suppress printing of the variable name. .It Fl q @@ -150,14 +149,17 @@ or to denote an increase or decrease, respectively. .El .Sh ENVIRONMENT -.Bl -tag -width MIXERDEVICE +.Bl -tag -width "MIXERDEVICEXXX" .It Ev MIXERDEVICE The audio mixer device to use. .El .Sh FILES -.Bl -tag -width /dev/mixer -.It Pa /dev/mixer -default mixer audio device +.Bl -tag -width "/etc/mixerctl.confXXX" -compact +.It /dev/mixer +Default mixer audio device. +.It /etc/mixerctl.conf +.Nm +configuration file. .El .Sh EXAMPLES Show possible values for all mixer variables, |