IFC @ r225592

sys/dev/bvm/bvm_console.c - move up to the new alt-break order.

43 files changed, 534 insertions, 348 deletions

diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile
index 4d38b11..803811b 100644
--- a/share/doc/bind9/Makefile
+++ b/share/doc/bind9/Makefile
@@ -8,7 +8,9 @@ SRCDIR=		${BIND_DIR}/doc
 NO_OBJ=
 
 FILESGROUPS=	TOP ARM MISC
-TOP=		CHANGES COPYRIGHT FAQ HISTORY README
+TOP=		CHANGES COPYRIGHT FAQ HISTORY README \
+		RELEASE-NOTES-BIND-9.8.1.pdf RELEASE-NOTES-BIND-9.8.1.txt \
+		RELEASE-NOTES-BIND-9.8.1.html release-notes.css
 TOPDIR=		${DOCDIR}/bind9
 ARM=		Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html \
 		Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html \
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index 007ca5c..76f9464 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -193,7 +193,7 @@ O(1) removal of an entry from the head of the list.
 .It
 Forward traversal through the list.
 .It
-Swawpping the contents of two lists.
+Swapping the contents of two lists.
 .El
 .Pp
 Singly-linked lists are the simplest of the four data structures
@@ -227,7 +227,7 @@ Code size is about 15% greater and operations run about 20% slower
 than singly-linked lists.
 .El
 .Pp
-Singly-linked tailqs are ideal for applications with large datasets and
+Singly-linked tail queues are ideal for applications with large datasets and
 few or no removals,
 or for implementing a FIFO queue.
 .Pp
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 7ccccfb..091eb28 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -71,7 +71,6 @@ MAN=	aac.4 \
 	cardbus.4 \
 	carp.4 \
 	cas.4 \
-	cc.4 \
 	cc_chd.4 \
 	cc_cubic.4 \
 	cc_hd.4 \
@@ -233,6 +232,7 @@ MAN=	aac.4 \
 	mmc.4 \
 	mmcsd.4 \
 	mn.4 \
+	mod_cc.4 \
 	mos.4 \
 	mouse.4 \
 	mps.4 \
@@ -500,6 +500,7 @@ MAN=	aac.4 \
 	vpo.4 \
 	vr.4 \
 	vte.4 \
+	${_vxge.4} \
 	watchdog.4 \
 	wb.4 \
 	wi.4 \
@@ -526,10 +527,6 @@ MLINKS+=agp.4 agpgart.4
 MLINKS+=ale.4 if_ale.4
 MLINKS+=altq.4 ALTQ.4
 MLINKS+=an.4 if_an.4
-MLINKS+=ata.4 acd.4 \
-	ata.4 ad.4 \
-	ata.4 afd.4 \
-	ata.4 ast.4
 MLINKS+=aue.4 if_aue.4
 MLINKS+=axe.4 if_axe.4
 MLINKS+=bce.4 if_bce.4
@@ -649,6 +646,7 @@ MLINKS+=vge.4 if_vge.4
 MLINKS+=vlan.4 if_vlan.4
 MLINKS+=vpo.4 imm.4
 MLINKS+=vr.4 if_vr.4
+MLINKS+=${_vxge.4} ${_if_vxge.4}
 MLINKS+=watchdog.4 SW_WATCHDOG.4
 MLINKS+=wb.4 if_wb.4
 MLINKS+=wi.4 if_wi.4
@@ -689,6 +687,7 @@ _if_nfe.4=	if_nfe.4
 _if_nve.4=	if_nve.4
 _if_nxge.4=	if_nxge.4
 _if_urtw.4=	if_urtw.4
+_if_vxge.4=	if_vxge.4
 _if_wpi.4=	if_wpi.4
 _ipmi.4=	ipmi.4
 _io.4=		io.4
@@ -700,6 +699,7 @@ _nfsmb.4=	nfsmb.4
 _nve.4=		nve.4
 _nvram.4=	nvram.4
 _nxge.4=	nxge.4
+_vxge.4=	vxge.4
 _padlock.4=	padlock.4
 _rr232x.4=	rr232x.4
 _speaker.4=	speaker.4
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index 05e03d6..633d1ed 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -1,135 +1,171 @@
-.\"
-.\" Copyright (c) 2003 Søren Schmidt <sos@FreeBSD.org>
+.\" Copyright (c) 2011 Alexander Motin <mav@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer,
-.\"    without modification, immediately at the beginning of the file.
+.\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 3, 2010
+.Dd August 17, 2011
 .Dt ATA 4
 .Os
 .Sh NAME
-.Nm ata ,
-.Nm ar ,
-.Nm acd ,
-.Nm ad ,
-.Nm afd ,
-.Nm ast
-.Nd generic ATA/ATAPI disk controller driver
+.Nm ata
+.Nd generic ATA/SATA controller driver
 .Sh SYNOPSIS
-For ISA based ATA/ATAPI support:
-.Cd device isa
-.Cd device ata
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.ata.0.at="isa"
-.Cd hint.ata.0.port="0x1f0"
-.Cd hint.ata.0.irq="14"
-.Cd hint.ata.1.at="isa"
-.Cd hint.ata.1.port="0x170"
-.Cd hint.ata.1.irq="15"
-.Pp
-For PC98 based ATA/ATAPI support:
-.Cd device isa
-.Cd device ata
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.atacbus.0.at="isa"
-.Cd hint.atacbus.0.port="0x640"
-.Cd hint.atacbus.0.irq="9"
-.Pp
-For PCI based ATA/ATAPI support:
-.Cd device pci
-.Cd device ata
-.Pp
-To support ATA compliant disk drives:
-.Cd device atadisk
-.Pp
-To support ATA software RAID's:
-.Cd device ataraid
-.Pp
-To support ATAPI CDROM, DVD and CD/DVD burner drives:
-.Cd device atapicd
+To compile this driver into the kernel, place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device scbus"
+.Cd "device ata"
+.Cd "options ATA_CAM"
+.Ed
 .Pp
-To support ATAPI floppy drives:
-.Cd device atapifd
+Alternatively, to load the driver as set of modules at boot time,
+place some of the following lines in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+ata_load="YES"
+
+atacard_load="YES"
+ataisa_load="YES"
+atapci_load="YES"
+
+ataacard_load="YES"
+ataacerlabs_load="YES"
+ataadaptec_load="YES"
+ataahci_load="YES"
+ataamd_load="YES"
+ataati_load="YES"
+atacenatek_load="YES"
+atacypress_load="YES"
+atacyrix_load="YES"
+atahighpoint_load="YES"
+ataintel_load="YES"
+ataite_load="YES"
+atajmicron_load="YES"
+atamarvell_load="YES"
+atamicron_load="YES"
+atanational_load="YES"
+atanetcell_load="YES"
+atanvidia_load="YES"
+atapromise_load="YES"
+ataserverworks_load="YES"
+atasiliconimage_load="YES"
+atasis_load="YES"
+atavia_load="YES"
+.Ed
 .Pp
-To support ATAPI tape drives:
-.Cd device atapist
-.Pp
-To turn
-.Xr ata 4
-subsystem controller drivers into cam(4) interface modules (disables all native
-.Xr ata 4
-APIs and peripheral drivers):
-.Cd options ATA_CAM
+The first line is for the common hardware independent code, and is a
+prerequisite for the other modules.
+The next three lines are generic bus-specific drivers.
+Of the rest, ataahci is the AHCI driver.
+The others are vendor-specific PCI drivers.
+The
+.Dv ATA_CAM
+option should always remain in the kernel configuration, to make
+the driver work as a
+.Xr CAM 4
+subsystem module.
 .Pp
-The following tunables are settable from the loader:
+The following tunables are settable from the
+.Xr loader 8 :
 .Bl -ohang
-.It Va hw.ata.ata_dma
-set to 1 for DMA access, 0 for PIO (default is DMA).
 .It Va hw.ata.ata_dma_check_80pin
-set to 0 to disable the 80pin cable check (default is 1, check the cable) 
-.It Va hw.ata.atapi_dma
-set to 1 for DMA access, 0 for PIO (default is DMA).
-.It Va hw.ata.wc
-set to 1 to enable Write Caching, 0 to disable (default is enabled).
-.Em WARNING :
-can cause data loss on power failures and crashes.
+set to 0 to disable the 80pin cable check (the default is 1, check the cable)
 .It Va hint.atapci.X.msi
