svn merge svn+ssh://svn.freebsd.org/base/head@208996

124 files changed, 1691 insertions, 634 deletions

diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile
index bc079ec..3ae8eca 100644
--- a/share/doc/legal/Makefile
+++ b/share/doc/legal/Makefile
@@ -2,6 +2,7 @@
 
 SUBDIR=	intel_ipw \
 	intel_iwi \
+	intel_iwn \
 	intel_wpi
 
 .include <bsd.subdir.mk>
diff --git a/share/doc/legal/intel_iwn/Makefile b/share/doc/legal/intel_iwn/Makefile
new file mode 100644
index 0000000..9a29dfa
--- /dev/null
+++ b/share/doc/legal/intel_iwn/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NO_OBJ=
+FILES=		${.CURDIR}/../../../../sys/contrib/dev/iwn/LICENSE
+FILESDIR=	${SHAREDIR}/doc/legal/intel_iwn
+
+.include <bsd.prog.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 99d92c0..7d011e3 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -15,6 +15,7 @@ LDIRS=	BSD_daemon \
 	find_interface \
 	hast \
 	ibcs2 \
+	indent \
 	ipfw \
 	kld \
 	libvgl \
@@ -77,6 +78,7 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	hast/vip-up.sh \
 	ibcs2/README \
 	ibcs2/hello.uu \
+	indent/indent.pro \
 	ipfw/change_rules.sh \
 	kld/Makefile \
 	kld/cdev/Makefile \
diff --git a/share/man/Makefile b/share/man/Makefile
index f1929dc..524235c 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -9,10 +9,12 @@ SUBDIR=	man1 man3 man4 man5 man6 man7 man8 man9
 MAKEWHATIS?=	makewhatis
 
 makedb:
