From 6f759f07fdd0dae38746874aa27785ab956c6018 Mon Sep 17 00:00:00 2001
From: wiz <wiz@NetBSD.org>
Date: Sun, 6 Apr 2003 15:24:08 +0000
Subject: [PATCH] Document mixerctl behaviour during startup better. Based on
 PR 21023 by Quentin Garnier.

---
 share/man/man5/mixerctl.conf.5 | 18 +++++++++++++++---
 share/man/man5/rc.conf.5       | 21 ++++++++++++++++-----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/share/man/man5/mixerctl.conf.5 b/share/man/man5/mixerctl.conf.5
index c85a67c0cc5d..4fece4af0b6b 100644
--- a/share/man/man5/mixerctl.conf.5
+++ b/share/man/man5/mixerctl.conf.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mixerctl.conf.5,v 1.5 2003/02/14 15:20:20 grant Exp $
+.\"	$NetBSD: mixerctl.conf.5,v 1.6 2003/04/06 15:24:08 wiz Exp $
 .\"
 .\" Copyright 2002 Jared D. McNeill <jmcneill@NetBSD.org>
 .\" All rights reserved.
@@ -25,7 +25,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.
 .\"
-.Dd June 2, 2002
+.Dd April 5, 2003
 .Dt MIXERCTL.CONF 5
 .Os
 .Sh NAME
@@ -48,6 +48,17 @@ To generate a
 .Nm
 from the current mixer settings, execute:
 .Dl Ic mixerctl -a \*[Gt] /etc/mixerctl.conf
+.Pp
+Set
+.Sy mixerctl
+to YES in
+.Xr rc.conf 5
+to have the variables set at boot time.
+Additionally, you can have the settings saved
+and restored for the devices of your choice by listing them in
+.Sy mixerctl_mixers
+in
+.Xr rc.conf 5 .
 .Sh FILES
 .Bl -tag -width /etc/mixerctl.conf -compact
 .It Pa /etc/mixerctl.conf
@@ -94,7 +105,8 @@ outputs.spatial.center=0
 outputs.spatial.depth=0
 .Ed
 .Sh SEE ALSO
-.Xr mixerctl 1
+.Xr mixerctl 1 ,
+.Xr rc.conf 5
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index cf3b9cc4e055..33565d9d74fa 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rc.conf.5,v 1.79 2003/04/02 19:19:18 wiz Exp $
+.\"	$NetBSD: rc.conf.5,v 1.80 2003/04/06 15:24:09 wiz Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" Copyright (c) 1997 Curt J. Sampson
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 2, 2003
+.Dd April 5, 2003
 .Dt RC.CONF 5
 .Os
 .\" turn off hyphenation
@@ -310,6 +310,17 @@ Run
 to calibrate touch panel device.
 Passes
 .Sy tpctl_flags .
+.It Sy mixerctl
+.Sq YES
+or
+.Sq NO .
+Read
+.Xr mixerctl.conf 5
+for how to set mixer values.
+List in
+.Sy mixerctl_mixers
+the devices whose settings are to be saved at shutdown and
+restored at start-up.
 .El
 .Ss System security setting
 .Bl -tag -width net_interfaces
@@ -754,15 +765,15 @@ If this is set to
 .Sq YES ,
 you can remove the submit.cf file, and then turn off the
 .Sy smmsp
-process. 
+process.
 .It Sy smmsp
 .Sq YES
 or
 .Sq NO .
-Runs   
+Runs
 .Xr sendmail 8
 as a client queue runner and passes
-.Sy smmsp_flags . 
+.Sy smmsp_flags .
 Note that the smmsp process is not a full-featured SMTP daemon.
 Its main purpose is to flush locally collected mail from the queue, but
 it can also be used as a non-privileged