-set to 1 to allow Message Signalled Interrupts (MSI) to be used by
+set to 1 to allow Message Signalled Interrupts (MSI) to be used by the
 specified PCI ATA controller, if supported.
 .It Va hint.ata.X.devX.mode
-limits initial ATA mode for specified device on specified channel.
+limits the initial ATA mode for the specified device on specified the channel.
 .It Va hint.ata.X.mode
-limits initial ATA mode for every device on specified channel.
+limits the initial ATA mode for every device on the specified channel.
 .It Va hint.ata.X.pm_level
-controls SATA interface Power Management for specified channel,
-allowing to save some power by the cost of additional command latency.
+controls SATA interface Power Management for the specified channel,
+allowing some power savings at the cost of additional command latency.
 Possible values:
 .Bl -tag -compact
 .It 0
-interface Power Management is disabled, default value.
+Interface Power Management is disabled.
+This is the default value.
 .It 1
-device is allowed to initiate PM state change, host is passive.
+The device is allowed to initiate a PM state change; the host is passive.
 .It 2
-host initiates PARTIAL PM state transition every time port becomes idle.
+The host initiates a PARTIAL PM state transition every time a port becomes idle.
 .It 3
 host initiates SLUMBER PM state transition every time port becomes idle.
 .El
-Modes 2 and 3 are implemented only for AHCI driver now.
+Modes 2 and 3 are only supported for AHCI.
 .El
 .Sh DESCRIPTION
 The
 .Nm
-driver provides access to ATA (IDE) and SerialATA disk drives,
-ATAPI CDROM/DVD drives, ZIP/LS120 ATAPI drives and ATAPI tape drives
-connected to controllers according to the ATA/ATAPI standards.
+driver gives the
+.Xr CAM 4
+subsystem access to the ATA (IDE) and SATA ports
+of many generic controllers.
+Depending on the controller, each PATA (IDE)
+port or each one or two SATA ports are
+represented to CAM as a separate bus with one or two targets.
+Most of the bus-management details are handled by the ATA/SATA-specific
+transport of CAM.
+Connected ATA disks are handled by the ATA protocol disk peripheral driver
+.Xr ada 4 .
+ATAPI devices are handled by the SCSI protocol peripheral drivers
+.Xr cd 4 ,
+.Xr da 4 ,
+.Xr sa 4 ,
+etc.
+.Pp
+This driver supports ATA, and for the most of controllers, ATAPI devices.
+Command queuing and SATA port multipliers are not supported.
+Device hot-plug and SATA interface power management is supported only on
+some controllers.
+.Pp
+The
+.Nm
+driver can change the transfer mode when the system is up and running.
+See the
+.Cm negotiate
+subcommand of
+.Xr camcontrol 8 .
 .Pp
+The
+.Nm
+driver sets the maximum transfer mode supported by the hardware as default.
+However, the
+.Nm
+driver sometimes warns:
+.Dq Sy "DMA limited to UDMA33, non-ATA66 cable or device".
+This means that
+the
+.Nm
+driver has detected that the required 80 conductor cable is not present
+or could not be detected properly,
+or that one of the devices on the channel only accepts up
+to UDMA2/ATA33.
+The
+.Va hw.ata.ata_dma_check_80pin
+tunable can be set to 0 to disable this check.
+.Sh HARDWARE
 The currently supported ATA/SATA controller chips are:
 .Pp
 .Bl -tag -width "Silicon Image:" -compact
@@ -186,72 +222,18 @@ VT82C686A, VT82C686B, VT8231, VT8233, VT8233A, VT8233C, VT8235, VT8237,
 VT8237A, VT8237S, VT8251, CX700, VX800, VX855, VX900.
 .El
 .Pp
+Some of above chips are also supported by the more featured
+.Xr ahci 4 ,
+.Xr mvs 4 ,
+and
+.Xr siis 4
+drivers.
+If both drivers are loaded at the same time, those will have precedence.
+.Pp
 Unknown ATA chipsets are supported in PIO modes, and if the standard
 busmaster DMA registers are present and contain valid setup, DMA is
 also enabled, although the max mode is limited to UDMA33, as it is
 not known what the chipset can do and how to program it.
-.Pp
-The
-.Nm
-driver can change the transfer mode and various other parameters
-when the system is up and running.
-See
-.Xr atacontrol 8 .
-.Pp
-The
-.Nm
-driver sets the maximum transfer mode supported by the hardware as default.
-However the
-.Nm
-driver sometimes warns:
-.Dq Sy "DMA limited to UDMA33, non-ATA66 cable or device".
-This means that
-the
-.Nm
-driver has detected that the required 80 conductor cable is not present
-or could not be detected properly,
-or that one of the devices on the channel only accepts up
-to UDMA2/ATA33.
-The
-.Va hw.ata.ata_dma_check_80pin
-tunable can be set to 0 to disable this check.
-.Pp
-Unknown ATAPI devices are initialized to DMA mode if the
-.Va hw.ata.atapi_dma
-tunable is set to 1 and they support at least UDMA33 transfers.
-Otherwise they are set to PIO mode because severe DMA problems are
-common even if the device capabilities indicate support.
-You can always try to set DMA mode on an ATAPI device using
-.Xr atacontrol 8 ,
-but be aware that your hardware might
-.Em not
-support it and can potentially
-.Em hang
-the entire system causing data loss.
-.Pp
-The
-.Nm acd
-driver implements most of the
-.Fn ioctl
-requests documented by
-.Xr cd 4 .
-.Sh FILES
-.Bl -tag -width ".Pa /sys/i386/conf/GENERIC" -compact
-.It Pa /dev/ad*
-ATA disk device nodes
-.It Pa /dev/ar*
-ATA RAID device nodes
-.It Pa /dev/acd*
-ATAPI CD-ROM device nodes
-.It Pa /dev/afd*
-ATAPI floppy drive device nodes
-.It Pa /dev/ast*
-ATAPI tape drive device nodes
-.It Pa /sys/i386/conf/GENERIC
-sample generic kernel config file for
-.Nm
-based systems
-.El
 .Sh NOTES
 Please remember that in order to use UDMA4/ATA66 and above modes you
 .Em must
@@ -260,31 +242,27 @@ Please assure that ribbon cables are no longer than 45cm.
 In case of rounded ATA cables, the length depends on the
 quality of the cables.
 SATA cables can be up to 1m long according to the specification.
-.Pp
-Static device numbering
-(enabled with the
-.Dv ATA_STATIC_ID
-kernel option)
-reserves a number for each possibly connected disk,
-even when not present.
-This is useful in hotswap scenarios
-where disks should always show up as the same numbered device,
-and not depend on attach order.
-.Pp
-Native Command Queuing (NCQ) on SATA drives is not yet supported.
+External SATA cables can be 2m long and more, but not all controllers
+work well on long cables, especially at high speeds.
 .Sh SEE ALSO
+.Xr ada 4 ,
 .Xr ahci 4 ,
 .Xr cam 4 ,
-.Xr ataraid 4 ,
-.Xr atacontrol 8 ,
-.Xr burncd 8 ,
+.Xr camcontrol 8 ,
 .Xr cd 4 ,
+.Xr mvs 4 ,
 .Xr siis 4
 .Sh HISTORY
 The
 .Nm
 driver first appeared in
 .Fx 4.0 .
+It was turned into a
+.Xr CAM 4
+interface module in
+.Fx 9.0 .
 .Sh AUTHORS