+.if ${MK_MAN_UTILS} != "no"
 	${MAKEWHATIS} ${DESTDIR}${BINDIR}/man
 .if ${MK_OPENSSL} != "no"
 	${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man
 .endif
+.endif
 
 .include "${.CURDIR}/../Makefile.inc"
 .include <bsd.subdir.mk>
diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index 0a93c21..e2d9da3 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 14, 2006
+.Dd May 9, 2010
 .Dt BUILTIN 1
 .Os
 .Sh NAME
@@ -36,6 +36,7 @@
 .Nm \&. ,
 .Nm \&: ,
 .Nm @ ,
+.Nm \&[ ,
 .Nm { ,
 .Nm } ,
 .Nm alias ,
@@ -195,11 +196,12 @@ but are implemented as scripts using a builtin command of the same name.
 .It Xo
 .Em "Command	External" Ta Xr csh 1 Ta Xr sh 1
 .Xc
-.It Ic ! Ta \&No Ta \&No Ta Yes
+.It Ic \&! Ta \&No Ta \&No Ta Yes
 .It Ic % Ta \&No Ta Yes Ta \&No
-.It Ic . Ta \&No Ta \&No Ta Yes
-.It Ic : Ta \&No Ta Yes Ta Yes
-.It Ic @ Ta \&No Ta Yes Ta Yes
+.It Ic \&. Ta \&No Ta \&No Ta Yes
+.It Ic \&: Ta \&No Ta Yes Ta Yes
+.It Ic @ Ta \&No Ta Yes Ta \&No
+.It Ic \&[ Ta Yes Ta \&No Ta Yes
 .It Ic { Ta \&No Ta \&No Ta Yes
 .It Ic } Ta \&No Ta \&No Ta Yes
 .It Ic alias Ta No** Ta Yes Ta Yes
@@ -243,7 +245,7 @@ but are implemented as scripts using a builtin command of the same name.
 .It Ic getopts Ta No** Ta \&No Ta Yes
 .It Ic glob Ta \&No Ta Yes Ta \&No
 .It Ic goto Ta \&No Ta Yes Ta \&No
-.It Ic hash Ta \&No Ta \&No Ta Yes
+.It Ic hash Ta No** Ta \&No Ta Yes
 .It Ic hashstat Ta \&No Ta Yes Ta \&No
 .It Ic history Ta \&No Ta Yes Ta \&No
 .It Ic hup Ta \&No Ta Yes Ta \&No
@@ -288,8 +290,8 @@ but are implemented as scripts using a builtin command of the same name.
 .It Ic times Ta \&No Ta \&No Ta Yes
 .It Ic trap Ta \&No Ta \&No Ta Yes
 .It Ic true Ta Yes Ta \&No Ta Yes
-.It Ic type Ta \&No Ta \&No Ta Yes
-.It Ic ulimit Ta \&No Ta \&No Ta Yes
+.It Ic type Ta No** Ta \&No Ta Yes
+.It Ic ulimit Ta No** Ta \&No Ta Yes
 .It Ic umask Ta No** Ta Yes Ta Yes
 .It Ic unalias Ta No** Ta Yes Ta Yes
 .It Ic uncomplete Ta \&No Ta Yes Ta \&No
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index ad176aa..9e536a0 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -251,7 +251,11 @@ PTHREAD_MLINKS+=pthread_barrierattr.3 pthread_barrierattr_destroy.3 \
 PTHREAD_MLINKS+=pthread_barrier_destroy.3 pthread_barrier_init.3 \
 		pthread_barrier_destroy.3 pthread_barrier_wait.3
 PTHREAD_MLINKS+=pthread_condattr.3 pthread_condattr_destroy.3 \
-		pthread_condattr.3 pthread_condattr_init.3
+		pthread_condattr.3 pthread_condattr_init.3 \
+		pthread_condattr.3 pthread_condattr_getclock.3 \
+		pthread_condattr.3 pthread_condattr_setclock.3 \
+		pthread_condattr.3 pthread_condattr_getpshared.3 \
+		pthread_condattr.3 pthread_condattr_setpshared.3
 PTHREAD_MLINKS+=pthread_getconcurrency.3 pthread_setconcurrency.3
 PTHREAD_MLINKS+=pthread_multi_np.3 pthread_single_np.3
 PTHREAD_MLINKS+=pthread_mutexattr.3 pthread_mutexattr_destroy.3 \
diff --git a/share/man/man3/fpgetround.3 b/share/man/man3/fpgetround.3
index 33c94b7..73fc1a0 100644
--- a/share/man/man3/fpgetround.3
+++ b/share/man/man3/fpgetround.3
@@ -170,10 +170,10 @@ At present, they are implemented only on the i386 and amd64 platforms.
 .Sh SEE ALSO
 .Xr fenv 3 ,
 .Xr isnan 3
+.Sh HISTORY
+These routines are based on SysV/386 routines of the same name.
 .Sh CAVEATS
 After a floating point exception and before a mask is set, the sticky
 flags must be reset.
 If another exception occurs before the sticky
 flags are reset, then a wrong exception type may be signaled.
-.Sh HISTORY
-These routines are based on SysV/386 routines of the same name.
diff --git a/share/man/man3/pthread_cond_timedwait.3 b/share/man/man3/pthread_cond_timedwait.3
index 0162569..11a3c2f 100644
--- a/share/man/man3/pthread_cond_timedwait.3
+++ b/share/man/man3/pthread_cond_timedwait.3
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 28, 1998
+.Dd May 9, 2010
 .Dt PTHREAD_COND_TIMEDWAIT 3
 .Os
 .Sh NAME
@@ -56,6 +56,11 @@ time specified in
 .Fa abstime ,
 and the current thread reacquires the lock on
 .Fa mutex .
+.Pp
+The clock used to measure
+.Fa abstime
+can be specified during creation of the condition variable using
+.Xr pthread_condattr_setclock 3 .
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_cond_timedwait
@@ -87,7 +92,8 @@ was not locked by the calling thread.
 .Xr pthread_cond_destroy 3 ,
 .Xr pthread_cond_init 3 ,
 .Xr pthread_cond_signal 3 ,
-.Xr pthread_cond_wait 3
+.Xr pthread_cond_wait 3 ,
+.Xr pthread_condattr_setclock 3
 .Sh STANDARDS
 The
 .Fn pthread_cond_timedwait
diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3
index bf28987..e232ef6 100644
--- a/share/man/man3/pthread_condattr.3
+++ b/share/man/man3/pthread_condattr.3
@@ -26,12 +26,16 @@
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd April 28, 2000
+.Dd May 9, 2010
 .Dt PTHREAD_CONDATTR 3
 .Os
 .Sh NAME
 .Nm pthread_condattr_init ,
-.Nm pthread_condattr_destroy
+.Nm pthread_condattr_destroy ,
+.Nm pthread_condattr_getclock ,
+.Nm pthread_condattr_setclock ,
+.Nm pthread_condattr_getpshared ,
+.Nm pthread_condattr_setpshared ,
 .Nd condition attribute operations
 .Sh LIBRARY
 .Lb libpthread
@@ -41,14 +45,17 @@
 .Fn pthread_condattr_init "pthread_condattr_t *attr"
 .Ft int
 .Fn pthread_condattr_destroy "pthread_condattr_t *attr"
+.Ft int
+.Fn pthread_condattr_getclock "pthread_condattr_t * restrict attr" "clock_t * restrict clock_id"
+.Ft int
+.Fn pthread_condattr_setclock "pthread_condattr_t *attr" "clock_t clock_id"
+.Ft int
+.Fn pthread_condattr_getpshared "pthread_condattr_t * restrict attr" "int * restrict pshared"
+.Ft int
+.Fn pthread_condattr_setpshared "pthread_condattr_t *attr" "int pshared"
 .Sh DESCRIPTION
 Condition attribute objects are used to specify parameters to
 .Fn pthread_cond_init .
-.Fx Ns 's
-implementation of conditions does not support any non-default
-attributes, so these functions are not very useful, though they are required
-to be present by
-.Tn POSIX .
 .Pp
 The
 .Fn pthread_condattr_init
@@ -57,6 +64,52 @@ function initializes a condition attribute object with the default attributes.
 The
 .Fn pthread_condattr_destroy
 function destroys a condition attribute object.
+.Pp
+The
+.Fn pthread_condattr_getclock
+function will put the value of the clock attribute from
+.Fa attr
+into the memory area pointed to by
+.Fa clock_id .
+The
+.Fn pthread_condattr_setclock
+function will set the clock attribute of
+.Fa attr
+to the value specified in
+.Fa clock_id .
+The clock attribute affects the interpretation of
+.Fa abstime
+in
+.Xr pthread_cond_timedwait 3
+and may be set to
+.Dv CLOCK_REALTIME
+(default)
+or
+.Dv CLOCK_MONOTONIC .
+.Pp
+The
+.Fn pthread_condattr_getpshared
+function will put the value of the process-shared attribute from
+.Fa attr
+into the memory area pointed to by
+.Fa pshared .
+The
+.Fn pthread_condattr_setpshared
+function will set the process-shared attribute of
+.Fa attr
+to the value specified in
+.Fa pshared .
+The argument
+.Fa pshared
+may have one of the following values:
+.Bl -tag -width ".Dv PTHREAD_PROCESS_PRIVATE"
+.It Dv PTHREAD_PROCESS_PRIVATE
+The condition variable it is attached to may only be accessed by
+threads in the same process as the one that created the object.
+.It Dv PTHREAD_PROCESS_SHARED
+The condition variable it is attached to may be accessed by
+threads in processes other than the one that created the object.
+.El
 .Sh RETURN VALUES
 If successful, these functions return 0.
 Otherwise, an error number is returned to indicate the error.
@@ -77,8 +130,29 @@ function will fail if:
 Invalid value for
 .Fa attr .
 .El
+.Pp
+The
+.Fn pthread_condattr_setclock
+function will fail if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The value specified in
+.Fa clock_id
+is not one of the allowed values.
+.El
+.Pp
+The
+.Fn pthread_condattr_setpshared
+function will fail if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The value specified in
+.Fa pshared
+is not one of the allowed values.
+.El
 .Sh SEE ALSO
-.Xr pthread_cond_init 3
+.Xr pthread_cond_init 3 ,
+.Xr pthread_cond_timedwait 3
 .Sh STANDARDS
 The
 .Fn pthread_condattr_init
@@ -86,3 +160,15 @@ and
 .Fn pthread_condattr_destroy
 functions conform to
 .St -p1003.1-96
+.Sh BUGS
+The implementation of
+condition variables
+does not fully conform to
+.St -p1003.2
+because the process-shared attribute is ignored;
+if any value other than
+.Dv PTHREAD_PROCESSES_PRIVATE
+is specified in a call to
+.Fn pthread_condattr_setpshared ,
+it will return
+.Er EINVAL .
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 3a897b1..9828911 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -220,6 +220,7 @@ MAN=	aac.4 \
 	msk.4 \
 	mtio.4 \
 	multicast.4 \
+	mvs.4 \
 	mwl.4 \
 	mwlfw.4 \
 	mxge.4 \
@@ -273,6 +274,7 @@ MAN=	aac.4 \
 	ng_nat.4 \
 	ng_netflow.4 \
 	ng_one2many.4 \
+	ng_patch.4 \
 	ng_ppp.4 \
 	ng_pppoe.4 \
 	ng_pptpgre.4 \
@@ -434,6 +436,7 @@ MAN=	aac.4 \
 	udav.4 \
 	udbp.4 \
 	udp.4 \
+	uep.4 \
 	ufm.4 \
 	ufoma.4 \
 	uftdi.4 \
diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index 69c1837..40b892d 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 9, 2010
+.Dd June 2, 2010
 .Dt ACPI 4
 .Os
 .Sh NAME
@@ -599,10 +599,8 @@ The
 .Nm
 CPU idle power management drive conflicts with the local APIC (LAPIC)
 timer.
-Disable APIC mode with
-.Va hint.apic.0.disabled
+Disable the local APIC timer with
+.Va hint.apic.0.clock=0
 or do not use the
-.Li C2
-and
 .Li C3
-states if APIC mode is enabled.
+and deeper states if the local APIC timer is enabled.
diff --git a/share/man/man4/ae.4 b/share/man/man4/ae.4
index 0b5e8f8..36951b2 100644
--- a/share/man/man4/ae.4
+++ b/share/man/man4/ae.4
@@ -133,6 +133,14 @@ instead.
 .Xr ng_ether 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+driver and this manual page was written by
+.An Stanislav Sedov
+.Aq stas@FreeBSD.org .
+It first appeared in
+.Fx 7.1 .
 .Sh BUGS
 The Attansic L2 FastEthernet contoller supports DMA but does not use a
 descriptor based transfer mechanism via scatter-gather DMA.
@@ -142,11 +150,3 @@ Furthermore, a lot of data alignment restrictions apply.
 This may introduce a high CPU load on systems with heavy network activity.
 Luckily enough this should not be a problem on modern hardware as L2 does
 not support speeds faster than 100Mbps.
-.Sh HISTORY
-The
-.Nm
-driver and this manual page was written by
-.An Stanislav Sedov
-.Aq stas@FreeBSD.org .
-It first appeared in
-.Fx 7.1 .
diff --git a/share/man/man4/ahb.4 b/share/man/man4/ahb.4
index 6ef9993..fab6fec 100644
--- a/share/man/man4/ahb.4
+++ b/share/man/man4/ahb.4
@@ -70,13 +70,6 @@ Adaptec AHA-1740A
 .It
 Adaptec AHA-1742A
 .El
-.Sh CAVEATS
-The Adaptec 174X is very sensitive to SCSI bus termination and cable
-length.
-It may also have difficulties operating with some modern devices
-that, due to their speed, expose timing problems in the controller.
-There are no known mechanisms for working around device incompatibilities of
-this nature.
 .Sh SEE ALSO
 .Xr aha 4 ,
 .Xr ahc 4 ,
@@ -90,3 +83,10 @@ The
 .Nm
 driver was written by
 .An Justin T. Gibbs .
+.Sh CAVEATS
+The Adaptec 174X is very sensitive to SCSI bus termination and cable
+length.
+It may also have difficulties operating with some modern devices
+that, due to their speed, expose timing problems in the controller.
+There are no known mechanisms for working around device incompatibilities of
+this nature.
diff --git a/share/man/man4/amdtemp.4 b/share/man/man4/amdtemp.4
index 6d1ca7c..b955d70 100644
--- a/share/man/man4/amdtemp.4
+++ b/share/man/man4/amdtemp.4
@@ -64,9 +64,6 @@ located in each CPU core.
 For the K10 and K11 families, the driver creates
 .Va dev.cpu.%d.temperature
 with the temperature of each core.
-.Sh BUGS
-AMD K9 is not supported because temperature reporting has been replaced
-by Maltese.
 .Sh SEE ALSO
 .Xr sysctl 8
 .Sh HISTORY
@@ -77,3 +74,6 @@ driver first appeared in
 .Sh AUTHORS
 .An Rui Paulo Aq rpaulo@FreeBSD.org
 .An Norikatsu Shigemura Aq nork@FreeBSD.org
+.Sh BUGS
+AMD K9 is not supported because temperature reporting has been replaced
+by Maltese.
diff --git a/share/man/man4/ataraid.4 b/share/man/man4/ataraid.4
index ee7446d..98d3068 100644
--- a/share/man/man4/ataraid.4
+++ b/share/man/man4/ataraid.4
@@ -135,9 +135,6 @@ ATA RAID device nodes
 .Sh SEE ALSO
 .Xr ata 4 ,
 .Xr atacontrol 8
-.Sh CAVEATS
-RAID5 is not supported at this time.
-Code exists, but it neither uses nor maintains parity information.
 .Sh AUTHORS
 .An -nosplit
 The
@@ -146,3 +143,6 @@ driver was written by
 .An S\(/oren Schmidt Aq sos@FreeBSD.org .
 This manual page was written by
 .An Christian Brueffer Aq brueffer@FreeBSD.org .
+.Sh CAVEATS
+RAID5 is not supported at this time.
+Code exists, but it neither uses nor maintains parity information.
diff --git a/share/man/man4/bwn.4 b/share/man/man4/bwn.4
index 1293c36..b75f9d0 100644
--- a/share/man/man4/bwn.4
+++ b/share/man/man4/bwn.4
@@ -123,7 +123,7 @@ ifconfig wlan create wlandev bwn0 ssid my_net \e
 The
 .Nm
 driver first appeared in
-.Fx 8.0 .
+.Fx 8.1 .
 .Sh AUTHORS
 .An -nosplit
 The
diff --git a/share/man/man4/cas.4 b/share/man/man4/cas.4
index 7851a99..cc050c9 100644
--- a/share/man/man4/cas.4
+++ b/share/man/man4/cas.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 15, 2009
+.Dd May 3, 2010
 .Dt CAS 4
 .Os
 .Sh NAME
@@ -91,6 +91,9 @@ driver at this time:
 .Pp
 .Bl -bullet -compact
 .It
+Sun GigaSwift Ethernet 1.0 MMF (Cassini Kuheen)
+(part no.\& 501-5524)
+.It
 Sun GigaSwift Ethernet 1.0 UTP (Cassini)
 (part no.\& 501-5902)
 .It
diff --git a/share/man/man4/cmx.4 b/share/man/man4/cmx.4
index b71bf66..b8db111 100644
--- a/share/man/man4/cmx.4
+++ b/share/man/man4/cmx.4
@@ -67,11 +67,6 @@ and
 are supported and work as expected.  An open file descriptor
 will always be ready for writing, but only ready for reading
 if the device indicates that it has data available.
-.Sh COMPATIBILITY
-Userland smartcard code written for the vendor's Linux drivers
-should work with the
-.Nm
-driver without modification.
 .Sh FILES
 .Bl -tag -width /usr/ports/security/openct -compact
 .It Pa /dev/cmx\fBn\fP
@@ -91,6 +86,11 @@ devices.
 .\".Nm
 .\"devices.
 .El
+.Sh COMPATIBILITY
+Userland smartcard code written for the vendor's Linux drivers
+should work with the
+.Nm
+driver without modification.
 .Sh SEE ALSO
 .Xr pccard 4
 .Sh HISTORY
diff --git a/share/man/man4/cpuctl.4 b/share/man/man4/cpuctl.4
index 09b2d4e..bf1bdde 100644
--- a/share/man/man4/cpuctl.4
+++ b/share/man/man4/cpuctl.4
@@ -148,10 +148,10 @@ The
 .Nm
 driver first appeared in
 .Fx 7.2 .
-.Sh BUGS
-Yes, probably, report if any.
 .Sh AUTHORS
 The
 .Nm
 module and this manual page were written by
 .An Stanislav Sedov Aq stas@FreeBSD.org .
+.Sh BUGS
+Yes, probably, report if any.
diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4
index fffcdf4..d3a49c2 100644
--- a/share/man/man4/dcons.4
+++ b/share/man/man4/dcons.4
@@ -122,4 +122,4 @@ dcons_gdb="1"
 .An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
 .Sh BUGS
 This driver is
-.Ud .
+.Ud
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 6f7412e..2500ccb 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -60,7 +60,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 29, 2008
+.Dd May 24, 2010
 .Dt DDB 4
 .Os
 .Sh NAME
@@ -964,7 +964,7 @@ is printed.
 Show all threads within the system.
 Output format is as follows:
 .Pp
-.Bl -tag -width "PPID" -compact -offset indent -width "Second column"
+.Bl -tag -compact -offset indent -width "Second column"
 .It Ic First column
 Thread identifier (TID)
 .It Ic Second column
@@ -1092,9 +1092,13 @@ for a list of signals.
 Note that the arguments are reversed relative to
 .Xr kill 2 .
 .Pp
-.It Ic reboot
-.It Ic reset
+.It Ic reboot Op Ar seconds
+.It Ic reset Op Ar seconds
 Hard reset the system.
+If the optional argument
+.Ar seconds
+is given, the debugger will wait for this long, at most a week,
+before rebooting.
 .Pp
 .It Ic help
 Print a short summary of the available commands and command
diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4
index 0a43527..6217669 100644
--- a/share/man/man4/ed.4
+++ b/share/man/man4/ed.4
@@ -370,6 +370,24 @@ Probing for an MII bus has failed.
 This indicates a coding error in the PC Card attachment, because a PHY
 is required for the chips that generate this error message.
 .El
+.Sh SEE ALSO
+.Xr altq 4 ,
+.Xr arp 4 ,
+.Xr miibus 4 ,
+.Xr netintro 4 ,
+.Xr ng_ether 4 ,
+.Xr device.hints 5 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 1.0 .
+.Sh AUTHORS
+The
+.Nm
+device driver and this manual page were written by
+.An David Greenman .
 .Sh CAVEATS
 Early revision DS8390 chips have problems.
 They lock up whenever the receive
@@ -393,24 +411,6 @@ The Mitsubishi B8895 PC Card uses a DP83902, but its ASIC part is
 undocumented.
 Neither the NE2000 nor the WD83x0 drivers work with this card.
 .Pp
-.Sh SEE ALSO
-.Xr altq 4 ,
-.Xr arp 4 ,
-.Xr miibus 4 ,
-.Xr netintro 4 ,
-.Xr ng_ether 4 ,
-.Xr device.hints 5 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 1.0 .
-.Sh AUTHORS
-The
-.Nm
-device driver and this manual page were written by
-.An David Greenman .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/ef.4 b/share/man/man4/ef.4
index c93d5f1..ce07487 100644
--- a/share/man/man4/ef.4
+++ b/share/man/man4/ef.4
@@ -100,12 +100,12 @@ file:
 .Dl ifconfig_ed2f1_ipx="ipx 0x102"
 .Sh DIAGNOSTICS
 None.
-.Sh CAVEATS
-Avoid to configure the parent Ethernet device for the IPX protocol, after the
-.Nm
-driver is loaded.
 .Sh SEE ALSO
 .Xr ipx 3 ,
 .Xr ifconfig 8
 .Sh AUTHORS
 .An Boris Popov Aq bp@FreeBSD.org .
+.Sh CAVEATS
+Avoid to configure the parent Ethernet device for the IPX protocol, after the
+.Nm
+driver is loaded.
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index fa39825..ecde44d 100644
--- a/share/man/man4/em.4
+++ b/share/man/man4/em.4
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 6, 2008
+.Dd May 14, 2010
 .Dt EM 4
 .Os
 .Sh NAME
@@ -62,6 +62,11 @@ The driver supports Transmit/Receive checksum offload
 and Jumbo Frames on all but 82542-based adapters.
 Furthermore it supports TCP segmentation offload (TSO) on all adapters but
 those based on the 82543, 82544 and 82547 controller chips.
+The identification LEDs of the adapters supported by the
+.Nm
+driver can be controlled via the
+.Xr led 4
+API for localization purposes.
 For further hardware information, see the
 .Pa README
 included with the driver.
@@ -241,10 +246,25 @@ If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
 .Aq freebsdnic@mailbox.intel.com .
+.Sh FILES
+.Bl -tag -width /dev/led/em*
+.It Pa /dev/led/em*
+identification LED device nodes
+.El
+.Sh EXAMPLES
+Make the identification LED of em0 blink:
+.Pp
+.Dl "echo f2 > /dev/led/em0"
+.Pp
+Turn the identification LED of em0 off again:
+.Pp
+.Dl "echo 0 > /dev/led/em0"
+.Pp
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
 .Xr igb 4 ,
+.Xr led 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
 .Xr polling 4 ,
diff --git a/share/man/man4/en.4 b/share/man/man4/en.4
index a256b9e..f9281fa 100644
--- a/share/man/man4/en.4
+++ b/share/man/man4/en.4
@@ -60,10 +60,6 @@ en0: ATM midway v0, board IDs 6.0, Utopia (pipelined), 512KB on-board RAM
 en0: maximum DMA burst length = 64 bytes
 en0: 7 32KB receive buffers, 8 32KB transmit buffers allocated
 .Ed
-.Sh CAVEATS
-The driver extensively uses DMA on PCI.
-The first
-generation PCI chipsets do not work or exhibit poor performance.
 .Sh SEE ALSO
 .Xr natm 4 ,
 .Xr natmip 4 ,
@@ -76,3 +72,7 @@ of Washington University implemented
 .Nm
 driver in 1996 for
 .Nx .
+.Sh CAVEATS
+The driver extensively uses DMA on PCI.
+The first
+generation PCI chipsets do not work or exhibit poor performance.
diff --git a/share/man/man4/fpa.4 b/share/man/man4/fpa.4
index b751e29..0974429 100644
--- a/share/man/man4/fpa.4
+++ b/share/man/man4/fpa.4
@@ -40,11 +40,6 @@ requires a minimum of 1K device memory to be set up.
 The ECU (EISA Configuration
 Utility) will need to be run to change the settings.
 .El
-.Sh CAVEATS
-Normally, the device driver will not enable the reception of SMT frames.
-However if the IFF_LINK1 flag is set, the device driver will enable the
-reception of SMT frames and pass them up to the Berkeley Packet Filter for
-processing.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,
@@ -56,3 +51,8 @@ and
 .Nm fea
 device drivers and this manual page were written by
 .An Matt Thomas .
+.Sh CAVEATS
+Normally, the device driver will not enable the reception of SMT frames.
+However if the IFF_LINK1 flag is set, the device driver will enable the
+reception of SMT frames and pass them up to the Berkeley Packet Filter for
+processing.
diff --git a/share/man/man4/fxp.4 b/share/man/man4/fxp.4
index 5057100..8b5cae7 100644
--- a/share/man/man4/fxp.4
+++ b/share/man/man4/fxp.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 15, 2008
+.Dd May 12, 2010
 .Dt FXP 4
 .Os
 .Sh NAME
@@ -62,23 +62,25 @@ except i82557, i82259ER and early i82558 revisions.
 The
 .Nm
 driver supports the following media types:
-.Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It autoselect
-Enable autoselection of the media type and options
-.It 10baseT/UTP
-Set 10Mbps operation
-.It 100baseTX
-Set 100Mbps (Fast Ethernet) operation
+.Bl -tag -width "10baseT/UTP"
+.It Cm autoselect
+Enable autoselection of the media type and options.
+The autoselected mode can be overridden by adding the media options to
+.Xr rc.conf 5 .
+.It Cm 10baseT/UTP
+Set 10Mbps operation.
+.It Cm 100baseTX
+Set 100Mbps (Fast Ethernet) operation.
 .El
 .Pp
 The
 .Nm
 driver supports the following media options:
-.Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It full-duplex
-Set full duplex operation
+.Bl -tag -width "full-duplex"
+.It Cm full-duplex
+Force full duplex operation.
+.It Cm half-duplex
+Force half duplex operation.
 .El
 .Pp
 Note that 100baseTX media type is not available on the Pro/10.
@@ -143,6 +145,43 @@ NEC PC-9821X-B06 (PC-98)
 .It
 Many on-board network interfaces on Intel motherboards
 .El
+.Sh LOADER TUNABLES
+Tunables can be set at the
+.Xr loader 8
+prompt before booting the kernel or stored in
+.Xr loader.conf 5 .
+The following variables are available as both
+.Xr loader 8
+tunables and
+.Xr sysctl 8
+variables:
+.Bl -tag -width "xxxxxx"
+.It Va dev.fxp.%d.int_delay
+Maximum amount of time, in microseconds, that an interrupt may
+be delayed in an attempt to coalesce interrupts.
+This is only effective if the Intel microcode is loaded.
+The accepted range is 300 to 3000, the default is 1000.
+.It Va dev.fxp.%d.bundle_max
+Number of packets that will be bundled, before an interrupt is
+generated.
+This is only effective if the Intel microcode is loaded.
+The accepted range is 1 to 65535, the default is 6.
+.It Va dev.fxp.%d.noflow
+Controls whether flow control should be used or not.
+The default is 1 (no flow control).
+.El
+.Sh SYSCTL VARIABLES
+The following variables are available as
+.Xr sysctl 8
+variables.
+.Bl -tag -width "xxxxxx"
+.It Va dev.fxp.%d.rnr
+This is a read-only variable and shows the number of events of
+RNR (resource not ready).
+.It Va dev.fxp.%d.stats
+This is a read-only variable and displays useful MAC counters
+maintained in the driver.
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "fxp%d: couldn't map memory"
diff --git a/share/man/man4/geom_fox.4 b/share/man/man4/geom_fox.4
index 8e262b9..76fd0b9 100644
--- a/share/man/man4/geom_fox.4
+++ b/share/man/man4/geom_fox.4
@@ -177,6 +177,14 @@ da2.fox     N/A  da2
 .Xr GEOM 4 ,
 .Xr geom 8 ,
 .Xr gmultipath 8
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
+This manual page was written by
+.An "Wilko Bulte" Aq wilko@FreeBSD.org .
 .Sh CAVEATS
 The
 .Nm
@@ -193,14 +201,6 @@ Safety belts are not provided.
 For FibreChannel devices it is suggested to use the Port WWN of the device.
 The World Wide Name is guaranteed to be worldwide unique per the
 FibreChannel standard.
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
-This manual page was written by
-.An "Wilko Bulte" Aq wilko@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/harp.4 b/share/man/man4/harp.4
index 6f4d941..9495f62 100644
--- a/share/man/man4/harp.4
+++ b/share/man/man4/harp.4
@@ -56,11 +56,11 @@ Netgraph interface (they are in different namespaces).
 .Xr ng_atm 4 ,
 .Xr patm 4 ,
 .Xr atm 8
+.Sh AUTHORS
+.An Harti Brandt Aq harti@FreeBSD.org
 .Sh CAVEATS
 When
 .Xr fatm 4
 is used, it must be started before
 .Nm
 is loaded, to get the correct configuration for the HARP physical interface.
-.Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
diff --git a/share/man/man4/hatm.4 b/share/man/man4/hatm.4
index f9b7e70..59de800 100644
--- a/share/man/man4/hatm.4
+++ b/share/man/man4/hatm.4
@@ -252,6 +252,19 @@ a connection can eat up all available TPDs.
 Maximum number of memory pages allocated to small external mbufs.
 This must not be zero and not larger than 65536.
 .El
+.Sh DIAGNOSTICS
+.Bd -literal
+hatm0: <FORE HE> mem 0xd2600000-0xd26fffff irq 9 at device 15.0 on pci2
+hatm0: ForeRunnerHE 622, Rev. D, S/N 2949834, MAC=00:20:48:2d:02:ca
+.Ed
+.Sh SEE ALSO
+.Xr natm 4 ,
+.Xr natmip 4 ,
+.Xr utopia 4 ,
+.Xr ifconfig 8 ,
+.Xr route 8
+.Sh AUTHORS
+.An Harti Brandt Aq harti@FreeBSD.org
 .Sh CAVEATS
 When putting a HE155 into a 64-bit 66MHz PCI slot the machine may hang.
 This occurs very early in the POST so that even the display does not turn on.
@@ -267,16 +280,3 @@ and
 arguments the
 .Nx
 function has.
-.Sh DIAGNOSTICS
-.Bd -literal
-hatm0: <FORE HE> mem 0xd2600000-0xd26fffff irq 9 at device 15.0 on pci2
-hatm0: ForeRunnerHE 622, Rev. D, S/N 2949834, MAC=00:20:48:2d:02:ca
-.Ed
-.Sh SEE ALSO
-.Xr natm 4 ,
-.Xr natmip 4 ,
-.Xr utopia 4 ,
-.Xr ifconfig 8 ,
-.Xr route 8
-.Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index 02b8e32..a53bac3 100644
--- a/share/man/man4/hifn.4
+++ b/share/man/man4/hifn.4
@@ -107,15 +107,6 @@ Contains a 7955 and supports symmetric and random number operations.
 .Xr ipsec 4 ,
 .Xr random 4 ,
 .Xr crypto 9
-.Sh CAVEATS
-The Hifn 9751 shares the same PCI ID.
-This chip is basically a 7751, but with the cryptographic functions missing.
-Instead, the 9751 is only capable of doing compression.
-Since we do not currently attempt to use any of these chips to do
-compression, the 9751-based cards are not useful.
-.Pp
-Support for the 7955 and 7956 is incomplete; the asymmetric crypto
-facilities are to be added and the performance is suboptimal.
 .Sh HISTORY
 The
 .Nm
@@ -125,6 +116,15 @@ The
 .Nm
 device driver was imported to
 .Fx 5.0 .
+.Sh CAVEATS
+The Hifn 9751 shares the same PCI ID.
+This chip is basically a 7751, but with the cryptographic functions missing.
+Instead, the 9751 is only capable of doing compression.
+Since we do not currently attempt to use any of these chips to do
+compression, the 9751-based cards are not useful.
+.Pp
+Support for the 7955 and 7956 is incomplete; the asymmetric crypto
+facilities are to be added and the performance is suboptimal.
 .Sh BUGS
 The 7751 chip starts out at initialization by only supporting compression.
 A proprietary algorithm, which has been reverse engineered, is required to
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index 7034cd4..6264bd0 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -450,42 +450,6 @@ These variables may be set in the kernel environment using
 before
 .Nm
 is loaded.
-.Sh SECURITY CONSIDERATIONS
-PMCs may be used to monitor the actual behavior of the system on hardware.
-In situations where this constitutes an undesirable information leak,
-the following options are available:
-.Bl -enum
-.It
-Set the
-.Xr sysctl 8
-tunable
-.Va security.bsd.unprivileged_syspmcs
-to 0.
-This ensures that unprivileged processes cannot allocate system-wide
-PMCs and thus cannot observe the hardware behavior of the system
-as a whole.
-This tunable may also be set at boot time using
-.Xr loader 8 ,
-or with
-.Xr kenv 1
-prior to loading the
-.Nm
-driver into the kernel.
-.It
-Set the
-.Xr sysctl 8
-tunable
-.Va security.bsd.unprivileged_proc_debug
-to 0.
-This will ensure that an unprivileged process cannot attach a PMC
-to any process other than itself and thus cannot observe the hardware
-behavior of other processes with the same credentials.
-.El
-.Pp
-System administrators should note that on IA-32 platforms
-.Fx
-makes the content of the IA-32 TSC counter available to all processes
-via the RDTSC instruction.
 .Sh IMPLEMENTATION NOTES
 .Ss SMP Symmetry
 The kernel driver requires all physical CPUs in an SMP system to have
@@ -831,3 +795,39 @@ Many single-processor motherboards keep the APIC disabled in BIOS; on
 such systems
 .Nm
 will not support sampling PMCs.
+.Sh SECURITY CONSIDERATIONS
+PMCs may be used to monitor the actual behavior of the system on hardware.
+In situations where this constitutes an undesirable information leak,
+the following options are available:
+.Bl -enum
+.It
+Set the
+.Xr sysctl 8
+tunable
+.Va security.bsd.unprivileged_syspmcs
+to 0.
+This ensures that unprivileged processes cannot allocate system-wide
+PMCs and thus cannot observe the hardware behavior of the system
+as a whole.
+This tunable may also be set at boot time using
+.Xr loader 8 ,
+or with
+.Xr kenv 1
+prior to loading the
+.Nm
+driver into the kernel.
+.It
+Set the
+.Xr sysctl 8
+tunable
+.Va security.bsd.unprivileged_proc_debug
+to 0.
+This will ensure that an unprivileged process cannot attach a PMC
+to any process other than itself and thus cannot observe the hardware
+behavior of other processes with the same credentials.
+.El
+.Pp
+System administrators should note that on IA-32 platforms
+.Fx
+makes the content of the IA-32 TSC counter available to all processes
+via the RDTSC instruction.
diff --git a/share/man/man4/igb.4 b/share/man/man4/igb.4
index 86bcc73..65012d2 100644
--- a/share/man/man4/igb.4
+++ b/share/man/man4/igb.4
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 6, 2008
+.Dd May 14, 2010
 .Dt IGB 4
 .Os
 .Sh NAME
@@ -60,6 +60,11 @@ The driver supports Transmit/Receive checksum offload and Jumbo
 Frames.
 Furthermore it supports TCP segmentation offload (TSO) on all
 adapters.
+The identification LEDs of the adapters supported by the
+.Nm
+driver can be controlled via the
+.Xr led 4
+API for localization purposes.
 .Pp
 For questions related to hardware requirements, refer to the
 documentation supplied with your Intel PRO/1000 adapter.
@@ -175,10 +180,25 @@ If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
 .Aq freebsdnic@mailbox.intel.com .
+.Sh FILES
+.Bl -tag -width /dev/led/igb*
+.It Pa /dev/led/igb*
+identification LED device nodes
+.El
+.Sh EXAMPLES
+Make the identification LED of igb0 blink:
+.Pp
+.Dl "echo f2 > /dev/led/igb0"
+.Pp
+Turn the identification LED of igb0 off again:
+.Pp
+.Dl "echo 0 > /dev/led/igb0"
+.Pp
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
 .Xr em 4 ,
+.Xr led 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
 .Xr polling 4 ,
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index b1878d5..ef189d3 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -280,12 +280,6 @@ in the reassembling queue for a packet.
 .%B PS1
 .%N 8
 .Re
-.Sh CAVEATS
-The Internet protocol support is subject to change as
-the Internet protocols develop.
-Users should not depend
-on details of the current implementation, but rather
-the services exported.
 .Sh HISTORY
 The
 .Nm
@@ -295,3 +289,9 @@ The
 .Dq protocol cloning
 code appeared in
 .Fx 2.1 .
+.Sh CAVEATS
+The Internet protocol support is subject to change as
+the Internet protocols develop.
+Users should not depend
+on details of the current implementation, but rather
+the services exported.
diff --git a/share/man/man4/io.4 b/share/man/man4/io.4
index a54b9fd..7ceacae 100644
--- a/share/man/man4/io.4
+++ b/share/man/man4/io.4
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 8, 2010
+.Dd June 01, 2010
 .Dt IO 4
 .Os
 .Sh NAME
@@ -35,32 +35,93 @@
 .Nd I/O privilege file
 .Sh SYNOPSIS
 .Cd "device io"
+.Pp
+.In sys/types.h
+.In sys/ioctl.h
+.In dev/io/iodev.h
+.In machine/iodev.h
+.Pp
+.Bd -literal
+struct iodev_pio_req {
+	u_int access;
+	u_int port;
+	u_int width;
+	u_int val;
+};
 .Sh DESCRIPTION
 The special file
 .Pa /dev/io
 is a controlled security hole that allows a process to gain I/O
 privileges
 (which are normally reserved for kernel-internal code).
-Any process that holds a file descriptor on
-.Pa /dev/io
-open will get its
-.Em IOPL
-bits in the flag register set, thus allowing it to perform direct
-I/O operations.
 This can be useful in order to write userland
 programs that handle some hardware directly.
-Note that even read-only access will grant the full I/O privileges.
+.Pp
+The usual operations on the device are to open it via the
+.Xr open 2
+interface and to send I/O requests to the file descriptor using the
+.Xr ioctl 2
+syscall.
+.Pp
+The
+.Xr ioctl 2
+requests available for
+.Pa /dev/io
+are mostly platform dependent, but there are also some in common between
+all of them.
+The
+.Dv IODEV_PIO
+is used by all the architectures in order to request that an I/O operation
+be performed.
+It takes a 'struct iodev_pio_req' argument that must be previously setup.
+.Pp
+The
+.Fa access
+member specifies the type of operation requested.
+It may be:
+.Bl -tag -width IODEV_PIO_WRITE
+.It Dv IODEV_PIO_READ
+The operation is an "in" type.
+A value will be read from the specified port
+(retrieved from the
+.Fa port
+member) and the result will be stored in the
+.Fa val
+member.
+.It Dv IODEV_PIO_WRITE
+The operation is a "out" type.
+The value will be fetched from the
+.Fa val
+member and will be written out to the specified port (defined as the
+.Fa port
+member).
+.El
+.Pp
+Finally, the
+.Fa width
+member specifies the size of the operand to be read/written, expressed
+in bytes.
 .Pp
 In addition to any file access permissions on
 .Pa /dev/io ,
 the kernel enforces that only the super-user may open this device.
-.Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /dev/io
-.El
+.Sh LEGACY
+The
+.Pa /dev/io
+interface used to be very i386 specific and worked differently.
+The initial implementation simply raised the
+.Em IOPL
+of the current thread when
+.Xr open 2
+was called on the device.
+This behaviour is retained in the current implementation as legacy
+support for both i386 and amd64 architectures.
 .Sh SEE ALSO
+.Xr close 2 ,
 .Xr i386_get_ioperm 2 ,
 .Xr i386_set_ioperm 2 ,
+.Xr ioctl 2 ,
+.Xr open 2 ,
 .Xr mem 4
 .Sh HISTORY
 The
diff --git a/share/man/man4/iscsi_initiator.4 b/share/man/man4/iscsi_initiator.4
index b6c47f0..24cd898 100644
--- a/share/man/man4/iscsi_initiator.4
+++ b/share/man/man4/iscsi_initiator.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 23, 2007
+.Dd May 9, 2010
 .Dt ISCSI_INITIATOR 4
 .Os
 .Sh NAME
@@ -48,34 +48,39 @@ iscsi_initiator_load="YES"
 The
 .Nm
 implements the kernel side of the Internet SCSI (iSCSI) network
-protocol standard, the user land companion is
+protocol standard.
+The userland companion is
 .Xr iscontrol 8 ,
 and permits access to remote
 .Em virtual
 SCSI devices via
 .Xr cam 4 .
 .Sh SYSCTL VARIABLES
-.Bl -tag -width ".Va net.iscsi.n.targeaddress"
+.Bl -tag -width "net.iscsi.n.targedaddress"
 .It Va debug.iscsi_initiator
 set the debug-level, 0 means no debugging, 9 for maximum.
 .It Va net.iscsi.isid
 the initiator part of the Session Identifier.
-.It "the following are informative only:"
+.El
+.Pp
+The following are informative only:
+.Pp
+.Bl -tag -width "net.iscsi.n.targedaddress"
 .It Va net.iscsi.driver_version
 the current version of the driver.
 .It Va net.iscsi.sessions
 the number of current active sessions.
 .It Va net.iscsi.n.targetname
-is the targe name of session
+the target name of session
 .Em n .
-.It Va net.iscsi.n.targeaddress
-is the IP address of the target of session
+.It Va net.iscsi.n.targedaddress
+the IP address of the target of session
 .Em n .
 .It Va net.iscsi.n.stats
-are some statistics for session
+statistics for session
 .Em n
 .It Va net.iscsi.n.pid
-is the 
+the 
 .Em "process id"
 of the userland side of session
 .Em n ,
diff --git a/share/man/man4/kbdmux.4 b/share/man/man4/kbdmux.4
index f92fa45..72b5889 100644
--- a/share/man/man4/kbdmux.4
+++ b/share/man/man4/kbdmux.4
@@ -35,6 +35,13 @@ utility.
 .Xr atkbd 4 ,
 .Xr syscons 4 ,
 .Xr ukbd 4
+.Sh HISTORY
+The
+.Nm
+module was implemented in
+.Fx 6.0 .
+.Sh AUTHORS
+.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm
@@ -47,10 +54,3 @@ keyboard share the same state.
 The
 .Nm
 keyboard is logically equivalent to one keyboard with lots of duplicated keys.
-.Sh HISTORY
-The
-.Nm
-module was implemented in
-.Fx 6.0 .
-.Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
diff --git a/share/man/man4/ksyms.4 b/share/man/man4/ksyms.4
index 56572e9..d5683fb 100644
--- a/share/man/man4/ksyms.4
+++ b/share/man/man4/ksyms.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2008-2009 Stacey Son <sson@freebsd.org> 
+.\" Copyright (c) 2008-2009 Stacey Son <sson@FreeBSD.org>
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -130,6 +130,12 @@ driver first appeared in
 .Fx 8.0
 to support 
 .Xr lockstat 1 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Stacey Son
+.Aq sson@FreeBSD.org .
 .Sh BUGS
 Because files can be dynamically linked into the kernel at any time the symbol 
 information can vary.  When you open the
@@ -150,9 +156,3 @@ can be used to get the memory address where the symbol table is stored to
 save kernel memory. 
 .Xr mmap 2
 may also be used but it will map it to another address. 
-.Sh AUTHORS
-The 
-.Nm
-driver was written by 
-.An Stacey Son
-.Aq sson@freebsd.org .
diff --git a/share/man/man4/lindev.4 b/share/man/man4/lindev.4
index 199bd8d..ffc5e83 100644
--- a/share/man/man4/lindev.4
+++ b/share/man/man4/lindev.4
@@ -70,4 +70,4 @@ For reads it emulates
 The
 .Nm
 module first appeared in
-.Fx 9.0 .
+.Fx 8.1 .
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index f0545f4..8a3c723 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
+.\" Copyright (c) 2008 Weongyo Jeong <weongyo@FreeBSD.org>
 .\" All rights reserved.
 .\""
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index c1ee7ae..b7e0389 100644
--- a/share/man/man4/man4.i386/cs.4
+++ b/share/man/man4/man4.i386/cs.4
@@ -129,12 +129,6 @@ The parameters obtained via PnP were not accepted by the driver.
 The adapter
 may not function.
 .El
-.Sh CAVEATS
-The CS89x0 family of adapters have a very small RAM buffer (4K).
-This may
-cause problems with extremely high network loads or bursty network traffic.
-In particular, NFS operations should be limited to 1k read/write transactions
-in order to avoid overruns.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,
@@ -150,3 +144,9 @@ and
 .An Oleg Sharoiko .
 This manpage was written by
 .An Michael Smith .
+.Sh CAVEATS
+The CS89x0 family of adapters have a very small RAM buffer (4K).
+This may
+cause problems with extremely high network loads or bursty network traffic.
+In particular, NFS operations should be limited to 1k read/write transactions
+in order to avoid overruns.
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index 17d24d2..2ef9d05 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -116,12 +116,6 @@ The card refused to respond correctly during configuration.
 .It "ie%d: individual address setup command failed"
 The programming of the Ethernet (MAC) address failed.
 .El
-.Sh CAVEATS
-The Racal Interlan NI5210 comes in variants with 8 and 16 kbytes of
-shared memory.
-It is strongly advisable to use the 16 kbyte variant.
-You can upgrade your 8 kbyte card to 16 kbyte by adding an additional
-RAM chip.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,
@@ -141,3 +135,9 @@ support was written by
 .An Charles M. Hannum .
 This manual page was written by
 .An Wilko C. Bulte .
+.Sh CAVEATS
+The Racal Interlan NI5210 comes in variants with 8 and 16 kbytes of
+shared memory.
+It is strongly advisable to use the 16 kbyte variant.
+You can upgrade your 8 kbyte card to 16 kbyte by adding an additional
+RAM chip.
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index 7f83dcc..a5cb3f7 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -373,10 +373,6 @@ Define the
 .Nm
 driver at the secondary port address with the IRQ 4 and the acceleration
 factor of 3.
-.Sh CAVEATS
-Some bus mouse interface cards generate interrupts at the fixed report rate
-when enabled, whether or not the mouse state is changing.
-The others generate interrupts only when the state is changing.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr mouse 4 ,
@@ -384,3 +380,7 @@ The others generate interrupts only when the state is changing.
 .Xr sysmouse 4 ,
 .Xr moused 8
 .\".Sh HISTORY
+.Sh CAVEATS
+Some bus mouse interface cards generate interrupts at the fixed report rate
+when enabled, whether or not the mouse state is changing.
+The others generate interrupts only when the state is changing.
diff --git a/share/man/man4/man4.i386/pnp.4 b/share/man/man4/man4.i386/pnp.4
index 1c9a2cd..7c17b0e 100644
--- a/share/man/man4/man4.i386/pnp.4
+++ b/share/man/man4/man4.i386/pnp.4
@@ -48,17 +48,6 @@ If it cannot assign necessary resources to a PnP ISA device without
 causing conflict with other devices in the system,
 the device will not be activated and will be unavailable
 to programs.
-.Sh CAVEATS
-It is not possible to disable individual PnP ISA devices.
-The
-.Nm
-driver will find all devices conforming the PnP ISA specification
-and try to activate them all.
-.Pp
-There is no way to explicitly assign particular resource to
-the PnP ISA device.
-The resource assignment is fully automatic and there is
-no provision for manual override.
 .Sh SEE ALSO
 .Xr pnpbios 4
 .Sh STANDARDS
@@ -88,3 +77,14 @@ by
 .An Luigi Rizzo ,
 based on initial work done by
 .An Sujal Patel .
+.Sh CAVEATS
+It is not possible to disable individual PnP ISA devices.
+The
+.Nm
+driver will find all devices conforming the PnP ISA specification
+and try to activate them all.
+.Pp
+There is no way to explicitly assign particular resource to
+the PnP ISA device.
+The resource assignment is fully automatic and there is
+no provision for manual override.
diff --git a/share/man/man4/man4.i386/pnpbios.4 b/share/man/man4/man4.i386/pnpbios.4
index d8e7609..b386be2 100644
--- a/share/man/man4/man4.i386/pnpbios.4
+++ b/share/man/man4/man4.i386/pnpbios.4
@@ -44,17 +44,6 @@ If it cannot assign necessary resources to a device without
 causing conflict with other devices in the system,
 the device will not be activated and will be unavailable
 to programs.
-.Sh CAVEATS
-There is no explicit way to disable individual embedded devices.
-The
-.Nm
-driver will find all devices reported by the
-.Dq "Plug and Play (PnP)"
-BIOS and try to activate them all.
-.Pp
-There is no way to explicitly assign particular resource to a device.
-The resource assignment is fully automatic and there is
-no provision for manual override.
 .Sh SEE ALSO
 .Xr pnp 4
 .Sh STANDARDS
@@ -83,3 +72,14 @@ The
 .Nm
 driver was written by
 .An Mike Smith .
+.Sh CAVEATS
+There is no explicit way to disable individual embedded devices.
+The
+.Nm
+driver will find all devices reported by the
+.Dq "Plug and Play (PnP)"
+BIOS and try to activate them all.
+.Pp
+There is no way to explicitly assign particular resource to a device.
+The resource assignment is fully automatic and there is
+no provision for manual override.
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index 99d89e9..ab0472b 100644
--- a/share/man/man4/man4.i386/vx.4
+++ b/share/man/man4/man4.i386/vx.4
@@ -96,16 +96,6 @@ rebuild the kernel, and reboot.
 .Pp
 All other diagnostics indicate either a hardware problem or a bug in the
 driver.
-.Sh CAVEATS
-Some early-revision 3c590 cards are defective and suffer from many receive
-overruns, which cause lost packets.
-The author has attempted to implement
-a test for it based on the information supplied by 3Com, but the test resulted
-mostly in spurious warnings.
-.Pp
-The performance of this driver is somewhat limited by the fact that it uses
-only polled-mode I/O and does not make use of the bus-mastering capability
-of the cards.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,
@@ -128,6 +118,16 @@ device driver and this manual page were written by
 based on the work of
 .An Herb Peyerl
 and with the assistance of numerous others.
+.Sh CAVEATS
+Some early-revision 3c590 cards are defective and suffer from many receive
+overruns, which cause lost packets.
+The author has attempted to implement
+a test for it based on the information supplied by 3Com, but the test resulted
+mostly in spurious warnings.
+.Pp
+The performance of this driver is somewhat limited by the fact that it uses
+only polled-mode I/O and does not make use of the bus-mastering capability
+of the cards.
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/man4.i386/wl.4 b/share/man/man4/man4.i386/wl.4
index 2f8fdc5..a1eacda 100644
--- a/share/man/man4/man4.i386/wl.4
+++ b/share/man/man4/man4.i386/wl.4
@@ -141,17 +141,6 @@ packets and also stores the IP src address.
 ARP packets are ignored,
 as are any other network protocol barring IPv4 packets.
 .El
-.Sh CAVEATS
-The 82586 has numerous defects.
-It may experience transmit-side
-errors when modern faster cpus send packets at it faster than it can handle.
-The driver (and probably the chip) does not support an all multicast mode.
-As a result, it can be used with applications like
-.Xr mrouted 8 Pq Pa ports/net/mrouted ,
-but it must go into promiscuous mode for that to work.
-The driver
-is slow to change modes from "normal" to promiscuous mode, presumably
-due to delays in the configuration code.
 .Sh SEE ALSO
 .Xr sysctl 8 ,
 .Xr wlconfig 8
@@ -189,3 +178,14 @@ for contributions.
 .Sh AUTHORS
 Too numerous to mention.
 See above.
+.Sh CAVEATS
+The 82586 has numerous defects.
+It may experience transmit-side
+errors when modern faster cpus send packets at it faster than it can handle.
+The driver (and probably the chip) does not support an all multicast mode.
+As a result, it can be used with applications like
+.Xr mrouted 8 Pq Pa ports/net/mrouted ,
+but it must go into promiscuous mode for that to work.
+The driver
+is slow to change modes from "normal" to promiscuous mode, presumably
+due to delays in the configuration code.
diff --git a/share/man/man4/man4.powerpc/bm.4 b/share/man/man4/man4.powerpc/bm.4
index 3e12084..a9e57e3 100644
--- a/share/man/man4/man4.powerpc/bm.4
+++ b/share/man/man4/man4.powerpc/bm.4
@@ -83,7 +83,7 @@ The
 .Nm
 driver was written by
 .An Nathan Whitehorn
-.Aq nwhitehorn@freebsd.org
+.Aq nwhitehorn@FreeBSD.org
 based on work by
 .An Peter Grehan
-.Aq grehan@freebsd.org .
+.Aq grehan@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/snd_ai2s.4 b/share/man/man4/man4.powerpc/snd_ai2s.4
index eabea34..dee0424 100644
--- a/share/man/man4/man4.powerpc/snd_ai2s.4
+++ b/share/man/man4/man4.powerpc/snd_ai2s.4
@@ -66,8 +66,6 @@ Apple Tumbler Audio
 Apple Snapper Audio
 .El
 .Pp
-.Sh BUGS
-Recording and operation with non-44.1 Khz audio are not currently supported.
 .Sh SEE ALSO
 .Xr sound 4 ,
 .Xr snd_davbus 4
@@ -88,3 +86,5 @@ driver was written by
 and ported to FreeBSD by
 .An Marco Trillo
 .Aq marcotrillo@gmail.com .
+.Sh BUGS
+Recording and operation with non-44.1 Khz audio are not currently supported.
diff --git a/share/man/man4/man4.powerpc/snd_davbus.4 b/share/man/man4/man4.powerpc/snd_davbus.4
index 934886e..afdf906 100644
--- a/share/man/man4/man4.powerpc/snd_davbus.4
+++ b/share/man/man4/man4.powerpc/snd_davbus.4
@@ -64,8 +64,6 @@ Apple Burgundy Audio
 Apple Screamer Audio
 .El
 .Pp
-.Sh BUGS
-Recording is not currently supported.
 .Sh SEE ALSO
 .Xr sound 4 ,
 .Xr snd_ai2s 4
@@ -81,3 +79,5 @@ The
 driver was written by
 .An Marco Trillo
 .Aq marcotrillo@gmail.com .
+.Sh BUGS
+Recording is not currently supported.
diff --git a/share/man/man4/man4.sparc64/clkbrd.4 b/share/man/man4/man4.sparc64/clkbrd.4
index b6c0bb3..ad74ee2 100644
--- a/share/man/man4/man4.sparc64/clkbrd.4
+++ b/share/man/man4/man4.sparc64/clkbrd.4
@@ -62,8 +62,6 @@ driver also prints out the number of board slots the chassis provides.
 .It Pa /dev/led/clockboard
 clock board LED device node
 .El
-.Sh CAVEATS
-Hardware management functionality is not implemented.
 .Sh SEE ALSO
 .Xr fhc 4 ,
 .Xr led 4
@@ -86,3 +84,5 @@ and ported to
 .Fx
 by
 .An "Marius Strobl" Aq marius@FreeBSD.org .
+.Sh CAVEATS
+Hardware management functionality is not implemented.
diff --git a/share/man/man4/man4.sparc64/creator.4 b/share/man/man4/man4.sparc64/creator.4
index 5f6ab23..5d7205b 100644
--- a/share/man/man4/man4.sparc64/creator.4
+++ b/share/man/man4/man4.sparc64/creator.4
@@ -62,8 +62,6 @@ these frame buffers
 .Nm
 device nodes
 .El
-.Sh CAVEATS
-Font loading and mode switching are not implemented.
 .Sh SEE ALSO
 .Xr machfb 4 ,
 .Xr syscons 4
@@ -86,3 +84,5 @@ roughly based on the
 .Ox
 driver written by
 .An "Jason L. Wright" .
+.Sh CAVEATS
+Font loading and mode switching are not implemented.
diff --git a/share/man/man4/man4.sparc64/machfb.4 b/share/man/man4/man4.sparc64/machfb.4
index 7d0af11..c42eb9b 100644
--- a/share/man/man4/man4.sparc64/machfb.4
+++ b/share/man/man4/man4.sparc64/machfb.4
@@ -154,8 +154,6 @@ driver at this time:
 .Tn Sun PGX64 8/24-Bit Color Frame Buffer
 (part no.\& 370-4362)
 .El
-.Sh CAVEATS
-Font loading and mode switching are not implemented.
 .Sh SEE ALSO
 .Xr creator 4 ,
 .Xr syscons 4
@@ -178,3 +176,5 @@ based on the
 .Nx
 driver written by
 .An "Bang Jun-Young" .
+.Sh CAVEATS
+Font loading and mode switching are not implemented.
diff --git a/share/man/man4/man4.sparc64/ofw_console.4 b/share/man/man4/man4.sparc64/ofw_console.4
index 8ae1c0c..9a4513b 100644
--- a/share/man/man4/man4.sparc64/ofw_console.4
+++ b/share/man/man4/man4.sparc64/ofw_console.4
@@ -78,19 +78,6 @@ terminal output device in case the console output device is the screen
 .It Pa /dev/tty[a-z]
 terminal device in case both the console input and output device is tty[a-z]
 .El
-.Sh CAVEATS
-Since the Open Firmware will handle BREAK
-(or Stop-A)
-sequences before
-.Nm ,
-the preferred way to enter
-.Xr ddb 4
-when using
-.Nm
-is to include
-.Cd "options ALT_BREAK_TO_DEBUGGER"
-in a ddb-enabled kernel, and enter the alternate BREAK sequence
-(RETURN TILDE CTRL-b).
 .Sh SEE ALSO
 .Xr creator 4 ,
 .Xr machfb 4 ,
@@ -107,6 +94,19 @@ The
 .Nm
 driver was written by
 .An "Benno Rice" Aq benno@FreeBSD.org .
+.Sh CAVEATS
+Since the Open Firmware will handle BREAK
+(or Stop-A)
+sequences before
+.Nm ,
+the preferred way to enter
+.Xr ddb 4
+when using
+.Nm
+is to include
+.Cd "options ALT_BREAK_TO_DEBUGGER"
+in a ddb-enabled kernel, and enter the alternate BREAK sequence
+(RETURN TILDE CTRL-b).
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/man4.sparc64/openfirm.4 b/share/man/man4/man4.sparc64/openfirm.4
index 686fe86..63abd85 100644
--- a/share/man/man4/man4.sparc64/openfirm.4
+++ b/share/man/man4/man4.sparc64/openfirm.4
@@ -251,25 +251,6 @@ The kernel could not allocate memory to copy in data from user-space or to
 retrieve data from the
 .Tn Open Firmware .
 .El
-.Sh CAVEATS
-Due to limitations within
-.Tn Open Firmware
-itself,
-these functions run at elevated priority and may adversely affect system
-performance.
-.Pp
-For at least the
-.Pa /options
-node the property value passed in to the
-.Dv OFIOCSET
-call has to be null-terminated and the value length passed in has to include
-the terminating
-.Ql \e0 .
-However, as with the
-.Dv OFIOCGET
-call,
-the returned value length does not include the terminating
-.Ql \e0 .
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr openprom 4 ,
@@ -298,3 +279,22 @@ interface was ported to
 .Fx
 by
 .An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.Sh CAVEATS
+Due to limitations within
+.Tn Open Firmware
+itself,
+these functions run at elevated priority and may adversely affect system
+performance.
+.Pp
+For at least the
+.Pa /options
+node the property value passed in to the
+.Dv OFIOCSET
+call has to be null-terminated and the value length passed in has to include
+the terminating
+.Ql \e0 .
+However, as with the
+.Dv OFIOCGET
+call,
+the returned value length does not include the terminating
+.Ql \e0 .
diff --git a/share/man/man4/man4.sparc64/openprom.4 b/share/man/man4/man4.sparc64/openprom.4
index e66a8d8..e833628 100644
--- a/share/man/man4/man4.sparc64/openprom.4
+++ b/share/man/man4/man4.sparc64/openprom.4
@@ -206,21 +206,6 @@ The kernel could not allocate memory to copy in data from user-space or to
 retrieve data from the
 .Tn Open Firmware .
 .El
-.Sh CAVEATS
-Due to limitations within
-.Tn Open Firmware
-itself,
-these functions run at elevated priority and may adversely affect system
-performance.
-.Pp
-The
-.Nm
-interface exists entirely for compatibility with software like X11,
-and only the features that are actually needed for that are implemented.
-The interface sucks too much to actually use,
-new code should use the
-.Xr openfirm 4
-interface instead.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr openfirm 4 ,
@@ -238,3 +223,18 @@ The
 .Nm
 interface was written by
 .An "Jake Burkholder" Aq jake@FreeBSD.org .
+.Sh CAVEATS
+Due to limitations within
+.Tn Open Firmware
+itself,
+these functions run at elevated priority and may adversely affect system
+performance.
+.Pp
+The
+.Nm
+interface exists entirely for compatibility with software like X11,
+and only the features that are actually needed for that are implemented.
+The interface sucks too much to actually use,
+new code should use the
+.Xr openfirm 4
+interface instead.
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index fea4a34..3b93007b 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -1,6 +1,6 @@
 .\" ----------------------------------------------------------------------------
 .\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
+.\" <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
 .\" can do whatever you want with this stuff. If we meet some day, and you think
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
diff --git a/share/man/man4/mfi.4 b/share/man/man4/mfi.4
index d34eb27..9313335 100644
--- a/share/man/man4/mfi.4
+++ b/share/man/man4/mfi.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 2, 2010
+.Dd May 12, 2010
 .Dt MFI 4
 .Os
 .Sh NAME
@@ -91,6 +91,8 @@ Dell PERC5
 .It
 Dell PERC6
 .It
+IBM ServeRAID M5015 SAS/SATA
+.It
 IBM ServeRAID-MR10i
 .It
 Intel RAID Controller SROMBSAS18E
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index a90dcff..f355fd2 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -35,7 +35,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 15, 2009
+.Dd May 13, 2010
 .Dt MPT 4
 .Os
 .Sh NAME
@@ -105,6 +105,7 @@ LSI Logic FC949X
 (Dual 4Gb/s
 .Tn Fibre Channel )
 .It
+LSI Logic FC949E,
 LSI Logic FC949ES
 (Dual 4Gb/s
 .Tn Fibre Channel PCI-Express)
@@ -182,4 +183,3 @@ by
 and
 .An Scott Long Aq scottl@FreeBSD.org
 have made more substantial improvements.
-.Sh BUGS
diff --git a/share/man/man4/msk.4 b/share/man/man4/msk.4
index 7a842f5..7ea12dd 100644
--- a/share/man/man4/msk.4
+++ b/share/man/man4/msk.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 1, 2010
+.Dd April 30, 2010
 .Dt MSK 4
 .Os
 .Sh NAME
@@ -208,6 +208,8 @@ Marvell Yukon 88E8057 Gigabit Ethernet
 .It
 Marvell Yukon 88E8058 Gigabit Ethernet
 .It
+Marvell Yukon 88E8059 Gigabit Ethernet
+.It
 Marvell Yukon 88E8070 Gigabit Ethernet
 .It
 Marvell Yukon 88E8071 Gigabit Ethernet
diff --git a/share/man/man4/mvs.4 b/share/man/man4/mvs.4
new file mode 100644
index 0000000..942c3c4
--- /dev/null
+++ b/share/man/man4/mvs.4
@@ -0,0 +1,176 @@
+.\" Copyright (c) 2009 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.
+.\" 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd April 27, 2010
+.Dt MVS 4
+.Os
+.Sh NAME
+.Nm mvs
+.Nd Marvell Serial ATA Host Controller driver
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device pci"
+.Cd "device scbus"
+.Cd "device mvs"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+mvs_load="YES"
+.Ed
+.Pp
+The following tunables are settable from the
+.Xr loader 8 :
+.Bl -ohang
+.It Va hint.mvs. Ns Ar X Ns Va .msi
+controls Message Signaled Interrupts (MSI) usage by the specified controller.
+.It Va hint.mvs. Ns Ar X Ns Va .ccc
+controls Command Completion Coalescing (CCC) usage by the specified controller.
+Non-zero value enables CCC and defines maximum time (in us), request can wait
+for interrupt.
+CCC reduces number of context switches on systems with many parallel requests,
+but it can decrease disk performance on some workloads due to additional
+command latency.
+.It Va hint.mvs. Ns Ar X Ns Va .cccc
+defines number of completed commands for CCC, which trigger interrupt without
+waiting for specified coalescing timeout.
+.It Va hint.mvs. Ns Ar X Ns Va .pm_level
+controls SATA interface Power Management for the specified channel,
+allowing some power to be saved at the cost of additional command
+latency.
+Possible values:
+.Bl -tag -compact
+.It 0
+interface Power Management is disabled (default);
+.It 1
+device is allowed to initiate PM state change, host is passive;
+.It 4
+driver initiates PARTIAL PM state transition 1ms after port becomes idle;
+.It 5
+driver initiates SLUMBER PM state transition 125ms after port becomes idle.
+.El
+.Pp
+Note that interface Power Management is not compatible with
+device presence detection.
+A manual bus reset is needed on device hot-plug.
+.It Va hint.mvs. Ns Ar X Ns Va .sata_rev
+setting to nonzero value limits maximum SATA revision (speed).
+Values 1, 2 and 3 are respectively 1.5, 3 and 6Gbps.
+.El
+.Sh DESCRIPTION
+This driver provides the
+.Xr CAM 4
+subsystem with native access to the
+.Tn SATA
+ports of several generations (Gen-I/II/IIe) of Marvell SATA controllers.
+Each SATA port found is represented to CAM as a separate bus with one
+target, or, if HBA supports Port Multipliers (Gen-II/IIe), 16 targets.
+Most of the bus-management details are handled by the 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
+Driver features include support for Serial ATA and ATAPI devices,
+Port Multipliers (including FIS-based switching, when supported),
+hardware command queues (up to 31 command per port),
+Native Command Queuing, SATA interface Power Management, device hot-plug
+and Message Signaled Interrupts.
+.Pp
+Same hardware is also supported by atamarvell and ataadaptec drivers from
+.Xr ata 4
+subsystem.
+If both drivers are loaded at the same time, this one will be
+given precedence as the more functional of the two.
+.Sh HARDWARE
+The
+.Nm
+driver supports the following controllers:
+.Bl -tag -compact
+.It Gen-I (SATA 1.5Gbps):
+.Bl -bullet -compact
+.It
+88SX5040
+.It
+88SX5041
+.It
+88SX5080
+.It
+88SX5081
+.El
+.It Gen-II (SATA 3Gbps, NCQ, PMP):
+.Bl -bullet -compact
+.It
+88SX6040
+.It
+88SX6041 (including Adaptec 1420SA)
+.It
+88SX6080
+.It
+88SX6081
+.El
+.It Gen-IIe (SATA 3Gbps, NCQ, PMP with FBS):
+.Bl -bullet -compact
+.It
+88SX6042
+.It
+88SX7042 (including Adaptec 1430SA)
+.It
+88F5182 SoC
+.It
+88F6281 SoC
+.It
+MV78100 SoC
+.El
+.El
+Note, that this hardware supports command queueing and FIS-based switching
+only for ATA DMA commands. ATAPI and non-DMA ATA commands executed one by one
+for each port.
+.Pp
+.Sh SEE ALSO
+.Xr ada 4 ,
+.Xr ata 4 ,
+.Xr cam 4 ,
+.Xr cd 4 ,
+.Xr da 4 ,
+.Xr sa 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 8.1 .
+.Sh AUTHORS
+.An Alexander Motin Aq mav@FreeBSD.org .
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index 33bd2b1..59e5559d3 100644
--- a/share/man/man4/natm.4
+++ b/share/man/man4/natm.4
@@ -83,11 +83,6 @@ overhead of a protocol control block lookup.
 This allows us to take
 advantage of the fact that ATM has already demultiplexed the data for
 us.
-.Sh CAVEATS
-The NATM protocol support is subject to change as
-the ATM protocols develop.
-Users should not depend on details of the current implementation, but rather
-the services exported.
 .Sh SEE ALSO
 .Xr en 4 ,
 .Xr fatm 4 ,
@@ -99,3 +94,8 @@ the services exported.
 of Washington University implemented the NATM protocol layer
 along with the EN ATM driver in 1996 for
 .Nx .
+.Sh CAVEATS
+The NATM protocol support is subject to change as
+the ATM protocols develop.
+Users should not depend on details of the current implementation, but rather
+the services exported.
diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4
index 3b1dd71..8884e33 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -34,7 +34,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 31, 2000
+.Dd May 5, 2010
 .Dt NG_BRIDGE 4
 .Os
 .Sh NAME
@@ -181,11 +181,17 @@ but also atomically clears the statistics as well.
 .It Dv NGM_BRIDGE_GET_TABLE
 Returns the current host mapping table used to direct packets, in a
 .Dv "struct ng_bridge_host_ary" .
+.It Dv NGM_BRIDGE_SET_PERSISTENT
+This command sets the persistent flag on the node, and takes no arguments.
 .El
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
 .Dv NGM_SHUTDOWN
-control message, or when all hooks have been disconnected.
+control message, or when all hooks have been disconnected.  Setting the
+persistent flag via a
+.Dv NGM_BRIDGE_SET_PERSISTENT
+control message disables automatic node shutdown when the last hook gets
+disconnected.
 .Sh FILES
 .Bl -tag -width XXXXXXXX -compact
 .It Pa /usr/share/examples/netgraph/ether.bridge
diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4
index 923b06d..3a9e121 100644
--- a/share/man/man4/ng_ccatm.4
+++ b/share/man/man4/ng_ccatm.4
@@ -6,7 +6,7 @@
 .\"	Hartmut Brandt.
 .\"	All rights reserved.
 .\"
-.\" Author: Harti Brandt <harti@freebsd.org>
+.\" Author: Harti Brandt <harti@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/ng_hub.4 b/share/man/man4/ng_hub.4
index a1ad068..c52aba0 100644
--- a/share/man/man4/ng_hub.4
+++ b/share/man/man4/ng_hub.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 17, 2004
+.Dd May 5, 2010
 .Dt NG_HUB 4
 .Os
 .Sh NAME
@@ -45,11 +45,20 @@ A
 node accepts any request to connect, regardless of the hook name,
 as long as the name is unique.
 .Sh CONTROL MESSAGES
-This node type supports only the generic control messages.
+This node type supports the generic control messages, plus the
+following:
+.Bl -tag -width foo
+.It Dv NGM_HUB_SET_PERSISTENT
+This command sets the persistent flag on the node, and takes no arguments.
+.El
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
 .Dv NGM_SHUTDOWN
-control message, or when all hooks have been disconnected.
+control message, or when all hooks have been disconnected.  Setting the
+persistent flag via a
+.Dv NGM_HUB_SET_PERSISTENT
+control message disables automatic node shutdown when the last hook gets
+disconnected.
 .Sh SEE ALSO
 .Xr netgraph 4 ,
 .Xr ng_bridge 4 ,
diff --git a/share/man/man4/ng_patch.4 b/share/man/man4/ng_patch.4
new file mode 100644
index 0000000..4937327
--- /dev/null
+++ b/share/man/man4/ng_patch.4
@@ -0,0 +1,235 @@
+.\" Copyright (c) 2010 Maxim Ignatenko <gelraen.ua@gmail.com>
+.\" Copyright (c) 2010 Vadim Goncharov <vadimnuclight@tpu.ru>
+.\" 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.
+.\" 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.
+.\"
+.\" 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 June 9, 2010
+.Dt NG_PATCH 4
+.Os
+.Sh NAME
+.Nm ng_patch
+.Nd "trivial mbuf data modifying netgraph node type"
+.Sh SYNOPSIS
+.In netgraph/ng_patch.h
+.Sh DESCRIPTION
+The
+.Nm patch
+node performs data modification of packets passing through it.
+Modifications are restricted to a subset of C language operations
+on unsigned integers of 8, 16, 32 or 64 bit size.
+These are: set to new value (=), addition (+=), subtraction (-=),
+multiplication (*=), division (/=), negation (= -),
+bitwise AND (&=), bitwise OR (|=), bitwise eXclusive OR (^=),
+shift left (<<=), shift right (>>=).
+A negation operation is the one exception: integer is treated as signed
+and second operand (the
+.Va value )
+is not used.
+There may be several modification operations, they are all applied
+to a packet sequentially in order they were specified by user.
+Data payload of packet is viewed as array of bytes, with zero offset
+corresponding to the very first byte of packet headers, and
+.Va length
+bytes beginning from
+.Va offset
+are taken as a single integer in network byte order.
+.Sh HOOKS
+This node type has two hooks:
+.Bl -tag -width indent
+.It Va in
+Packets received on this hook are modified according to rules specified
+in config and then forwarded to
+.Ar out
+hook, if it exists and connected.
+Otherwise they are reflected back to the
+.Ar in
+hook.
+.It Va out
+Packets received on this hook are forwarded to
+.Ar in
+hook without any changes.
+.El
+.Sh CONTROL MESSAGES
+This node type supports the generic control messages, plus the following:
+.Bl -tag -width indent
+.It Dv NGM_PATCH_SETCONFIG Pq Li setconfig
+This command sets the sequence of modify operations
+that will be applied to incoming data on a hook.
+The following
+.Vt "struct ng_patch_config"
+must be supplied as an argument:
+.Bd -literal -offset 4n
+struct ng_patch_op {
+	uint64_t	value;
+	uint32_t	offset;
+	uint16_t	length; /* 1,2,4 or 8 bytes */
+	uint16_t	mode;
+};
+/* Patching modes */
+#define NG_PATCH_MODE_SET	1
+#define NG_PATCH_MODE_ADD	2
+#define NG_PATCH_MODE_SUB	3
+#define NG_PATCH_MODE_MUL	4
+#define NG_PATCH_MODE_DIV	5
+#define NG_PATCH_MODE_NEG	6
+#define NG_PATCH_MODE_AND	7
+#define NG_PATCH_MODE_OR	8
+#define NG_PATCH_MODE_XOR	9
+#define NG_PATCH_MODE_SHL	10
+#define NG_PATCH_MODE_SHR	11
+
+struct ng_patch_config {
+	uint32_t	count;
+	uint32_t	csum_flags;
+	struct ng_patch_op ops[];
+};
+.Ed
+.Pp
+The
+.Va csum_flags
+can be set to any combination of CSUM_IP, CSUM_TCP, CSUM_SCTP and CSUM_UDP
+(other values are ignored) for instructing the IP stack to recalculate the
+corresponding checksum before transmitting packet on output interface.
+The
+.Nm
+node does not do any checksum correction by itself.
+.It Dv NGM_PATCH_GETCONFIG Pq Li getconfig
+This control message obtains current set of modify operations,
+returned as
+.Vt "struct ng_patch_config" .
+.It Dv NGM_PATCH_GET_STATS Pq Li getstats
+Returns node statistics as a
+.Vt "struct ng_patch_stats" .
+.It Dv NGM_PATCH_CLR_STATS Pq Li clrstats
+Clear node statistics.
+.It Dv NGM_PATCH_GETCLR_STATS Pq Li getclrstats
+This command is identical to
+.Dv NGM_PATCH_GET_STATS ,
+except that the statistics are also atomically cleared.
+.El
+.Sh SHUTDOWN
+This node shuts down upon receipt of a
+.Dv NGM_SHUTDOWN
+control message, or when all hooks have been disconnected.
+.Sh EXAMPLES
+The
+.Nm
+node allows to modify TTL and TOS/DSCP fields in IP packets.
+Suppose you have two adjacent simplex links to remote network
+(e.g.\& satellite), so that the packets expiring in between
+will generate unwanted ICMP-replies which have to go forth, not back.
+Thus you need to raise TTL of every packet entering link link by 2
+to ensure the TTL will not reach zero there.
+So you setup
+.Xr ipfw 8
+rule with
+.Cm netgraph
+action to inject packets going to other end of simplex link by the
+following
+.Xr ngctl 8
+script:
+.Bd -literal -offset 4n
+/usr/sbin/ngctl -f- <<-SEQ
+	mkpeer ipfw: patch 200 in
+	name ipfw:200 ttl_add
+	msg ttl_add: setconfig { count=1 csum_flags=1 ops=[	\e
+		{ mode=2 value=3 length=1 offset=8 } ] }
+SEQ
+/sbin/ipfw add 150 netgraph 200 ip from any to simplex.remote.net
+.Ed
+.Pp
+Here
+.Dq Li ttl_add
+node of type
+.Nm
+configured to add (mode 
+.Dv NG_PATCH_MODE_ADD )
+a
+.Va value
+of 3 to a one-byte TTL field, which is 9th byte of IP packet header.
+.Pp
+Another example would be two consecutive modifications of packet TOS
+field: say, you need to clear the
+.Dv IPTOS_THROUGHPUT
+bit and set the
+.Dv IPTOS_MINCOST
+bit.
+So you do:
+.Bd -literal -offset 4n
+/usr/sbin/ngctl -f- <<-SEQ
+	mkpeer ipfw: patch 300 in
+	name ipfw:300 tos_chg
+	msg tos_chg: setconfig { count=2 csum_flags=1 ops=[	\e
+		{ mode=7 value=0xf7 length=1 offset=1 }		\e
+		{ mode=8 value=0x02 length=1 offset=1 } ] }
+SEQ
+/sbin/ipfw add 160 netgraph 600 ip from any to any not dst-port 80
+.Ed
+.Pp
+This first does
+.Dv NG_PATCH_MODE_AND
+clearing the fourth bit and then
+.Dv NG_PATCH_MODE_OR
+setting the third bit.
+.Pp
+In both examples the
+.Va csum_flags
+field indicates that IP checksum (but not TCP or UDP checksum) should be
+recalculated before transmit.
+.Pp
+Note: one should ensure that packets are returned to ipfw after processing
+inside
+.Xr netgraph 4 ,
+by setting appropriate
+.Xr sysctl 8
+variable:
+.Bd -literal -offset 4n
+sysctl net.inet.ip.fw.one_pass=0
+.Ed
+.Sh SEE ALSO
+.Xr netgraph 4 ,
+.Xr ng_ipfw 4 ,
+.Xr ngctl 8
+.Sh HISTORY
+The
+.Nm
+node type was implemented in
+.Fx 8.1 .
+.Sh AUTHORS
+.An "Maxim Ignatenko" Aq gelraen.ua@gmail.com .
+This manual page was written by
+.An "Vadim Goncharov" Aq vadimnuclight@tpu.ru .
+.Sh BUGS
+Node blindly tries to apply every patching operation to each packet
+(except those which offset if greater than length of the packet),
+so be sure that you supply only the right packets to it (e.g. changing
+bytes in the ARP packets meant to be in IP header could corrupt
+them and make your machine unreachable from the network).
+.Pp
+.Em !!! WARNING !!!
+.Pp
+Output path of the IP stack assumes correct fields and lengths in the
+packets - changing them by mistake to incorrect values can cause
+unpredictable results including kernel panics.
diff --git a/share/man/man4/nve.4 b/share/man/man4/nve.4
index 5fe5229..a1db97a 100644
--- a/share/man/man4/nve.4
+++ b/share/man/man4/nve.4
@@ -114,10 +114,6 @@ There are not enough mbufs available for allocation.
 The device has stopped responding to the network, or there is a problem with
 the network connection (cable).
 .El
-.Sh BUGS
-There are reports that when the card is in auto select mode,
-ifconfig output reports a 10baseT/UTP output while the LEDs and
-bandwidth show that the card is actually in 100baseTX mode.
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -138,3 +134,7 @@ driver was written by
 .An Quinton Dolan Aq q@onthenet.com.au
 and
 .An "David E. O'Brien" Aq obrien@FreeBSD.org .
+.Sh BUGS
+There are reports that when the card is in auto select mode,
+ifconfig output reports a 10baseT/UTP output while the LEDs and
+bandwidth show that the card is actually in 100baseTX mode.
diff --git a/share/man/man4/patm.4 b/share/man/man4/patm.4
index 3ab2f7a..443b9f7 100644
--- a/share/man/man4/patm.4
+++ b/share/man/man4/patm.4
@@ -154,6 +154,12 @@ patm1: 128K x 32 SRAM; 4096 connections
 .Xr natm 4 ,
 .Xr natmip 4 ,
 .Xr utopia 4
+.Sh ACKNOWLEDGEMENTS
+Thanks to Christian Bucari from ProSum for lending two of these cards to enable
+the development of this driver.
+Thanks also for answering my questions.
+.Sh AUTHORS
+.An Harti Brandt Aq harti@FreeBSD.org
 .Sh CAVEATS
 The card fails to generate an interrupt if a cell is received in AAL0 mode
 that has the MSB of the PTI field cleared.
@@ -184,9 +190,3 @@ uses idle cells for spacing and the PHY counts these cells.
 While there is a configuration option for the chip to switch of these cells
 and, according to the documentation, this should not influence cell spacing,
 it does, so the driver lets the chip generate idle cells.
-.Sh ACKNOWLEDGEMENTS
-Thanks to Christian Bucari from ProSum for lending two of these cards to enable
-the development of this driver.
-Thanks also for answering my questions.
-.Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index b61a4d3..ed911bd 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -817,36 +817,6 @@ The rest of the lines show the device ID code, the number of detected
 buttons and internal variables.
 .Pp
 At debug level 2, much more detailed information is logged.
-.Sh CAVEATS
-Many pad devices behave as if the first (left) button were pressed if
-the user `taps' the surface of the pad.
-In contrast, some pad products, e.g.\& some versions of ALPS GlidePoint
-and Interlink VersaPad, treat the tapping action
-as fourth button events.
-.Pp
-It is reported that Interlink VersaPad requires both
-.Em HOOKRESUME
-and
-.Em INITAFTERSUSPEND
-flags in order to recover from suspended state.
-These flags are automatically set when VersaPad is detected by the
-.Nm
-driver.
-.Pp
-Some PS/2 mouse models from MouseSystems require to be put in the
-high resolution mode to work properly.
-Use the driver flag to
-set resolution.
-.Pp
-There is not a guaranteed way to re-synchronize with the first byte
-of the packet once we are out of synchronization with the data
-stream.
-However, if you are using the \fIXFree86\fP server and experiencing
-the problem, you may be able to make the X server synchronize with the mouse
-by switching away to a virtual terminal and getting back to the X server,
-unless the X server is accessing the mouse via
-.Xr moused 8 .
-Clicking any button without moving the mouse may also work.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr syslog 3 ,
@@ -878,6 +848,36 @@ to name the few.
 .Pp
 This manual page was written by
 .An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.Sh CAVEATS
+Many pad devices behave as if the first (left) button were pressed if
+the user `taps' the surface of the pad.
+In contrast, some pad products, e.g.\& some versions of ALPS GlidePoint
+and Interlink VersaPad, treat the tapping action
+as fourth button events.
+.Pp
+It is reported that Interlink VersaPad requires both
+.Em HOOKRESUME
+and
+.Em INITAFTERSUSPEND
+flags in order to recover from suspended state.
+These flags are automatically set when VersaPad is detected by the
+.Nm
+driver.
+.Pp
+Some PS/2 mouse models from MouseSystems require to be put in the
+high resolution mode to work properly.
+Use the driver flag to
+set resolution.
+.Pp
+There is not a guaranteed way to re-synchronize with the first byte
+of the packet once we are out of synchronization with the data
+stream.
+However, if you are using the \fIXFree86\fP server and experiencing
+the problem, you may be able to make the X server synchronize with the mouse
+by switching away to a virtual terminal and getting back to the X server,
+unless the X server is accessing the mouse via
+.Xr moused 8 .
+Clicking any button without moving the mouse may also work.
 .Sh BUGS
 The ioctl command
 .Dv MOUSEIOCREAD
diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index a7c6f4d..8f00eb2 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -98,7 +98,9 @@ driver can be configured at runtime with
 or on boot with
 .Xr hostname.if 5 .
 .Sh HARDWARE
-The following adapters should work:
+The 
+.Nm
+driver supports the following wireless adapters:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
 .It Airlink101 AWLL6090
diff --git a/share/man/man4/sbp_targ.4 b/share/man/man4/sbp_targ.4
index f9c58ef..9a81a99 100644
--- a/share/man/man4/sbp_targ.4
+++ b/share/man/man4/sbp_targ.4
@@ -93,6 +93,6 @@ driver was written by
 .An Hidetoshi Shimokawa .
 .Sh BUGS
 This driver is
-.Ud .
+.Ud
 It does not work correctly in multi-initiator environments
 or after the bus topology has been changed.
diff --git a/share/man/man4/sge.4 b/share/man/man4/sge.4
index a3d057d..a31563a 100644
--- a/share/man/man4/sge.4
+++ b/share/man/man4/sge.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 14, 2010
+.Dd May 10, 2010
 .Dt SGE 4
 .Os
 .Sh NAME
@@ -53,11 +53,11 @@ controllers and SiS191 Fast/Gigabit Ethernet controllers.
 .Pp
 All LOMs supported by the
 .Nm
-driver have TCP/UDP/IP checksum offload for transmit and receive.
-Due to lack of documentation more offloading features like TCP
-segmentation offload (TSO), hardware VLAN tag stripping/insertion
-features, Wake On Lan (WOL), Jumbo frame and an interrupt moderation
-mechanism are not supported yet.
+driver have TCP/UDP/IP checksum offload for transmit and receive,
+TCP segmentation offload (TSO), hardware VLAN tag stripping/insertion
+features.
+Due to lack of documentation Wake On Lan (WOL), Jumbo frame and an
+interrupt moderation mechanism are not supported yet.
 .Pp
 The
 .Nm
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index 2c06d1d..84c01bf 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -1,5 +1,5 @@
 .\" Copyright (c) 1997
-.\"	Steve Passe <fsmp@FreeBSD.ORG>.  All rights reserved.
+.\"	Steve Passe <fsmp@FreeBSD.org>.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/snd_emu10kx.4 b/share/man/man4/snd_emu10kx.4
index e813f6d..a363260 100644
--- a/share/man/man4/snd_emu10kx.4
+++ b/share/man/man4/snd_emu10kx.4
@@ -276,11 +276,11 @@ device driver first appeared in
 The PCM part of the driver is based on the
 .Xr snd_emu10k1 4
 SB Live!\& driver by
-.An "Cameron Grant" Aq cg@freebsd.org .
+.An Cameron Grant Aq cg@FreeBSD.org .
 The MIDI interface is based on the
 .Xr snd_emu10k1 4
 MIDI interface code by
-.An "Mathew Kanner" Aq matk@freebsd.org .
+.An Mathew Kanner Aq matk@FreeBSD.org .
 The
 .Nm
 device driver and this manual page were written by
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index 165366a..5a32e86 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -221,10 +221,6 @@ necessary to load the VESA module.
 Just load the bitmap file and the splash decoder module as in the
 first example above.
 .\".Sh DIAGNOSTICS
-.Sh CAVEATS
-Both the splash screen and the screen saver work with
-.Xr syscons 4
-only.
 .Sh SEE ALSO
 .Xr vidcontrol 1 ,
 .Xr syscons 4 ,
@@ -257,6 +253,10 @@ module was written by
 based on the
 .Pa splash_bmp
 code.
+.Sh CAVEATS
+Both the splash screen and the screen saver work with
+.Xr syscons 4
+only.
 .Sh BUGS
 If you load a screen saver while another screen saver has already
 been loaded, the first screen saver will not be automatically unloaded
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index b0f98a1..acc6c66 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -523,14 +523,6 @@ to the kernel.
 .Dl "makeoptions SC_DFLT_FONT=cp850
 .Dl "device sc"
 .\".Sh DIAGNOSTICS
-.Sh CAVEATS
-The amount of data that is possible to insert from the cut buffer is limited
-by the
-.Brq Dv MAX_INPUT ,
-a system limit on the number of bytes that may be stored in the terminal
-input queue - usually 1024 bytes
-(see
-.Xr termios 4 ) .
 .Sh SEE ALSO
 .Xr kbdcontrol 1 ,
 .Xr login 1 ,
@@ -562,5 +554,13 @@ driver was written by
 .An S\(/oren Schmidt Aq sos@FreeBSD.org .
 This manual page was written by
 .An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.Sh CAVEATS
+The amount of data that is possible to insert from the cut buffer is limited
+by the
+.Brq Dv MAX_INPUT ,
+a system limit on the number of bytes that may be stored in the terminal
+input queue - usually 1024 bytes
+(see
+.Xr termios 4 ) .
 .Sh BUGS
 This manual page is incomplete and urgently needs revision.
diff --git a/share/man/man4/twa.4 b/share/man/man4/twa.4
index 32cccfc..32cccfc 100755..100644
--- a/share/man/man4/twa.4
+++ b/share/man/man4/twa.4
diff --git a/share/man/man4/tx.4 b/share/man/man4/tx.4
index da54d8c..f0cda0e 100644
--- a/share/man/man4/tx.4
+++ b/share/man/man4/tx.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1998-2001 Semen Ustimenko (semenu@FreeBSD.org)
+.\" Copyright (c) 1998-2001 Semen Ustimenko <semenu@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4
index 47a34a1..cfae50b 100644
--- a/share/man/man4/u3g.4
+++ b/share/man/man4/u3g.4
@@ -121,5 +121,5 @@ The
 driver was written by
 .An Andrea Guzzo Aq aguzzo@anywi.com
 and
-.An Nick Hibma Aq n_hibma@freebsd.org .
+.An Nick Hibma Aq n_hibma@FreeBSD.org .
 Hardware for testing was provided by AnyWi Technologies, Leiden, NL.
diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4
index 52a5fb6..4ef898e 100644
--- a/share/man/man4/uath.4
+++ b/share/man/man4/uath.4
@@ -177,9 +177,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Weongyo Jeong Aq weongyo@freebsd.org
+.An Weongyo Jeong Aq weongyo@FreeBSD.org
 and
-.An Sam Leffler Aq sam@freebsd.org .
+.An Sam Leffler Aq sam@FreeBSD.org .
 It is distantly related to a driver written by
 .An Damien Bergamini Aq damien@openbsd.org .
 .Sh CAVEATS
diff --git a/share/man/man4/ucom.4 b/share/man/man4/ucom.4
index 1f39847..ff891cb 100644
--- a/share/man/man4/ucom.4
+++ b/share/man/man4/ucom.4
@@ -68,14 +68,6 @@ The
 .Va portno
 locater can be used to decide which port to use for devices that have
 multiple external ports.
-.Sh BUGS
-Prior to
-.Fx 6.0
-.Nm
-created
-.Pa /dev/ucom?
-rather than the uniform device names created today.
-Old scripts must be adjusted accordingly.
 .Sh FILES
 .Bl -tag -width ".Pa /dev/cuaU?"
 .It Pa /dev/cuaU?
@@ -103,3 +95,11 @@ This manual page was adopted from
 by
 .An Tom Rhodes Aq trhodes@FreeBSD.org
 in April 2002.
+.Sh BUGS
+Prior to
+.Fx 6.0
+.Nm
+created
+.Pa /dev/ucom?
+rather than the uniform device names created today.
+Old scripts must be adjusted accordingly.
diff --git a/share/man/man4/uep.4 b/share/man/man4/uep.4
new file mode 100644
index 0000000..d89805e
--- /dev/null
+++ b/share/man/man4/uep.4
@@ -0,0 +1,79 @@
+.\" Copyright (c) 2010 Gleb Smirnoff <glebius@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.
+.\" 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.
+.\"
+.\" 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 May 25, 2010
+.Dt UEP 4
+.Os
+.Sh NAME
+.Nm uep
+.Nd eGalax touchscreen driver
+.Sh SYNOPSIS
+To compile this driver into the kernel, place the following lines into
+your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device uep"
+.Cd "device usb"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+uep_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the eGalax onscreen touch panels.
+.Pp
+The driver is stub.
+It just probes and attaches to USB device, creates device entry
+and feeds reassambled packets from the hardware to it.
+.Pp
+To get mouse working in
+.Xr X 7 ,
+one needs to install
+.Pa ports/x11-drivers/xf86-input-egalax .
+.Sh BUGS
+.Nm
+can't act like
+.Xr sysmouse 4 ,
+since the latter does not support absolute motion events.
+.Sh FILES
+.Nm
+creates a blocking pseudo\-device file,
+.Pa /dev/uep0 .
+.Sh SEE ALSO
+.Xr usb 4 ,
+.Xr loader.conf 5 ,
+.Xr xorg.conf 5 Pq Pa ports/x11/xorg ,
+.Xr egalax 4 Pq Pa ports/x11-drivers/xf86-input-egalax .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Gleb Smirnoff Aq glebius@FreeBSD.org
diff --git a/share/man/man4/uhso.4 b/share/man/man4/uhso.4
index e4d6df5..d7018ba 100644
--- a/share/man/man4/uhso.4
+++ b/share/man/man4/uhso.4
@@ -87,6 +87,10 @@ This behavior can be disabled by setting
 .Va hw.usb.uhso.auto_switch
 to 0 using
 .Xr sysctl 8
+.Sh FILES
+.Bl -tag -width "XXXXXX"
+.It Pa /dev/cuaU?.?
+.El
 .Sh EXAMPLES
 Establishing a packet interface connection
 .Bd -literal -offset indent
@@ -112,10 +116,6 @@ The connection can be terminated with
 .Bd -literal -offset indent
 AT_OWANCALL=1,0,1
 .Ed
-.Sh FILES
-.Bl -tag -width "XXXXXX"
-.It Pa /dev/cuaU?.?
-.El
 .Sh SEE ALSO
 .Xr ucom 4 ,
 .Xr usb 4
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 2ecfbce..05a4d02 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -176,4 +176,4 @@ module has been inspired by the NetBSD USB stack initially written by
 Lennart Augustsson. The
 .Nm
 module was written by
-.An Hans Petter Selasky Aq hselasky@freebsd.org .
+.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
diff --git a/share/man/man4/usb2_template.4 b/share/man/man4/usb2_template.4
index 06dc611..92abef3 100644
--- a/share/man/man4/usb2_template.4
+++ b/share/man/man4/usb2_template.4
@@ -81,4 +81,4 @@ module complies with the USB 2.0 standard.
 The
 .Nm
 module was written by
-.An Hans Petter Selasky Aq hselasky@freebsd.org .
+.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
diff --git a/share/man/man4/vkbd.4 b/share/man/man4/vkbd.4
index 079688f..debdd3e 100644
--- a/share/man/man4/vkbd.4
+++ b/share/man/man4/vkbd.4
@@ -130,6 +130,13 @@ All queued scan codes are thrown away.
 .Xr atkbdc 4 ,
 .Xr psm 4 ,
 .Xr syscons 4
+.Sh HISTORY
+The
+.Nm
+module was implemented in
+.Fx 6.0 .
+.Sh AUTHORS
+.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm
@@ -144,10 +151,3 @@ at the same time.
 It is, however, in principal possible to obtain AT scan
 codes from the different sources and write them into the same virtual keyboard.
 The virtual keyboard state synchronization is the user's responsibility.
-.Sh HISTORY
-The
-.Nm
-module was implemented in
-.Fx 6.0 .
-.Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index f7f7807..17fff6a 100644
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -134,6 +134,7 @@ in the hardware is limited to the following devices:
 .Xr msk 4 ,
 .Xr nge 4 ,
 .Xr re 4 ,
+.Xr sge 4 ,
 .Xr stge 4 ,
 .Xr ti 4 ,
 .Xr txp 4 ,
@@ -172,7 +173,6 @@ natively:
 .Xr nve 4 ,
 .Xr rl 4 ,
 .Xr sf 4 ,
-.Xr sge 4 ,
 .Xr sis 4 ,
 .Xr sk 4 ,
 .Xr ste 4 ,
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index 07e8816..9932ff4 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -117,10 +117,6 @@ unload/reload the driver to continue.
 The hardware switch controlling the radio is currently turned off. 
 Data transmission is not possible in this state.
 .El
-.Sh BUGS
-Not all the error messages are documented here.
-.Pp
-Background scanning is not currently supported.
 .Sh SEE ALSO
 .Xr wpifw 4 ,
 .Xr pci 4 ,
@@ -143,3 +139,7 @@ ported
 .Nm
 to
 .Fx .
+.Sh BUGS
+Not all the error messages are documented here.
+.Pp
+Background scanning is not currently supported.
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index 137b2e4..d6318ef 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -35,7 +35,7 @@
 .\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd June 5, 1993
+.Dd June 10, 2010
 .Dt A.OUT 5
 .Os
 .Sh NAME
@@ -307,13 +307,13 @@ structures:
 .Bd -literal -offset indent
 struct nlist {
 	union {
-		char	*n_name;
-		long	n_strx;
+		const char	*n_name;
+		long		n_strx;
 	} n_un;
-	unsigned char	n_type;
-	char		n_other;
-	short		n_desc;
-	unsigned long	n_value;
+	unsigned char		n_type;
+	char			n_other;
+	short			n_desc;
+	unsigned long		n_value;
 };
 .Ed
 .Pp
diff --git a/share/man/man5/boot.config.5 b/share/man/man5/boot.config.5
index 41cc55c..681fc3a 100644
--- a/share/man/man5/boot.config.5
+++ b/share/man/man5/boot.config.5
@@ -64,6 +64,11 @@ the other options available for
 are documented in detail in the
 .Xr boot 8
 manual page.
+.Sh FILES
+.Bl -tag -width /boot.config -compact
+.It Pa /boot.config
+parameters for the boot blocks (optional)
+.El
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
@@ -90,11 +95,6 @@ The command:
 .Ed
 .Pp
 will do both of the above.
-.Sh FILES
-.Bl -tag -width /boot.config -compact
-.It Pa /boot.config
-parameters for the boot blocks (optional)
-.El
 .Sh SEE ALSO
 .Xr boot 8 ,
 .Xr loader 8
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index d932425..e27ff74 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -38,7 +38,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 14, 1996
+.Dd May 30, 2010
 .Dt DEVFS 5
 .Os
 .Sh NAME
@@ -80,9 +80,9 @@ mount point.
 To mount a
 .Nm
 volume located on
-.Pa /dev :
+.Pa /mychroot/dev :
 .Pp
-.Dl "mount -t devfs devfs /dev"
+.Dl "mount -t devfs devfs /mychroot/dev"
 .Sh SEE ALSO
 .Xr devfs 8 ,
 .Xr mount 8
@@ -91,6 +91,10 @@ The
 .Nm
 file system first appeared in
 .Fx 2.0 .
+It became the preferred method for accessing devices in
+.Fx 5.0
+and the only method in
+.Fx 6.0 .
 The
 .Nm
 manual page first appeared in
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index 4e63f22..b844451 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -87,6 +87,10 @@ call other than
 and
 .Dv O_RDWR
 are ignored.
+.Sh FILES
+.Bl -tag -width /dev/stderr -compact
+.It Pa /dev/fd/#
+.El
 .Sh EXAMPLES
 To mount a  
 .Nm
@@ -94,10 +98,6 @@ volume located on
 .Pa /dev/fd :
 .Pp
 .Dl "mount -t fdescfs null /dev/fd"
-.Sh FILES
-.Bl -tag -width /dev/stderr -compact
-.It Pa /dev/fd/#
-.El
 .Sh SEE ALSO
 .Xr mount 8
 .Sh HISTORY
diff --git a/share/man/man5/linsysfs.5 b/share/man/man5/linsysfs.5
index a586564..f3ea3cf 100644
--- a/share/man/man5/linsysfs.5
+++ b/share/man/man5/linsysfs.5
@@ -55,14 +55,6 @@ registered driver name for these devices.
 .It Pa device
 A symlink to the PCI device directory.
 .El
-.Sh EXAMPLES
-The most common usage follows:
-.Pp
-.Dl "mount -t linsysfs linsys /compat/linux/sys"
-.Pp
-where
-.Pa /compat/linux/sys
-is a mount point.
 .Sh FILES
 .Bl -tag -width ".Pa /compat/linux/sys/devices/pci0000:00" -compact
 .It Pa /compat/linux/sys
@@ -73,6 +65,14 @@ The storage host node.
 .It Pa /compat/linux/sys/devices/pci0000:00
 The PCI device hierarchy node.
 .El
+.Sh EXAMPLES
+The most common usage follows:
+.Pp
+.Dl "mount -t linsysfs linsys /compat/linux/sys"
+.Pp
+where
+.Pa /compat/linux/sys
+is a mount point.
 .Sh SEE ALSO
 .Xr nmount 2 ,
 .Xr unmount 2 ,
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index a6a3259..9cc3c1d 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -753,13 +753,6 @@ file appeared sometime before
 This
 manual page was written by
 .An Mike W. Meyer Aq mwm@mired.org .
-.Sh BUGS
-This manual page may occasionally be out of date with respect to
-the options currently available for use in
-.Nm .
-Please check the
-.Pa /usr/share/examples/etc/make.conf
-file for the latest options which are available.
 .Sh CAVEATS
 Note, that
 .Ev MAKEOBJDIRPREFIX
@@ -768,3 +761,10 @@ and
 are environment variables and should not be set in
 .Nm
 but in make's environment.
+.Sh BUGS
+This manual page may occasionally be out of date with respect to
+the options currently available for use in
+.Nm .
+Please check the
+.Pa /usr/share/examples/etc/make.conf
+file for the latest options which are available.
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index c0b358d..734e7a3 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 14, 2010
+.Dd April 27, 2010
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1303,6 +1303,13 @@ interface:
 ifconfig_ed0_ipv6="RTADV"
 .Ed
 .Pp
+To configure only a link-local address on the
+.Dq Li ed0
+interface:
+.Bd -literal
+ifconfig_ed0_ipv6="inet6 auto_linklocal"
+.Ed
+.Pp
 To disable RA the
 .Dq Li NORTADV
 option is available, although not required if manual
@@ -1363,7 +1370,7 @@ configured on that interface.
 If not set to
 .Dq Li NO ,
 this is the default output interface for scoped addresses.
-Now this works only for IPv6 link local multicast addresses.
+This works only with ipv6_gateway_enable="NO".
 .It Va ip6addrctl_enable
 .Pq Vt bool
 If set to
diff --git a/share/man/man5/reiserfs.5 b/share/man/man5/reiserfs.5
index b7445a6..eda7028 100644
--- a/share/man/man5/reiserfs.5
+++ b/share/man/man5/reiserfs.5
@@ -61,9 +61,6 @@ volume located on
 .Xr unmount 2 ,
 .Xr fstab 5 ,
 .Xr mount 8
-.Sh CAVEATS
-Currently, only read-only access is supported for ReiserFS volumes,
-writing to a volume is not supported.
 .Sh HISTORY
 The
 .Nm
@@ -82,3 +79,6 @@ by
 .Pp
 This manual page was written by
 .An Craig Rodrigues Aq rodrigc@FreeBSD.org .
+.Sh CAVEATS
+Currently, only read-only access is supported for ReiserFS volumes,
+writing to a volume is not supported.
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 8720a72..f9548b0 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm
 .\" $FreeBSD$
-.Dd March 26, 2010
+.Dd June 10, 2010
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -247,6 +247,9 @@ When set, it also enforces the following options:
 .It
 .Va WITHOUT_ZFS
 .El
+.It Va WITHOUT_CLANG
+.\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG 208971 2010-06-10 06:20:26Z ed
+Set to not build the Clang C/C++ compiler.
 .It Va WITHOUT_CPP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru
 Set to not build
@@ -297,6 +300,10 @@ dynamically.
 .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru
 Set to avoid installing examples to
 .Pa /usr/share/examples/ .
+.It Va WITH_FDT
+.\" from FreeBSD: head/tools/build/options/WITH_FDT 208537 2010-05-25 15:12:21Z raj
+Set to build Flattened Device Tree support as part of the base system. This
+includes the device tree compiler (dtc) and libfdt support library.
 .It Va WITHOUT_FLOPPY
 .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 183306 2008-09-23 16:15:42Z sam
 Set to not build or install programs 
@@ -556,6 +563,24 @@ and related support files.
 .It Va WITHOUT_MAN
 .\" from FreeBSD: head/tools/build/options/WITHOUT_MAN 156932 2006-03-21 07:50:50Z ru
 Set to not build manual pages.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_MAN_UTILS
+(can be overridden with
+.Va WITH_MAN_UTILS )
+.El
+.It Va WITHOUT_MAN_UTILS
+.\" from FreeBSD: head/tools/build/options/WITHOUT_MAN_UTILS 208322 2010-05-20 00:07:21Z jkim
+Set to not build utilities for manual pages,
+.Xr apropos 1 ,
+.Xr catman 1 ,
+.Xr makewhatis 1 ,
+.Xr man 1 ,
+.Xr whatis 1 ,
+.Xr manctl 8 ,
+and related support files.
 .It Va WITHOUT_NCP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_NCP 156932 2006-03-21 07:50:50Z ru
 Set to not build programs, libraries, and kernel modules
@@ -781,6 +806,8 @@ When set, it also enforces the following options:
 .Pp
 .Bl -item -compact
 .It
+.Va WITHOUT_CLANG
+.It
 .Va WITHOUT_GDB
 .El
 .It Va WITHOUT_USB
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index bbbd292..bc4e680 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -32,7 +32,7 @@
 .\"     @(#)stab.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd June 5, 1993
+.Dd June 10, 2010
 .Dt STAB 5
 .Os
 .Sh NAME
@@ -79,7 +79,7 @@ consists of the following structure:
 
 struct nlist {
 	union {
-		char	*n_name;	/* for use when in-core */
+		const char *n_name;	/* for use when in-core */
 		long	n_strx;		/* index into file string table */
 	} n_un;
 	unsigned char	n_type;		/* type flag */
diff --git a/share/man/man5/xfs.5 b/share/man/man5/xfs.5
index 4465484..c350424 100644
--- a/share/man/man5/xfs.5
+++ b/share/man/man5/xfs.5
@@ -67,22 +67,6 @@ port contains the
 utility for
 creating XFS file systems, and also other utilities for analyzing,
 and repairing XFS file systems.
-.Sh CAVEATS
-The port of XFS to
-.Fx
-is currently incomplete.
-Only read-only access is supported for XFS volumes.
-Writing to a volume is not supported.
-.Pp
-The
-.Fl p
-flag to
-.Cm mkfs.xfs
-can be used to create an XFS file system which is populated with files
-and other metadata.
-This can be used to quickly create a read-only file system which
-can be tested on
-.Fx .
 .Sh HISTORY
 XFS was originally written by SGI for the IRIX operating system.
 SGI ported XFS to Linux, and released the source code under the GNU
@@ -106,3 +90,19 @@ first appeared in
 .Sh AUTHORS
 This manual page was written by
 .An Craig Rodrigues Aq rodrigc@FreeBSD.org .
+.Sh CAVEATS
+The port of XFS to
+.Fx
+is currently incomplete.
+Only read-only access is supported for XFS volumes.
+Writing to a volume is not supported.
+.Pp
+The
+.Fl p
+flag to
+.Cm mkfs.xfs
+can be used to create an XFS file system which is populated with files
+and other metadata.
+This can be used to quickly create a read-only file system which
+can be tested on
+.Fx .
diff --git a/share/man/man8/nanobsd.8 b/share/man/man8/nanobsd.8
index cb953ec..0309c4e 100644
--- a/share/man/man8/nanobsd.8
+++ b/share/man/man8/nanobsd.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 16, 2009
+.Dd May 20, 2010
 .Dt NANOBSD 8
 .Os
 .Sh NAME
@@ -203,6 +203,9 @@ Build name (used to construct the working directory names).
 Path to the source tree used to build the image.
 .It Va NANO_KERNEL
 Name of the kernel configuration file used to build the kernel.
+.It Va NANO_ARCH
+Machine processor architecture to build. Defaults to output of
+.Cm uname -p .
 .It Va NANO_BOOT0CFG
 Controls the options passed to
 .Xr boot0cfg 8 ;
diff --git a/share/man/man9/BUS_DESCRIBE_INTR.9 b/share/man/man9/BUS_DESCRIBE_INTR.9
index 989780f..0163e70 100644
--- a/share/man/man9/BUS_DESCRIBE_INTR.9
+++ b/share/man/man9/BUS_DESCRIBE_INTR.9
@@ -98,7 +98,7 @@ The
 method and
 .Fn bus_describe_intr
 functions first appeared in
-.Fx 9.0 .
+.Fx 8.1 .
 .Sh BUGS
 It is not currently possible to remove a description from an active interrupt
 handler.
diff --git a/share/man/man9/alq.9 b/share/man/man9/alq.9
index ec6ef26..65c2d07 100644
--- a/share/man/man9/alq.9
+++ b/share/man/man9/alq.9
@@ -1,7 +1,13 @@
 .\"
 .\" Copyright (c) 2003 Hiten Pandya <hmp@FreeBSD.org>
+.\" Copyright (c) 2009-2010 The FreeBSD Foundation
 .\" All rights reserved.
 .\"
+.\" Portions of this software were developed at the Centre for Advanced
+.\" Internet Architectures, Swinburne University of Technology, Melbourne,
+.\" Australia by Lawrence Stewart under sponsorship from the FreeBSD
+.\" Foundation.
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -25,21 +31,34 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 16, 2003
+.Dd April 26, 2010
 .Dt ALQ 9
 .Os
 .Sh NAME
 .Nm alq ,
+.Nm alq_open_flags ,
 .Nm alq_open ,
+.Nm alq_writen ,
 .Nm alq_write ,
 .Nm alq_flush ,
 .Nm alq_close ,
+.Nm alq_getn ,
 .Nm alq_get ,
+.Nm alq_post_flags ,
 .Nm alq_post
 .Nd Asynchronous Logging Queues
 .Sh SYNOPSIS
 .In sys/alq.h
 .Ft int
+.Fo alq_open_flags
+.Fa "struct alq **app"
+.Fa "const char *file"
+.Fa "struct ucred *cred"
+.Fa "int cmode"
+.Fa "int size"
+.Fa "int flags"
+.Fc
+.Ft int
 .Fo alq_open
 .Fa "struct alq **app"
 .Fa "const char *file"
@@ -49,19 +68,25 @@
 .Fa "int count"
 .Fc
 .Ft int
-.Fn alq_write "struct alq *alq" "void *data" "int waitok"
+.Fn alq_writen "struct alq *alq" "void *data" "int len" "int flags"
+.Ft int
+.Fn alq_write "struct alq *alq" "void *data" "int flags"
 .Ft void
 .Fn alq_flush "struct alq *alq"
 .Ft void
 .Fn alq_close "struct alq *alq"
 .Ft struct ale *
-.Fn alq_get "struct alq *alq" "int waitok"
+.Fn alq_getn "struct alq *alq" "int len" "int flags"
+.Ft struct ale *
+.Fn alq_get "struct alq *alq" "int flags"
+.Ft void
+.Fn alq_post_flags "struct alq *alq" "struct ale *ale" "int flags"
 .Ft void
 .Fn alq_post "struct alq *alq" "struct ale *ale"
 .Sh DESCRIPTION
 The
 .Nm
-facility provides an asynchronous fixed length recording
+facility provides an asynchronous fixed or variable length recording
 mechanism, known as Asynchronous Logging Queues.
 It can record to any
 .Xr vnode 9 ,
@@ -81,26 +106,37 @@ is defined as
 which has the following members:
 .Bd -literal -offset indent
 struct ale {
-	struct ale	*ae_next;	/* Next Entry */
-	char		*ae_data;	/* Entry buffer */
-	int		ae_flags;	/* Entry flags */
+	intptr_t	ae_bytesused;	/* # bytes written to ALE. */
+	char		*ae_data;	/* Write ptr. */
+	int		ae_pad;		/* Unused, compat. */
 };
 .Ed
 .Pp
-The
-.Va ae_flags
-field is for internal use, clients of the
+An
 .Nm
-interface should not modify this field.
-Behaviour is undefined if this field is modified.
+can be created in either fixed or variable length mode.
+A variable length
+.Nm
+accommodates writes of varying length using
+.Fn alq_writen
+and
+.Fn alq_getn .
+A fixed length
+.Nm
+accommodates a fixed number of writes using
+.Fn alq_write
+and
+.Fn alq_get ,
+each of fixed size (set at queue creation time).
+Fixed length mode is deprecated in favour of variable length mode.
 .Sh FUNCTIONS
 The
-.Fn alq_open
-function creates a new logging queue.
+.Fn alq_open_flags
+function creates a new variable length asynchronous logging queue.
 The
 .Fa file
-argument is the name of the file to open for logging; if the file does not
-yet exist,
+argument is the name of the file to open for logging.
+If the file does not yet exist,
 .Fn alq_open
 will attempt to create it.
 The
@@ -112,33 +148,99 @@ as the requested creation mode, to be used if the file will be created by
 Consumers of this API may wish to pass
 .Dv ALQ_DEFAULT_CMODE ,
 a default creation mode suitable for most applications.
-The argument
+The
 .Fa cred
-specifies the credentials to use when opening and performing I/O on the file.
-The size of each entry in the queue is determined by
-.Fa size .
+argument specifies the credentials to use when opening and performing I/O on the file.
 The
+.Fa size
+argument sets the size (in bytes) of the underlying queue.
+The ALQ_ORDERED flag may be passed in via
+.Fa flags
+to indicate that the ordering of writer threads waiting for a busy
+.Nm
+to free up resources should be preserved.
+.Pp
+The deprecated
+.Fn alq_open
+function is implemented as a wrapper around
+.Fn alq_open_flags
+to provide backwards compatibility to consumers that have not been updated to
+utilise the newer
+.Fn alq_open_flags
+function.
+It passes all arguments through to
+.Fn alq_open_flags
+untouched except for
+.Fa size
+and
+.Fa count ,
+and sets
+.Fa flags
+to 0.
+To create a variable length mode
+.Nm ,
+the
+.Fa size
+argument should be set to the size (in bytes) of the underlying queue and the
+.Fa count
+argument should be set to 0.
+To create a fixed length mode
+.Nm ,
+the
+.Fa size
+argument should be set to the size (in bytes) of each write and the
 .Fa count
-argument determines the number of items to be stored in the
-asynchronous queue over an approximate period of a disk
-write operation.
+argument should be set to the number of
+.Fa size
+byte chunks to reserve capacity for.
 .Pp
 The
-.Fn alq_write
+.Fn alq_writen
 function writes
+.Fa len
+bytes from
 .Fa data
-to the designated queue,
+to the designated variable length mode queue
 .Fa alq .
-In the event that
-.Fn alq_write
-could not write the entry immediately, and
+If
+.Fn alq_writen
+could not write the entry immediately and
 .Dv ALQ_WAITOK
-is passed to
-.Fa waitok ,
-then
+is set in
+.Fa flags ,
+the function will be allowed to
+.Xr msleep_spin 9
+with the
+.Dq Li alqwnord
+or
+.Dq Li alqwnres
+wait message.
+A write will automatically schedule the queue
+.Fa alq
+to be flushed to disk.
+This behaviour can be controlled by passing ALQ_NOACTIVATE via
+.Fa flags
+to indicate that the write should not schedule
+.Fa alq
+to be flushed to disk.
+.Pp
+The deprecated
+.Fn alq_write
+function is implemented as a wrapper around
+.Fn alq_writen
+to provide backwards compatibility to consumers that have not been updated to
+utilise variable length mode queues.
+The function will write
+.Fa size
+bytes of data (where
+.Fa size
+was specified at queue creation time) from the
+.Fa data
+buffer to the
+.Fa alq .
+Note that it is an error to call
 .Fn alq_write
-will be allowed to
-.Xr tsleep 9 .
+on a variable length mode queue.
 .Pp
 The
 .Fn alq_flush
@@ -146,61 +248,136 @@ function is used for flushing
 .Fa alq
 to the log medium that was passed to
 .Fn alq_open .
+If
+.Fa alq
+has data to flush and is not already in the process of being flushed, the
+function will block doing IO.
+Otherwise, the function will return immediately.
 .Pp
 The
 .Fn alq_close
-function will close the asynchronous logging queue,
-.Fa alq ,
+function will close the asynchronous logging queue
+.Fa alq
 and flush all pending write requests to the log medium.
 It will free all resources that were previously allocated.
 .Pp
 The
-.Fn alq_get
-function returns the next available asynchronous logging entry
-from the queue,
-.Fa alq .
-This function leaves the queue in a locked state, until a subsequent
+.Fn alq_getn
+function returns an asynchronous log entry from
+.Fa alq ,
+initialised to point at a buffer capable of receiving
+.Fa len
+bytes of data.
+This function leaves
+.Fa alq
+in a locked state, until a subsequent
 .Fn alq_post
+or
+.Fn alq_post_flags
 call is made.
-In the event that
-.Fn alq_get
-could not retrieve an entry immediately, it will
-.Xr tsleep 9
+If
+.Fn alq_getn
+could not obtain
+.Fa len
+bytes of buffer immediately and
+.Dv ALQ_WAITOK
+is set in
+.Fa flags ,
+the function will be allowed to
+.Xr msleep_spin 9
 with the
-.Dq Li alqget
+.Dq Li alqgnord
+or
+.Dq Li alqgnres
 wait message.
+The caller can choose to write less than
+.Fa len
+bytes of data to the returned asynchronous log entry by setting the entry's
+ae_bytesused field to the number of bytes actually written.
+This must be done prior to calling
+.Fn alq_post .
 .Pp
-The
-.Fn alq_post
-function schedules the asynchronous logging entry,
-.Fa ale ,
-which is retrieved using the
+The deprecated
 .Fn alq_get
-function,
-for writing to the asynchronous logging queue,
+function is implemented as a wrapper around
+.Fn alq_getn
+to provide backwards compatibility to consumers that have not been updated to
+utilise variable length mode queues.
+The asynchronous log entry returned will be initialised to point at a buffer
+capable of receiving
+.Fa size
+bytes of data (where
+.Fa size
+was specified at queue creation time).
+Note that it is an error to call
+.Fn alq_get
+on a variable length mode queue.
+.Pp
+The
+.Fn alq_post_flags
+function schedules the asynchronous log entry
+.Fa ale
+(obtained from
+.Fn alq_getn
+or
+.Fn alq_get )
+for writing to
 .Fa alq .
-This function leaves the queue,
-.Fa alq ,
+The ALQ_NOACTIVATE flag may be passed in via
+.Fa flags
+to indicate that the queue should not be immediately scheduled to be flushed to
+disk.
+This function leaves
+.Fa alq
 in an unlocked state.
+.Pp
+The
+.Fn alq_post
+function is implemented as a wrapper around
+.Fn alq_post_flags
+to provide backwards compatibility to consumers that have not been updated to
+utilise the newer
+.Fn alq_post_flags
+function.
+It simply passes all arguments through to
+.Fn alq_post_flags
+untouched, and sets
+.Fa flags
+to 0.
 .Sh IMPLEMENTATION NOTES
 The
+.Fn alq_writen
+and
 .Fn alq_write
-function is a wrapper around the
+functions both perform a
+.Xr bcopy 3
+from the supplied
+.Fa data
+buffer into the underlying
+.Nm
+buffer.
+Performance critical code paths may wish to consider using
+.Fn alq_getn
+(variable length queues) or
+.Fn alq_get
+(fixed length queues) to avoid the extra memory copy. Note that a queue
+remains locked between calls to
+.Fn alq_getn
+or
 .Fn alq_get
 and
 .Fn alq_post
-functions; by using these functions separately, a call
-to
-.Fn bcopy
-can be avoided for performance critical code paths.
+or
+.Fn alq_post_flags ,
+so this method of writing to a queue is unsuitable for situations where the
+time between calls may be substantial.
 .Sh LOCKING
-Each asynchronous queue is protected by a spin mutex.
+Each asynchronous logging queue is protected by a spin mutex.
 .Pp
 Functions
-.Fn alq_flush ,
-.Fn alq_open
+.Fn alq_flush
 and
-.Fn alq_post
+.Fn alq_open
 may attempt to acquire an internal sleep mutex, and should
 consequently not be used in contexts where sleeping is
 not allowed.
@@ -214,32 +391,36 @@ if it fails to open
 or else it returns 0.
 .Pp
 The
+.Fn alq_writen
+and
 .Fn alq_write
-function returns
+functions return
 .Er EWOULDBLOCK
 if
 .Dv ALQ_NOWAIT
-was provided as a value to
-.Fa waitok
-and either the queue is full, or when the system is shutting down.
+was set in
+.Fa flags
+and either the queue is full or the system is shutting down.
 .Pp
 The
+.Fn alq_getn
+and
 .Fn alq_get
-function returns
-.Dv NULL ,
+functions return
+.Dv NULL
 if
 .Dv ALQ_NOWAIT
-was provided as a value to
-.Fa waitok
-and either the queue is full, or when the system is shutting down.
+was set in
+.Fa flags
+and either the queue is full or the system is shutting down.
 .Pp
 NOTE: invalid arguments to non-void functions will result in
 undefined behaviour.
 .Sh SEE ALSO
-.Xr syslog 3 ,
-.Xr kthread 9 ,
+.Xr kproc 9 ,
 .Xr ktr 9 ,
-.Xr tsleep 9 ,
+.Xr msleep_spin 9 ,
+.Xr syslog 3 ,
 .Xr vnode 9
 .Sh HISTORY
 The
@@ -250,7 +431,11 @@ Asynchronous Logging Queues (ALQ) facility first appeared in
 The
 .Nm
 facility was written by
-.An Jeffrey Roberson Aq jeff@FreeBSD.org .
+.An Jeffrey Roberson Aq jeff@FreeBSD.org
+and extended by
+.An Lawrence Stewart Aq lstewart@freebsd.org .
 .Pp
 This manual page was written by
-.An Hiten Pandya Aq hmp@FreeBSD.org .
+.An Hiten Pandya Aq hmp@FreeBSD.org
+and revised by
+.An Lawrence Stewart Aq lstewart@freebsd.org .
diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9
index 94c4ba4..0baac45 100644
--- a/share/man/man9/atomic.9
+++ b/share/man/man9/atomic.9
@@ -62,7 +62,6 @@
 .Fn atomic_subtract_[acq_|rel_]<type> "volatile <type> *p" "<type> v"
 .Ft void
 .Fn atomic_store_rel_<type> "volatile <type> *p" "<type> v"
-.rm LB RB La Ra
 .Sh DESCRIPTION
 Each of the atomic operations is guaranteed to be atomic in the presence of
 interrupts.
diff --git a/share/man/man9/cr_seeothergids.9 b/share/man/man9/cr_seeothergids.9
index 87fd139..ea8f436 100644
--- a/share/man/man9/cr_seeothergids.9
+++ b/share/man/man9/cr_seeothergids.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man9/cr_seeotheruids.9 b/share/man/man9/cr_seeotheruids.9
index 2066c40..b7b7000 100644
--- a/share/man/man9/cr_seeotheruids.9
+++ b/share/man/man9/cr_seeotheruids.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man9/fail.9 b/share/man/man9/fail.9
index 81292f5..8d1e593 100644
--- a/share/man/man9/fail.9
+++ b/share/man/man9/fail.9
@@ -183,6 +183,10 @@ Return 5 for 1 in 1000 executions, but only 5 times total.
 .It Sy sysctl debug.fail_point.foobar="1%*sleep(50)"
 1/100th of the time, sleep 50ms.
 .El
+.Sh AUTHORS
+.An -nosplit
+This manual page was written by
+.An Zach Loafman Aq zml@FreeBSD.org .
 .Sh CAVEATS
 It is easy to shoot yourself in the foot by setting fail points too
 aggressively or setting too many in combination.
@@ -197,7 +201,3 @@ Currently,
 .Fn fail_point_eval
 does not verify whether the context is appropriate for calling
 .Fn msleep .
-.Sh AUTHORS
-.An -nosplit
-This manual page was written by
-.An Zach Loafman Aq zml@FreeBSD.org .
diff --git a/share/man/man9/ieee80211.9 b/share/man/man9/ieee80211.9
index ae92d5e..8fd6e0d 100644
--- a/share/man/man9/ieee80211.9
+++ b/share/man/man9/ieee80211.9
@@ -25,11 +25,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 29, 2010
-.Dt NET80211 9
+.Dd April 28, 2010
+.Dt IEEE80211 9
 .Os
 .Sh NAME
-.Nm net80211
+.Nm IEEE80211 
 .Nd 802.11 network layer
 .Sh SYNOPSIS
 .In net80211/ieee80211_var.h
diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9
index be0b506..9389411 100644
--- a/share/man/man9/ieee80211_node.9
+++ b/share/man/man9/ieee80211_node.9
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 29, 2010
+.Dd April 28, 2010
 .Dt IEEE80211_NODE 9
 .Os
 .Sh NAME
@@ -152,7 +152,7 @@ displays the contents of a single node while
 .Fn ieee80211_dump_nodes
 displays the contents of the specified node table.
 Nodes may also be displayed using
-.Xr ddb 9
+.Xr ddb 4
 with the
 .Dq show node
 directive and the station node table can be displayed with
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index 50f7d46..65cf3d3 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 28, 2008
+.Dd May 6, 2010
 .Dt MAKE_DEV 9
 .Os
 .Sh NAME
@@ -133,9 +133,18 @@ The following values are currently accepted:
 .Pp
 .Bd -literal -offset indent -compact
 MAKEDEV_REF	reference the created device
+MAKEDEV_NOWAIT	do not sleep, may return NULL
+MAKEDEV_WAITOK	allow the function to sleep to satisfy malloc
 .Ed
 .Pp
 The
+.Dv MAKEDEV_WAITOK
+flag is assumed if none of
+.Dv MAKEDEV_WAITOK ,
+.Dv MAKEDEV_NOWAIT
+is specified.
+.Pp
+The
 .Xr dev_clone 9
 event handler shall specify
 .Dv MAKEDEV_REF
@@ -149,14 +158,14 @@ The
 function is equivalent to the call
 .Bd -literal -offset indent
 make_dev_credf(0, cdevsw, unit, cr, uid, gid, perms, fmt, ...);
-.Ed .
+.Ed
 .Pp
 The
 .Fn make_dev
 function call is the same as
 .Bd -literal -offset indent
 make_dev_credf(0, cdevsw, unit, NULL, uid, gid, perms, fmt, ...);
-.Ed .
+.Ed
 .Pp
 The
 .Fn make_dev_alias
@@ -236,7 +245,7 @@ The
 function is the same as
 .Bd -literal -offset indent
 destroy_dev_sched(cdev, NULL, NULL);
-.Ed .
+.Ed
 .Pp
 The
 .Fn d_close
diff --git a/share/man/man9/mbpool.9 b/share/man/man9/mbpool.9
index b042973..600c371 100644
--- a/share/man/man9/mbpool.9
+++ b/share/man/man9/mbpool.9
@@ -254,11 +254,11 @@ states and
 the number of buffers on the free list.
 .Sh SEE ALSO
 .Xr mbuf 9
+.Sh AUTHORS
+.An Harti Brandt Aq harti@FreeBSD.org
 .Sh CAVEATS
 The function
 .Fn mbp_sync
 is currently a no-op because
 .Xr bus_dmamap_sync 9
 is missing the offset and length parameters.
-.Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index 33f753f..c941004 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -319,6 +319,10 @@ function.
 If successful,
 .Fn namei
 will return 0, otherwise it will return an error.
+.Sh FILES
+.Bl -tag
+.It Pa src/sys/kern/vfs_lookup.c
+.El
 .Sh ERRORS
 Errors which
 .Fn namei
@@ -343,10 +347,6 @@ An attempt is made to open a directory with write mode specified.
 .It Bq Er EROFS
 An attempt is made to modify a file or directory on a read-only file system.
 .El
-.Sh FILES
-.Bl -tag
-.It Pa src/sys/kern/vfs_lookup.c
-.El
 .Sh SEE ALSO
 .Xr uio 9 ,
 .Xr uma 9 ,
diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9
index 6249a4d..722052a 100644
--- a/share/man/man9/p_candebug.9
+++ b/share/man/man9/p_candebug.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man9/p_cansee.9 b/share/man/man9/p_cansee.9
index fafe9d3..b94ec30 100644
--- a/share/man/man9/p_cansee.9
+++ b/share/man/man9/p_cansee.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\" Copyright (c) 2006 Ceri Davies <ceri@FreeBSD.org>
 .\"
 .\" All rights reserved.
diff --git a/share/man/man9/prison_check.9 b/share/man/man9/prison_check.9
index 68e90fb..4fe1f2f 100644
--- a/share/man/man9/prison_check.9
+++ b/share/man/man9/prison_check.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Joseph Koshy <jkoshy@freebsd.org>
+.\" Copyright (c) 2003 Joseph Koshy <jkoshy@FreeBSD.org>
 .\"
 .\" All rights reserved.
 .\"
diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9
index 0ddb2d3..2e79f9c 100644
--- a/share/man/man9/uio.9
+++ b/share/man/man9/uio.9
@@ -115,18 +115,6 @@ space.
 On success
 .Fn uiomove
 will return 0, on error it will return an appropriate errno.
-.Sh ERRORS
-.Fn uiomove
-will fail and return the following error code if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The invoked
-.Xr copyin 9
-or
-.Xr copyout 9
-returned
-.Er EFAULT
-.El
 .Sh EXAMPLES
 The idea is that the driver maintains a private buffer for its data,
 and processes the request in chunks of maximal the size of this
@@ -167,6 +155,18 @@ fooread(dev_t dev, struct uio *uio, int flag)
 	return (rv);
 }
 .Ed
+.Sh ERRORS
+.Fn uiomove
+will fail and return the following error code if:
+.Bl -tag -width Er
+.It Bq Er EFAULT
+The invoked
+.Xr copyin 9
+or
+.Xr copyout 9
+returned
+.Er EFAULT
+.El
 .Sh SEE ALSO
 .Xr read 2 ,
 .Xr readv 2 ,
diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9
index a26e026..449058c 100644
--- a/share/man/man9/usbdi.9
+++ b/share/man/man9/usbdi.9
@@ -634,4 +634,4 @@ module has been inspired by the NetBSD USB stack initially written by
 Lennart Augustsson. The
 .Nm usb
 module was written by
-.An Hans Petter Selasky Aq hselasky@freebsd.org .
+.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
diff --git a/share/man/man9/watchdog.9 b/share/man/man9/watchdog.9
index 25634c9..170812b 100644
--- a/share/man/man9/watchdog.9
+++ b/share/man/man9/watchdog.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2004 Poul-Henning Kamp <phk@FreeBSD.org
+.\" Copyright (c) 2004 Poul-Henning Kamp <phk@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 685667f..4a1cc5b 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -235,7 +235,8 @@ FreeBSD 5.2           |      |                 |                       |
  *--FreeBSD     |     |      |                 |                       |
  |    8.0       |     |      |                 |                       |
  |     |    FreeBSD   |      |                 |                       |
- |     V      7.3     |      |                 |                       |
+ |     V      7.3     |      |                 |                DragonFly 2.6.0
+ |                    |      |             OpenBSD 4.7                 |
  |                    |      |                 |                       |
 FreeBSD 9 -current    |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
@@ -512,6 +513,8 @@ DragonFly 2.4.0		2009-09-16 [DFB]
 OpenBSD 4.6		2009-10-18 [OBD]
 FreeBSD 8.0		2009-11-26 [FBD]
 FreeBSD 7.3		2010-03-23 [FBD]
+DragonFly 2.6.0		2010-03-28 [DFB]
+OpenBSD 4.7		2010-05-19 [OBD]
 
 Bibliography
 ------------------------
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index a52aa27..19babc8 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -53,8 +53,10 @@ node [color=lightblue2, style=filled, bgcolor=black];
 # Current src committers go here. Try to keep things sorted.
 
 ache [label="Andrey Chernov\nache@FreeBSD.org\n1993/10/31"]
+ae [label="Andrey V. Elsukov\nae@FreeBSD.org\n2010/06/03"]
 akiyama [label="Shunsuke Akiyama\nakiyama@FreeBSD.org\n2000/06/19"]
 ambrisko [label="Doug Ambrisko\nambrisko@FreeBSD.org\n2001/12/19"]
+anchie [label="Ana Kukec\nanchie@FreeBSD.org\n2010/04/14"]
 andre [label="Andre Oppermann\nandre@FreeBSD.org\n2003/11/12"]
 anholt [label="Eric Anholt\nanholt@FreeBSD.org\n2002/04/22"]
 antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2008/02/03"]
@@ -110,11 +112,12 @@ ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"]
 jake [label="Jake Burkholder\njake@FreeBSD.org\n2000/05/16"]
 jamie [label="Jamie Gritton\njamie@FreeBSD.org\n2009/01/28"]
 jayanth [label="Jayanth Vijayaraghavan\njayanth@FreeBSD.org\n2000/05/08"]
+jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"]
+jdp [label="John Polstra\njdp@FreeBSD.org\n????/??/??"]
 jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"]
+jhb [label="John Baldwin\njhb@FreeBSD.org\n1999/08/23"]
 jilles [label="Jilles Tjoelker\njilles@FreeBSD.org\n2009/05/22"]
 jinmei [label="JINMEI Tatuya\njinmei@FreeBSD.org\n2007/03/17"]
-jdp [label="John Polstra\njdp@FreeBSD.org\n????/??/??"]
-jhb [label="John Baldwin\njhb@FreeBSD.org\n1999/08/23"]
 jkh [label="Jordan K. Hubbard\njkh@FreeBSD.org\n1993/06/12"]
 jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2005/07/06"]
 jkoshy [label="A. Joseph Koshy\njkoshy@FreeBSD.org\n1998/05/13"]
@@ -139,6 +142,7 @@ markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2006/06/01"]
 matteo [label="Matteo Riondato\nmatteo@FreeBSD.org\n2006/01/18"]
 mav [label="Alexander Motin\nmav@FreeBSD.org\n2007/04/12"]
 maxim [label="Maxim Konovalov\nmaxim@FreeBSD.org\n2002/02/07"]
+mdf [label="Matthew Fleming\nmdf@FreeBSD.org\n2010/06/04"]
 mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"]
 mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"]
 mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"]
@@ -161,6 +165,7 @@ 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"]
 rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2007/01/31"]
+randi [label="Randi Harper\nrandi@FreeBSD.org\n2010/04/20"]
 remko [label="Remko Lodder\nremko@FreeBSD.org\n2007/02/23"]
 rik [label="Roman Kurakin\nrik@FreeBSD.org\n2003/12/18"]
 rink [label="Rink Springer\nrink@FreeBSD.org\n2006/01/16"]
@@ -169,6 +174,7 @@ roberto [label="Ollivier Robert\nroberto@FreeBSD.org\n1995/02/22"]
 rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2007/09/25"]
 rrs [label="Randall R Stewart\nrrs@FreeBSD.org\n2007/02/08"]
 rse [label="Ralf S. Engelschall\nrse@FreeBSD.org\n1997/07/31"]
+rstone [label="Ryan Stone\nrstone@FreeBSD.org\n2010/04/19"]
 ru [label="Ruslan Ermilov\nru@FreeBSD.org\n1999/05/27"]
 rwatson [label="Robert N. M. Watson\nrwatson@FreeBSD.org\n1999/12/16"]
 sam [label="Sam Leffler\nsam@FreeBSD.org\n2002/07/02"]
@@ -238,10 +244,12 @@ brian -> joe
 brooks -> bushman
 brooks -> jamie
 
+bz -> anchie
 bz -> jamie
 bz -> syrinx
 
 cperciva -> flz
+cperciva -> randi
 cperciva -> simon
 
 csjp -> bushman
@@ -269,6 +277,8 @@ ed -> uqs
 eivind -> des
 eivind -> rwatson
 
+emaste -> rstone
+
 emax -> markus
 
 gallatin -> ticso
@@ -340,6 +350,7 @@ jkh -> yar
 
 jkoshy -> kaiw
 jkoshy -> fabient
+jkoshy -> rstone
 
 jlemon -> bmilekic
 jlemon -> brooks
@@ -357,6 +368,7 @@ julian -> zec
 
 kan -> kib
 
+kib -> ae
 kib -> dchagin
 kib -> lulf
 kib -> pho
@@ -372,6 +384,8 @@ marcel -> nwhitehorn
 
 markm -> sheldonh
 
+mav -> ae
+
 mdodd -> jake
 
 mlaier -> benjsc
@@ -415,6 +429,7 @@ rpaulo -> avg
 rpaulo -> bschmidt
 
 rrs -> brucec
+rrs -> jchandra
 rrs -> tuexen
 
 ru -> ceri
@@ -472,4 +487,6 @@ wes -> scf
 
 wollman -> gad
 
+zml -> mdf
+
 }
diff --git a/share/misc/mdoc.template b/share/misc/mdoc.template
index 1ecacfc..63ba47d 100644
--- a/share/misc/mdoc.template
+++ b/share/misc/mdoc.template
@@ -2,8 +2,8 @@
 .\"
 .\" The following requests are required for all man pages.
 .Dd Month day, year
-.Os [OPERATING_SYSTEM] [version/release]
 .Dt DOCUMENT_TITLE [section number] [architecture/volume]
+.Os [OPERATING_SYSTEM] [version/release]
 .Sh NAME
 .Nm name
 .Nd one line description of name
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 2c8a8cd..51cfb39 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -91,12 +91,12 @@ the command "make b" will echo "bar".  This is for compatibility with the
 way the V7 make behaved.
 
 It's fairly difficult to make the BSD .mk files work when you're building
-multiple programs in a single directory.  It's a lot easier split up the
-programs than to deal with the problem.  Most of the agony comes from making
-the "obj" directory stuff work right, not because we switch to a new version
-of make.  So, don't get mad at us, figure out a better way to handle multiple
-architectures so we can quit using the symbolic link stuff.  (Imake doesn't
-count.)
+multiple programs in a single directory.  It's a lot easier to split up
+the programs than to deal with the problem.  Most of the agony comes from
+making the "obj" directory stuff work right, not because we switch to a new
+version of make.  So, don't get mad at us, figure out a better way to handle
+multiple architectures so we can quit using the symbolic link stuff.
+(Imake doesn't count.)
 
 The file .depend in the source directory is expected to contain dependencies
 for the source files.  This file is read automatically by make after reading
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 2ef272c..5068707 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -9,7 +9,7 @@ _CPUCFLAGS =
 . if ${MACHINE_CPUARCH} == "i386"
 MACHINE_CPU = i486
 . elif ${MACHINE_CPUARCH} == "amd64"
-MACHINE_CPU = amd64 sse2 sse
+MACHINE_CPU = amd64 sse2 sse mmx
 . elif ${MACHINE_CPUARCH} == "ia64"
 MACHINE_CPU = itanium
 . elif ${MACHINE_CPUARCH} == "powerpc"
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index c80fe23..3e47a2c 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -82,6 +82,7 @@ LIBLN?=		"don't use LIBLN, use LIBL"
 .if ${MK_BIND} != "no"
 LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
 .endif
+LIBLZMA?=	${DESTDIR}${LIBDIR}/liblzma.a
 LIBM?=		${DESTDIR}${LIBDIR}/libm.a
 LIBMAGIC?=	${DESTDIR}${LIBDIR}/libmagic.a
 LIBMD?=		${DESTDIR}${LIBDIR}/libmd.a
@@ -128,6 +129,7 @@ MINUSLPAM+=	-lypclnt
 
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
+LIBPKG?=	${DESTDIR}${LIBDIR}/libpkg.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 777ff36..8839bb4 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -278,6 +278,27 @@ WITH_HESIOD=
 WITH_IDEA=
 .endif
 
+# Enable FDT by default for selected platforms.
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc"
+# XXX this is temporarily disabled until all FDT support code is in place.
+#_fdt=	FDT
+_no_fdt= FDT
+.else
+_no_fdt= FDT
+.endif
+
+#
+# Default behaviour of MK_CLANG depends on the architecture.
+#
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "powerpc"
+_clang_yes=CLANG
+_clang_no=
+.else
+_clang_yes=
+_clang_no=CLANG
+.endif
+
 #
 # MK_* options which default to "yes".
 #
@@ -305,6 +326,7 @@ WITH_IDEA=
     BZIP2 \
     CALENDAR \
     CDDL \
+    ${_clang_yes} \
     CPP \
     CRYPT \
     CTM \
@@ -313,6 +335,7 @@ WITH_IDEA=
     DICT \
     DYNAMICROOT \
     EXAMPLES \
+    ${_fdt} \
     FLOPPY \
     FORTH \
     FP_LIBC \
@@ -407,6 +430,8 @@ MK_${var}:=	yes
     BIND_LIBS \
     BIND_SIGCHASE \
     BIND_XML \
+    ${_clang_no} \
+    ${_no_fdt} \
     HESIOD \
     IDEA
 .if defined(WITH_${var}) && defined(WITHOUT_${var})
@@ -486,6 +511,7 @@ MK_GROFF:=	no
 .endif
 
 .if ${MK_TOOLCHAIN} == "no"
+MK_CLANG:=	no
 MK_GDB:=	no
 .endif
 
@@ -524,7 +550,8 @@ MK_${var}_SUPPORT:= yes
 # MK_* options whose default value depends on another option.
 #
 .for vv in \
-    GSSAPI/KERBEROS
+    GSSAPI/KERBEROS \
+    MAN_UTILS/MAN
 .if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H})
 .error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set.
 .endif