merge from base/head

4 files changed, 19 insertions, 6 deletions

diff --git a/share/man/man4/acpi_sony.4 b/share/man/man4/acpi_sony.4
index 52a7fbe..3a06070 100644
--- a/share/man/man4/acpi_sony.4
+++ b/share/man/man4/acpi_sony.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 14, 2005
+.Dd February 7, 2010
 .Dt ACPI_SONY 4 i386
 .Os
 .Sh NAME
@@ -48,15 +48,24 @@ acpi_sony_load="YES"
 The
 .Nm
 driver provides support for the notebook controller in Sony laptops.
+Note that not all features will work on all laptop models.
 .Sh SYSCTLS
-The following sysctl is currently implemented:
+The following sysctl nodes are currently implemented:
 .Bl -tag -width indent
 .It Va dev.acpi_sony.0.brightness
 Current brightness level of the display.
+.It Va dev.acpi_sony.0.brightness_default
+Default brightness level of the display (survives reboot).
+.It Va dev.acpi_sony.0.contrast
+Current contrast level of the display.
+.It Va dev.acpi_sony.0.bass_gain
+Enable or disable the Bass Gain feature.
 .It Va dev.acpi_sony.0.cdp
 Turns the CD power on or off.
 .It Va dev.acpi_sony.0.azp
 Turns the audio power on or off.
+.It Va dev.acpi_sony.0.lnp
+Turns the wired network interface power on or off.
 .El
 .Sh SEE ALSO
 .Xr acpi 4 ,
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 28475bc..4839c30 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 11, 2008
+.Dd February 7, 2010
 .Dt VR 4
 .Os
 .Sh NAME
@@ -130,6 +130,8 @@ Fast Ethernet adapters including:
 .It
 AOpen/Acer ALN-320
 .It
+D-Link DFE520-TX
+.It
 D-Link DFE530-TX
 .It
 Hawking Technologies PN102TX
diff --git a/share/man/man9/mtx_pool.9 b/share/man/man9/mtx_pool.9
index e289f3c..ab2cc8b 100644
--- a/share/man/man9/mtx_pool.9
+++ b/share/man/man9/mtx_pool.9
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 25, 2002
+.Dd February 6, 2010
 .Dt MTX_POOL 9
 .Os
 .Sh NAME
@@ -177,7 +177,7 @@ on each mutex in the specified pool,
 deallocates the memory associated with the pool,
 and assigns NULL to the pool pointer.
 .Sh SEE ALSO
-.Xr locking 9
+.Xr locking 9 ,
 .Xr mutex 9
 .Sh HISTORY
 These routines first appeared in
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index d0ced6f..7f60f0c 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -70,6 +70,7 @@ brooks [label="Brooks Davis\nbrooks@FreeBSD.org\n2001/06/21"]
 brucec [label="Bruce Cran\nbrucec@FreeBSD.org\n2010/01/29"]
 brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2006/02/28"]
 bruno [label="Bruno Ducrot\nbruno@FreeBSD.org\n2005/07/18"]
+bschmidt [label="Bernhard Schmidt\nbschmidt@FreeBSD.org\n2010/02/06"]
 bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"]
 ceri [label="Ceri Davies\nceri@FreeBSD.org\n2006/11/07"]
 cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"]
@@ -155,7 +156,7 @@ peadar [label="Peter Edwards\npeadar@FreeBSD.org\n2004/03/08"]
 peter [label="Peter Wemm\npeter@FreeBSD.org\n????/??/??"]
 philip [label="Philip Paeps\nphilip@FreBSD.org\n2004/01/21"]
 phk [label="Poul-Henning Kamp\nphk@FreeBSD.org\n1994/02/21"]
-pho [label="Peter Holm	\npho@FreeBSD.org\n2008/11/16"]
+pho [label="Peter Holm\npho@FreeBSD.org\n2008/11/16"]
 pjd [label="Pawel Jakub Dawidek\npjd@FreeBSD.org\n2004/02/02"]
 ps [label="Paul Saab\nps@FreeBSD.org\n2000/02/23"]
 qingli [label="Qing Li\nqingli@FreeBSD.org\n2005/04/13"]
@@ -410,6 +411,7 @@ pjd -> lulf
 rgrimes -> markm
 
 rpaulo -> avg
+rpaulo -> bschmidt
 
 rrs -> brucec
 rrs -> tuexen