+.An Alexander Motin
+.Aq mav@FreeBSD.org ,
 .An S\(/oren Schmidt
-.Aq sos@FreeBSD.org .
+.Aq sos@FreeBSD.org
diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index fadf192..b36bc90 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd March 21, 2010
+.Dd August 28, 2011
 .Dt ATH 4
 .Os
 .Sh NAME
@@ -156,9 +156,6 @@ The
 .Nm
 driver supports all Atheros Cardbus and PCI cards,
 except those that are based on the AR5005VL chipset.
-.Pp
-A list of cards that are supported can be found at
-.Pa http://customerproducts.atheros.com/customerproducts/default.asp .
 .Sh EXAMPLES
 Join a specific BSS network with WEP encryption:
 .Bd -literal -offset indent
diff --git a/share/man/man4/ath_hal.4 b/share/man/man4/ath_hal.4
index c1ad779..a17393f 100644
--- a/share/man/man4/ath_hal.4
+++ b/share/man/man4/ath_hal.4
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd March 25, 2009
+.Dd August 28, 2011
 .Dt ATH_HAL 4
 .Os
 .Sh NAME
@@ -129,9 +129,6 @@ module:
 .It "Sony PCWA-C500	AR5210	Cardbus	a"
 .It "3Com 3CRPAG175	AR5212	CardBus	a/b/g"
 .El
-.Pp
-An up to date list can be found at
-.Pa http://customerproducts.atheros.com/customerproducts .
 .Sh SEE ALSO
 .Xr ath 4
 .Sh HISTORY
diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4
index a985fb8..4064c6c 100644
--- a/share/man/man4/carp.4
+++ b/share/man/man4/carp.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 5, 2010
+.Dd August 15, 2011
 .Dt CARP 4
 .Os
 .Sh NAME
@@ -168,6 +168,25 @@ forwarded to its destination, and destination replying faster
 than the state information is packed and synced with the second router.
 If the reply would be load balanced to second router, it will be
 dropped due to no state.
+.Sh STATE CHANGE NOTIFICATIONS
+Sometimes it is useful to get notified about
+.Nm
+status change events.
+This can be accomplished by using
+.Xr devd 8
+hooks.
+Master/slave events are signalled as
+.Nm
+interface
+.Dv LINK_UP
+or
+.Dv LINK_DOWN
+event.
+Please see
+.Xr devd.conf 5
+and 
+.Sx EXAMPLES
+section for more information.
 .Sh EXAMPLES
 For firewalls and routers with multiple interfaces, it is desirable to
 failover all of the
@@ -249,10 +268,30 @@ This way, locally connected systems will receive different ARP replies and
 subsequent IP traffic will be balanced among the hosts.
 If one of the hosts fails, the other will take over the virtual MAC address,
 and begin answering ARP requests on its behalf.
+.Pp
+Processing of
+.Nm
+status change events can be set up by using the following devd.conf rules:
+.Bd -literal -offset indent
+notify 0 {
+	match "system"          "IFNET";
+	match "type"            "LINK_UP";
+	match "subsystem"       "carp*";
+	action "/root/carpcontrol.sh $type $subsystem";
+};
+
+notify 0 {
+	match "system"          "IFNET";
+	match "type"            "LINK_DOWN";
+	match "subsystem"       "carp*";
+	action "/root/carpcontrol.sh $type $subsystem";
+};
+.Ed
 .Sh SEE ALSO
 .Xr inet 4 ,
 .Xr pfsync 4 ,
 .Xr rc.conf 5 ,
+.Xr devd.conf 5 ,
 .Xr ifconfig 8 ,
 .Xr sysctl 8
 .Sh HISTORY
diff --git a/share/man/man4/cc_chd.4 b/share/man/man4/cc_chd.4
index 9a1f762..39cdef3 100644
--- a/share/man/man4/cc_chd.4
+++ b/share/man/man4/cc_chd.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
+.Dd September 15, 2011
 .Dt CC_CHD 4
 .Os
 .Sh NAME
@@ -86,16 +86,16 @@ is used.
 Default is 1.
 .El
 .Sh SEE ALSO
-.Xr cc 4 ,
 .Xr cc_cubic 4 ,
 .Xr cc_hd 4 ,
 .Xr cc_htcp 4 ,
 .Xr cc_newreno 4 ,
 .Xr cc_vegas 4 ,
 .Xr h_ertt 4 ,
+.Xr mod_cc 4 ,
 .Xr tcp 4 ,
-.Xr cc 9 ,
-.Xr khelp 9
+.Xr khelp 9 ,
+.Xr mod_cc 9
 .Rs
 .%A "D. A. Hayes"
 .%A "G. Armitage"
diff --git a/share/man/man4/cc_cubic.4 b/share/man/man4/cc_cubic.4
index be5684c..771f264 100644
--- a/share/man/man4/cc_cubic.4
+++ b/share/man/man4/cc_cubic.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
+.Dd September 15, 2011
 .Dt CC_CUBIC 4
 .Os
 .Sh NAME
@@ -62,14 +62,14 @@ section below.
 .Sh MIB Variables
 There are currently no tunable MIB variables.
 .Sh SEE ALSO
-.Xr cc 4 ,
 .Xr cc_chd 4 ,
 .Xr cc_hd 4 ,
 .Xr cc_htcp 4 ,
 .Xr cc_newreno 4 ,
 .Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
 .Xr tcp 4 ,
-.Xr cc 9
+.Xr mod_cc 9
 .Rs
 .%A "Sangtae Ha"
 .%A "Injong Rhee"
diff --git a/share/man/man4/cc_hd.4 b/share/man/man4/cc_hd.4
index 5c4c2de..d0acb34 100644
--- a/share/man/man4/cc_hd.4
+++ b/share/man/man4/cc_hd.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
+.Dd September 15, 2011
 .Dt CC_HD 4
 .Os
 .Sh NAME
@@ -69,16 +69,16 @@ Minimum queuing delay threshold (qmin) in ticks.
 Default is 5.
 .El
 .Sh SEE ALSO
-.Xr cc 4 ,
 .Xr cc_chd 4 ,
 .Xr cc_cubic 4 ,
 .Xr cc_htcp 4 ,
 .Xr cc_newreno 4 ,
 .Xr cc_vegas 4 ,
 .Xr h_ertt 4 ,
+.Xr mod_cc 4 ,
 .Xr tcp 4 ,
-.Xr cc 9 ,
-.Xr khelp 9
+.Xr khelp 9 ,
+.Xr mod_cc 9
 .Rs
 .%A "L. Budzisz"
 .%A "R. Stanojevic"
diff --git a/share/man/man4/cc_htcp.4 b/share/man/man4/cc_htcp.4
index 6e916b9..45d0018 100644
--- a/share/man/man4/cc_htcp.4
+++ b/share/man/man4/cc_htcp.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
+.Dd September 15, 2011
 .Dt CC_HTCP 4
 .Os
 .Sh NAME
@@ -69,14 +69,14 @@ window increase during congestion avoidance mode invariant with respect to RTT.
 Default is 0 (disabled).
 .El
 .Sh SEE ALSO
-.Xr cc 4 ,
 .Xr cc_chd 4 ,
 .Xr cc_cubic 4 ,
 .Xr cc_hd 4 ,
 .Xr cc_newreno 4 ,
 .Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
 .Xr tcp 4 ,
-.Xr cc 9
+.Xr mod_cc 9
 .Rs
 .%A "D. Leith"
 .%A "R. Shorten"
diff --git a/share/man/man4/cc_newreno.4 b/share/man/man4/cc_newreno.4
index c09b362..fe4c3db 100644
--- a/share/man/man4/cc_newreno.4
+++ b/share/man/man4/cc_newreno.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
+.Dd September 15, 2011
 .Dt CC_NEWRENO 4
 .Os
 .Sh NAME
@@ -42,14 +42,14 @@ Details about the algorithm can be found in RFC5681.
 .Sh MIB Variables
 There are currently no tunable MIB variables.
 .Sh SEE ALSO
-.Xr cc 4 ,
 .Xr cc_chd 4 ,
 .Xr cc_cubic 4 ,
 .Xr cc_hd 4 ,
 .Xr cc_htcp 4 ,
 .Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
 .Xr tcp 4 ,
-.Xr cc 9
+.Xr mod_cc 9
 .Sh ACKNOWLEDGEMENTS
 Development and testing of this software were made possible in part by grants
 from the FreeBSD Foundation and Cisco University Research Program Fund at
diff --git a/share/man/man4/cc_vegas.4 b/share/man/man4/cc_vegas.4
index ce55723..13a3fe0 100644
--- a/share/man/man4/cc_vegas.4
+++ b/share/man/man4/cc_vegas.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
+.Dd September 15, 2011
 .Dt CC_VEGAS 4
 .Os
 .Sh NAME
@@ -94,16 +94,16 @@ When setting beta, the value must satisfy: 0 < alpha < beta.
 Default is 3.
 .El
 .Sh SEE ALSO
-.Xr cc 4 ,
 .Xr cc_chd 4 ,
 .Xr cc_cubic 4 ,
 .Xr cc_hd 4 ,
 .Xr cc_htcp 4 ,
 .Xr cc_newreno 4 ,
 .Xr h_ertt 4 ,
+.Xr mod_cc 4 ,
 .Xr tcp 4 ,
-.Xr cc 9 ,
-.Xr khelp 9
+.Xr khelp 9 ,
+.Xr mod_cc 9
 .Rs
 .%A "L. S. Brakmo"
 .%A "L. L. Peterson"
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index 6628d73..3a565fc 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd July 23, 2011
 .Dt DC 4
 .Os
 .Sh NAME
@@ -357,7 +357,7 @@ the card should be configured correctly.
 .Re
 .Rs
 .%T Davicom DM9102 data sheet
-.%U http://www.davicom8.com
+.%U http://www.davicom.com.tw/userfile/24247/DM9102H-DS-F01-021508.pdf
 .Re
 .Rs
 .%T Intel 21143 Hardware Reference Manual
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index 43605df..453b4bd 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 8, 2009
+.Dd August 1, 2011
 .Dt GIF 4
 .Os
 .Sh NAME
@@ -198,7 +198,7 @@ to 1.
 .%B RFC2893
 .%T Transition Mechanisms for IPv6 Hosts and Routers
 .%D August 2000
-.%U ftp://ftp.isi.edu/in-notes/rfc2893.txt
+.%U http://tools.ietf.org/html/rfc2893
 .Re
 .Rs
 .%A Sally Floyd
diff --git a/share/man/man4/h_ertt.4 b/share/man/man4/h_ertt.4
index b04efaa..70ed36d 100644
--- a/share/man/man4/h_ertt.4
+++ b/share/man/man4/h_ertt.4
@@ -108,10 +108,10 @@ consumers to unset the flag if they wish to use it as a notification method for
 new measurements.
 .El
 .Sh SEE ALSO
-.Xr cc 4 ,
 .Xr cc_chd 4 ,
 .Xr cc_hd 4 ,
 .Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
 .Xr hhook 9 ,
 .Xr khelp 9
 .Sh ACKNOWLEDGEMENTS
diff --git a/share/man/man4/hptiop.4 b/share/man/man4/hptiop.4
index 83d356b..77fab0c 100644
--- a/share/man/man4/hptiop.4
+++ b/share/man/man4/hptiop.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 12, 2007
+.Dd August 1, 2011
 .Dt HPTIOP 4
 .Os
 .Sh NAME
@@ -60,6 +60,10 @@ driver supports the following SAS and SATA RAID controllers:
 .It
 HighPoint RocketRAID 4320
 .It
+HighPoint RocketRAID 4321
+.It
+HighPoint RocketRAID 4322
+.It
 HighPoint RocketRAID 3220
 .It
 HighPoint RocketRAID 3320
diff --git a/share/man/man4/lmc.4 b/share/man/man4/lmc.4
index 073f9b1..439a10f 100644
--- a/share/man/man4/lmc.4
+++ b/share/man/man4/lmc.4
@@ -43,7 +43,7 @@
 .\" this program; if not, write to the Free Software Foundation, Inc., 59
 .\" Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 .\"
-.Dd May 20, 2006
+.Dd July 23, 2011
 .Dt LMC 4
 .Os
 .\"
@@ -723,8 +723,6 @@ Thus, cable length does not affect data/clock timing.
 .Xr ngctl 8 ,
 .Xr ping 8 ,
 .Xr ifnet 9
-.Pp
-.Pa http://www.sbei.com/
 .\"
 .Sh HISTORY
 .\"
diff --git a/share/man/man4/cc.4 b/share/man/man4/mod_cc.4
index c518f45..204537f 100644
--- a/share/man/man4/cc.4
+++ b/share/man/man4/mod_cc.4
@@ -30,11 +30,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
-.Dt CC 4
+.Dd September 15, 2011
+.Dt MOD_CC 4
 .Os
 .Sh NAME
-.Nm cc
+.Nm mod_cc
 .Nd Modular congestion control
 .Sh DESCRIPTION
 The modular congestion control framework allows the TCP implementation to
@@ -82,7 +82,7 @@ MIB variable.
 .Xr cc_newreno 4 ,
 .Xr cc_vegas 4 ,
 .Xr tcp 4 ,
-.Xr cc 9
+.Xr mod_cc 9
 .Sh ACKNOWLEDGEMENTS
 Development and testing of this software were made possible in part by grants
 from the FreeBSD Foundation and Cisco University Research Program Fund at
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index 50ae0c6..4983759 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -35,7 +35,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 13, 2010
+.Dd July 23, 2011
 .Dt MPT 4
 .Os
 .Sh NAME
@@ -161,7 +161,7 @@ can take on - no separate compilation is required.
 .Xr gmultipath 8
 .Rs
 .%T "LSI Logic Website"
-.%U http://www.lsilogic.com/
+.%U http://www.lsi.com/
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index 710ec13..333033d 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1998, Luigi Rizzo
+.\" Copyright (c) 2009-2011 Joel Dahl <joel@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 13, 2009
+.Dd July 31, 2011
 .Dt SOUND 4
 .Os
 .Sh NAME
@@ -41,7 +41,122 @@ kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device sound"
 .Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver is the main component of the
+.Fx
+sound system.
+It works in conjunction with a bridge device driver on supported devices
+and provides PCM audio record and playback once it attaches.
+Each bridge device driver supports a specific set of audio chipsets and
+needs to be enabled together with the
+.Nm
+driver.
+PCI and ISA PnP audio devices identify themselves so users are usually not
+required to add anything to
+.Pa /boot/device.hints .
+.Pp
+Some of the main features of the
+.Nm
+driver are: multichannel audio, per-application
+volume control, dynamic mixing through virtual sound channels, true full
+duplex operation, bit perfect audio, rate conversion and low latency
+modes.
+.Pp
+The
+.Nm
+driver is enabled by default, along with several bridge device drivers.
+Those not enabled by default can be loaded during runtime with
+.Xr kldload 8
+or during boot via
+.Xr loader.conf 5 .
+The following bridge device drivers are available:
+.Pp
+.Bl -bullet -compact
+.It
+.Xr snd_ad1816 4
+.It
+.Xr snd_ai2s 4 (enabled by default on powerpc)
+.It
+.Xr snd_als4000 4
+.It
+.Xr snd_atiixp 4
+.It
+.Xr snd_audiocs 4 (enabled by default on sparc64)
+.It
+.Xr snd_cmi 4
+.It
+.Xr snd_cs4281 4
+.It
+.Xr snd_csa 4
+.It
+.Xr snd_davbus 4 (enabled by default on powerpc)
+.It
+.Xr snd_ds1 4
+.It
+.Xr snd_emu10k1 4
+.It
+.Xr snd_emu10kx 4
+.It
+.Xr snd_envy24 4
+.It
+.Xr snd_envy24ht 4
+.It
+.Xr snd_es137x 4 (enabled by default on amd64, i386, sparc64)
+.It
+.Xr snd_ess 4
+.It
+.Xr snd_fm801 4
+.It
+.Xr snd_gusc 4
+.It
+.Xr snd_hda 4 (enabled by default on amd64, i386)
+.It
+.Xr snd_ich 4 (enabled by default on amd64, i386)
+.It
+.Xr snd_maestro 4
+.It
+.Xr snd_maestro3 4
+.It
+.Xr snd_mss 4
+.It
+.Xr snd_neomagic 4
+.It
+snd_sb16
+.It
+snd_sb8
+.It
+.Xr snd_sbc 4
+.It
+.Xr snd_solo 4
+.It
+.Xr snd_spicds 4
+.It
+.Xr snd_t4dwave 4 (enabled by default on sparc64)
+.It
+.Xr snd_uaudio 4 (enabled by default on amd64, i386, powerpc, sparc64)
+.It
+.Xr snd_via8233 4 (enabled by default on amd64, i386)
+.It
+.Xr snd_via82c686 4
+.It
+.Xr snd_vibes 4
+.El
 .Pp
+Refer to the manual page for each bridge device driver for driver specific
+settings and information.
+.Ss Legacy Hardware
+For old legacy
+.Tn ISA
+cards, the driver looks for
+.Tn MSS
+cards at addresses
+.Dv 0x530
+and
+.Dv 0x604 .
+These values can be overridden in
+.Pa /boot/device.hints .
 Non-PnP sound cards require the following lines in
 .Xr device.hints 5 :
 .Bd -literal -offset indent
@@ -50,33 +165,6 @@ hint.pcm.0.irq="5"
 hint.pcm.0.drq="1"
 hint.pcm.0.flags="0x0"
 .Ed
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for
-.Tn PCM
-audio play and capture.
-This driver also supports various
-.Tn PCI ,
-.Tn ISA ,
-.Tn WSS/MSS
-compatible
-sound cards, AC97 mixer and High Definition Audio.
-Once the
-.Nm
-driver attaches, supported devices provide audio record and
-playback channels.
-The
-.Fx
-sound system provides dynamic mixing
-.Dq VCHAN
-and rate conversion
-.Dq soft formats .
-True full duplex operation is available on most sound cards.
-.Pp
-If the sound card is supported by a bridge driver, the
-.Nm
-driver works in conjunction with the bridge driver.
 .Pp
 Apart from the usual parameters, the flags field is used to specify
 the secondary
@@ -85,24 +173,6 @@ channel (generally used for capture in full duplex cards).
 Flags are set to 0 for cards not using a secondary
 .Tn DMA
 channel, or to 0x10 + C to specify channel C.
-.Pp
-The driver does its best to recognize the installed hardware and drive
-it correctly so the user is not required to add several lines in
-.Pa /boot/device.hints .
-For
-.Tn PCI
-and
-.Tn ISA
-.Tn PnP
-cards this is actually easy
-since they identify themselves.
-For legacy
-.Tn ISA
-cards, the driver looks for
-.Tn MSS
-cards at addresses 0x530 and 0x604 (unless overridden
-in
-.Pa /boot/device.hints ) .
 .Ss Boot Variables
 In general, the module
 .Pa snd_foo
@@ -119,17 +189,18 @@ utility.
 Options which can be specified in
 .Pa /boot/loader.conf
 include:
-.Bl -tag -width ".Va snd_emu10k1_load" -offset indent
+.Bl -tag -width ".Va snd_driver_load" -offset indent
 .It Va snd_driver_load
 .Pq Dq Li NO
 If set to
 .Dq Li YES ,
 this option loads all available drivers.
-.It Va snd_emu10k1_load
+.It Va snd_hda_load
 .Pq Dq Li NO
 If set to
 .Dq Li YES ,
-only the SoundBlaster 5.1 driver and dependent modules will be loaded.
+only the Intel High Definition Audio bridge device driver and dependent
+modules will be loaded.
 .It Va snd_foo_load
 .Pq Dq Li NO
 If set to
@@ -155,8 +226,9 @@ This provides a base interface for related multichannel
 support.
 Multichannel audio works both with and without
 .Tn VCHANs .
-Most bridge device drivers are still missing multichannel matrixing support
-, but in most cases this should be trivial to implement.
+.Pp
+Most bridge device drivers are still missing multichannel matrixing
+support, but in most cases this should be trivial to implement.
 Use the
 .Va dev.pcm.%d.[play|rec].vchanformat
 .Xr sysctl(8)
@@ -173,7 +245,7 @@ controls (bass and treble).
 Commonly used for ear-candy or frequency compensation due to the vast
 difference in hardware quality.
 EQ is disabled by default, but can be enabled with the
-.Va hint.pcm. Ns Ao Ar X Ac Ns Va .eq
+.Va hint.pcm.%d.eq
 tunable.
 .Ss VCHANs
 Each device can optionally support more playback and recording channels
@@ -208,13 +280,13 @@ driver.
 The following tunables can not be changed during runtime using
 .Xr sysctl 8 .
 .Bl -tag -width indent
-.It Va hint.pcm. Ns Ao Ar X Ac Ns Va .eq
+.It Va hint.pcm.%d.eq
 Set to 1 or 0 to explicitly enable (1) or disable (0) the equalizer.
 Requires a driver reload if changed.
 Enabling this will make bass and treble controls appear in mixer applications.
 This tunable is undefined by default.
 Equalizing is disabled by default.
-.It Va hint.pcm. Ns Ao Ar X Ac Ns Va .vpc
+.It Va hint.pcm.%d.vpc
 Set to 1 or 0 to explicitly enable (1) or disable (0) the
 .Tn VPC
 feature.
@@ -512,6 +584,9 @@ On devices that have more than one recording source (ie: mic and line),
 there is a corresponding
 .Pa /dev/dsp%d.r%d
 device.
+The
+.Xr mixer 8
+utility can be used to start and stop recording from an specific device.
 .Ss Statistics
 Channel statistics are only kept while the device is open.
 So with situations involving overruns and underruns, consider the output
@@ -586,6 +661,31 @@ For specific sound card access, please instead use
 .Pa /dev/dsp
 or
 .Pa /dev/dsp%d .
+.Sh EXAMPLES
+Use the sound metadriver to load all
+.Nm
+bridge device drivers at once
+(for example if it is unclear which the correct driver to use is):
+.Pp
+.Dl kldload snd_driver
+.Pp
+Load a specific bridge device driver, in this case the Intel
+High Definition Audio driver:
+.Pp
+.Dl kldload snd_hda
+.Pp
+Check the status of all detected
+.Nm
+devices:
+.Pp
+.Dl cat /dev/sndstat
+.Pp
+Change the default sound device, in this case to the second device.
+This is handy if there are multiple
+.Nm
+devices available:
+.Pp
+.Dl sysctl hw.snd.default_unit=1
 .Sh DIAGNOSTICS
 .Bl -diag
 .It pcm%d:play:%d:dsp%d.p%d: play interrupt timeout, channel dead
@@ -596,12 +696,14 @@ A device node is not created properly.
 .El
 .Sh SEE ALSO
 .Xr snd_ad1816 4 ,
+.Xr snd_ai2s 4 ,
 .Xr snd_als4000 4 ,
 .Xr snd_atiixp 4 ,
 .Xr snd_audiocs 4 ,
 .Xr snd_cmi 4 ,
 .Xr snd_cs4281 4 ,
 .Xr snd_csa 4 ,
+.Xr snd_davbus 4 ,
 .Xr snd_ds1 4 ,
 .Xr snd_emu10k1 4 ,
 .Xr snd_emu10kx 4 ,
@@ -630,6 +732,7 @@ A device node is not created properly.
 .Xr loader.conf 5 ,
 .Xr dmesg 8 ,
 .Xr kldload 8 ,
+.Xr mixer 8 ,
 .Xr sysctl 8
 .Rs
 .%T "Cookbook formulae for audio EQ biquad filter coefficients, by Robert Bristow-Johnson"
diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4
index 36e8bb4..34880cd 100644
--- a/share/man/man4/puc.4
+++ b/share/man/man4/puc.4
@@ -35,11 +35,11 @@ Communications driver
 .Sh SYNOPSIS
 .Cd "device pci"
 .Cd "device puc"
-.Cd "device sio"
+.Cd "device uart"
 .Cd "device ppc"
 .Sh DESCRIPTION
 This driver acts as a shim to connect PCI serial and parallel ports to the
-.Xr sio 4
+.Xr uart 4
 and
 .Xr ppc 4
 driver.
@@ -49,14 +49,9 @@ The list of supported devices is in
 Support for new cards should be added there.
 .Sh SEE ALSO
 .Xr ppc 4 ,
-.Xr sio 4
+.Xr uart 4
 .Sh HISTORY
 This driver took the idea from the
 .Nx
 .Xr puc 4
-driver and still uses the same structure to describe cards, to ease exchanging
-card info.
-.Sh BUGS
-Only serial ports are supported through the
-.Xr sio 4
-driver at the moment.
+driver.
diff --git a/share/man/man4/rue.4 b/share/man/man4/rue.4
index e8f69ec..06f91e8 100644
--- a/share/man/man4/rue.4
+++ b/share/man/man4/rue.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd July 23, 2011
 .Dt RUE 4
 .Os
 .Sh NAME
@@ -139,8 +139,8 @@ The driver failed to allocate an mbuf for the receiver ring.
 .Xr ng_ether 4 ,
 .Xr ifconfig 8
 .Rs
-.%T "ReakTek RTL8150 data sheet"
-.%U ftp://ftp.realtek.com.tw/lancard/data_sheet/8150/
+.%T "RealTek RTL8150 data sheet"
+.%U http://pdf.seekdatasheet.com/2008714/200807142333305235.pdf
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index 84c01bf..5d0d983 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -63,10 +63,10 @@ the read-only sysctl variable
 .Pp
 .Fx
 allows specific CPUs on a multi-processor system to be disabled.
-The sysctl variable
-.Va machdep.hlt_cpus
-is an integer bitmask denoting CPUs to halt, counting from 0.
-Setting a bit to 1 will result in the corresponding CPU being
+This can be done using the
+.Va hint.lapic.X.disabled
+tunable, where X is the APIC ID of a CPU.
+Setting this tunable to 1 will result in the corresponding CPU being
 disabled.
 .Pp
 The
@@ -122,12 +122,12 @@ tasks on CPUs that are closely grouped together.
 supports hyperthreading on Intel CPU's on the i386 and AMD64 platforms.
 Since using logical CPUs can cause performance penalties under certain loads,
 the logical CPUs can be disabled by setting the
-.Va machdep.hlt_logical_cpus
-sysctl to one. 
-Note that this operation is different from the mechanism used by the
+.Va machdep.hyperthreading_allowed
+tunable to zero. 
 .Xr cpuset 1 .
 .Sh SEE ALSO
 .Xr mptable 1 ,
+.Xr loader 8 ,
 .Xr sysctl 8 ,
 .Xr condvar 9 ,
 .Xr msleep 9 ,
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 660e33e..1178e03 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 27, 2001
+.Dd July 23, 2011
 .Dt STF 4
 .Os
 .Sh NAME
@@ -230,7 +230,7 @@ and not to use your 6to4 prefix as a source.
 .Xr inet 4 ,
 .Xr inet6 4
 .Pp
-.Pa http://www.6bone.net/6bone_6to4.html
+.Pa http://www.ipv6day.org/action.php?n=En.IPv6day
 .Rs
 .%A Brian Carpenter
 .%A Keith Moore
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index 725dc4f..213e94a 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -38,7 +38,7 @@
 .\"     From: @(#)tcp.4	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
+.Dd September 15, 2011
 .Dt TCP 4
 .Os
 .Sh NAME
@@ -144,7 +144,7 @@ bandwidth-controlled window space.
 Select or query the congestion control algorithm that TCP will use for the
 connection.
 See
-.Xr cc 4
+.Xr mod_cc 4
 for details.
 .It Dv TCP_NODELAY
 Under most circumstances,
@@ -249,7 +249,7 @@ The default congestion control algorithm for
 is
 .Xr cc_newreno 4 .
 Other congestion control algorithms can be made available using the
-.Xr cc 4
+.Xr mod_cc 4
 framework.
 .Ss MIB Variables
 The
@@ -510,10 +510,10 @@ address.
 .Xr socket 2 ,
 .Xr sysctl 3 ,
 .Xr blackhole 4 ,
-.Xr cc 4 ,
 .Xr inet 4 ,
 .Xr intro 4 ,
 .Xr ip 4 ,
+.Xr mod_cc 4 ,
 .Xr syncache 4 ,
 .Xr setkey 8
 .Rs
diff --git a/share/man/man4/uhso.4 b/share/man/man4/uhso.4
index 7f60691..26d169b 100644
--- a/share/man/man4/uhso.4
+++ b/share/man/man4/uhso.4
@@ -79,6 +79,8 @@ The following devices have been verified to work
 .It
 Option GlobeSurfer iCON 7.2 (new firmware)
 .It
+Option GlobeTrotter Max 7.2 (new firmware)
+.It
 Option iCON 225
 .It
 Option iCON 452
diff --git a/share/man/man4/vxge.4 b/share/man/man4/vxge.4
index 72a644d..888413e 100644
--- a/share/man/man4/vxge.4
+++ b/share/man/man4/vxge.4
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd March 16, 2011
-.Dt VXGE 1
+.Dt VXGE 4
 .Os
 .Sh NAME
 .Nm vxge
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index 1e1a2bc..c8b49a5 100644
--- a/share/man/man4/wi.4
+++ b/share/man/man4/wi.4
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"	$OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $
 .\"
-.Dd January 4, 2010
+.Dd July 23, 2011
 .Dt WI 4
 .Os
 .Sh NAME
@@ -319,7 +319,7 @@ command.
 .Xr wpa_supplicant 8 .
 .Rs
 .%T HCF Light programming specification
-.%U http://www.wavelan.com
+.%U http://web.archive.org/web/20040130141721/http://wavelan.com/
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4
index b685f34..4a2d1e7 100644
--- a/share/man/man4/wlan.4
+++ b/share/man/man4/wlan.4
@@ -121,7 +121,7 @@ Note that an interface's type cannot be changed once it is created.
 .Pp
 .Nm
 defines several mechanisms by which plugin modules may
-be used to extend its' functionality.
+be used to extend its functionality.
 Cryptographic support such as WEP, TKIP, and AES-CCMP are implemented
 as standalone modules (if not statically configured into a system)
 that register with
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index d7d52c1..009ba33 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -1337,7 +1337,7 @@ Default is
 If the variable is
 .Dq Li YES
 privacy addresses will be generated for each IPv6
-interface as described in RFC 4193.
+interface as described in RFC 4941.
 .It Va ipv6_network_interfaces
 .Pq Vt str
 This is the IPv6 equivalent of
diff --git a/share/man/man5/reiserfs.5 b/share/man/man5/reiserfs.5
index dd7757c..2f3eaee 100644
--- a/share/man/man5/reiserfs.5
+++ b/share/man/man5/reiserfs.5
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 16, 2006
+.Dd July 23, 2011
 .Dt REISERFS 5
 .Os
 .Sh NAME
@@ -71,7 +71,6 @@ first appeared in
 .An -nosplit
 The ReiserFS kernel implementation was written by
 .An Hans Reiser
-.Pq Pa http://www.namesys.com/ ,
 and ported to
 .Fx
 by
diff --git a/share/man/man8/crash.8 b/share/man/man8/crash.8
index 94a0ecc..d290443 100644
--- a/share/man/man8/crash.8
+++ b/share/man/man8/crash.8
@@ -36,7 +36,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 2, 1996
+.Dd July 23, 2011
 .Dt CRASH 8
 .Os
 .Sh NAME
@@ -207,7 +207,7 @@ the panic message is printed.
 For more details consult the chapter on kernel debugging in
 the
 .%B "FreeBSD Developers' Handbook"
-.Pq Pa http://www.FreeBSD.org/ .
+.Pq Pa http://www.freebsd.org/doc/en/books/developers-handbook/ .
 .Sh SEE ALSO
 .Xr kgdb 1 ,
 .Xr dumpon 8 ,
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index a7282ea..3fcbc25 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 10, 2005
+.Dd August 7, 2011
 .Dt DISKLESS 8
 .Os
 .Sh NAME
@@ -417,7 +417,7 @@ or
 .Tn TFTP ,
 must include support for the NFS client:
 .Pp
-.D1 Cd "options NFSCLIENT"
+.D1 Cd "options NFSCL"
 .D1 Cd "options NFS_ROOT"
 .Pp
 If you are using a boot mechanism that does not pass network configuration
diff --git a/share/man/man9/DRIVER_MODULE.9 b/share/man/man9/DRIVER_MODULE.9
index 346177a..ca73945 100644
--- a/share/man/man9/DRIVER_MODULE.9
+++ b/share/man/man9/DRIVER_MODULE.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 16, 2000
+.Dd August 27, 2011
 .Dt DRIVER_MODULE 9
 .Os
 .Sh NAME
@@ -40,7 +40,6 @@
 .In sys/bus.h
 .In sys/module.h
 .Fn DRIVER_MODULE name busname "driver_t driver" "devclass_t devclass" "modeventhand_t evh" "void *arg"
-.Fn MULTI_DRIVER_MODULE name busname "driver_t drivers[]" "devclass_t devclass" "modeventhand_t evh" "void *arg"
 .Sh DESCRIPTION
 The
 .Fn DRIVER_MODULE
@@ -96,11 +95,6 @@ The
 is unused at this time and should be a
 .Dv NULL
 pointer.
-.Pp
-.Fn MULTI_DRIVER_MODULE
-is a special version of
-.Fn DRIVER_MODULE ,
-which takes a list of drivers instead of a single driver instance.
 .Sh SEE ALSO
 .Xr device 9 ,
 .Xr driver 9 ,
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index a04cb68..7d34c31 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -43,7 +43,6 @@ MAN=	accept_filter.9 \
 	BUS_SETUP_INTR.9 \
 	bus_space.9 \
 	byteorder.9 \
-	cc.9 \
 	cd.9 \
 	condvar.9 \
 	config_intrhook.9 \
@@ -169,6 +168,7 @@ MAN=	accept_filter.9 \
 	microtime.9 \
 	microuptime.9 \
 	mi_switch.9 \
+	mod_cc.9 \
 	module.9 \
 	MODULE_DEPEND.9 \
 	MODULE_VERSION.9 \
@@ -320,7 +320,7 @@ MAN=	accept_filter.9 \
 	vm_page_cache.9 \
 	vm_page_deactivate.9 \
 	vm_page_dontneed.9 \
-	vm_page_flag.9 \
+	vm_page_aflag.9 \
 	vm_page_free.9 \
 	vm_page_grab.9 \
 	vm_page_hold.9 \
@@ -605,7 +605,6 @@ MLINKS+=domain.9 DOMAIN_SET.9 \
 	domain.9 pfctlinput2.9 \
 	domain.9 pffindproto.9 \
 	domain.9 pffindtype.9
-MLINKS+=DRIVER_MODULE.9 MULTI_DRIVER_MODULE.9
 MLINKS+=EVENTHANDLER.9 EVENTHANDLER_DECLARE.9 \
 	EVENTHANDLER.9 EVENTHANDLER_DEREGISTER.9 \
 	EVENTHANDLER.9 eventhandler_deregister.9 \
@@ -1075,7 +1074,8 @@ MLINKS+=scheduler.9 curpriority_cmp.9 \
 	scheduler.9 setrunnable.9 \
 	scheduler.9 updatepri.9
 MLINKS+=securelevel_gt.9 securelevel_ge.9
-MLINKS+=selrecord.9 selwakeup.9
+MLINKS+=selrecord.9 seldrain.9 \
+	selrecord.9 selwakeup.9
 MLINKS+=sema.9 sema_destroy.9 \
 	sema.9 sema_init.9 \
 	sema.9 sema_post.9 \
@@ -1372,8 +1372,9 @@ MLINKS+=vm_page_bits.9 vm_page_clear_dirty.9 \
 	vm_page_bits.9 vm_page_test_dirty.9 \
 	vm_page_bits.9 vm_page_undirty.9 \
 	vm_page_bits.9 vm_page_zero_invalid.9
-MLINKS+=vm_page_flag.9 vm_page_flag_clear.9 \
-	vm_page_flag.9 vm_page_flag_set.9
+MLINKS+=vm_page_aflag.9 vm_page_aflag_clear.9 \
+	vm_page_aflag.9 vm_page_aflag_set.9 \
+	vm_page_aflag.9 vm_page_reference.9
 MLINKS+=vm_page_free.9 vm_page_free_toq.9 \
 	vm_page_free.9 vm_page_free_zero.9 \
 	vm_page_free.9 vm_page_try_to_free.9
diff --git a/share/man/man9/cc.9 b/share/man/man9/mod_cc.9
index 6a37984..75e2db0 100644
--- a/share/man/man9/cc.9
+++ b/share/man/man9/mod_cc.9
@@ -31,11 +31,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2011
-.Dt CC 9
+.Dd September 15, 2011
+.Dt MOD_CC 9
 .Os
 .Sh NAME
-.Nm cc ,
+.Nm mod_cc ,
 .Nm DECLARE_CC_MODULE ,
 .Nm CC_VAR
 .Nd Modular Congestion Control
@@ -53,7 +53,7 @@ loadable kernel modules via the
 facility.
 Transport protocols can select from the list of available algorithms on a
 connection-by-connection basis, or use the system default (see
-.Xr cc 4
+.Xr mod_cc 4
 for more details).
 .Pp
 .Nm
@@ -290,13 +290,13 @@ by the value of the congestion window.
 Algorithms should use the abscence of this flag being set to avoid accumulating
 a large difference between the congestion window and send window.
 .Sh SEE ALSO
-.Xr cc 4 ,
 .Xr cc_chd 4 ,
 .Xr cc_cubic 4 ,
 .Xr cc_hd 4 ,
 .Xr cc_htcp 4 ,
 .Xr cc_newreno 4 ,
 .Xr cc_vegas 4 ,
+.Xr mod_cc 4 ,
 .Xr tcp 4
 .Sh ACKNOWLEDGEMENTS
 Development and testing of this software were made possible in part by grants
diff --git a/share/man/man9/selrecord.9 b/share/man/man9/selrecord.9
index 15c5a18..f7a0113 100644
--- a/share/man/man9/selrecord.9
+++ b/share/man/man9/selrecord.9
@@ -26,10 +26,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 13, 2007
+.Dd August 25, 2011
 .Dt SELRECORD 9
 .Os
 .Sh NAME
+.Nm seldrain ,
 .Nm selrecord ,
 .Nm selwakeup
 .Nd "record and wakeup select requests"
@@ -37,14 +38,17 @@
 .In sys/param.h
 .In sys/selinfo.h
 .Ft void
+.Fn seldrain "struct selinfo *sip"
+.Ft void
 .Fn selrecord "struct thread *td" "struct selinfo *sip"
 .Ft void
 .Fn selwakeup "struct selinfo *sip"
 .Sh DESCRIPTION
+.Fn seldrain ,
 .Fn selrecord
 and
 .Fn selwakeup
-are the two central functions used by
+are the three central functions used by
 .Xr select 2 ,
 .Xr poll 2
 and the objects that are being selected on.
@@ -86,6 +90,15 @@ and
 .Xr poll 2
 when they wake up.
 .Pp
+.Fn seldrain
+will flush the waiters queue on a specified object before its
+destruction.
+The object handling code must ensure that
+.Fa *sip
+cannot be used once
+.Fn seldrain
+has been called.
+.Pp
 The contents of
 .Fa *sip
 must be zeroed, such as by softc initialization, before any call to
@@ -98,6 +111,10 @@ acquires and releases
 .Va sellock
 and may acquire and release
 .Va sched_lock .
+.Fn seldrain
+could usually be just a wrapper for
+.Fn selwakeup ,
+but consumers should not generally rely on this feature.
 .Sh SEE ALSO
 .Xr poll 2 ,
 .Xr select 2
diff --git a/share/man/man9/taskqueue.9 b/share/man/man9/taskqueue.9
index 9a517e8..40d64af 100644
--- a/share/man/man9/taskqueue.9
+++ b/share/man/man9/taskqueue.9
@@ -133,7 +133,7 @@ If the task's
 .Va ta_pending
 field is non-zero,
 then it is simply incremented to reflect the number of times the task
-was enqueued.
+was enqueued, up to a cap of USHRT_MAX.
 Otherwise,
 the task is added to the list before the first task which has a lower
 .Va ta_priority
@@ -188,7 +188,8 @@ The
 count is cleared, and the old value returned in the reference
 parameter
 .Fa pendp ,
-if it is non- Dv NULL .
+if it is non-
+.Dv NULL .
 If the task is currently running,
 .Dv EBUSY
 is returned, otherwise 0.
diff --git a/share/man/man9/vfs_getopt.9 b/share/man/man9/vfs_getopt.9
index 8d8d3b3..09db47c 100644
--- a/share/man/man9/vfs_getopt.9
+++ b/share/man/man9/vfs_getopt.9
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 2, 2009
+.Dd July 31, 2011
 .Dt VFS_GETOPT 9
 .Os
 .Sh NAME
@@ -51,7 +51,7 @@
 .Fn vfs_getops "struct vfsoptlist *opts" "const char *name" "int *error"
 .Ft int
 .Fo vfs_flagopt
-.Fa "struct vfsoptlist *opts" "const char *name" "u_int *flags" "u_int flag"
+.Fa "struct vfsoptlist *opts" "const char *name" "uint64_t *flags" "uint64_t flag"
 .Fc
 .Ft int
 .Fo vfs_scanopt
diff --git a/share/man/man9/vm_page_flag.9 b/share/man/man9/vm_page_aflag.9
index 5a1d75f..8ef5d87 100644
--- a/share/man/man9/vm_page_flag.9
+++ b/share/man/man9/vm_page_aflag.9
@@ -26,36 +26,75 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 14, 2001
+.Dd August 31, 2011
 .Dt VM_PAGE_FLAG 9
 .Os
 .Sh NAME
-.Nm vm_page_flag_clear , vm_page_flag_set
-.Nd "change page flags"
+.Nm vm_page_aflag_clear , vm_page_aflag_set , vm_page_reference
+.Nd "change page atomic flags"
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
 .In vm/vm_page.h
 .Ft void
-.Fn vm_page_flag_clear "vm_page_t m" "unsigned short bits"
+.Fn vm_page_aflag_clear "vm_page_t m" "uint8_t bits"
 .Ft void
-.Fn vm_page_flag_set "vm_page_t m" "unsigned short bits"
+.Fn vm_page_aflag_set "vm_page_t m" "uint8_t bits"
+.Ft void
+.Fn vm_page_reference "vm_page_t m"
 .Sh DESCRIPTION
 The
-.Fn vm_page_flag_clear
-atomically clears the specified bits on the page's flags.
+.Fn vm_page_aflag_clear
+atomically clears the specified bits on the page's
+.Va aflags .
+.Pp
+The
+.Fn vm_page_aflag_set
+atomically sets the specified bits on the page's
+.Va aflags .
 .Pp
 The
-.Fn vm_page_flag_set
-atomically sets the specified bits on the page's flags.
+.Fn vm_page_reference m
+call is the same as
+.Bd -literal -offset indent
+vm_page_aflag_set(m, PGA_REFERENCED);
+.Ed
+.Lp
+and is the recommended way to mark the page as referenced from
+third-party kernel modules.
+.Pp
+These functions neither block nor require any locks to be held
+around the calls for correctness.
 .Pp
 The functions arguments are:
 .Bl -tag -width ".Fa bits"
 .It Fa m
-The page whose flags are updated.
+The page whose
+.Va aflags
+are updated.
 .It Fa bits
 The bits that are set or cleared on the page's flags.
 .El
+.Pp
+The following
+.Va aflags
+can be set or cleared:
+.Bl -tag -width ".Fa PGA_REFERENCED"
+.It Fa PGA_REFERENCED
+The bit may be set to indicate that the page has been recently accessed.
+For instance,
+.Xr pmap 9
+sets this bit to reflect the accessed attribute of the page mapping
+typically updated by processor's memory management unit on the page access.
+.It Fa PGA_WRITEABLE
+A writeable mapping for the page may exist.
+.El
+.Pp
+Both
+.Dv PGA_REFERENCED
+and
+.Dv PGA_WRITEABLE
+bits are only valid for the managed pages.
 .Sh AUTHORS
 This manual page was written by
 .An Chad David Aq davidc@acns.ab.ca .
diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot
index f83a371..3754bb7 100644
--- a/share/misc/committers-doc.dot
+++ b/share/misc/committers-doc.dot
@@ -57,6 +57,7 @@ danger [label="Daniel Gerzo\ndanger@FreeBSD.org\n2006/08/20"]
 delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"]
 gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2007/02/02"]
 ganbold [label="Ganbold Tsagaankhuu\nganbold@FreeBSD.org\n2008/02/26"]
+gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2011/07/18"]
 gjb [label="Glen Barber\ngjb@FreeBSD.org\n2010/09/01"]
 hrs [label="Hiroki Sato\nhrs@FreeBSD.org\n2000/07/06"]
 jkois [label="Johann Kois\njkois@FreeBSD.org\n2004/11/11"]
@@ -83,6 +84,8 @@ trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/03/25"]
 # Group together all the mentees for a particular mentor.
 # Keep the list sorted by mentor login.
 
+bcr -> gavin
+
 blackend -> ale
 
 brueffer -> joel
@@ -110,6 +113,7 @@ jim -> trhodes
 
 jkois -> miwi
 jkois -> bcr
+jkois -> gavin
 jkois -> gjb
 
 keramida -> blackend
diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps
index 73e24cf..95681f4 100644
--- a/share/syscons/keymaps/INDEX.keymaps
+++ b/share/syscons/keymaps/INDEX.keymaps
@@ -117,6 +117,8 @@ danish.cp865.kbd:fr:Danois Code page 865
 danish.cp865.kbd:pt:Dinamarquês Codepage 865
 danish.cp865.kbd:es:Danés Codepage 865
 
+dutch.iso.acc.kbd:en:Dutch ISO keymap (accent keys)
+
 eee_nordic.kbd:en:Nordic layout on Asus eeePC
 eee_nordic.kbd:fr:Norvégien phonétique sur Asus eeePC
 
@@ -368,6 +370,14 @@ ru.koi8-r.shift.kbd:pt:Russo koi8-r (shift)
 ru.koi8-r.shift.kbd:es:Ruso koi8-r (shift)
 ru.koi8-r.shift.kbd:uk:òÏÓ¦ÊÓØËÁ koi8-r (shift)
 
+ru.koi8-r.win.kbd:en:Russian koi8-r (winkeys)
+ru.koi8-r.win.kbd:de:Russisch koi8-r (winkeys)
+ru.koi8-r.win.kbd:ru:òÕÓÓËÉÊ koi8-r (winkeys)
+ru.koi8-r.win.kbd:fr:Russe koi8-r (winkeys)
+ru.koi8-r.win.kbd:pt:Russo koi8-r (winkeys)
+ru.koi8-r.win.kbd:es:Ruso koi8-r (winkeys)
+ru.koi8-r.win.kbd:uk:òÏÓ¦ÊÓØËÁ koi8-r (winkeys)
+
 spanish.iso.kbd:en:Spanish ISO-8859-1
 spanish.iso.kbd:de:Spanisch ISO-8859-1
 spanish.iso.kbd:fr:Espagnol ISO-8859-1
@@ -456,12 +466,16 @@ uk.iso.kbd:fr:Royaume Uni ISO-8859-1
 uk.iso.kbd:pt:Reino Unido ISO-8859-1
 uk.iso.kbd:es:Británico ISO-8859-1
 
+uk.iso-ctrl.kbd:en:United Kingdom ISO-8859-1 (Caps Lock acts as Left Ctrl)
+
 uk.cp850.kbd:en:United Kingdom Codepage 850
 uk.cp850.kbd:de:Vereinigtes Königreich Codeseite 850
 uk.cp850.kbd:fr:Royaume Uni Code page 850
 uk.cp850.kbd:pt:Reino Unido Codepage 850
 uk.cp850.kbd:es:Británico Codepage 850
 
+uk.cp850-ctrl.kbd:en:United Kingdom Codepage 850 (Caps Lock acts as Left Ctrl)
+
 uk.dvorak.kbd:en:United Kingdom Dvorak
 uk.dvorak.kbd:de:Vereinigtes K\xf6nigreich Dvorak
 uk.dvorak.kbd:fr:Royaume Uni Dvorak
@@ -510,6 +524,8 @@ us.emacs.kbd:fr:États Unis d'Amérique emacs
 us.emacs.kbd:pt:Estados Unidos da América emacs
 us.emacs.kbd:es:Estadounidense optimizado para Emacs
 
+us.pc-ctrl.kbd:en:United States of America ISO-8859-1 (Caps Lock acts as Left Ctrl)
+
 us.unix.kbd:en:United States of America Traditional Unix Workstation
 us.unix.kbd:de:US-amerikanisch traditionelles Unix Layout
 us.unix.kbd:fr:États Unis d'Amérique unix