[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

zrouter-src-freebsd at zrouter.org zrouter-src-freebsd at zrouter.org
Wed Jul 25 14:36:08 UTC 2012


details:   http://zrouter.org/hg/FreeBSD/head//rev/58bcef12a717
changeset: 492:58bcef12a717
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Wed Jul 25 16:32:50 2012 +0300
description:
Lazy update

diffstat:

 head/Makefile                                 |    4 +-
 head/Makefile.inc1                            |   72 ++--
 head/ObsoleteFiles.inc                        |   64 +++-
 head/UPDATING                                 |   30 +-
 head/etc/Makefile                             |    5 +-
 head/etc/auth.conf                            |    8 -
 head/etc/defaults/periodic.conf               |    5 +-
 head/etc/defaults/rc.conf                     |    9 +-
 head/etc/devd.conf                            |    4 +-
 head/etc/devd/usb.conf                        |   22 +-
 head/etc/login.conf                           |    6 +-
 head/etc/mtree/BSD.include.dist               |    8 +-
 head/etc/mtree/BSD.usr.dist                   |   12 +-
 head/etc/pam.d/Makefile                       |    3 +-
 head/etc/pam.d/kde                            |   19 -
 head/etc/periodic/daily/400.status-disks      |   15 +-
 head/etc/periodic/daily/420.status-network    |    6 +-
 head/etc/rc.d/accounting                      |    6 +-
 head/etc/rc.d/bgfsck                          |    6 +-
 head/etc/rc.d/bridge                          |    6 +-
 head/etc/rc.d/cleanvar                        |    4 +-
 head/etc/rc.d/devd                            |    4 +-
 head/etc/rc.d/ip6addrctl                      |    5 +-
 head/etc/rc.d/ipfw                            |    6 +-
 head/etc/rc.d/jail                            |    4 +-
 head/etc/rc.d/kfd                             |   14 +-
 head/etc/rc.d/kldxref                         |    4 +-
 head/etc/rc.d/named                           |    6 +-
 head/etc/rc.d/power_profile                   |    4 +-
 head/etc/rc.d/rarpd                           |    5 +-
 head/etc/rc.d/tmp                             |    6 +-
 head/etc/rc.firewall                          |    6 +-
 head/etc/rc.subr                              |    6 +-
 head/etc/syslog.conf                          |    3 +-
 head/include/Makefile                         |   24 +-
 head/include/dirent.h                         |   23 +-
 head/include/fmtmsg.h                         |    4 +-
 head/include/malloc_np.h                      |   12 +-
 head/include/paths.h                          |    3 +-
 head/include/printf.h                         |    4 +-
 head/include/protocols/dumprestore.h          |   13 +-
 head/include/setjmp.h                         |    8 +-
 head/include/stdatomic.h                      |   31 +-
 head/include/unistd.h                         |    4 +-
 head/include/wchar.h                          |    8 +-
 head/include/xlocale/_ctype.h                 |    6 +-
 head/share/Makefile                           |    3 +-
 head/share/dtrace/Makefile                    |   21 +
 head/share/dtrace/README                      |   11 +
 head/share/dtrace/hotopen                     |   58 +++
 head/share/dtrace/nfsattrstats                |   74 ++++
 head/share/dtrace/nfsclienttime               |   74 ++++
 head/share/dtrace/toolkit/Makefile            |   17 +
 head/share/examples/Makefile                  |    9 +-
 head/share/examples/csh/dot.cshrc             |    8 +-
 head/share/examples/etc/README.examples       |    3 +-
 head/share/examples/libusb20/Makefile         |   13 +
 head/share/examples/libusb20/README           |   42 ++
 head/share/examples/libusb20/aux.c            |  120 +++++++
 head/share/examples/libusb20/aux.h            |   15 +
 head/share/examples/libusb20/bulk.c           |  243 +++++++++++++++
 head/share/examples/libusb20/control.c        |  414 ++++++++++++++++++++++++++
 head/share/examples/mdoc/example.4            |    4 +-
 head/share/examples/pf/faq-example1           |    4 +-
 head/share/examples/pf/pf.conf                |    4 +-
 head/share/examples/scsi_target/scsi_target.c |   31 +-
 head/share/examples/ses/Makefile.inc          |    3 +-
 head/share/examples/ses/srcs/eltsub.c         |  111 +++---
 head/share/examples/ses/srcs/getencstat.c     |   83 +++-
 head/share/examples/ses/srcs/getnobj.c        |    7 +-
 head/share/examples/ses/srcs/getobjmap.c      |    7 +-
 head/share/examples/ses/srcs/getobjstat.c     |    7 +-
 head/share/examples/ses/srcs/inienc.c         |    7 +-
 head/share/examples/ses/srcs/sesd.c           |   19 +-
 head/share/examples/ses/srcs/setencstat.c     |   15 +-
 head/share/examples/ses/srcs/setobjstat.c     |   15 +-
 head/share/man/man3/ATOMIC_VAR_INIT.3         |    6 +-
 head/share/man/man3/pthread.3                 |    4 +-
 head/share/man/man3/pthread_condattr.3        |    4 +-
 head/share/man/man4/Makefile                  |   32 +-
 head/share/man/man4/acpi.4                    |    9 +-
 head/share/man/man4/acpi_asus.4               |    3 +-
 head/share/man/man4/acpi_asus_wmi.4           |   90 +++++
 head/share/man/man4/acpi_hp.4                 |    6 +-
 head/share/man/man4/acpi_ibm.4                |   28 +-
 head/share/man/man4/acpi_panasonic.4          |    8 +-
 head/share/man/man4/acpi_wmi.4                |    8 +-
 head/share/man/man4/ahci.4                    |   16 +-
 head/share/man/man4/ata.4                     |   14 +-
 head/share/man/man4/ath.4                     |    6 +-
 head/share/man/man4/atp.4                     |    6 +-
 head/share/man/man4/bce.4                     |   76 ++++-
 head/share/man/man4/bpf.4                     |    6 +-
 head/share/man/man4/bridge.4                  |    5 +-
 head/share/man/man4/bxe.4                     |  138 ++++++++
 head/share/man/man4/capsicum.4                |    4 +-
 head/share/man/man4/carp.4                    |   76 ++--
 head/share/man/man4/ch.4                      |    7 +-
 head/share/man/man4/cpuctl.4                  |    6 +-
 head/share/man/man4/cpufreq.4                 |    3 +-
 head/share/man/man4/cxgbe.4                   |   13 +-
 head/share/man/man4/dcons.4                   |    4 +-
 head/share/man/man4/ddb.4                     |    8 +-
 head/share/man/man4/divert.4                  |    4 +-
 head/share/man/man4/epair.4                   |    4 +-
 head/share/man/man4/est.4                     |   98 ++++++
 head/share/man/man4/fdt.4                     |   10 +-
 head/share/man/man4/fdtbus.4                  |    7 +-
 head/share/man/man4/filemon.4                 |  178 +++++++++++
 head/share/man/man4/firewire.4                |   14 +-
 head/share/man/man4/gdb.4                     |    6 +-
 head/share/man/man4/gpib.4                    |    6 +-
 head/share/man/man4/gre.4                     |    8 +-
 head/share/man/man4/hptrr.4                   |   12 +-
 head/share/man/man4/igb.4                     |   12 +-
 head/share/man/man4/io.4                      |    4 +-
 head/share/man/man4/ip.4                      |   49 ++-
 head/share/man/man4/ipfirewall.4              |    9 +-
 head/share/man/man4/ipmi.4                    |    8 +-
 head/share/man/man4/ipw.4                     |    6 +-
 head/share/man/man4/isci.4                    |    5 +-
 head/share/man/man4/isp.4                     |    4 +-
 head/share/man/man4/iwn.4                     |    4 +-
 head/share/man/man4/mac_lomac.4               |    4 +-
 head/share/man/man4/mac_none.4                |    6 +-
 head/share/man/man4/mac_stub.4                |    8 +-
 head/share/man/man4/man4.i386/sbni.4          |    4 +-
 head/share/man/man4/mk48txx.4                 |    4 +-
 head/share/man/man4/mps.4                     |   11 +-
 head/share/man/man4/mpt.4                     |    8 +-
 head/share/man/man4/mvs.4                     |    5 +-
 head/share/man/man4/mwl.4                     |    4 +-
 head/share/man/man4/nand.4                    |  140 ++++++++
 head/share/man/man4/nandsim.4                 |   92 +++++
 head/share/man/man4/net80211.4                |    8 +-
 head/share/man/man4/netmap.4                  |    4 +-
 head/share/man/man4/ng_etf.4                  |    3 +-
 head/share/man/man4/ng_ksocket.4              |    4 +-
 head/share/man/man4/ng_nat.4                  |    6 +-
 head/share/man/man4/ng_netflow.4              |   53 ++-
 head/share/man/man4/ng_patch.4                |    4 +-
 head/share/man/man4/ng_socket.4               |    5 +-
 head/share/man/man4/pcm.4                     |    6 +-
 head/share/man/man4/pcn.4                     |    4 +-
 head/share/man/man4/psm.4                     |    4 +-
 head/share/man/man4/ral.4                     |   90 +++-
 head/share/man/man4/rl.4                      |    4 +-
 head/share/man/man4/run.4                     |   11 +-
 head/share/man/man4/scsi.4                    |   71 +--
 head/share/man/man4/send.4                    |    7 +-
 head/share/man/man4/ses.4                     |    4 +-
 head/share/man/man4/siftr.4                   |  137 ++++----
 head/share/man/man4/siis.4                    |    6 +-
 head/share/man/man4/simplebus.4               |    7 +-
 head/share/man/man4/sis.4                     |    4 +-
 head/share/man/man4/sk.4                      |    4 +-
 head/share/man/man4/snd_hda.4                 |   12 +-
 head/share/man/man4/snd_hdspe.4               |    4 +-
 head/share/man/man4/splash.4                  |    5 +-
 head/share/man/man4/ste.4                     |    6 +-
 head/share/man/man4/termios.4                 |    5 +-
 head/share/man/man4/ti.4                      |   16 +-
 head/share/man/man4/tl.4                      |    8 +-
 head/share/man/man4/tws.4                     |    6 +-
 head/share/man/man4/ugen.4                    |   60 +--
 head/share/man/man4/uhso.4                    |    4 +-
 head/share/man/man4/ulpt.4                    |    6 +-
 head/share/man/man4/umcs.4                    |    4 +-
 head/share/man/man4/usb.4                     |    6 +-
 head/share/man/man4/uslcom.4                  |    4 +-
 head/share/man/man4/vge.4                     |    4 +-
 head/share/man/man4/vlan.4                    |   38 +-
 head/share/man/man4/vr.4                      |    4 +-
 head/share/man/man4/watchdog.4                |    3 +-
 head/share/man/man4/wb.4                      |    4 +-
 head/share/man/man4/witness.4                 |   37 +-
 head/share/man/man4/wpi.4                     |    6 +-
 head/share/man/man4/xl.4                      |    4 +-
 head/share/man/man4/xnb.4                     |    8 +-
 head/share/man/man5/Makefile                  |    6 +-
 head/share/man/man5/devfs.conf.5              |    4 +-
 head/share/man/man5/devfs.rules.5             |    4 +-
 head/share/man/man5/device.hints.5            |    4 +-
 head/share/man/man5/libmap.conf.5             |   25 +-
 head/share/man/man5/make.conf.5               |    8 +-
 head/share/man/man5/moduli.5                  |  240 ++++++--------
 head/share/man/man5/nandfs.5                  |  128 ++++++++
 head/share/man/man5/nsmb.conf.5               |    3 +-
 head/share/man/man5/passwd.5                  |   18 +-
 head/share/man/man5/periodic.conf.5           |   10 +-
 head/share/man/man5/portsnap.conf.5           |   14 +-
 head/share/man/man5/rc.conf.5                 |   66 +++-
 head/share/man/man5/src.conf.5                |   65 +++-
 head/share/man/man5/tmpfs.5                   |   11 +-
 head/share/man/man7/build.7                   |   14 +-
 head/share/man/man7/c99.7                     |    4 +-
 head/share/man/man7/development.7             |   26 +-
 head/share/man/man7/release.7                 |    6 +-
 head/share/man/man7/tuning.7                  |   28 +-
 head/share/man/man8/picobsd.8                 |    9 +-
 head/share/man/man8/rc.8                      |    6 +-
 head/share/man/man9/BUF_ISLOCKED.9            |    4 +-
 head/share/man/man9/DB_COMMAND.9              |    6 +-
 head/share/man/man9/DECLARE_GEOM_CLASS.9      |    4 +-
 head/share/man/man9/EVENTHANDLER.9            |    6 +-
 head/share/man/man9/VOP_GETACL.9              |    4 +-
 head/share/man/man9/VOP_GETEXTATTR.9          |    8 +-
 head/share/man/man9/VOP_GETPAGES.9            |    4 +-
 head/share/man/man9/VOP_GETVOBJECT.9          |    4 +-
 head/share/man/man9/VOP_SETACL.9              |    4 +-
 head/share/man/man9/VOP_SETEXTATTR.9          |    6 +-
 head/share/man/man9/acl.9                     |    4 +-
 head/share/man/man9/bpf.9                     |   28 +-
 head/share/man/man9/bus_generic_print_child.9 |    4 +-
 head/share/man/man9/bus_release_resource.9    |    4 +-
 head/share/man/man9/bus_space.9               |    7 +-
 head/share/man/man9/byteorder.9               |    4 +-
 head/share/man/man9/cd.9                      |    4 +-
 head/share/man/man9/devclass_get_maxunit.9    |    4 +-
 head/share/man/man9/device_find_child.9       |    4 +-
 head/share/man/man9/disk.9                    |   30 +-
 head/share/man/man9/eventtimers.9             |    6 +-
 head/share/man/man9/fail.9                    |    4 +-
 head/share/man/man9/firmware.9                |   10 +-
 head/share/man/man9/hashinit.9                |    4 +-
 head/share/man/man9/ieee80211_node.9          |    4 +-
 head/share/man/man9/ieee80211_proto.9         |    4 +-
 head/share/man/man9/ifnet.9                   |    4 +-
 head/share/man/man9/kernel_mount.9            |    6 +-
 head/share/man/man9/kqueue.9                  |    5 +-
 head/share/man/man9/lock.9                    |    4 +-
 head/share/man/man9/locking.9                 |   67 ++-
 head/share/man/man9/malloc.9                  |    4 +-
 head/share/man/man9/mbuf.9                    |    8 +-
 head/share/man/man9/mod_cc.9                  |    4 +-
 head/share/man/man9/namei.9                   |    4 +-
 head/share/man/man9/netisr.9                  |    4 +-
 head/share/man/man9/pci.9                     |   12 +-
 head/share/man/man9/rmlock.9                  |  123 +++---
 head/share/man/man9/rtalloc.9                 |   13 +-
 head/share/man/man9/rwlock.9                  |   10 +-
 head/share/man/man9/spl.9                     |    8 +-
 head/share/man/man9/store.9                   |    8 +-
 head/share/man/man9/sysctl.9                  |    4 +-
 head/share/man/man9/taskqueue.9               |    6 +-
 head/share/man/man9/usbdi.9                   |   14 +-
 head/share/man/man9/vm_page_aflag.9           |    4 +-
 head/share/misc/bsd-family-tree               |    5 +-
 head/share/misc/committers-doc.dot            |   15 +-
 head/share/misc/committers-ports.dot          |   36 +-
 head/share/misc/committers-src.dot            |   29 +-
 head/share/misc/organization.dot              |   14 +-
 head/share/mk/bsd.README                      |   10 +-
 head/share/mk/bsd.crunchgen.mk                |    4 +-
 head/share/mk/bsd.lib.mk                      |   31 +-
 head/share/mk/bsd.libnames.mk                 |    3 +-
 head/share/mk/bsd.own.mk                      |   25 +-
 head/share/mk/bsd.sys.mk                      |   11 +-
 head/share/mk/sys.mk                          |    6 +-
 head/share/skel/dot.cshrc                     |   24 +-
 head/share/syscons/keymaps/INDEX.keymaps      |    4 +-
 head/share/syscons/keymaps/Makefile           |    3 +-
 head/share/syscons/keymaps/spanish.dvorak.kbd |  139 ++++++++
 head/share/termcap/termcap.5                  |    6 +-
 264 files changed, 4163 insertions(+), 1377 deletions(-)

diffs (12509 lines):

diff -r 49f3e3227aef -r 58bcef12a717 head/Makefile
--- a/head/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/Makefile 233644 2012-03-29 02:54:35Z jmallett $
+# $FreeBSD: head/Makefile 238051 2012-07-03 06:41:00Z obrien $
 #
 # The user-driven targets are:
 #
@@ -92,7 +92,7 @@
 	delete-old delete-old-dirs delete-old-files delete-old-libs \
 	depend distribute distributekernel distributekernel.debug \
 	distributeworld distrib-dirs distribution doxygen \
-	everything hierarchy install installcheck installkernel \
+	everything hier hierarchy install installcheck installkernel \
 	installkernel.debug packagekernel packageworld \
 	reinstallkernel reinstallkernel.debug \
 	installworld kernel-toolchain libraries lint maninstall \
diff -r 49f3e3227aef -r 58bcef12a717 head/Makefile.inc1
--- a/head/Makefile.inc1	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/Makefile.inc1	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/Makefile.inc1 233645 2012-03-29 03:04:59Z jmallett $
+# $FreeBSD: head/Makefile.inc1 238051 2012-07-03 06:41:00Z obrien $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -15,6 +15,7 @@
 #	-DNO_WWWUPDATE do not update www in ${MAKE} update
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+#	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
 #	    list
 #	TARGET="machine" to crossbuild world for a different machine type
@@ -89,7 +90,7 @@
 
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.
-.for _DIR in ${LOCAL_DIRS}
+.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
 SUBDIR+= ${_DIR}
 .endif
@@ -225,9 +226,6 @@
 		MACHINE=${TARGET} \
 		SRC_ROOT=${.CURDIR} \
 		CPUTYPE=${TARGET_CPUTYPE}
-.if ${OSRELDATE} < 700044
-CROSSENV+=	AR=gnu-ar RANLIB=gnu-ranlib
-.endif
 .if ${MK_GROFF} != "no"
 CROSSENV+=	GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
@@ -247,7 +245,7 @@
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
 		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
+		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -257,7 +255,7 @@
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DNO_LINT \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
+		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -267,6 +265,7 @@
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
+		_LDSCRIPTROOT= \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
@@ -309,6 +308,7 @@
 # Yes, the flags are redundant.
 LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
+		_LDSCRIPTROOT=${LIB32TMP} \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
@@ -321,11 +321,11 @@
 		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
 		-DWITHOUT_HTML -DNO_CTF -DNO_LINT -ECC -ECXX -EAS -ELD \
 		DESTDIR=${LIB32TMP}
-LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS
+LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS
 .endif
 
 # install stage
-IMAKEENV=	${CROSSENV}
+IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
@@ -491,7 +491,8 @@
 .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
 	cd ${.CURDIR}/${_dir}; \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
-	    DIRPRFX=${_dir}/ build-tools
+	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
+	    -DEARLY_BUILD build-tools
 .endfor
 	cd ${.CURDIR}; \
 	    ${LIB32WMAKE} -f Makefile.inc1 libraries
@@ -844,18 +845,18 @@
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
-	cd ${KRNLOBJDIR}/${_kernel}; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \
-	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
+#	cd ${KRNLOBJDIR}/${_kernel}; \
+#	    PATH=${BPATH}:${PATH} \
+#	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
+#	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \
+#	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
 # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
 .for target in obj depend all
-	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target}
+#	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
+#	    PATH=${BPATH}:${PATH} \
+#	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
+#	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target}
 .endfor
 .endif
 .if !defined(NO_KERNELDEPEND)
@@ -996,8 +997,8 @@
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0
-	@echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \
+.if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0
+	@echo "ERROR: Source upgrades from versions prior to 7.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
@@ -1025,7 +1026,7 @@
 _groff=		gnu/usr.bin/groff
 .endif
 
-.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
+.if ${BOOTSTRAPPING} < 800022
 _ar=		usr.bin/ar
 .endif
 
@@ -1039,6 +1040,9 @@
 
 .if ${BOOTSTRAPPING} < 900006
 _lex=		usr.bin/lex
+.endif
+
+.if ${BOOTSTRAPPING} < 1000013
 _yacc=		usr.bin/yacc
 .endif
 
@@ -1046,16 +1050,10 @@
 _awk=		usr.bin/awk
 .endif
 
-.if ${MK_BSNMP} != "no" && \
-    (${BOOTSTRAPPING} < 700018 || !exists(/usr/sbin/gensnmptree))
+.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree)
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
-.if ${MK_RESCUE} != "no" && \
-    ${BOOTSTRAPPING} < 700026
-_crunchgen=	usr.sbin/crunch/crunchgen
-.endif
-
 .if ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
@@ -1105,12 +1103,11 @@
     ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
+    ${_yacc} \
     ${_lex} \
-    ${_yacc} \
     usr.bin/xinstall \
     ${_gensnmptree} \
-    usr.sbin/config \
-    ${_crunchgen}
+    usr.sbin/config
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -1217,7 +1214,7 @@
 #
 # hierarchy - ensure that all the needed directories are present
 #
-hierarchy:
+hierarchy hier:
 	cd ${.CURDIR}/etc;		${MAKE} distrib-dirs
 
 #
@@ -1294,6 +1291,11 @@
 .endif
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+.for _DIR in ${LOCAL_LIB_DIRS}
+.if exists(${.CURDIR}/${_DIR}/Makefile)
+_generic_libs+= ${_DIR}
+.endif
+.endfor
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
@@ -1666,8 +1668,8 @@
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
 
-.ORDER: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
-xdev-install: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
+.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
+xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
 
 _xi-cross-tools:
 	@echo "_xi-cross-tools"
diff -r 49f3e3227aef -r 58bcef12a717 head/ObsoleteFiles.inc
--- a/head/ObsoleteFiles.inc	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/ObsoleteFiles.inc	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/ObsoleteFiles.inc 234353 2012-04-16 21:23:25Z dim $
+# $FreeBSD: head/ObsoleteFiles.inc 238562 2012-07-18 05:50:40Z avatar $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -38,6 +38,47 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20120712: OpenSSL 1.0.1c import
+OLD_LIBS+=lib/libcrypto.so.6
+OLD_LIBS+=usr/lib/libssl.so.6
+OLD_LIBS+=usr/lib32/libcrypto.so.6
+OLD_LIBS+=usr/lib32/libssl.so.6
+OLD_FILES+=usr/include/openssl/aes_locl.h
+OLD_FILES+=usr/include/openssl/bio_lcl.h
+OLD_FILES+=usr/include/openssl/e_os.h
+OLD_FILES+=usr/include/openssl/fips.h
+OLD_FILES+=usr/include/openssl/fips_rand.h
+OLD_FILES+=usr/include/openssl/md2.h
+OLD_FILES+=usr/include/openssl/pq_compat.h
+OLD_FILES+=usr/include/openssl/store.h
+OLD_FILES+=usr/include/openssl/tmdiff.h
+OLD_FILES+=usr/include/openssl/ui_locl.h
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz
+# 20120621: remove old man page
+OLD_FILES+=usr/share/man/man8/vnconfig.8.gz
+# 20120613: auth.conf removed
+OLD_FILES+=etc/auth.conf
+OLD_FILES+=usr/share/examples/etc/auth.conf
+OLD_FILES+=usr/share/man/man3/auth.3.gz
+OLD_FILES+=usr/share/man/man5/auth.conf.5.gz
+# 20120530: kde pam lives now in ports
+OLD_FILES+=etc/pam.d/kde
+# 20120505: new clang import installed a redundant internal header
+OLD_FILES+=usr/include/clang/3.1/stdalign.h
+# 20120428: MD2 removed from libmd
+OLD_FILES+=usr/include/md2.h
+OLD_FILES+=usr/share/man/man3/MD2Data.3.gz
+OLD_FILES+=usr/share/man/man3/MD2End.3.gz
+OLD_FILES+=usr/share/man/man3/MD2File.3.gz
+OLD_FILES+=usr/share/man/man3/MD2FileChunk.3.gz
+OLD_FILES+=usr/share/man/man3/MD2Final.3.gz
+OLD_FILES+=usr/share/man/man3/MD2Init.3.gz
+OLD_FILES+=usr/share/man/man3/MD2Update.3.gz
+OLD_FILES+=usr/share/man/man3/md2.3.gz
+# 20120425: libusb version bump (r234684)
+OLD_LIBS+=usr/lib/libusb.so.2
+OLD_LIBS+=usr/lib32/libusb.so.2
+OLD_FILES+=usr/share/man/man3/libsub_get_active_config_descriptor.3.gz
 # 20120415: new clang import which bumps version from 3.0 to 3.1
 OLD_FILES+=usr/include/clang/3.0/altivec.h
 OLD_FILES+=usr/include/clang/3.0/avxintrin.h
@@ -54,6 +95,17 @@
 OLD_FILES+=usr/include/clang/3.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.0
+# 20120412: BIND 9.8.1 release notes removed
+OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
+OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.txt
+OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.html
+OLD_FILES+=usr/share/doc/bind9/release-notes.css
+# 20120330: legacy(4) moved to x86
+OLD_FILES+=usr/include/machine/legacyvar.h
+# 20120324: MPI headers updated
+OLD_FILES+=usr/include/dev/mpt/mpilib/mpi_inb.h
+# 20120322: hwpmc_mips24k.h removed
+OLD_FILES+=usr/include/dev/hwpmc/hwpmc_mips24k.h
 # 20120322: Update heimdal to 1.5.1.
 OLD_FILES+=usr/include/krb5-v4compat.h \
 	usr/include/krb_err.h \
@@ -98,6 +150,8 @@
 # 20120309: Remove fifofs header files.
 OLD_FILES+=usr/include/fs/fifofs/fifo.h
 OLD_DIRS+=usr/include/fs/fifofs
+# 20120304: xlocale cleanup
+OLD_FILES+=usr/include/_xlocale_ctype.h
 # 20120225: libarchive 3.0.3
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_read_support_compression_all.3.gz \
@@ -459,7 +513,7 @@
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
-OLB_LIBS+=usr/lib32/libutil.so.8
+OLD_LIBS+=usr/lib32/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
@@ -579,6 +633,7 @@
 OLD_LIBS+=lib/libkiconv.so.3
 OLD_LIBS+=lib/libkvm.so.4
 OLD_LIBS+=lib/libmd.so.4
+OLD_LIBS+=lib/libmd.so.5
 OLD_LIBS+=lib/libncurses.so.7
 OLD_LIBS+=lib/libncursesw.so.7
 OLD_LIBS+=lib/libnvpair.so.1
@@ -1303,6 +1358,11 @@
 OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
 OLD_FILES+=usr/lib32/libkse.so
 OLD_LIBS+=usr/lib32/libkse.so.3
+# 20080225: bsdar/bsdranlib rename to ar/ranlib
+OLD_FILES+=usr/bin/bsdar
+OLD_FILES+=usr/bin/bsdranlib
+OLD_FILES+=usr/share/man/man1/bsdar.1.gz
+OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz
 # 20080220: geom_lvm rename to geom_linux_lvm
 OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal
diff -r 49f3e3227aef -r 58bcef12a717 head/UPDATING
--- a/head/UPDATING	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/UPDATING	Wed Jul 25 16:32:50 2012 +0300
@@ -24,6 +24,34 @@
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20120712:
+	The OpenSSL has been upgraded to 1.0.1c.  Any binaries requiring
+	libcrypto.so.6 or libssl.so.6 must be recompiled.  Also, there are
+	configuration changes.  Make sure to merge /etc/ssl/openssl.cnf.
+
+20120712:
+	The following sysctls and tunables have been renamed for consistency
+	with other variables:
+	  kern.cam.da.da_send_ordered   -> kern.cam.da.send_ordered
+	  kern.cam.ada.ada_send_ordered -> kern.cam.ada.send_ordered
+
+20120628:
+	The sort utility has been replaced with BSD sort.  For now, GNU sort
+	is also available as "gnusort" or the default can be set back to
+	GNU sort by setting WITH_GNU_SORT.  In this case, BSD sort will be
+	installed as "bsdsort".
+
+20120611:
+	A new version of ZFS (pool version 5000) has been merged to -HEAD.
+	Starting with this version the old system of ZFS pool versioning
+	is superseded by "feature flags". This concept enables forward
+	compatibility against certain future changes in functionality of ZFS
+	pools. The first read-only compatible "feature flag" for ZFS pools
+	is named "com.delphix:async_destroy". For more information
+	read the new zpool-features(5) manual page.
+	Please refer to the "ZFS notes" section of this file for information
+	on upgrading boot ZFS pools.
+
 20120417:
 	The malloc(3) implementation embedded in libc now uses sources imported
 	as contrib/jemalloc.  The most disruptive API change is to
@@ -1587,4 +1615,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: head/UPDATING 234396 2012-04-17 20:35:54Z jasone $
+$FreeBSD: head/UPDATING 238405 2012-07-12 19:30:53Z jkim $
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/Makefile
--- a/head/etc/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: head/etc/Makefile 231849 2012-02-17 01:21:08Z eadler $
+# $FreeBSD: head/etc/Makefile 236965 2012-06-12 17:02:53Z des $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,7 @@
 SUBDIR=	sendmail
 .endif
 
-BIN1=	auth.conf \
-	crontab \
+BIN1=	crontab \
 	devd.conf \
 	devfs.conf \
 	ddb.conf \
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/auth.conf
--- a/head/etc/auth.conf	Wed Jul 25 16:31:11 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#
-# $FreeBSD$
-#
-# Configure some authentication-related defaults.  This file is being
-# gradually subsumed by user class and PAM configuration.
-#
-
-# crypt_default	=	md5 des
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/defaults/periodic.conf
--- a/head/etc/defaults/periodic.conf	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/defaults/periodic.conf	Wed Jul 25 16:32:50 2012 +0300
@@ -13,7 +13,7 @@
 # For a more detailed explanation of all the periodic.conf variables, please
 # refer to the periodic.conf(5) manual page.
 #
-# $FreeBSD: head/etc/defaults/periodic.conf 231171 2012-02-08 00:08:21Z gjb $
+# $FreeBSD: head/etc/defaults/periodic.conf 238416 2012-07-13 06:46:09Z kevlo $
 #
 
 # What files override these defaults ?
@@ -47,6 +47,7 @@
 daily_clean_tmps_days="3"				# If not accessed for
 daily_clean_tmps_ignore=".X*-lock .X11-unix .ICE-unix .font-unix .XIM-unix"
 daily_clean_tmps_ignore="$daily_clean_tmps_ignore quota.user quota.group .snap"
+daily_clean_tmps_ignore="$daily_clean_tmps_ignore .sujournal"
 							# Don't delete these
 daily_clean_tmps_verbose="YES"				# Mention files deleted
 
@@ -274,7 +275,7 @@
 
 if [ -z "${source_periodic_confs_defined}" ]; then
         source_periodic_confs_defined=yes
-        source_periodic_confs () {
+        source_periodic_confs() {
                 local i sourced_files
 
                 for i in ${periodic_conf_files}; do
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/defaults/rc.conf
--- a/head/etc/defaults/rc.conf	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/defaults/rc.conf	Wed Jul 25 16:32:50 2012 +0300
@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: head/etc/defaults/rc.conf 234093 2012-04-10 09:27:41Z stas $
+# $FreeBSD: head/etc/defaults/rc.conf 238416 2012-07-13 06:46:09Z kevlo $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -123,6 +123,7 @@
 firewall_type="UNKNOWN"		# Firewall type (see /etc/rc.firewall)
 firewall_quiet="NO"		# Set to YES to suppress rule display
 firewall_logging="NO"		# Set to YES to enable events logging
+firewall_logif="NO"		# Set to YES to create logging-pseudo interface
 firewall_flags=""		# Flags passed to ipfw when type is a file
 firewall_coscripts=""		# List of executables/scripts to run after
 				# firewall starts/stops
@@ -297,8 +298,8 @@
 kadmind5_server="/usr/libexec/kadmind"	# path to kerberos 5 admin daemon
 kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
 kpasswdd_server="/usr/libexec/kpasswdd"	# path to kerberos 5 passwd daemon
-kfd_server_enable="NO"		# Run kfd (or NO)
-kfd_server="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
+kfd_enable="NO"			# Run kfd (or NO)
+kfd_program="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
 
 gssd_enable="NO"		# Run the gssd daemon (or NO).
 gssd_flags=""			# Flags for gssd.
@@ -712,7 +713,7 @@
 
 if [ -z "${source_rc_confs_defined}" ]; then
 	source_rc_confs_defined=yes
-	source_rc_confs () {
+	source_rc_confs() {
 		local i sourced_files
 		for i in ${rc_conf_files}; do
 			case ${sourced_files} in
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/devd.conf
--- a/head/etc/devd.conf	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/devd.conf	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/etc/devd.conf 226775 2011-10-26 02:11:28Z hrs $
+# $FreeBSD: head/etc/devd.conf 238308 2012-07-09 20:11:32Z hrs $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -320,7 +320,7 @@
 notify 0 {
 	match "system"		"RCTL";
 	match "rule"		"user:70:swap:.*";
-	action			"/usr/local/etc/rc.d/postgresql restart"
+	action			"/usr/local/etc/rc.d/postgresql restart";
 };
 
 */
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/devd/usb.conf
--- a/head/etc/devd/usb.conf	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/devd/usb.conf	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/etc/devd/usb.conf 233111 2012-03-18 09:52:54Z hselasky $
+# $FreeBSD: head/etc/devd/usb.conf 235725 2012-05-21 15:01:35Z hselasky $
 #
 # This file was automatically generated by "tools/bus_autoconf.sh".
 # Please do not edit!
@@ -157,7 +157,7 @@
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0403";
-	match "product" "(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xa6d0|0xa6d0|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)";
+	match "product" "(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82)";
 	action "kldload -n uftdi";
 };
 
@@ -1021,7 +1021,7 @@
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05c6";
-	match "product" "(0x1000|0x6000|0x6613)";
+	match "product" "(0x1000|0x6000|0x6613|0x9000)";
 	action "kldload -n u3g";
 };
 
@@ -2852,6 +2852,14 @@
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x1199";
+	match "product" "0x68aa";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x11ad";
 	match "product" "0x0701";
 	action "kldload -n uplcom";
@@ -3661,7 +3669,7 @@
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x19d2";
-	match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x2000|0x2002|0x2003|0xfff1|0xfff5|0xfffe)";
+	match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x1179|0x2000|0x2002|0x2003|0xfff1|0xfff5|0xfffe)";
 	action "kldload -n u3g";
 };
 
@@ -4165,7 +4173,7 @@
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x9710";
-	match "product" "0x7830";
+	match "product" "(0x7830|0x7832)";
 	action "kldload -n if_mos";
 };
 
@@ -4336,5 +4344,5 @@
 	action "kldload -n umass";
 };
 
-# 1652 USB entries processed
-
+# 1654 USB entries processed
+
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/login.conf
--- a/head/etc/login.conf	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/login.conf	Wed Jul 25 16:32:50 2012 +0300
@@ -7,7 +7,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-# $FreeBSD$
+# $FreeBSD: head/etc/login.conf 237270 2012-06-19 14:47:07Z des $
 #
 
 # Default settings effectively disable resource limits, see the
@@ -23,10 +23,10 @@
 # AND SEMANTICS'' section of getcap(3) for more escape sequences).
 
 default:\
-	:passwd_format=md5:\
+	:passwd_format=sha512:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,FTP_PASSIVE_MODE=YES:\
+	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
 	:path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/mtree/BSD.include.dist
--- a/head/etc/mtree/BSD.include.dist	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/mtree/BSD.include.dist	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/etc/mtree/BSD.include.dist 234353 2012-04-16 21:23:25Z dim $
+# $FreeBSD: head/etc/mtree/BSD.include.dist 237279 2012-06-20 00:09:47Z obrien $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -102,6 +102,8 @@
         ..
         ciss
         ..
+        filemon
+        ..
         firewire
         ..
         hwpmc
@@ -122,6 +124,8 @@
             mpilib
             ..
         ..
+        nand
+        ..
         ofw
         ..
         pbio
@@ -154,6 +158,8 @@
         ..
         msdosfs
         ..
+        nandfs
+        ..
         nfs
         ..
         ntfs
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/mtree/BSD.usr.dist
--- a/head/etc/mtree/BSD.usr.dist	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/mtree/BSD.usr.dist	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/etc/mtree/BSD.usr.dist 233435 2012-03-24 21:10:19Z eadler $
+# $FreeBSD: head/etc/mtree/BSD.usr.dist 238618 2012-07-19 11:18:41Z joerg $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -200,6 +200,10 @@
                 ..
             ..
         ..
+        dtrace
+            toolkit
+            ..
+        ..  
         examples
             BSD_daemon
             ..
@@ -209,8 +213,8 @@
             ..
             bootforth
             ..
-	    csh
-	    	..
+            csh
+            ..
             cvs
                 contrib
                 ..
@@ -267,6 +271,8 @@
                     ..
                 ..
             ..
+            libusb20
+            ..
             libvgl
             ..
             mdoc
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/pam.d/Makefile
--- a/head/etc/pam.d/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/pam.d/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/etc/pam.d/Makefile 236281 2012-05-30 03:10:22Z miwi $
 
 NO_OBJ=
 
@@ -7,7 +7,6 @@
 	cron \
 	ftpd \
 	imap \
-	kde \
 	login \
 	other \
 	passwd pop3 \
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/pam.d/kde
--- a/head/etc/pam.d/kde	Wed Jul 25 16:31:11 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#
-# $FreeBSD$
-#
-# PAM configuration for the "kde" service
-#
-
-# auth
-#auth		sufficient	pam_krb5.so		no_warn try_first_pass
-#auth		sufficient	pam_ssh.so		no_warn try_first_pass
-auth		required	pam_unix.so		no_warn try_first_pass
-
-# account
-account		required	pam_nologin.so
-#account	required	pam_krb5.so
-account		required	pam_unix.so
-
-# session
-#session	optional	pam_ssh.so		want_agent
-session		required	pam_permit.so
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/periodic/daily/400.status-disks
--- a/head/etc/periodic/daily/400.status-disks	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/periodic/daily/400.status-disks	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/etc/periodic/daily/400.status-disks 237337 2012-06-20 20:01:51Z jhb $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -19,12 +19,15 @@
 	df $daily_status_disks_df_flags && rc=1 || rc=3
 
 	# display which filesystems need backing up
-	if ! [ -f /etc/fstab ]; then
-		export PATH_FSTAB=/dev/null
+	if [ -s /etc/dumpdates ]; then
+		if ! [ -f /etc/fstab ]; then
+			export PATH_FSTAB=/dev/null
+		fi
+
+		echo ""
+		dump W || rc=3
 	fi
-
-	echo ""
-	dump W || rc=3;;
+	;;
 
     *)  rc=0;;
 esac
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/periodic/daily/420.status-network
--- a/head/etc/periodic/daily/420.status-network	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/periodic/daily/420.status-network	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/etc/periodic/daily/420.status-network 235132 2012-05-07 15:41:31Z jhb $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -18,9 +18,9 @@
 
 	case "$daily_status_network_usedns" in
 	    [Yy][Ee][Ss])
-		netstat -i && rc=0 || rc=3;;
+		netstat -id && rc=0 || rc=3;;
 	    *)
-		netstat -in && rc=0 || rc=3;;
+		netstat -idn && rc=0 || rc=3;;
 	esac;;
 
     *)  rc=0;;
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/accounting
--- a/head/etc/rc.d/accounting	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/accounting	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/accounting 230099 2012-01-14 02:18:41Z dougb $
+# $FreeBSD: head/etc/rc.d/accounting 234927 2012-05-02 14:25:39Z jhb $
 #
 
 # PROVIDE: accounting
@@ -65,9 +65,7 @@
 	mv ${accounting_file} ${accounting_file}.0
 
 	if checkyesno accounting_enable; then
-		ln $_file ${accounting_file##*/}
-		${accounting_command} ${accounting_file}
-		unlink $_file
+		mv $_file ${accounting_file}
 	fi
 }
 
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/bgfsck
--- a/head/etc/rc.d/bgfsck	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/bgfsck	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/bgfsck 229783 2012-01-07 16:10:32Z uqs $
+# $FreeBSD: head/etc/rc.d/bgfsck 238628 2012-07-19 22:33:13Z dteske $
 #
 
 # PROVIDE: bgfsck
@@ -14,10 +14,10 @@
 start_cmd="bgfsck_start"
 stop_cmd=":"
 
-bgfsck_start ()
+bgfsck_start()
 {
 	if [ -z "${rc_force}" ]; then
-		background_fsck_delay=${background_fsck_delay:=0}
+		background_fsck_delay=${background_fsck_delay:-0}
 	else
 		background_fsck_delay=0
 	fi
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/bridge
--- a/head/etc/rc.d/bridge	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/bridge	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD: head/etc/rc.d/bridge 225684 2011-09-20 00:37:35Z hrs $
+# $FreeBSD: head/etc/rc.d/bridge 238416 2012-07-13 06:46:09Z kevlo $
 #
 
 # PROVIDE: bridge
@@ -37,14 +37,14 @@
 stop_cmd="bridge_stop"
 cmd=""
 
-glob_int () {
+glob_int() {
 	case "$1" in
 		$2 ) true ;;
 		* ) false ;;
 	esac
 }
 
-bridge_test () {
+bridge_test() {
 	bridge=$1
 	iface=$2
 
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/cleanvar
--- a/head/etc/rc.d/cleanvar	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/cleanvar	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/cleanvar 231534 2012-02-11 20:47:16Z ed $
+# $FreeBSD: head/etc/rc.d/cleanvar 238416 2012-07-13 06:46:09Z kevlo $
 #
 
 # PROVIDE: cleanvar
@@ -54,7 +54,7 @@
 	rm -f /var/run/clean_var /var/spool/lock/clean_var
 }
 
-cleanvar_start ()
+cleanvar_start()
 {
 	if [ -d /var/run -a ! -f /var/run/clean_var ]; then
 		purgedir /var/run
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/devd
--- a/head/etc/rc.d/devd	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/devd	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/devd 230099 2012-01-14 02:18:41Z dougb $
+# $FreeBSD: head/etc/rc.d/devd 238416 2012-07-13 06:46:09Z kevlo $
 #
 
 # PROVIDE: devd
@@ -26,7 +26,7 @@
 	fi
 }
 
-devd_prestart ()
+devd_prestart()
 {
 	find_pidfile
 
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/ip6addrctl
--- a/head/etc/rc.d/ip6addrctl	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/ip6addrctl	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/ip6addrctl 230099 2012-01-14 02:18:41Z dougb $
+# $FreeBSD: head/etc/rc.d/ip6addrctl 238622 2012-07-19 15:36:36Z emax $
 #
 
 # PROVIDE: ip6addrctl
@@ -83,6 +83,9 @@
 		# Backward compatibility when ipv6_prefer=NO
 		ip6addrctl_prefer_ipv4
 	;;
+	[Nn][Oo][Nn][Ee])
+		ip6addrctl flush >/dev/null 2>&1
+	;;
 	*)
 		warn "\$ip6addrctl_policy is invalid: ${ip6addrctl_policy}. " \
 		    " \"ipv4_prefer\" is used instead."
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/ipfw
--- a/head/etc/rc.d/ipfw	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/ipfw	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/ipfw 220153 2011-03-30 01:19:00Z emaste $
+# $FreeBSD: head/etc/rc.d/ipfw 238277 2012-07-09 07:16:19Z hrs $
 #
 
 # PROVIDE: ipfw
@@ -57,6 +57,10 @@
 		echo 'Firewall logging enabled.'
 		sysctl net.inet.ip.fw.verbose=1 >/dev/null
 	fi
+	if checkyesno firewall_logif; then
+		ifconfig ipfw0 create
+		echo 'Firewall logging pseudo-interface (ipfw0) created.'
+	fi
 }
 
 ipfw_poststart()
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/jail
--- a/head/etc/rc.d/jail	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/jail	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/jail 230403 2012-01-20 22:55:19Z brooks $
+# $FreeBSD: head/etc/rc.d/jail 238605 2012-07-18 23:01:23Z des $
 #
 
 # PROVIDE: jail
@@ -641,7 +641,7 @@
 			i=$((i + 1))
 		done
 
-		eval ${_setfib} jail ${_flags} -i ${_rootdir} ${_hostname} \
+		eval ${_setfib} jail -n ${_jail} ${_flags} -i ${_rootdir} ${_hostname} \
 			\"${_addrl}\" ${_exec_start} > ${_tmp_jail} 2>&1 \
 			</dev/null
 
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/kfd
--- a/head/etc/rc.d/kfd	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/kfd	Wed Jul 25 16:32:50 2012 +0300
@@ -1,19 +1,17 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/kfd 234093 2012-04-10 09:27:41Z stas $
+# $FreeBSD: head/etc/rc.d/kfd 235107 2012-05-06 20:46:04Z stas $
 #
 
 # PROVIDE: kfd
-# BEFORE: DAEMON
+# REQUIRE: NETWORK
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-name="kfd"
+name=kfd
+rcvar=kfd_enable
 load_rc_config $name
-rcvar="kfd_server_enable"
-unset start_cmd
-command="${kfd_server}"
-kfd_flags="-i"
-command_args="&"
+command_args="-i &"
 
 run_rc_command "$1"
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/kldxref
--- a/head/etc/rc.d/kldxref	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/kldxref	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/etc/rc.d/kldxref 238416 2012-07-13 06:46:09Z kevlo $
 #
 
 # PROVIDE: kldxref
@@ -15,7 +15,7 @@
 stop_cmd=":"
 start_cmd="kldxref_start"
 
-kldxref_start () {
+kldxref_start() {
 	if [ -n "$kldxref_module_path" ]; then
 		MODULE_PATHS="$kldxref_module_path"
 	else
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/named
--- a/head/etc/rc.d/named	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/named	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/named 220962 2011-04-23 04:26:31Z dougb $
+# $FreeBSD: head/etc/rc.d/named 238629 2012-07-19 22:41:00Z dteske $
 #
 
 # PROVIDE: named
@@ -96,7 +96,7 @@
 	    ln -fs "${named_chrootdir}${pidfile}" ${pidfile}
 }
 
-named_poststart () {
+named_poststart() {
 	make_symlinks
 
 	if checkyesno named_wait; then
@@ -156,7 +156,7 @@
 	fi
 }
 
-create_file () {
+create_file() {
 	if [ -e "$1" ]; then
 		unlink $1
 	fi
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/power_profile
--- a/head/etc/rc.d/power_profile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/power_profile	Wed Jul 25 16:32:50 2012 +0300
@@ -5,7 +5,7 @@
 #
 # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance)
 #
-# $FreeBSD$
+# $FreeBSD: head/etc/rc.d/power_profile 238416 2012-07-13 06:46:09Z kevlo $
 #
 
 # PROVIDE: power_profile
@@ -27,7 +27,7 @@
 # $highest_value: maximum value for this sysctl, when $value is "HIGH"
 # $lowest_value: minimum value for this sysctl, when $value is "LOW"
 #
-sysctl_set ()
+sysctl_set()
 {
 	# Check if the node exists
 	if [ -z "$(sysctl -n ${node} 2> /dev/null)" ]; then
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/rarpd
--- a/head/etc/rc.d/rarpd	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/rarpd	Wed Jul 25 16:32:50 2012 +0300
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/etc/rc.d/rarpd 230099 2012-01-14 02:18:41Z dougb $
+# $FreeBSD: head/etc/rc.d/rarpd 238282 2012-07-09 08:11:16Z hrs $
 #
 
 # PROVIDE: rarpd
@@ -13,8 +13,9 @@
 name="rarpd"
 rcvar="rarpd_enable"
 command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
 required_files="/etc/ethers"
 
 load_rc_config $name
+pidfile="${rarpd_pidfile:-/var/run/${name}.pid}"
+
 run_rc_command "$1"
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.d/tmp
--- a/head/etc/rc.d/tmp	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.d/tmp	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: head/etc/rc.d/tmp 221007 2011-04-25 06:03:22Z dougb $
+# $FreeBSD: head/etc/rc.d/tmp 238427 2012-07-13 20:10:59Z brooks $
 #
 
 # PROVIDE: tmp
@@ -37,9 +37,9 @@
 
 load_rc_config $name
 
-mount_tmpmfs ()
+mount_tmpmfs()
 {
-	if ! /bin/df /tmp | grep -q "^/dev/md[0-9]"; then
+	if ! /bin/df /tmp | grep -q "^/dev/md[0-9].* /tmp"; then
 		mount_md ${tmpsize} /tmp "${tmpmfs_flags}"
 		chmod 01777 /tmp
 	fi
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.firewall
--- a/head/etc/rc.firewall	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.firewall	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: head/etc/rc.firewall 229783 2012-01-07 16:10:32Z uqs $
+# $FreeBSD: head/etc/rc.firewall 238416 2012-07-13 06:46:09Z kevlo $
 #
 
 #
@@ -78,7 +78,7 @@
 #	http://www.pearsonhighered.com/educator/academic/product/0,3110,020163466X,00.html
 #
 
-setup_loopback () {
+setup_loopback() {
 	############
 	# Only in rare cases do you want to change these rules
 	#
@@ -91,7 +91,7 @@
 	fi
 }
 
-setup_ipv6_mandatory () {
+setup_ipv6_mandatory() {
 	[ $ipv6_available -eq 0 ] || return 0
 
 	############
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/rc.subr
--- a/head/etc/rc.subr	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/rc.subr	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: head/etc/rc.subr 231888 2012-02-18 00:46:18Z delphij $
+# $FreeBSD: head/etc/rc.subr 238416 2012-07-13 06:46:09Z kevlo $
 #
 # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1593,7 +1593,7 @@
 
 # Find scripts in local_startup directories that use the old syntax
 #
-find_local_scripts_old () {
+find_local_scripts_old() {
 	zlist=''
 	slist=''
 	for dir in ${local_startup}; do
@@ -1612,7 +1612,7 @@
 	done
 }
 
-find_local_scripts_new () {
+find_local_scripts_new() {
 	local_rc=''
 	for dir in ${local_startup}; do
 		if [ -d "${dir}" ]; then
diff -r 49f3e3227aef -r 58bcef12a717 head/etc/syslog.conf
--- a/head/etc/syslog.conf	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/etc/syslog.conf	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/etc/syslog.conf 237921 2012-07-01 12:34:19Z brueffer $
 #
 #	Spaces ARE valid field separators in this file. However,
 #	other *nix-like systems still insist on using tabs as field
@@ -16,6 +16,7 @@
 *.=debug					/var/log/debug.log
 *.emerg						*
 # uncomment this to log all writes to /dev/console to /var/log/console.log
+# touch /var/log/console.log and chmod it to mode 600 before it will work
 #console.info					/var/log/console.log
 # uncomment this to enable logging of all log messages to /var/log/all.log
 # touch /var/log/all.log and chmod it to mode 600 before it will work
diff -r 49f3e3227aef -r 58bcef12a717 head/include/Makefile
--- a/head/include/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: head/include/Makefile 232821 2012-03-11 12:19:58Z kib $
+# $FreeBSD: head/include/Makefile 237279 2012-06-20 00:09:47Z obrien $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -39,11 +39,11 @@
 	sys vm
 
 LSUBDIRS=	cam/ata cam/scsi \
-	dev/acpica dev/an dev/bktr dev/ciss dev/firewire dev/hwpmc \
+	dev/acpica dev/an dev/bktr dev/ciss dev/filemon dev/firewire dev/hwpmc \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \
 	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
 	dev/speaker dev/switch dev/usb dev/utopia dev/vkbd dev/wi \
-	fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \
+	fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
 	geom/mirror geom/mountver geom/multipath geom/nop \
@@ -157,7 +157,7 @@
 	done
 .endif
 .endfor
-.for i in ${LDIRS} ${LSUBDIRS:Ndev/acpica:Ndev/bktr:Ndev/switch} ${LSUBSUBDIRS}
+.for i in ${LDIRS} ${LSUBDIRS:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/switch} ${LSUBSUBDIRS}
 	cd ${.CURDIR}/../sys; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
 	    ${DESTDIR}${INCLUDEDIR}/$i
@@ -171,6 +171,13 @@
 	cd ${.CURDIR}/../sys/dev/switch; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 switch_ioctl.h \
 	    ${DESTDIR}${INCLUDEDIR}/dev/switch
+.if ${MK_NAND} != "no"
+	cd ${.CURDIR}/../sys/dev/nand; \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 nandsim.h \
+	    ${DESTDIR}${INCLUDEDIR}/dev/nand; \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 nand_dev.h \
+	    ${DESTDIR}${INCLUDEDIR}/dev/nand
+.endif
 	cd ${.CURDIR}/../sys/contrib/altq/altq; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${DESTDIR}${INCLUDEDIR}/altq
@@ -227,7 +234,7 @@
 		ln -fs ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
 	done
 .endfor
-.for i in ${LSUBDIRS:Ndev/acpica:Ndev/bktr:Ndev/switch}
+.for i in ${LSUBDIRS:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/switch}
 	cd ${.CURDIR}/../sys/$i; \
 	for h in *.h; do \
 		ln -fs ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
@@ -243,6 +250,13 @@
 		ln -fs ../../../../sys/dev/bktr/$$h \
 		    ${DESTDIR}${INCLUDEDIR}/dev/bktr; \
 	done
+.if ${MK_NAND} != "no"
+	cd ${.CURDIR}/../sys/dev/nand; \
+	for h in nandsim.h nand_dev.h; do \
+		ln -fs ../../../../sys/dev/nand/$$h \
+		    ${DESTDIR}${INCLUDEDIR}/dev/nand; \
+	done
+.endif
 	cd ${.CURDIR}/../sys/dev/switch; \
 	for h in switch_ioctl.h; do \
 		ln -fs ../../../../sys/dev/switch/$$h \
diff -r 49f3e3227aef -r 58bcef12a717 head/include/dirent.h
--- a/head/include/dirent.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/dirent.h	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.2 (Berkeley) 7/28/94
- * $FreeBSD$
+ * $FreeBSD: head/include/dirent.h 235647 2012-05-19 12:44:27Z gleb $
  */
 
 #ifndef _DIRENT_H_
@@ -55,24 +55,8 @@
 /* definitions for library routines operating on directories. */
 #define	DIRBLKSIZ	1024
 
-struct _telldir;		/* see telldir.h */
-struct pthread_mutex;
-
-/* structure describing an open directory. */
-typedef struct _dirdesc {
-	int	dd_fd;		/* file descriptor associated with directory */
-	long	dd_loc;		/* offset in current buffer */
-	long	dd_size;	/* amount of data returned by getdirentries */
-	char	*dd_buf;	/* data buffer */
-	int	dd_len;		/* size of data buffer */
-	long	dd_seek;	/* magic cookie returned by getdirentries */
-	long	dd_rewind;	/* magic cookie for rewinding */
-	int	dd_flags;	/* flags for readdir */
-	struct pthread_mutex	*dd_lock;	/* lock */
-	struct _telldir *dd_td;	/* telldir position recording */
-} DIR;
-
-#define	dirfd(dirp)	((dirp)->dd_fd)
+struct _dirdesc;
+typedef struct _dirdesc DIR;
 
 /* flags for opendir2 */
 #define DTF_HIDEW	0x0001	/* hide whiteout entries */
@@ -91,6 +75,7 @@
 __BEGIN_DECLS
 #if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 700
 int	 alphasort(const struct dirent **, const struct dirent **);
+int	 dirfd(DIR *);
 #endif
 #if __BSD_VISIBLE
 DIR	*__opendir2(const char *, int);
diff -r 49f3e3227aef -r 58bcef12a717 head/include/fmtmsg.h
--- a/head/include/fmtmsg.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/fmtmsg.h	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/include/fmtmsg.h 236629 2012-06-05 19:42:57Z ed $
  */
 
 #ifndef _FMTMSG_H_
@@ -32,7 +32,7 @@
 /* Source of condition is... */
 #define	MM_HARD		0x0001	/* ...hardware. */
 #define	MM_SOFT		0x0002	/* ...software. */
-#define	MM_FIRM		0x0004	/* ...fireware. */
+#define	MM_FIRM		0x0004	/* ...firmware. */
 
 /* Condition detected by... */
 #define	MM_APPL		0x0010	/* ...application. */
diff -r 49f3e3227aef -r 58bcef12a717 head/include/malloc_np.h
--- a/head/include/malloc_np.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/malloc_np.h	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: head/include/malloc_np.h 234370 2012-04-17 07:22:14Z jasone $
+ * $FreeBSD: head/include/malloc_np.h 235780 2012-05-22 09:59:49Z harti $
  */
 
 #ifndef _MALLOC_NP_H_
@@ -55,13 +55,11 @@
 #define	ALLOCM_ERR_OOM		1
 #define	ALLOCM_ERR_NOT_MOVED	2
 
-int	allocm(void **ptr, size_t *rsize, size_t size, int flags)
-    __attribute__(nonnull(1));
+int	allocm(void **ptr, size_t *rsize, size_t size, int flags) __nonnull(1);
 int	rallocm(void **ptr, size_t *rsize, size_t size, size_t extra,
-    int flags) __attribute__(nonnull(1));
-int	sallocm(const void *ptr, size_t *rsize, int flags)
-    __attribute__(nonnull(1));
-int	dallocm(void *ptr, int flags) __attribute__(nonnull(1));
+    int flags) __nonnull(1);
+int	sallocm(const void *ptr, size_t *rsize, int flags) __nonnull(1);
+int	dallocm(void *ptr, int flags) __nonnull(1);
 int	nallocm(size_t *rsize, size_t size, int flags);
 __END_DECLS
 
diff -r 49f3e3227aef -r 58bcef12a717 head/include/paths.h
--- a/head/include/paths.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/paths.h	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD$
+ * $FreeBSD: head/include/paths.h 236965 2012-06-12 17:02:53Z des $
  */
 
 #ifndef _PATHS_H_
@@ -42,7 +42,6 @@
 /* Locate system binaries. */
 #define	_PATH_SYSPATH	"/sbin:/usr/sbin"
 
-#define	_PATH_AUTHCONF	"/etc/auth.conf"
 #define	_PATH_BSHELL	"/bin/sh"
 #define	_PATH_CAPABILITY	"/etc/capability"
 #define	_PATH_CAPABILITY_DB	"/etc/capability.db"
diff -r 49f3e3227aef -r 58bcef12a717 head/include/printf.h
--- a/head/include/printf.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/printf.h	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/include/printf.h 238111 2012-07-04 17:35:07Z pjd $
  */
 
 #ifndef _PRINTF_H_
@@ -123,7 +123,7 @@
 
 /* FreeBSD */
 int register_printf_render(int spec, printf_render *render, printf_arginfo_function *arginfo);
-int register_printf_render_std(const unsigned char *specs);
+int register_printf_render_std(const char *specs);
 
 /* vprintf_errno.c */
 printf_arginfo_function		__printf_arginfo_errno;
diff -r 49f3e3227aef -r 58bcef12a717 head/include/protocols/dumprestore.h
--- a/head/include/protocols/dumprestore.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/protocols/dumprestore.h	Wed Jul 25 16:32:50 2012 +0300
@@ -33,7 +33,7 @@
  *
  *	@(#)dumprestore.h	8.2 (Berkeley) 1/21/94
  *
- * $FreeBSD$
+ * $FreeBSD: head/include/protocols/dumprestore.h 235601 2012-05-18 10:01:31Z gleb $
  */
 
 #ifndef _PROTOCOLS_DUMPRESTORE_H_
@@ -65,6 +65,15 @@
 #endif
 #define CHECKSUM	(int)84446
 
+/*
+ * Since ino_t size is changing to 64-bits, yet we desire this structure to
+ * remain compatible with exiting dump formats, we do NOT use ino_t here,
+ * but rather define a 32-bit type in its place.  At some point, it may be
+ * necessary to use some of the c_spare[] in order to fully support 64-bit
+ * inode numbers.
+ */
+typedef uint32_t dump_ino_t;
+
 union u_spcl {
 	char dummy[TP_BSIZE];
 	struct	s_spcl {
@@ -73,7 +82,7 @@
 		int32_t	c_old_ddate;	    /* date of previous dump */
 		int32_t	c_volume;	    /* dump volume number */
 		int32_t	c_old_tapea;	    /* logical block of this record */
-		ino_t	c_inumber;	    /* number of inode */
+		dump_ino_t c_inumber;	    /* number of inode */
 		int32_t	c_magic;	    /* magic number (see above) */
 		int32_t	c_checksum;	    /* record checksum */
 		/*
diff -r 49f3e3227aef -r 58bcef12a717 head/include/setjmp.h
--- a/head/include/setjmp.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/setjmp.h	Wed Jul 25 16:32:50 2012 +0300
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)setjmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD$
+ * $FreeBSD: head/include/setjmp.h 234785 2012-04-29 11:04:31Z dim $
  */
 
 #ifndef _SETJMP_H_
@@ -46,16 +46,16 @@
 __BEGIN_DECLS
 #if __BSD_VISIBLE || __XSI_VISIBLE >= 600
 void	_longjmp(jmp_buf, int) __dead2;
-int	_setjmp(jmp_buf);
+int	_setjmp(jmp_buf) __returns_twice;
 #endif
 void	longjmp(jmp_buf, int) __dead2;
 #if __BSD_VISIBLE
 void	longjmperror(void);
 #endif
-int	setjmp(jmp_buf);
+int	setjmp(jmp_buf) __returns_twice;
 #if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
 void	siglongjmp(sigjmp_buf, int) __dead2;
-int	sigsetjmp(sigjmp_buf, int);
+int	sigsetjmp(sigjmp_buf, int) __returns_twice;
 #endif
 __END_DECLS
 
diff -r 49f3e3227aef -r 58bcef12a717 head/include/stdatomic.h
--- a/head/include/stdatomic.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/stdatomic.h	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/include/stdatomic.h 230267 2012-01-17 15:20:41Z theraven $
+ * $FreeBSD: head/include/stdatomic.h 234958 2012-05-03 15:54:06Z theraven $
  */
 
 #ifndef _STDATOMIC_H_
@@ -51,7 +51,7 @@
 
 #if defined(__CLANG_ATOMICS)
 #define	ATOMIC_VAR_INIT(value)		(value)
-#define	atomic_init(obj, value)		__atomic_init(obj, value)
+#define	atomic_init(obj, value)		__c11_atomic_init(obj, value)
 #else
 #define	ATOMIC_VAR_INIT(value)		{ .__val = (value) }
 #define	atomic_init(obj, value) do {					\
@@ -104,7 +104,10 @@
  * 7.17.4 Fences.
  */
 
-#if defined(__CLANG_ATOMICS) || defined(__GNUC_ATOMICS)
+#ifdef __CLANG_ATOMICS
+#define	atomic_thread_fence(order)	__c11_atomic_thread_fence(order)
+#define	atomic_signal_fence(order)	__c11_atomic_signal_fence(order)
+#elif defined(__GNUC_ATOMICS)
 #define	atomic_thread_fence(order)	__atomic_thread_fence(order)
 #define	atomic_signal_fence(order)	__atomic_signal_fence(order)
 #else
@@ -118,7 +121,7 @@
 
 #if defined(__CLANG_ATOMICS)
 #define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof(obj))
+	__c11_atomic_is_lock_free(sizeof(obj))
 #elif defined(__GNUC_ATOMICS)
 #define	atomic_is_lock_free(obj) \
 	__atomic_is_lock_free(sizeof((obj)->__val))
@@ -182,28 +185,28 @@
 #if defined(__CLANG_ATOMICS)
 #define	atomic_compare_exchange_strong_explicit(object, expected,	\
     desired, success, failure)						\
-	__atomic_compare_exchange_strong(object, expected, desired,	\
+	__c11_atomic_compare_exchange_strong(object, expected, desired,	\
 	    success, failure)
 #define	atomic_compare_exchange_weak_explicit(object, expected,		\
     desired, success, failure)						\
-	__atomic_compare_exchange_weak(object, expected, desired,	\
+	__c11_atomic_compare_exchange_weak(object, expected, desired,	\
 	    success, failure)
 #define	atomic_exchange_explicit(object, desired, order)		\
-	__atomic_exchange(object, desired, order)
+	__c11_atomic_exchange(object, desired, order)
 #define	atomic_fetch_add_explicit(object, operand, order)		\
-	__atomic_fetch_add(object, operand, order)
+	__c11_atomic_fetch_add(object, operand, order)
 #define	atomic_fetch_and_explicit(object, operand, order)		\
-	__atomic_fetch_and(object, operand, order)
+	__c11_atomic_fetch_and(object, operand, order)
 #define	atomic_fetch_or_explicit(object, operand, order)		\
-	__atomic_fetch_or(object, operand, order)
+	__c11_atomic_fetch_or(object, operand, order)
 #define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__atomic_fetch_sub(object, operand, order)
+	__c11_atomic_fetch_sub(object, operand, order)
 #define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__atomic_fetch_xor(object, operand, order)
+	__c11_atomic_fetch_xor(object, operand, order)
 #define	atomic_load_explicit(object, order)				\
-	__atomic_load(object, order)
+	__c11_atomic_load(object, order)
 #define	atomic_store_explicit(object, desired, order)			\
-	__atomic_store(object, desired, order)
+	__c11_atomic_store(object, desired, order)
 #elif defined(__GNUC_ATOMICS)
 #define	atomic_compare_exchange_strong_explicit(object, expected,	\
     desired, success, failure)						\
diff -r 49f3e3227aef -r 58bcef12a717 head/include/unistd.h
--- a/head/include/unistd.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/unistd.h	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD: head/include/unistd.h 228843 2011-12-23 15:00:37Z cperciva $
+ * $FreeBSD: head/include/unistd.h 234785 2012-04-29 11:04:31Z dim $
  */
 
 #ifndef _UNISTD_H_
@@ -479,7 +479,7 @@
 useconds_t
 	 ualarm(useconds_t, useconds_t);
 int	 usleep(useconds_t);
-pid_t	 vfork(void);
+pid_t	 vfork(void) __returns_twice;
 #endif
 
 #if __BSD_VISIBLE
diff -r 49f3e3227aef -r 58bcef12a717 head/include/wchar.h
--- a/head/include/wchar.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/wchar.h	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/include/wchar.h 233600 2012-03-28 12:11:54Z theraven $
+ * $FreeBSD: head/include/wchar.h 237517 2012-06-24 04:15:58Z andrew $
  */
 
 /*-
@@ -88,10 +88,8 @@
 #define	_WINT_T_DECLARED
 #endif
 
-#ifndef	WCHAR_MIN 
-#define	WCHAR_MIN	__INT_MIN
-#define	WCHAR_MAX	__INT_MAX
-#endif
+#define	WCHAR_MIN	__WCHAR_MIN
+#define	WCHAR_MAX	__WCHAR_MAX
 
 #ifndef WEOF
 #define	WEOF 	((wint_t)-1)
diff -r 49f3e3227aef -r 58bcef12a717 head/include/xlocale/_ctype.h
--- a/head/include/xlocale/_ctype.h	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/include/xlocale/_ctype.h	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/include/xlocale/_ctype.h 232931 2012-03-13 18:53:28Z theraven $
+ * $FreeBSD: head/include/xlocale/_ctype.h 234573 2012-04-22 16:58:14Z theraven $
  */
 
 
@@ -78,8 +78,8 @@
 {
 	int __limit;
 	_RuneLocale *runes = __runes_for_locale(__loc, &__limit);
-	return (__c < 0 || __c >= _CACHED_RUNES) ? ___runetype_l(__c, __loc) :
-	       runes->__runetype[__c] & __f;
+	return ((__c < 0 || __c >= _CACHED_RUNES) ? ___runetype_l(__c, __loc) :
+	        runes->__runetype[__c]) & __f;
 }
 
 _XLOCALE_INLINE int
diff -r 49f3e3227aef -r 58bcef12a717 head/share/Makefile
--- a/head/share/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $FreeBSD: head/share/Makefile 235613 2012-05-18 16:40:15Z gnn $
 
 .include <bsd.own.mk>
 
@@ -8,6 +8,7 @@
 SUBDIR=	${_colldef} \
 	${_dict} \
 	${_doc} \
+	dtrace \
 	${_examples} \
 	${_i18n} \
 	${_man} \
diff -r 49f3e3227aef -r 58bcef12a717 head/share/dtrace/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/dtrace/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,21 @@
+# $FreeBSD: head/share/dtrace/Makefile 238660 2012-07-20 23:56:23Z gnn $
+#
+# Hand installing our scripts and optionally (based on MK_CDDL) installing
+# the DTraceToolkit.
+#
+
+.include <bsd.own.mk>
+
+SUBDIR= ${_toolkit}
+
+.if ${MK_CDDL} != "no"
+_toolkit=	toolkit
+.endif
+
+SCRIPTS=	nfsclienttime hotopen
+
+SCRIPTSDIR= ${SHAREDIR}/dtrace
+
+NO_OBJ=
+
+.include <bsd.prog.mk>
diff -r 49f3e3227aef -r 58bcef12a717 head/share/dtrace/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/dtrace/README	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,11 @@
+$FreeBSD: head/share/dtrace/README 235628 2012-05-18 20:34:08Z gnn $
+
+This directory contains scripts for use with the DTrace system.  The
+toolkit/ directory contains the latest vendor import of Brendan
+Gregg's DTraceToolkit while all the other files and directories
+contain code generated by the FreeBSD Project for use with DTrace on
+FreeBSD.
+
+NOTE: Do not add new scripts to the DTraceToolkit contained in this
+directory. New DTraceToolkit scripts should be send to the maintainer
+of the toolkit and then brought back into FreeBSD via future vendor imports.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/dtrace/hotopen
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/dtrace/hotopen	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 George V. Neville-Neil
+# 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: head/share/dtrace/hotopen 238665 2012-07-21 07:14:52Z gnn $
+#
+# The hotopen D script periodically outputs  table of which UIDs
+# are opening files.   This is a very quick way to find out if
+# a paritcular user is thrashing a system with rapid calls to
+# open/close.
+#
+# Usage: hotopen
+#
+
+/usr/sbin/dtrace -n '
+#pragma D option quiet
+BEGIN
+{
+	printf("Files opened per UID in the last second.\n");
+}
+
+syscall::open:entry
+{
+	@files[uid] = count();
+	output = 1;
+}
+
+tick-1sec
+/output != 0/
+{
+	printf("%-20Y \n", walltimestamp);
+	printa("uid %d\tcount %@d\n", @files, @files);
+	trunc(@files);
+	output = 0;
+}
+'
diff -r 49f3e3227aef -r 58bcef12a717 head/share/dtrace/nfsattrstats
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/dtrace/nfsattrstats	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Robert N. M. Watson
+# All rights reserved.
+#
+# This software was developed at the University of Cambridge Computer
+# Laboratory with support from a grant from Google, Inc.
+#
+# 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: head/share/dtrace/nfsattrstats 238535 2012-07-16 17:48:43Z gnn $
+#
+# This script creates a trace of NFS RPCs, NFS attribute cache
+# activity, and NFS access cache activity, along with the system call
+# that instigated the activity. Notice that NFS events may happen
+# outside of the context of a system call, most likely due to the VM
+# system paging from NFS, in which case the system call name is
+# reported as "-"
+
+/usr/sbin/dtrace -n '
+#pragma D option quiet
+
+dtrace:::BEGIN
+{
+	printf("probe\targ0\texecutable\tsyscall\n");
+}
+
+syscall:::entry
+{
+
+        self->syscallname = probefunc;
+}
+
+syscall:::return
+{
+
+        self->syscallname = "";
+}
+
+nfsclient:::
+/self->syscallname != 0 && self->syscallname != ""/
+{
+
+    printf("%s\t%s\t%s\t%s\n", probemod, stringof(arg0), execname, 
+	    self->syscallname);
+}
+
+nfsclient:::
+/self->syscallname == 0 || self->syscallname == ""/
+{
+
+    printf("%s\t%s\t%s\t%s\n", probemod, stringof(arg0), execname, 
+	    self->syscallname);
+}
+'
diff -r 49f3e3227aef -r 58bcef12a717 head/share/dtrace/nfsclienttime
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/dtrace/nfsclienttime	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Robert N. M. Watson
+# All rights reserved.
+#
+# This software was developed at the University of Cambridge Computer
+# Laboratory with support from a grant from Google, Inc.
+#
+# 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: head/share/dtrace/nfsclienttime 235614 2012-05-18 16:47:15Z gnn $
+#
+# This script measures all time spent waiting on RPC replies for each
+# system call, and then generates a histogram of those times sorted by
+# system call name.
+#
+# Currently only supports NFSv3
+#
+# Usage: nfsclienttime
+#
+# Press Ctrl-C to exit and display statistics.
+#
+
+/usr/sbin/dtrace -n '
+#pragma D option quiet
+
+dtrace:::BEGIN
+{
+	printf("Collecting data...press Ctrl-C to exit.\n");
+}
+
+syscall:::entry
+{
+
+        self->count = 0;
+}
+
+nfsclient:nfs3::start
+{
+
+        self->timestamp = timestamp;
+}
+
+nfsclient:nfs3::done
+{
+
+        self->count += (timestamp - self->timestamp);
+}
+
+syscall:::return
+/self->count != 0/  {
+
+        @syscalls[probefunc] = quantize(self->count);
+}
+'
diff -r 49f3e3227aef -r 58bcef12a717 head/share/dtrace/toolkit/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/dtrace/toolkit/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,17 @@
+#$FreeBSD: head/share/dtrace/toolkit/Makefile 235613 2012-05-18 16:40:15Z gnn $
+#
+# Install scripts from the DTraceToolkit
+#
+DTRACETOOLKIT= ../../../cddl/contrib/dtracetoolkit
+
+SCRIPTS=	${DTRACETOOLKIT}/execsnoop \
+		${DTRACETOOLKIT}/hotuser   \
+		${DTRACETOOLKIT}/hotkernel \
+		${DTRACETOOLKIT}/opensnoop \
+		${DTRACETOOLKIT}/procsystime \
+
+SCRIPTSDIR= ${SHAREDIR}/dtrace/toolkit
+
+NO_OBJ=
+
+.include <bsd.prog.mk>
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/Makefile
--- a/head/share/examples/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/examples/Makefile 233429 2012-03-24 18:43:18Z eadler $
+# $FreeBSD: head/share/examples/Makefile 238603 2012-07-18 21:30:17Z joerg $
 #
 # Doing a make install builds /usr/share/examples
 
@@ -20,6 +20,7 @@
 	ipfw \
 	jails \
 	kld \
+	libusb20 \
 	libvgl \
 	mdoc \
 	netgraph \
@@ -110,6 +111,12 @@
 	kld/syscall/module/syscall.c \
 	kld/syscall/test/Makefile \
 	kld/syscall/test/call.c \
+	libusb20/Makefile \
+	libusb20/README \
+	libusb20/aux.c \
+	libusb20/aux.h \
+	libusb20/bulk.c \
+	libusb20/control.c \
 	libvgl/Makefile \
 	libvgl/demo.c \
 	mdoc/POSIX-copyright \
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/csh/dot.cshrc
--- a/head/share/examples/csh/dot.cshrc	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/csh/dot.cshrc	Wed Jul 25 16:32:50 2012 +0300
@@ -1,11 +1,15 @@
 # Here are some example (t)csh options and configurations that you may find interesting
 #
-# $FreeBSD: head/share/examples/csh/dot.cshrc 234159 2012-04-12 00:12:17Z eadler $
+# $FreeBSD: head/share/examples/csh/dot.cshrc 236999 2012-06-13 06:46:00Z eadler $
 #
 
 # Sets SSH_AUTH_SOCK to the user's ssh-agent socket path if running
+#
+# This has a couple caveats, the most notable being that if a user
+# has multiple ssh-agent(1) processes running, this will very likely
+# set SSH_AUTH_SOCK to point to the wrong file/domain socket.
 if (${?SSH_AUTH_SOCK} != "1") then
-	setenv SSH_AUTH_SOCK `sockstat | grep "${USER}" | cut -d ' ' -f 6` 
+	setenv SSH_AUTH_SOCK `sockstat -u | awk '/^${USER}.+ ssh-agent/ { print $6 }'
 endif
 
 # Change only root's prompt
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/etc/README.examples
--- a/head/share/examples/etc/README.examples	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/etc/README.examples	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: head/share/examples/etc/README.examples 236965 2012-06-12 17:02:53Z des $
 
 The /usr/share/examples/etc directory contains the original
 distribution versions of the files which are shipped in /etc.  This is
@@ -9,7 +9,6 @@
 
 amd.map		- filesystem automounter lookup resolution map (see amd(8))
 apmd.conf	- configuration file for apmd(8)
-auth.conf	- authentication capability database (see auth.conf(5))
 bsd-style-copyright	- copyright style for bsd system
 crontab		- system scheduled command table (see crontab(5))
 csh.cshrc	- sample .cshrc (see csh(1))
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/libusb20/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/examples/libusb20/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,13 @@
+# $FreeBSD: head/share/examples/libusb20/Makefile 238603 2012-07-18 21:30:17Z joerg $
+TARGETS=	bulk control
+
+all: $(TARGETS)
+
+bulk: bulk.o aux.o
+	$(CC) $(CFLAGS) -o bulk bulk.o aux.o -lusb
+
+control: control.o aux.o
+	$(CC) $(CFLAGS) -o control control.o aux.o -lusb
+
+clean:
+	rm -f $(TARGETS) *.o *~
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/libusb20/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/examples/libusb20/README	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,42 @@
+As I dug my own way through the documentation of libusb 2.0 that ships
+with FreeBSD 8+ as the OS'es own USB library API, I noticed there are
+only few code examples around under /usr/src (namely, usbconfig
+itself).
+
+The libusb20(3) man page is a starting point, but it's a reference
+manual, nothing less, nothing more.  Using just a reference, it's not
+very easy to start writing your own code based on that.
+
+So I started writing my own examples, to "get a feeling" about how to
+use the library.  I covered two typical scenarios which are common for
+a number of devices.
+
+The first one is called "bulk", and uses bulk output (host to device)
+and input transfers to talk to an USB device.
+
+The second one is called "control", and can use both control output
+and input transfers, as well as so-called interrupt transfers.  The
+latter are used for data that are being reported frequently or
+repeatedly, like position updates from a pointing device (mouse).
+Despite of its name, the host has to poll devices for their interrupt
+transfers on each USB frame (i.e., each 1 ms).
+
+Recommended reading is the USB 3.0 specification (the older 2.0 one
+would do as well), to be found under
+
+http://www.usb.org/developers/docs/
+
+as well as documents for individual USB device classes where
+appropriate.
+
+Feel free to be liberal in the licensing of these examples: while the
+beer-ware license mandates to keep the license notice, this only
+applies to modifications of the original examples itself.  For
+copy&pasting (even a larger) piece of an example into your own work, I
+won't imply you have to reproduce the beer-ware license text there.
+Feel free to credit my name in your derived work if you want.
+
+Dresden, July 2012
+Joerg Wunsch <joerg at FreeBSD.org>
+
+# $FreeBSD: head/share/examples/libusb20/README 238603 2012-07-18 21:30:17Z joerg $
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/libusb20/aux.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/examples/libusb20/aux.c	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,120 @@
+/* ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp):
+ * <joerg at 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.        Joerg Wunsch
+ * ----------------------------------------------------------------------------
+ *
+ * $FreeBSD: head/share/examples/libusb20/aux.c 238603 2012-07-18 21:30:17Z joerg $
+ */
+
+/*
+ * Helper functions common to all examples
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <libusb20.h>
+#include <libusb20_desc.h>
+
+#include "aux.h"
+
+/*
+ * Return a textual description for error "r".
+ */
+const char *
+usb_error(enum libusb20_error r)
+{
+  const char *msg = "UNKNOWN";
+
+  switch (r)
+    {
+    case LIBUSB20_SUCCESS:
+      msg = "success";
+      break;
+
+    case LIBUSB20_ERROR_IO:
+      msg = "IO error";
+      break;
+
+    case LIBUSB20_ERROR_INVALID_PARAM:
+      msg = "Invalid parameter";
+      break;
+
+    case LIBUSB20_ERROR_ACCESS:
+      msg = "Access denied";
+      break;
+
+    case LIBUSB20_ERROR_NO_DEVICE:
+      msg = "No such device";
+      break;
+
+    case LIBUSB20_ERROR_NOT_FOUND:
+      msg = "Entity not found";
+      break;
+
+    case LIBUSB20_ERROR_BUSY:
+      msg = "Resource busy";
+      break;
+
+    case LIBUSB20_ERROR_TIMEOUT:
+      msg = "Operation timed out";
+      break;
+
+    case LIBUSB20_ERROR_OVERFLOW:
+      msg = "Overflow";
+      break;
+
+    case LIBUSB20_ERROR_PIPE:
+      msg = "Pipe error";
+      break;
+
+    case LIBUSB20_ERROR_INTERRUPTED:
+      msg = "System call interrupted";
+      break;
+
+    case LIBUSB20_ERROR_NO_MEM:
+      msg = "Insufficient memory";
+      break;
+
+    case LIBUSB20_ERROR_NOT_SUPPORTED:
+      msg = "Operation not supported";
+      break;
+
+    case LIBUSB20_ERROR_OTHER:
+      msg = "Other error";
+      break;
+    }
+
+  return msg;
+}
+
+/*
+ * Print "len" bytes from "buf" in hex, followed by an ASCII
+ * representation (somewhat resembling the output of hd(1)).
+ */
+void
+print_formatted(uint8_t *buf, uint32_t len)
+{
+  int i, j;
+
+  for (j = 0; j < len; j += 16)
+    {
+      printf("%02x: ", j);
+
+      for (i = 0; i < 16 && i + j < len; i++)
+	printf("%02x ", buf[i + j]);
+      printf("  ");
+      for (i = 0; i < 16 && i + j < len; i++)
+	{
+	  uint8_t c = buf[i + j];
+	  if(c >= ' ' && c <= '~')
+	    printf("%c", (char)c);
+	  else
+	    putchar('.');
+	}
+      putchar('\n');
+    }
+}
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/libusb20/aux.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/examples/libusb20/aux.h	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,15 @@
+/* ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp):
+ * <joerg at 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.        Joerg Wunsch
+ * ----------------------------------------------------------------------------
+ *
+ * $FreeBSD: head/share/examples/libusb20/aux.h 238603 2012-07-18 21:30:17Z joerg $
+ */
+
+#include <stdint.h>
+#include <libusb20.h>
+
+const char *usb_error(enum libusb20_error r);
+void print_formatted(uint8_t *buf, uint32_t len);
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/libusb20/bulk.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/examples/libusb20/bulk.c	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,243 @@
+/* ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp):
+ * <joerg at 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.        Joerg Wunsch
+ * ----------------------------------------------------------------------------
+ *
+ * $FreeBSD: head/share/examples/libusb20/bulk.c 238603 2012-07-18 21:30:17Z joerg $
+ */
+
+/*
+ * Simple demo program to illustrate the handling of FreeBSD's
+ * libusb20.
+ *
+ * Issues a bulk output, and then requests a bulk input.
+ */
+
+/*
+ * Examples:
+ * Just list all VID:PID pairs
+ * ./bulk
+ *
+ * Say "hello" to an Atmel JTAGICEmkII.
+ * ./bulk -o 2 -i 0x82 -v 0x03eb -p 0x2103 0x1b 0 0 1 0 0 0 0x0e 1 0xf3 0x97
+ *
+ * Return the INQUIRY data of an USB mass storage device.
+ * (It's best to have the umass(4) driver unloaded while doing such
+ * experiments, and perform a "usbconfig reset" for the device if it
+ * gets stuck.)
+ * ./bulk -v 0x5e3 -p 0x723 -i 0x81 -o 2 0x55 0x53 0x42 0x43 1 2 3 4 31 12 0x80 0x24 0 0 0 0x12 0 0 0 36 0 0 0 0 0 0 0 0 0 0
+ */
+
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#include <libusb20.h>
+#include <libusb20_desc.h>
+
+#include "aux.h"
+
+/*
+ * If you want to see the details of the internal datastructures
+ * in the debugger, unifdef the following.
+ */
+#ifdef DEBUG
+#  include <sys/queue.h>
+#  include "/usr/src/lib/libusb/libusb20_int.h"
+#endif
+
+#define BUFLEN 64
+
+#define TIMEOUT 5000 		/* 5 s */
+
+int in_ep, out_ep;		/* endpoints */
+uint8_t out_buf[BUFLEN];
+uint16_t out_len;
+
+static void
+doit(struct libusb20_device *dev)
+{
+  int rv;
+
+  /*
+   * Open the device, allocating memory for two possible (bulk or
+   * interrupt) transfers.
+   *
+   * If only control transfers are intended (via
+   * libusb20_dev_request_sync()), transfer_max can be given as 0.
+   */
+  if ((rv = libusb20_dev_open(dev, 2)) != 0)
+    {
+      fprintf(stderr, "libusb20_dev_open: %s\n", usb_error(rv));
+      return;
+    }
+
+  /*
+   * If the device has more than one configuration, select the desired
+   * one here.
+   */
+  if ((rv = libusb20_dev_set_config_index(dev, 0)) != 0)
+    {
+      fprintf(stderr, "libusb20_dev_set_config_index: %s\n", usb_error(rv));
+      return;
+    }
+
+  /*
+   * Two transfers have been requested in libusb20_dev_open() above;
+   * obtain the corresponding transfer struct pointers.
+   */
+  struct libusb20_transfer *xfr_out = libusb20_tr_get_pointer(dev, 0);
+  struct libusb20_transfer *xfr_in = libusb20_tr_get_pointer(dev, 1);
+
+  if (xfr_in == NULL || xfr_out == NULL)
+    {
+      fprintf(stderr, "libusb20_tr_get_pointer: %s\n", usb_error(rv));
+      return;
+    }
+
+  /*
+   * Open both transfers, the "out" one for the write endpoint, the
+   * "in" one for the read endpoint (ep | 0x80).
+   */
+  if ((rv = libusb20_tr_open(xfr_out, 0, 1, out_ep)) != 0)
+    {
+      fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv));
+      return;
+    }
+  if ((rv = libusb20_tr_open(xfr_in, 0, 1, in_ep)) != 0)
+    {
+      fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv));
+      return;
+    }
+
+  uint8_t in_buf[BUFLEN];
+  uint32_t rlen;
+
+  if (out_len > 0)
+    {
+      if ((rv = libusb20_tr_bulk_intr_sync(xfr_out, out_buf, out_len, &rlen, TIMEOUT))
+	  != 0)
+	{
+	  fprintf(stderr, "libusb20_tr_bulk_intr_sync (OUT): %s\n", usb_error(rv));
+	}
+      printf("sent %d bytes\n", rlen);
+    }
+
+  if ((rv = libusb20_tr_bulk_intr_sync(xfr_in, in_buf, BUFLEN, &rlen, TIMEOUT))
+      != 0)
+    {
+      fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", usb_error(rv));
+    }
+      printf("received %d bytes\n", rlen);
+      if (rlen > 0)
+	print_formatted(in_buf, rlen);
+
+  libusb20_tr_close(xfr_out);
+  libusb20_tr_close(xfr_in);
+
+  libusb20_dev_close(dev);
+}
+
+static void
+usage(void)
+{
+  fprintf(stderr,
+	  "Usage ./usb -i <IN_EP> -o <OUT_EP> -v <VID> -p <PID> [<outdata> ...\n]");
+  exit(EX_USAGE);
+}
+
+int
+main(int argc, char **argv)
+{
+  unsigned int vid = UINT_MAX, pid = UINT_MAX; /* impossible VID:PID */
+  int c;
+
+  while ((c = getopt(argc, argv, "i:o:p:v:")) != -1)
+    switch (c)
+      {
+      case 'i':
+	in_ep = strtol(optarg, NULL, 0);
+	break;
+
+      case 'o':
+	out_ep = strtol(optarg, NULL, 0);
+	break;
+
+      case 'p':
+	pid = strtol(optarg, NULL, 0);
+	break;
+
+      case 'v':
+	vid = strtol(optarg, NULL, 0);
+	break;
+
+      default:
+	usage();
+	break;
+      }
+  argc -= optind;
+  argv += optind;
+
+  if (vid != UINT_MAX || pid != UINT_MAX)
+    {
+      if (in_ep == 0 || out_ep == 0)
+	{
+	  usage();
+	}
+      if ((in_ep & 0x80) == 0)
+	{
+	  fprintf(stderr, "IN_EP must have bit 7 set\n");
+	  return (EX_USAGE);
+	}
+
+      if (argc > 0)
+	{
+	  for (out_len = 0; argc > 0 && out_len < BUFLEN; out_len++, argc--)
+	    {
+	      unsigned n = strtoul(argv[out_len], 0, 0);
+	      if (n > 255)
+		fprintf(stderr,
+			"Warning: data #%d 0x%0x > 0xff, truncating\n",
+			out_len, n);
+	      out_buf[out_len] = (uint8_t)n;
+	    }
+	  out_len++;
+	  if (argc > 0)
+	    fprintf(stderr,
+		    "Data count exceeds maximum of %d, ignoring %d elements\n",
+		    BUFLEN, optind);
+	}
+    }
+
+  struct libusb20_backend *be;
+  struct libusb20_device *dev;
+
+  if ((be = libusb20_be_alloc_default()) == NULL)
+    {
+      perror("libusb20_be_alloc()");
+      return 1;
+    }
+
+  dev = NULL;
+  while ((dev = libusb20_be_device_foreach(be, dev)) != NULL)
+    {
+      struct LIBUSB20_DEVICE_DESC_DECODED *ddp =
+      libusb20_dev_get_device_desc(dev);
+
+      printf("Found device %s (VID:PID = 0x%04x:0x%04x)\n",
+	     libusb20_dev_get_desc(dev),
+	     ddp->idVendor, ddp->idProduct);
+
+      if (ddp->idVendor == vid && ddp->idProduct == pid)
+	doit(dev);
+    }
+
+  libusb20_be_free(be);
+  return 0;
+}
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/libusb20/control.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/examples/libusb20/control.c	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,414 @@
+/* ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp):
+ * <joerg at 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.        Joerg Wunsch
+ * ----------------------------------------------------------------------------
+ *
+ * $FreeBSD: head/share/examples/libusb20/control.c 238603 2012-07-18 21:30:17Z joerg $
+ */
+
+/*
+ * Simple demo program to illustrate the handling of FreeBSD's
+ * libusb20.
+ *
+ * XXX
+ */
+
+/*
+ * Examples:
+ * Just list all VID:PID pairs
+ * ./control
+ *
+ * Standard device request GET_STATUS, report two bytes of status
+ * (bit 0 in the first byte returned is the "self powered" bit)
+ * ./control -v 0x3eb -p 0x2103 in std dev get_status 0 0 2
+ *
+ * Request input reports through the interrupt pipe from a mouse
+ * device (move the mouse around after issuing the command):
+ * ./control -v 0x093a -p 0x2516 -i 0x81
+ *
+ */
+
+
+#include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#include <libusb20.h>
+#include <libusb20_desc.h>
+
+#include <sys/queue.h>
+
+/*
+ * If you want to see the details of the internal datastructures
+ * in the debugger, unifdef the following.
+ */
+#ifdef DEBUG
+#  include "/usr/src/lib/libusb/libusb20_int.h"
+#endif
+
+#define BUFLEN 64
+
+#define TIMEOUT 5000 		/* 5 s */
+
+int intr_ep;		/* endpoints */
+struct LIBUSB20_CONTROL_SETUP_DECODED setup;
+
+uint8_t out_buf[BUFLEN];
+uint16_t out_len;
+
+bool do_request;
+
+static void
+doit(struct libusb20_device *dev)
+{
+  int rv;
+
+  if (do_request)
+    printf("doit(): bmRequestType 0x%02x, bRequest 0x%02x, wValue 0x%04x, wIndex 0x%04x, wLength 0x%04x\n",
+	   setup.bmRequestType,
+	   setup.bRequest,
+	   setup.wValue,
+	   setup.wIndex,
+	   setup.wLength);
+
+  /*
+   * Open the device, allocating memory for two possible (bulk or
+   * interrupt) transfers.
+   *
+   * If only control transfers are intended (via
+   * libusb20_dev_request_sync()), transfer_max can be given as 0.
+   */
+  if ((rv = libusb20_dev_open(dev, 1)) != 0)
+    {
+      fprintf(stderr, "libusb20_dev_open: %s\n", usb_error(rv));
+      return;
+    }
+
+  /*
+   * If the device has more than one configuration, select the desired
+   * one here.
+   */
+  if ((rv = libusb20_dev_set_config_index(dev, 0)) != 0)
+    {
+      fprintf(stderr, "libusb20_dev_set_config_index: %s\n", usb_error(rv));
+      return;
+    }
+
+  uint8_t *data = 0;
+  uint16_t actlen;
+
+  if ((setup.bmRequestType & 0x80) != 0)
+    {
+      /* this is an IN request, allocate a buffer */
+      data = malloc(setup.wLength);
+      if (data == 0)
+	{
+	  fprintf(stderr,
+		  "Out of memory allocating %u bytes of reply buffer\n",
+		  setup.wLength);
+	  return;
+	}
+    }
+  else
+    data = out_buf;
+
+  if (do_request)
+    {
+      if ((rv = libusb20_dev_request_sync(dev, &setup, data,
+					  &actlen,
+					  TIMEOUT,
+					  0 /* flags */)) != 0)
+	{
+	  fprintf(stderr,
+		  "libusb20_dev_request_sync: %s\n", usb_error(rv));
+	}
+      printf("sent %d bytes\n", actlen);
+      if ((setup.bmRequestType & 0x80) != 0)
+	{
+	  print_formatted(data, (uint32_t)setup.wLength);
+	  free(data);
+	}
+    }
+
+  if (intr_ep != 0)
+    {
+      /*
+       * One transfer has been requested in libusb20_dev_open() above;
+       * obtain the corresponding transfer struct pointer.
+       */
+      struct libusb20_transfer *xfr_intr = libusb20_tr_get_pointer(dev, 0);
+
+      if (xfr_intr == NULL)
+	{
+	  fprintf(stderr, "libusb20_tr_get_pointer: %s\n", usb_error(rv));
+	  return;
+	}
+
+      /*
+       * Open the interrupt transfer.
+       */
+      if ((rv = libusb20_tr_open(xfr_intr, 0, 1, intr_ep)) != 0)
+	{
+	  fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv));
+	  return;
+	}
+
+      uint8_t in_buf[BUFLEN];
+      uint32_t rlen;
+
+      if ((rv = libusb20_tr_bulk_intr_sync(xfr_intr, in_buf, BUFLEN, &rlen, TIMEOUT))
+	  != 0)
+	{
+	  fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", usb_error(rv));
+	}
+      printf("received %d bytes\n", rlen);
+      if (rlen > 0)
+	print_formatted(in_buf, rlen);
+
+      libusb20_tr_close(xfr_intr);
+    }
+
+  libusb20_dev_close(dev);
+}
+
+static void
+usage(void)
+{
+  fprintf(stderr,
+	  "Usage ./usb [-i <INTR_EP>] -v <VID> -p <PID> [dir type rcpt req wValue wIndex wLength [<outdata> ...]]\n");
+  exit(EX_USAGE);
+}
+
+static const char *reqnames[] =
+{
+  "get_status",
+  "clear_feature",
+  "res1",
+  "set_feature",
+  "res2",
+  "set_address",
+  "get_descriptor",
+  "set_descriptor",
+  "get_configuration",
+  "set_configuration",
+  "get_interface",
+  "set_interface",
+  "synch_frame",
+};
+
+static int
+get_req(const char *reqname)
+{
+  size_t i;
+  size_t l = strlen(reqname);
+
+  for (i = 0;
+       i < sizeof reqnames / sizeof reqnames[0];
+       i++)
+    if (strncasecmp(reqname, reqnames[i], l) == 0)
+      return i;
+
+  return strtoul(reqname, 0, 0);
+}
+
+
+static int
+parse_req(int argc, char **argv)
+{
+  int idx;
+  uint8_t rt = 0;
+
+  for (idx = 0; argc != 0 && idx <= 6; argc--, idx++)
+    switch (idx)
+      {
+      case 0:
+	/* dir[ection]: i[n] | o[ut] */
+	if (*argv[idx] == 'i')
+	  rt |= 0x80;
+	else if (*argv[idx] == 'o')
+	  /* nop */;
+	else
+	  {
+	    fprintf(stderr, "request direction must be \"in\" or \"out\" (got %s)\n",
+		    argv[idx]);
+	    return -1;
+	  }
+	break;
+
+      case 1:
+	/* type: s[tandard] | c[lass] | v[endor] */
+	if (*argv[idx] == 's')
+	  /* nop */;
+	else if (*argv[idx] == 'c')
+	  rt |= 0x20;
+	else if (*argv[idx] == 'v')
+	  rt |= 0x40;
+	else
+	  {
+	    fprintf(stderr,
+		    "request type must be one of \"standard\", \"class\", or \"vendor\" (got %s)\n",
+		    argv[idx]);
+	    return -1;
+	  }
+	break;
+
+      case 2:
+	/* rcpt: d[evice], i[nterface], e[ndpoint], o[ther] */
+	if (*argv[idx] == 'd')
+	  /* nop */;
+	else if (*argv[idx] == 'i')
+	  rt |= 1;
+	else if (*argv[idx] == 'e')
+	  rt |= 2;
+	else if (*argv[idx] == 'o')
+	  rt |= 3;
+	else
+	  {
+	    fprintf(stderr,
+		    "recipient must be one of \"device\", \"interface\", \"endpoint\", or \"other\" (got %s)\n",
+		    argv[idx]);
+	    return -1;
+	  }
+	setup.bmRequestType = rt;
+	break;
+
+      case 3:
+	setup.bRequest = get_req(argv[idx]);
+	break;
+
+      case 4:
+	setup.wValue = strtoul(argv[idx], 0, 0);
+	break;
+
+      case 5:
+	setup.wIndex = strtoul(argv[idx], 0, 0);
+	break;
+
+      case 6:
+	setup.wLength = strtoul(argv[idx], 0, 0);
+	break;
+      }
+
+  return argc;
+}
+
+
+int
+main(int argc, char **argv)
+{
+  unsigned int vid = UINT_MAX, pid = UINT_MAX; /* impossible VID:PID */
+  int c;
+
+  /*
+   * Initialize setup struct.  This step is required, and initializes
+   * internal fields in the struct.
+   *
+   * All the "public" fields are named exactly the way as the USB
+   * standard describes them, namely:
+   *
+   *	setup.bmRequestType: bitmask, bit 7 is direction
+   *	                              bits 6/5 is request type
+   *	                                       (standard, class, vendor)
+   *	                              bits 4..0 is recipient
+   *	                                       (device, interface, endpoint,
+   *	                                        other)
+   *	setup.bRequest:      the request itself (see get_req() for standard
+   *	                                         requests, or specific value)
+   *	setup.wValue:        a 16-bit value
+   *	setup.wIndex:        another 16-bit value
+   *	setup.wLength:       length of associated data transfer, direction
+   *	                     depends on bit 7 of bmRequestType
+   */
+  LIBUSB20_INIT(LIBUSB20_CONTROL_SETUP, &setup);
+
+  while ((c = getopt(argc, argv, "i:p:v:")) != -1)
+    switch (c)
+      {
+      case 'i':
+	intr_ep = strtol(optarg, NULL, 0);
+	break;
+
+      case 'p':
+	pid = strtol(optarg, NULL, 0);
+	break;
+
+      case 'v':
+	vid = strtol(optarg, NULL, 0);
+	break;
+
+      default:
+	usage();
+	break;
+      }
+  argc -= optind;
+  argv += optind;
+
+  if (vid != UINT_MAX || pid != UINT_MAX)
+    {
+      if (intr_ep != 0 && (intr_ep & 0x80) == 0)
+	{
+	  fprintf(stderr, "Interrupt endpoint must be of type IN\n");
+	  usage();
+	}
+
+      if (argc > 0)
+	{
+	  do_request = true;
+
+	  int rv = parse_req(argc, argv);
+	  if (rv < 0)
+	    return EX_USAGE;
+	  argc = rv;
+
+	  if (argc > 0)
+	    {
+	      for (out_len = 0; argc > 0 && out_len < BUFLEN; out_len++, argc--)
+		{
+		  unsigned n = strtoul(argv[out_len], 0, 0);
+		  if (n > 255)
+		    fprintf(stderr,
+			    "Warning: data #%d 0x%0x > 0xff, truncating\n",
+			    out_len, n);
+		  out_buf[out_len] = (uint8_t)n;
+		}
+	      out_len++;
+	      if (argc > 0)
+		fprintf(stderr,
+			"Data count exceeds maximum of %d, ignoring %d elements\n",
+			BUFLEN, optind);
+	    }
+	}
+    }
+
+  struct libusb20_backend *be;
+  struct libusb20_device *dev;
+
+  if ((be = libusb20_be_alloc_default()) == NULL)
+    {
+      perror("libusb20_be_alloc()");
+      return 1;
+    }
+
+  dev = NULL;
+  while ((dev = libusb20_be_device_foreach(be, dev)) != NULL)
+    {
+      struct LIBUSB20_DEVICE_DESC_DECODED *ddp =
+      libusb20_dev_get_device_desc(dev);
+
+      printf("Found device %s (VID:PID = 0x%04x:0x%04x)\n",
+	     libusb20_dev_get_desc(dev),
+	     ddp->idVendor, ddp->idProduct);
+
+      if (ddp->idVendor == vid && ddp->idProduct == pid)
+	doit(dev);
+    }
+
+  libusb20_be_free(be);
+  return 0;
+}
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/mdoc/example.4
--- a/head/share/examples/mdoc/example.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/mdoc/example.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/examples/mdoc/example.4 237018 2012-06-13 19:08:00Z joel $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
@@ -34,7 +34,6 @@
 .Nd "example device driver manual page"
 .Sh SYNOPSIS
 To compile the
-.Ns Nm
 driver into the kernel,
 place the following lines in the
 kernel configuration file:
@@ -44,7 +43,6 @@
 .Ed
 .Pp
 Alternatively, to load the
-.Ns Nm
 driver as a
 module at boot time, place the following line in
 .Xr loader.conf 5 :
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/pf/faq-example1
--- a/head/share/examples/pf/faq-example1	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/pf/faq-example1	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/share/examples/pf/faq-example1 237681 2012-06-28 03:30:17Z rpaulo $
 # $OpenBSD: faq-example1,v 1.5 2006/10/07 04:48:01 mcbride Exp $
 
 #
@@ -26,7 +26,7 @@
 scrub in
 
 # nat/rdr
-nat on $ext_if from !($ext_if) -> ($ext_if:0)
+nat on $ext_if inet from !($ext_if) -> ($ext_if:0)
 nat-anchor "ftp-proxy/*"
 rdr-anchor "ftp-proxy/*"
 
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/pf/pf.conf
--- a/head/share/examples/pf/pf.conf	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/pf/pf.conf	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$FreeBSD: head/share/examples/pf/pf.conf 237681 2012-06-28 03:30:17Z rpaulo $
 #	$OpenBSD: pf.conf,v 1.34 2007/02/24 19:30:59 millert Exp $
 #
 # See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
@@ -16,7 +16,7 @@
 
 #nat-anchor "ftp-proxy/*"
 #rdr-anchor "ftp-proxy/*"
-#nat on $ext_if from !($ext_if) -> ($ext_if:0)
+#nat on $ext_if inet from !($ext_if) -> ($ext_if:0)
 #rdr pass on $int_if proto tcp to port ftp -> 127.0.0.1 port 8021
 #no rdr on $ext_if proto tcp from <spamd-white> to any port smtp
 #rdr pass on $ext_if proto tcp from any to any port smtp \
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/scsi_target/scsi_target.c
--- a/head/share/examples/scsi_target/scsi_target.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/scsi_target/scsi_target.c	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/share/examples/scsi_target/scsi_target.c 228481 2011-12-13 21:26:33Z ed $
+ * $FreeBSD: head/share/examples/scsi_target/scsi_target.c 237601 2012-06-26 14:51:35Z ken $
  */
 
 #include <sys/types.h>
@@ -88,7 +88,7 @@
 /* static int		work_atio(struct ccb_accept_tio *); */
 static void		queue_io(struct ccb_scsiio *);
 static int		run_queue(struct ccb_accept_tio *);
-static int		work_inot(struct ccb_immed_notify *);
+static int		work_inot(struct ccb_immediate_notify *);
 static struct ccb_scsiio *
 			get_ctio(void);
 /* static void		free_ccb(union ccb *); */
@@ -387,7 +387,7 @@
 			warn("malloc INOT");
 			return (-1);
 		}
-		inot->ccb_h.func_code = XPT_IMMED_NOTIFY;
+		inot->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY;
 		send_ccb((union ccb *)inot, /*priority*/1);
 	}
 
@@ -495,8 +495,8 @@
 				/* Start one more transfer. */
 				retval = work_atio(&ccb->atio);
 				break;
-			case XPT_IMMED_NOTIFY:
-				retval = work_inot(&ccb->cin);
+			case XPT_IMMEDIATE_NOTIFY:
+				retval = work_inot(&ccb->cin1);
 				break;
 			default:
 				warnx("Unhandled ccb type %#x on workq",
@@ -651,7 +651,7 @@
 			warnx("ATIO with %u bytes sense received",
 			      atio->sense_len);
 		}
-		sense = &atio->sense_data;
+		sense = (struct scsi_sense_data_fixed *)&atio->sense_data;
 		tcmd_sense(ctio->init_id, ctio, sense->flags,
 			   sense->add_sense_code, sense->add_sense_code_qual);
 		send_ccb((union ccb *)ctio, /*priority*/1);
@@ -772,16 +772,14 @@
 }
 
 static int
-work_inot(struct ccb_immed_notify *inot)
+work_inot(struct ccb_immediate_notify *inot)
 {
 	cam_status status;
-	int sense;
 
 	if (debug)
 		warnx("Working on INOT %p", inot);
 
 	status = inot->ccb_h.status;
-	sense = (status & CAM_AUTOSNS_VALID) != 0;
 	status &= CAM_STATUS_MASK;
 
 	switch (status) {
@@ -794,7 +792,7 @@
 		abort_all_pending();
 		break;
 	case CAM_MESSAGE_RECV:
-		switch (inot->message_args[0]) {
+		switch (inot->arg) {
 		case MSG_TASK_COMPLETE:
 		case MSG_INITIATOR_DET_ERR:
 		case MSG_ABORT_TASK_SET:
@@ -805,7 +803,7 @@
 		case MSG_ABORT_TASK:
 		case MSG_CLEAR_TASK_SET:
 		default:
-			warnx("INOT message %#x", inot->message_args[0]);
+			warnx("INOT message %#x", inot->arg);
 			break;
 		}
 		break;
@@ -817,17 +815,6 @@
 		break;
 	}
 
-	/* If there is sense data, use it */
-	if (sense != 0) {
-		struct scsi_sense_data_fixed *sense;
-
-		sense = (struct scsi_sense_data_fixed *)&inot->sense_data;
-		tcmd_sense(inot->initiator_id, NULL, sense->flags,
-			   sense->add_sense_code, sense->add_sense_code_qual);
-		if (debug)
-			warnx("INOT has sense: %#x", sense->flags);
-	}
-
 	/* Requeue on SIM */
 	TAILQ_REMOVE(&work_queue, &inot->ccb_h, periph_links.tqe);
 	send_ccb((union ccb *)inot, /*priority*/1);
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/Makefile.inc
--- a/head/share/examples/ses/Makefile.inc	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/Makefile.inc	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/share/examples/ses/Makefile.inc 235911 2012-05-24 14:07:44Z mav $
 #
 # Copyright (c) 2000 by Matthew Jacob
 # All rights reserved.
@@ -32,7 +32,6 @@
 # mjacob at feral.com
 #
 
-CFLAGS+= -I/usr/include/cam/scsi -DSESINC="<scsi_ses.h>"
 BINDIR?= /usr/sbin
 
 CLEANFILES+= ${MAN}
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/eltsub.c
--- a/head/share/examples/ses/srcs/eltsub.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/eltsub.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/share/examples/ses/srcs/eltsub.c 222339 2011-05-27 03:44:47Z mav $ */
+/* $FreeBSD: head/share/examples/ses/srcs/eltsub.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -33,10 +33,13 @@
  */
 
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_enc.h>
 
 #include "eltsub.h"
 
@@ -46,79 +49,82 @@
 	static char rbuf[132];
 
 	switch (type) {
-	case SESTYP_UNSPECIFIED:
+	case ELMTYP_UNSPECIFIED:
 		sprintf(rbuf, "Unspecified");
 		break;
-	case SESTYP_DEVICE:
-		sprintf(rbuf, "Device");
+	case ELMTYP_DEVICE:
+		sprintf(rbuf, "Device Slot");
 		break;
-	case SESTYP_POWER:
-		sprintf(rbuf, "Power supply");
+	case ELMTYP_POWER:
+		sprintf(rbuf, "Power Supply");
 		break;
-	case SESTYP_FAN:
-		sprintf(rbuf, "Cooling element");
+	case ELMTYP_FAN:
+		sprintf(rbuf, "Cooling");
 		break;
-	case SESTYP_THERM:
-		sprintf(rbuf, "Temperature sensors");
+	case ELMTYP_THERM:
+		sprintf(rbuf, "Temperature Sensors");
 		break;
-	case SESTYP_DOORLOCK:
+	case ELMTYP_DOORLOCK:
 		sprintf(rbuf, "Door Lock");
 		break;
-	case SESTYP_ALARM:
+	case ELMTYP_ALARM:
 		sprintf(rbuf, "Audible alarm");
 		break;
-	case SESTYP_ESCC:
-		sprintf(rbuf, "Enclosure services controller electronics");
+	case ELMTYP_ESCC:
+		sprintf(rbuf, "Enclosure Eervices Controller Electronics");
 		break;
-	case SESTYP_SCC:
-		sprintf(rbuf, "SCC controller electronics");
+	case ELMTYP_SCC:
+		sprintf(rbuf, "SCC Controller Electronics");
 		break;
-	case SESTYP_NVRAM:
-		sprintf(rbuf, "Nonvolatile cache");
+	case ELMTYP_NVRAM:
+		sprintf(rbuf, "Nonvolatile Cache");
 		break;
-	case SESTYP_UPS:
-		sprintf(rbuf, "Uninterruptible power supply");
+	case ELMTYP_INV_OP_REASON:
+		sprintf(rbuf, "Invalid Operation Reason");
 		break;
-	case SESTYP_DISPLAY:
+	case ELMTYP_UPS:
+		sprintf(rbuf, "Uninterruptible Power Supply");
+		break;
+	case ELMTYP_DISPLAY:
 		sprintf(rbuf, "Display");
 		break;
-	case SESTYP_KEYPAD:
-		sprintf(rbuf, "Key pad entry device");
+	case ELMTYP_KEYPAD:
+		sprintf(rbuf, "Key Pad Entry");
 		break;
-	case SESTYP_ENCLOSURE:
+	case ELMTYP_ENCLOSURE:
 		sprintf(rbuf, "Enclosure");
 		break;
-	case SESTYP_SCSIXVR:
-		sprintf(rbuf, "SCSI port/transceiver");
+	case ELMTYP_SCSIXVR:
+		sprintf(rbuf, "SCSI Port/Transceiver");
 		break;
-	case SESTYP_LANGUAGE:
+	case ELMTYP_LANGUAGE:
 		sprintf(rbuf, "Language");
 		break;
-	case SESTYP_COMPORT:
+	case ELMTYP_COMPORT:
 		sprintf(rbuf, "Communication Port");
 		break;
-	case SESTYP_VOM:
+	case ELMTYP_VOM:
 		sprintf(rbuf, "Voltage Sensor");
 		break;
-	case SESTYP_AMMETER:
+	case ELMTYP_AMMETER:
 		sprintf(rbuf, "Current Sensor");
 		break;
-	case SESTYP_SCSI_TGT:
-		sprintf(rbuf, "SCSI target port");
+	case ELMTYP_SCSI_TGT:
+		sprintf(rbuf, "SCSI Target Port");
 		break;
-	case SESTYP_SCSI_INI:
-		sprintf(rbuf, "SCSI initiator port");
+	case ELMTYP_SCSI_INI:
+		sprintf(rbuf, "SCSI Initiator Port");
 		break;
-	case SESTYP_SUBENC:
-		sprintf(rbuf, "Simple sub-enclosure");
+	case ELMTYP_SUBENC:
+		sprintf(rbuf, "Simple Subenclosure");
 		break;
-	case SESTYP_ARRAY:
-		sprintf(rbuf, "Array device");
+	case ELMTYP_ARRAY_DEV:
+		sprintf(rbuf, "Array Device Slot");
 		break;
-	case SESTYP_SASEXPANDER:
+	case ELMTYP_SAS_EXP:
 		sprintf(rbuf, "SAS Expander");
 		break;
-	case SESTYP_SASCONNECTOR:
+	case ELMTYP_SAS_CONN:
 		sprintf(rbuf, "SAS Connector");
 		break;
 	default:
@@ -134,31 +140,34 @@
 	static char rbuf[32];
 	switch (code & 0xf) {
 	case SES_OBJSTAT_UNSUPPORTED:
-		sprintf(rbuf, "status not supported");
+		sprintf(rbuf, "Unsupported");
 		break;
 	case SES_OBJSTAT_OK:
-		sprintf(rbuf, "ok");
+		sprintf(rbuf, "OK");
 		break;
 	case SES_OBJSTAT_CRIT:
-		sprintf(rbuf, "critical");
+		sprintf(rbuf, "Critical");
 		break;
 	case SES_OBJSTAT_NONCRIT:
-		sprintf(rbuf, "non-critical");
+		sprintf(rbuf, "Noncritical");
 		break;
 	case SES_OBJSTAT_UNRECOV:
-		sprintf(rbuf, "unrecoverable");
+		sprintf(rbuf, "Unrecoverable");
 		break;
 	case SES_OBJSTAT_NOTINSTALLED:
-		sprintf(rbuf, "not installed");
+		sprintf(rbuf, "Not Installed");
 		break;
 	case SES_OBJSTAT_UNKNOWN:
-		sprintf(rbuf, "unknown status");
+		sprintf(rbuf, "Unknown");
 		break;
 	case SES_OBJSTAT_NOTAVAIL:
-		sprintf(rbuf, "status not available");
+		sprintf(rbuf, "Not Available");
+		break;
+	case SES_OBJSTAT_NOACCESS:
+		sprintf(rbuf, "No Access Allowed");
 		break;
 	default:
-		sprintf(rbuf, "unknown status code %x", code & 0xf);
+		sprintf(rbuf, "<Status 0x%x>", code & 0xf);
 		break;
 	}
 	return (rbuf);
@@ -171,7 +180,7 @@
 	static char ebuf[256], *scode;
 
 	scode = scode2ascii(cstat[0]);
-	sprintf(ebuf, "Status=%s (bytes=0x%02x 0x%02x 0x%02x 0x%02x)",
+	sprintf(ebuf, "status: %s (0x%02x 0x%02x 0x%02x 0x%02x)",
 	    scode, cstat[0], cstat[1], cstat[2], cstat[3]);
 	return (ebuf);
 }
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/getencstat.c
--- a/head/share/examples/ses/srcs/getencstat.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/getencstat.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/share/examples/ses/srcs/getencstat.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -33,20 +33,25 @@
  */
 
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_enc.h>
 
 #include "eltsub.h"
 
 int
 main(int a, char **v)
 {
-	ses_object *objp;
-	ses_objstat ob;
+	encioc_element_t *objp;
+	encioc_elm_status_t ob;
+	encioc_elm_desc_t objd;
+	encioc_elm_devnames_t objdn;
 	int fd, nobj, f, i, verbose, quiet, errors;
 	u_char estat;
 
@@ -73,13 +78,13 @@
 			perror(*v);
 			continue;
 		}
-		if (ioctl(fd, SESIOC_GETNOBJ, (caddr_t) &nobj) < 0) {
-			perror("SESIOC_GETNOBJ");
+		if (ioctl(fd, ENCIOC_GETNELM, (caddr_t) &nobj) < 0) {
+			perror("ENCIOC_GETNELM");
 			(void) close(fd);
 			continue;
 		}
-		if (ioctl(fd, SESIOC_GETENCSTAT, (caddr_t) &estat) < 0) {
-			perror("SESIOC_GETENCSTAT");
+		if (ioctl(fd, ENCIOC_GETENCSTAT, (caddr_t) &estat) < 0) {
+			perror("ENCIOC_GETENCSTAT");
 			(void) close(fd);
 			continue;
 		}
@@ -113,38 +118,64 @@
 			}
 		}
 		fprintf(stdout, ">\n");
-		objp = calloc(nobj, sizeof (ses_object));
+		objp = calloc(nobj, sizeof (encioc_element_t));
 		if (objp == NULL) {
 			perror("calloc");
 			(void) close(fd);
 			continue;
 		}
-                if (ioctl(fd, SESIOC_GETOBJMAP, (caddr_t) objp) < 0) {
-                        perror("SESIOC_GETOBJMAP");
+                if (ioctl(fd, ENCIOC_GETELMMAP, (caddr_t) objp) < 0) {
+                        perror("ENCIOC_GETELMMAP");
                         (void) close(fd);
                         continue;
                 }
 		for (i = 0; i < nobj; i++) {
-			ob.obj_id = objp[i].obj_id;
-			if (ioctl(fd, SESIOC_GETOBJSTAT, (caddr_t) &ob) < 0) {
-				perror("SESIOC_GETOBJSTAT");
+			ob.elm_idx = objp[i].elm_idx;
+			if (ioctl(fd, ENCIOC_GETELMSTAT, (caddr_t) &ob) < 0) {
+				perror("ENCIOC_GETELMSTAT");
 				(void) close(fd);
 				break;
 			}
-			if ((ob.cstat[0] & 0xf) == SES_OBJSTAT_OK) {
-				if (verbose) {
-					fprintf(stdout,
-					    "Element 0x%x: %s OK (%s)\n",
-					    ob.obj_id,
-					    geteltnm(objp[i].object_type),
-					    stat2ascii(objp[i].object_type,
-					    ob.cstat));
-				}
+			bzero(&objd, sizeof(objd));
+			objd.elm_idx = objp[i].elm_idx;
+			objd.elm_desc_len = UINT16_MAX;
+			objd.elm_desc_str = calloc(UINT16_MAX, sizeof(char));
+			if (objd.elm_desc_str == NULL) {
+				perror("calloc");
+				(void) close(fd);
 				continue;
 			}
-			fprintf(stdout, "Element 0x%x: %s, %s\n",
-			    ob.obj_id, geteltnm(objp[i].object_type),
-			    stat2ascii(objp[i].object_type, ob.cstat));
+			if (ioctl(fd, ENCIOC_GETELMDESC, (caddr_t)&objd) < 0) {
+				perror("ENCIOC_GETELMDESC");
+				(void) close(fd);
+				break;
+			}
+			bzero(&objdn, sizeof(objdn));
+			objdn.elm_idx = objp[i].elm_idx;
+			objdn.elm_names_size = 128;
+			objdn.elm_devnames = calloc(128, sizeof(char));
+			if (objdn.elm_devnames == NULL) {
+				perror("calloc");
+				(void) close(fd);
+				break;
+			}
+			/*
+			 * This ioctl isn't critical and has a good chance
+			 * of returning -1.
+			 */
+			(void)ioctl(fd, ENCIOC_GETELMDEVNAMES, (caddr_t)&objdn);
+			fprintf(stdout, "Element 0x%x: %s", ob.elm_idx,
+			    geteltnm(objp[i].elm_type));
+			fprintf(stdout, ", %s",
+			    stat2ascii(objp[i].elm_type, ob.cstat));
+			if (objd.elm_desc_len > 0)
+				fprintf(stdout, ", descriptor: '%s'",
+				    objd.elm_desc_str);
+			if (objdn.elm_names_len > 0)
+				fprintf(stdout, ", dev: '%s'",
+				    objdn.elm_devnames);
+			fprintf(stdout, "\n");
+			free(objdn.elm_devnames);
 		}
 		free(objp);
 		(void) close(fd);
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/getnobj.c
--- a/head/share/examples/ses/srcs/getnobj.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/getnobj.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/share/examples/ses/srcs/getnobj.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -33,12 +33,15 @@
  */
 
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_ses.h>
 
 int
 main(int argc, char **argv)
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/getobjmap.c
--- a/head/share/examples/ses/srcs/getobjmap.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/getobjmap.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/share/examples/ses/srcs/getobjmap.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -33,11 +33,14 @@
  */
 
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_ses.h>
 
 #include "eltsub.h"
 
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/getobjstat.c
--- a/head/share/examples/ses/srcs/getobjstat.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/getobjstat.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/share/examples/ses/srcs/getobjstat.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -32,11 +32,14 @@
  * mjacob at feral.com
  */
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_ses.h>
 
 int
 main(int a, char **v)
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/inienc.c
--- a/head/share/examples/ses/srcs/inienc.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/inienc.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/share/examples/ses/srcs/inienc.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -33,11 +33,14 @@
  */
 
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_ses.h>
 
 int
 main(int a, char **v)
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/sesd.c
--- a/head/share/examples/ses/srcs/sesd.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/sesd.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/share/examples/ses/srcs/sesd.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -32,6 +32,8 @@
  * mjacob at feral.com
  */
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -39,7 +41,8 @@
 #include <string.h>
 #include <syslog.h>
 #include <sys/ioctl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_enc.h>
 
 #define	ALLSTAT (SES_ENCSTAT_UNRECOV | SES_ENCSTAT_CRITICAL | \
 	SES_ENCSTAT_NONCRITICAL | SES_ENCSTAT_INFO)
@@ -54,7 +57,7 @@
 	static const char *usage =
 	    "usage: %s [ -d ] [ -t pollinterval ] device [ device ]\n";
 	int fd, polltime, dev, devbase, nodaemon;
-	ses_encstat stat, *carray;
+	encioc_enc_status_t stat, *carray;
 
 	if (a < 2) {
 		fprintf(stderr, usage, *v);
@@ -83,7 +86,7 @@
 		return (1);
 	}
 	for (dev = devbase; dev < a; dev++)
-		carray[dev] = (ses_encstat) -1;
+		carray[dev] = (encioc_enc_status_t) -1;
 
 	/*
 	 * Check to make sure we can open all devices
@@ -94,8 +97,8 @@
 			perror(v[dev]);
 			return (1);
 		}
-		if (ioctl(fd, SESIOC_INIT, NULL) < 0) {
-			fprintf(stderr, "%s: SESIOC_INIT fails- %s\n",
+		if (ioctl(fd, ENCIOC_INIT, NULL) < 0) {
+			fprintf(stderr, "%s: ENCIOC_INIT fails- %s\n",
 			    v[dev], strerror(errno));
 			return (1);
 		}
@@ -122,9 +125,9 @@
 			/*
 			 * Get the actual current enclosure status.
 			 */
-			if (ioctl(fd, SESIOC_GETENCSTAT, (caddr_t) &stat) < 0) {
+			if (ioctl(fd, ENCIOC_GETENCSTAT, (caddr_t) &stat) < 0) {
 				syslog(LOG_ERR,
-				    "%s: SESIOC_GETENCSTAT- %m", v[dev]);
+				    "%s: ENCIOC_GETENCSTAT- %m", v[dev]);
 				(void) close(fd);
 				continue;
 			}
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/setencstat.c
--- a/head/share/examples/ses/srcs/setencstat.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/setencstat.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/share/examples/ses/srcs/setencstat.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -33,18 +33,21 @@
  */
 
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_enc.h>
 
 int
 main(int a, char **v)
 {
 	int fd;
 	long val;
-	ses_encstat stat;
+	encioc_enc_status_t stat;
 
 	if (a != 3) {
 		fprintf(stderr, "usage: %s device enclosure_status\n", *v);
@@ -57,9 +60,9 @@
 	}
 	
 	val =  strtol(v[2], NULL, 0);
-	stat = (ses_encstat) val;
-	if (ioctl(fd, SESIOC_SETENCSTAT, (caddr_t) &stat) < 0) {
-		perror("SESIOC_SETENCSTAT");
+	stat = (encioc_enc_status_t)val;
+	if (ioctl(fd, ENCIOC_SETENCSTAT, (caddr_t) &stat) < 0) {
+		perror("ENCIOC_SETENCSTAT");
 	}
 	(void) close(fd);
 	return (0);
diff -r 49f3e3227aef -r 58bcef12a717 head/share/examples/ses/srcs/setobjstat.c
--- a/head/share/examples/ses/srcs/setobjstat.c	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/examples/ses/srcs/setobjstat.c	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: head/share/examples/ses/srcs/setobjstat.c 235911 2012-05-24 14:07:44Z mav $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -33,18 +33,21 @@
  */
 
 #include <unistd.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include SESINC
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_enc.h>
 
 int
 main(int a, char **v)
 {
 	int fd;
 	int i;
-	ses_objstat obj;
+	encioc_elm_status_t obj;
 	long cvt;
 	char *x;
 
@@ -64,7 +67,7 @@
 	if (x == v[2]) {
 		goto usage;
 	}
-	obj.obj_id = cvt;
+	obj.elm_idx = cvt;
 	for (i = 0; i < 4; i++) {
 		x = v[3 + i];
 		cvt = strtol(v[3 + i],  &x, 0);
@@ -73,8 +76,8 @@
 		}
 		obj.cstat[i] = cvt;
 	}
-	if (ioctl(fd, SESIOC_SETOBJSTAT, (caddr_t) &obj) < 0) {
-		perror("SESIOC_SETOBJSTAT");
+	if (ioctl(fd, ENCIOC_SETELMSTAT, (caddr_t) &obj) < 0) {
+		perror("ENCIOC_SETELMSTAT");
 	}
 	(void) close(fd);
 	return (0);
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man3/ATOMIC_VAR_INIT.3
--- a/head/share/man/man3/ATOMIC_VAR_INIT.3	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man3/ATOMIC_VAR_INIT.3	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man3/ATOMIC_VAR_INIT.3 229651 2012-01-05 21:36:12Z uqs $
+.\" $FreeBSD: head/share/man/man3/ATOMIC_VAR_INIT.3 235286 2012-05-11 20:06:46Z gjb $
 .\"
 .Dd December 27, 2011
 .Dt ATOMIC_VAR_INIT 3
@@ -139,7 +139,7 @@
 .Fa object
 to its desired
 .Fa value
-and returs the original contents of the atomic variable.
+and returns the original contents of the atomic variable.
 .Pp
 The
 .Fn atomic_compare_exchange_strong
@@ -203,7 +203,7 @@
 .Fn atomic_fetch_sub
 macro subtracts the value
 .Fa operand
-to atomic variable
+from atomic variable
 .Fa object
 and returns the original contents of the atomic variable.
 .Pp
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man3/pthread.3
--- a/head/share/man/man3/pthread.3	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man3/pthread.3	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man3/pthread.3 235286 2012-05-11 20:06:46Z gjb $
 .\"
 .Dd January 8, 2010
 .Dt PTHREAD 3
@@ -452,7 +452,7 @@
 .Fa "void \*[lp]*child\*[rp]\*[lp]void\*[rp]"
 .Fc
 .Xc
-Register fork handlers
+Register fork handlers.
 .It Xo
 .Ft void
 .Fn pthread_cleanup_pop "int execute"
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man3/pthread_condattr.3
--- a/head/share/man/man3/pthread_condattr.3	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man3/pthread_condattr.3	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man3/pthread_condattr.3 235286 2012-05-11 20:06:46Z gjb $
 .Dd May 9, 2010
 .Dt PTHREAD_CONDATTR 3
 .Os
@@ -35,7 +35,7 @@
 .Nm pthread_condattr_getclock ,
 .Nm pthread_condattr_setclock ,
 .Nm pthread_condattr_getpshared ,
-.Nm pthread_condattr_setpshared ,
+.Nm pthread_condattr_setpshared
 .Nd condition attribute operations
 .Sh LIBRARY
 .Lb libpthread
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/Makefile
--- a/head/share/man/man4/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,9 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: head/share/man/man4/Makefile 232337 2012-03-01 13:10:18Z mav $
+# $FreeBSD: head/share/man/man4/Makefile 237981 2012-07-02 08:31:29Z mav $
 
 MAN=	aac.4 \
 	acpi.4 \
 	${_acpi_asus.4} \
+	${_acpi_asus_wmi.4} \
 	${_acpi_dock.4} \
 	${_acpi_fujitsu.4} \
 	${_acpi_hp.4} \
@@ -36,6 +37,7 @@
 	${_amdsbwd.4} \
 	${_amdsmb.4} \
 	${_amdtemp.4} \
+	${_bxe.4} \
 	amr.4 \
 	an.4 \
 	${_apic.4} \
@@ -116,6 +118,7 @@
 	enc.4 \
 	epair.4 \
 	esp.4 \
+	est.4 \
 	et.4 \
 	eventtimers.4 \
 	exca.4 \
@@ -126,6 +129,7 @@
 	fdt.4 \
 	fdtbus.4 \
 	ffclock.4 \
+	filemon.4 \
 	firewire.4 \
 	fpa.4 \
 	fwe.4 \
@@ -250,6 +254,8 @@
 	mwlfw.4 \
 	mxge.4 \
 	my.4 \
+	nand.4 \
+	nandsim.4 \
 	natm.4 \
 	natmip.4 \
 	ncr.4 \
@@ -520,6 +526,7 @@
 	${_vxge.4} \
 	watchdog.4 \
 	wb.4 \
+	${_wbwd.4} \
 	wi.4 \
 	witness.4 \
 	wlan.4 \
@@ -542,8 +549,11 @@
 MLINKS=	ae.4 if_ae.4
 MLINKS+=age.4 if_age.4
 MLINKS+=agp.4 agpgart.4
+MLINKS+=alc.4 if_alc.4
 MLINKS+=ale.4 if_ale.4
 MLINKS+=altq.4 ALTQ.4
+MLINKS+=ath.4 if_ath.4
+MLINKS+=ath_pci.4 if_ath_pci.4
 MLINKS+=an.4 if_an.4
 MLINKS+=aue.4 if_aue.4
 MLINKS+=axe.4 if_axe.4
@@ -553,9 +563,14 @@
 MLINKS+=bktr.4 brooktree.4
 MLINKS+=bridge.4 if_bridge.4
 MLINKS+=bwi.4 if_bwi.4
+MLINKS+=bwn.4 if_bwn.4
+MLINKS+=${_bxe.4} ${_if_bxe.4}
 MLINKS+=cas.4 if_cas.4
+MLINKS+=cdce.4 if_cdce.4
 MLINKS+=crypto.4 cryptodev.4
 MLINKS+=cue.4 if_cue.4
+MLINKS+=cxgb.4 if_cxgb.4
+MLINKS+=cxgbe.4 if_cxgbe.4
 MLINKS+=dc.4 if_dc.4
 MLINKS+=de.4 if_de.4
 MLINKS+=disc.4 if_disc.4
@@ -601,14 +616,19 @@
 MLINKS+=jme.4 if_jme.4
 MLINKS+=kue.4 if_kue.4
 MLINKS+=lagg.4 trunk.4
+MLINKS+=lagg.4 if_lagg.4
 MLINKS+=le.4 if_le.4
 MLINKS+=lge.4 if_lge.4
+MLINKS+=lmc.4 if_lmc.4
 MLINKS+=lo.4 loop.4
 MLINKS+=lp.4 plip.4
 MLINKS+=malo.4 if_malo.4
 MLINKS+=md.4 vn.4
 MLINKS+=mem.4 kmem.4
 MLINKS+=mn.4 if_mn.4
+MLINKS+=mos.4 if_mos.4
+MLINKS+=msk.4 if_msk.4
+MLINKS+=mwl.4 if_mwl.4
 MLINKS+=mxge.4 if_mxge.4
 MLINKS+=my.4 if_my.4
 MLINKS+=${_ndis.4} ${_if_ndis.4}
@@ -628,11 +648,13 @@
 MLINKS+=rl.4 if_rl.4
 MLINKS+=rue.4 if_rue.4
 MLINKS+=rum.4 if_rum.4
+MLINKS+=run.4 if_run.4
 MLINKS+=scsi.4 CAM.4 \
 	scsi.4 cam.4 \
 	scsi.4 scbus.4 \
 	scsi.4 SCSI.4
 MLINKS+=sf.4 if_sf.4
+MLINKS+=sge.4 if_sge.4
 MLINKS+=sis.4 if_sis.4
 MLINKS+=sk.4 if_sk.4
 MLINKS+=smp.4 SMP.4
@@ -664,6 +686,7 @@
 MLINKS+=vlan.4 if_vlan.4
 MLINKS+=vpo.4 imm.4
 MLINKS+=vr.4 if_vr.4
+MLINKS+=vte.4 if_vte.4
 MLINKS+=${_vtnet.4} ${_if_vtnet.4}
 MLINKS+=${_vxge.4} ${_if_vxge.4}
 MLINKS+=watchdog.4 SW_WATCHDOG.4
@@ -676,6 +699,7 @@
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 _acpi_asus.4=	acpi_asus.4
+_acpi_asus_wmi.4=	acpi_asus_wmi.4
 _acpi_dock.4=	acpi_dock.4
 _acpi_fujitsu.4=acpi_fujitsu.4
 _acpi_hp.4=	acpi_hp.4
@@ -694,6 +718,7 @@
 _amdtemp.4=	amdtemp.4
 _asmc.4=	asmc.4
 _atp.4=		atp.4
+_bxe.4=		bxe.4
 _coretemp.4=	coretemp.4
 _cpuctl.4=	cpuctl.4
 _dpms.4=	dpms.4
@@ -703,6 +728,7 @@
 _hptrr.4=	hptrr.4
 _i8254.4=	i8254.4
 _ichwd.4=	ichwd.4
+_if_bxe.4=	if_bxe.4
 _if_ndis.4=	if_ndis.4
 _if_nfe.4=	if_nfe.4
 _if_nve.4=	if_nve.4
@@ -733,6 +759,7 @@
 _tpm.4=		tpm.4
 _urtw.4=	urtw.4
 _viawd.4=	viawd.4
+_wbwd.4=	wbwd.4
 _wpi.4=		wpi.4
 _xen.4=		xen.4
 _xnb.4=		xnb.4
@@ -743,6 +770,9 @@
 .if ${MACHINE_CPUARCH} == "amd64"
 _qlxgb.4=	qlxgb.4
 _sfxge.4=	sfxge.4
+
+MLINKS+=qlxgb.4 if_qlxgb.4
+MLINKS+=sfxge.4 if_sfxge.4
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/acpi.4
--- a/head/share/man/man4/acpi.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/acpi.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/acpi.4 233313 2012-03-22 17:01:25Z jkim $
+.\" $FreeBSD: head/share/man/man4/acpi.4 235029 2012-05-04 18:54:51Z jkim $
 .\"
-.Dd March 22, 2012
+.Dd May 4, 2012
 .Dt ACPI 4
 .Os
 .Sh NAME
@@ -198,6 +198,11 @@
 Enables loading of a custom ACPI DSDT.
 .It Va acpi_dsdt_name
 Name of the DSDT table to load, if loading is enabled.
+.It Va debug.acpi.cpu_unordered
+Do not use the MADT to match ACPI Processor objects to CPUs.
+This is needed on a few systems with a buggy BIOS that does not use
+consistent processor IDs.
+Default is 0 (disabled).
 .It Va debug.acpi.disabled
 Selectively disables portions of ACPI for debugging purposes.
 .It Va debug.acpi.interpreter_slack
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/acpi_asus.4
--- a/head/share/man/man4/acpi_asus.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/acpi_asus.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/acpi_asus.4 237981 2012-07-02 08:31:29Z mav $
 .\"
 .Dd February 8, 2010
 .Dt ACPI_ASUS 4
@@ -157,6 +157,7 @@
 which is parsed at boot-time.
 .Sh SEE ALSO
 .Xr acpi 4 ,
+.Xr acpi_asus_wmi 4 ,
 .Xr acpi_video 4 ,
 .Xr sysctl.conf 5 ,
 .Xr sysctl 8
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/acpi_asus_wmi.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man4/acpi_asus_wmi.4	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,90 @@
+.\"
+.\" Copyright (c) 2012 Alexander Motin <mav at 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: head/share/man/man4/acpi_asus_wmi.4 237982 2012-07-02 08:41:22Z mav $
+.\"
+.Dd July 2, 2012
+.Dt ACPI_ASUS_WMI 4
+.Os
+.Sh NAME
+.Nm acpi_asus_wmi
+.Nd Asus Laptop WMI Extras
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device acpi_asus_wmi"
+.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
+acpi_asus_wmi_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the extra WMI-controlled gadgets, such as hotkeys
+and leds, found on Asus laptops.
+It allows one to use the
+.Xr sysctl 8
+interface to manipulate the brightness of the LCD panel and keyboard backlight,
+power on/off different internal components, such as WiFi, Bluetooth, camera,
+cardreader, etc, read some sensors.
+Hotkey events are passed to
+.Xr devd 8
+for easy handling in userspace with the default configuration in
+.Pa /etc/devd/asus.conf .
+Some hotkey events, such as keyboard backlight and touchpad control, are
+handled inside the driver.
+.Sh SYSCTL VARIABLES
+The following sysctls are currently implemented:
+.Bl -tag -width indent
+.It Va dev.acpi_asus_wmi.0.handle_keys
+Specifies whether driver should handle some harwdare keys, such as keyboard
+backlight, internally.
+.El
+.Pp
+Number of other variables under the same sysctl branch are model-specific.
+.Pp
+Defaults for these variables can be set in
+.Xr sysctl.conf 5 ,
+which is parsed at boot-time.
+.Sh SEE ALSO
+.Xr acpi 4 ,
+.Xr acpi_asus 4 ,
+.Xr acpi_video 4 ,
+.Xr sysctl.conf 5 ,
+.Xr devd 8 ,
+.Xr sysctl 8
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An Alexander Motin Aq mav at FreeBSD.org .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/acpi_hp.4
--- a/head/share/man/man4/acpi_hp.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/acpi_hp.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/acpi_hp.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/acpi_hp.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd February 8, 2010
 .Dt ACPI_HP 4
@@ -261,7 +261,7 @@
 The
 .Nm
 driver was written by
-.An Michael Gmelin Aq freebsd at grem.de
+.An Michael Gmelin Aq freebsd at grem.de .
 .Pp
 It has been inspired by hp-wmi driver, which implements a subset of these
 features (hotkeys) on Linux.
@@ -275,7 +275,7 @@
 .El
 .Pp
 This manual page was written by
-.An Michael Gmelin Aq freebsd at grem.de
+.An Michael Gmelin Aq freebsd at grem.de .
 .Sh BUGS
 This driver is experimental and has only been tested on i386 on an
 HP Compaq 8510p which featured all supported wireless devices (WWAN/BT/WLAN).
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/acpi_ibm.4
--- a/head/share/man/man4/acpi_ibm.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/acpi_ibm.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/acpi_ibm.4 237509 2012-06-23 20:44:45Z joel $
 .\"
-.Dd February 8, 2010
+.Dd June 24, 2012
 .Dt ACPI_IBM 4
 .Os
 .Sh NAME
@@ -335,6 +335,17 @@
 .It
 UltraBay battery
 .El
+.It Va dev.acpi_ibm.0.handlerevents
+.Xr devd 8
+events handled by
+.Nm
+when
+.Va events
+is set to 1.
+Events are specified as a whitespace-separated list of event code in
+hexadecimal or decimal form.
+Note that the event maybe handled twice (eg. Brightness up/down) if ACPI BIOS
+already handled the event.
 .El
 .Pp
 Defaults for these sysctls can be set in
@@ -436,6 +447,19 @@
 fi
 exit 0
 .Ed
+.Pp
+The following example specify that event code 0x04 (Suspend to RAM),
+0x10 (Brightness up) and 0x11 (Brightness down) are handled by
+.Nm .
+.Bd -literal -offset indent
+sysctl dev.acpi_ibm.0.handlerevents='0x04 0x10 0x11'
+.Ed
+.Pp
+in
+.Xr sysctl.conf 5 :
+.Bd -literal -offset indent
+dev.acpi_ibm.0.handlerevents=0x04\\ 0x10\\ 0x11
+.Ed
 .Sh SEE ALSO
 .Xr acpi 4 ,
 .Xr led 4 ,
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/acpi_panasonic.4
--- a/head/share/man/man4/acpi_panasonic.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/acpi_panasonic.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/acpi_panasonic.4 232157 2012-02-25 14:31:25Z gjb $
+.\" $FreeBSD: head/share/man/man4/acpi_panasonic.4 236443 2012-06-02 11:03:14Z joel $
 .\"
 .Dd February 25, 2012
 .Dt ACPI_PANASONIC 4
@@ -68,7 +68,7 @@
 .Ss Hotkeys
 There are 9 hotkeys available on the supported hardware:
 .Pp
-.Bl -tag -compact -offset indent
+.Bl -tag -width 10n -compact -offset indent
 .It Sy Fn+F1
 Make LCD backlight darker.
 .It Sy Fn+F2
@@ -105,7 +105,7 @@
 .Xr devd 8 ,
 the hotkey event provides the following information:
 .Pp
-.Bl -tag -compact -offset indent
+.Bl -tag -width 10n -compact -offset indent
 .It system
 .Qq Li ACPI
 .It subsystem
@@ -119,7 +119,7 @@
 .El
 .Pp
 Event codes to be generated are assigned as follows:
-.Bl -tag -offset indent
+.Bl -tag -width 10n -offset indent
 .It 0x81-0x86, 0x89
 .Sy Fn+F<n>
 pressed.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/acpi_wmi.4
--- a/head/share/man/man4/acpi_wmi.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/acpi_wmi.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/acpi_wmi.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/acpi_wmi.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd November 22, 2011
 .Dt ACPI_WMI 4
@@ -85,12 +85,12 @@
 The
 .Nm
 driver was written by
-.An Michael Gmelin Aq freebsd at grem.de
+.An Michael Gmelin Aq freebsd at grem.de .
 .Pp
-Work has been inspired by the Linux acpi-wmi driver written by Carlos Corbacho
+Work has been inspired by the Linux acpi-wmi driver written by Carlos Corbacho.
 .Pp
 See http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx for
 the specification of ACPI-WMI.
 .Pp
 This manual page was written by
-.An Michael Gmelin Aq freebsd at grem.de
+.An Michael Gmelin Aq freebsd at grem.de .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ahci.4
--- a/head/share/man/man4/ahci.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ahci.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ahci.4 232380 2012-03-02 08:49:07Z mav $
+.\" $FreeBSD: head/share/man/man4/ahci.4 237234 2012-06-18 19:11:07Z marius $
 .\"
-.Dd December 6, 2011
+.Dd June 18, 2012
 .Dt AHCI 4
 .Os
 .Sh NAME
@@ -51,8 +51,9 @@
 .Xr loader 8 :
 .Bl -ohang
 .It Va hint.ahci. Ns Ar X Ns Va .msi
-controls Message Signaled Interrupts (MSI) usage by the specified controller
-.Bl -tag -compact
+controls Message Signaled Interrupts (MSI) usage by the specified controller.
+.Pp
+.Bl -tag -width 4n -offset indent -compact
 .It 0
 MSI disabled;
 .It 1
@@ -72,7 +73,8 @@
 allowing some power to be saved at the cost of additional command
 latency.
 Possible values:
-.Bl -tag -compact
+.Pp
+.Bl -tag -width 4n -offset indent -compact
 .It 0
 interface Power Management is disabled (default);
 .It 1
@@ -86,6 +88,7 @@
 .It 5
 driver initiates SLUMBER PM state transition 125ms after port becomes idle.
 .El
+.Pp
 Some controllers, such as ICH8, do not implement modes 2 and 3 with NCQ used.
 Because of artificial entering latency, performance degradation in modes
 4 and 5 is much smaller then in modes 2 and 3.
@@ -98,7 +101,8 @@
 Values 1, 2 and 3 are respectively 1.5, 3 and 6Gbps.
 .It Va hw.ahci.force
 setting to nonzero value forces driver attach to some known AHCI-capable
-chips even if they are configured for legacy IDE emulation. Default is 1.
+chips even if they are configured for legacy IDE emulation.
+Default is 1.
 .El
 .Sh DESCRIPTION
 This driver provides the
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ata.4
--- a/head/share/man/man4/ata.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ata.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ata.4 232380 2012-03-02 08:49:07Z mav $
+.\" $FreeBSD: head/share/man/man4/ata.4 237235 2012-06-18 19:14:06Z marius $
 .\"
-.Dd August 17, 2011
+.Dd June 18, 2012
 .Dt ATA 4
 .Os
 .Sh NAME
@@ -89,8 +89,12 @@
 The following tunables are settable from the
 .Xr loader 8 :
 .Bl -ohang
+.It Va hw.ahci.force
+set to nonzero value for forcing drivers to attach to some known AHCI-capable
+chips even if they are configured for legacy IDE emulation (the default is 1,
+force the attach).
 .It Va hw.ata.ata_dma_check_80pin
-set to 0 to disable the 80pin cable check (the default is 1, check the cable)
+set to 0 to disable the 80pin cable check (the default is 1, check the cable).
 .It Va hint.atapci.X.msi
 set to 1 to allow Message Signalled Interrupts (MSI) to be used by the
 specified PCI ATA controller, if supported.
@@ -102,7 +106,8 @@
 controls SATA interface Power Management for the specified channel,
 allowing some power savings at the cost of additional command latency.
 Possible values:
-.Bl -tag -compact
+.Pp
+.Bl -tag -width 4n -offset indent -compact
 .It 0
 Interface Power Management is disabled.
 This is the default value.
@@ -113,6 +118,7 @@
 .It 3
 host initiates SLUMBER PM state transition every time port becomes idle.
 .El
+.Pp
 Modes 2 and 3 are only supported for AHCI.
 .El
 .Sh DESCRIPTION
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ath.4
--- a/head/share/man/man4/ath.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ath.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: head/share/man/man4/ath.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/ath.4 235317 2012-05-12 03:25:46Z gjb $
 .\"/
 .Dd August 28, 2011
 .Dt ATH 4
@@ -186,7 +186,7 @@
 .Ed
 .Pp
 Create two virtual 802.11a host-based access points, one with
-with WEP enabled and one with no security, and bridge them to
+WEP enabled and one with no security, and bridge them to
 the fxp0 (wired) device:
 .Bd -literal -offset indent
 ifconfig wlan0 create wlandev ath0 wlanmode hostap \e
@@ -221,7 +221,7 @@
 This should not happen.
 .It "ath%d: unable to setup a beacon xmit queue!"
 The request to the HAL to set up the transmit queue for 802.11 beacon frames
-frames failed.
+failed.
 This should not happen.
 .It "ath%d: 802.11 address: %s"
 The MAC address programmed in the EEPROM is displayed.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/atp.4
--- a/head/share/man/man4/atp.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/atp.4	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/atp.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/atp.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd November 12, 2009
 .Dt ATP 4
@@ -171,10 +171,10 @@
 .Xr loader.conf 5 ,
 .Xr xorg.conf 5 Pq Pa ports/x11/xorg ,
 .Xr moused 8 ,
-.Xr sysctl 8 .
+.Xr sysctl 8
 .Sh AUTHORS
 .An -nosplit
 The
 .Nm
 driver was written by
-.An Rohit Grover Aq rgrover1 at gmail.com
+.An Rohit Grover Aq rgrover1 at gmail.com .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/bce.4
--- a/head/share/man/man4/bce.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/bce.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,9 +26,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/bce.4 233510 2012-03-26 15:18:14Z joel $
+.\" $FreeBSD: head/share/man/man4/bce.4 236624 2012-06-05 17:58:47Z joel $
 .\"
-.Dd October 7, 2009
+.Dd June 4, 2012
 .Dt BCE 4
 .Os
 .Sh NAME
@@ -200,9 +200,73 @@
 .Xr loader 8
 tunables:
 .Bl -tag -width indent
+.It Va hw.bce.verbose
+Enable/Disable verbose logging and output to the console.
+Useful for debugging (default 0).
 .It Va hw.bce.msi_enable
-Whether or not MSI support is enabled in the driver.
-The default value is 1.
+Enable/Disable MSI support (default 1).
+.It Va hw.bce.tso_enable
+Enable/Disable TSO support (default 1).
+.It Va hw.bce.strict_rx_mtu
+Enable/Disable strict RX frame size checking (default 0).
+.It Va hw.bce.hdr_split
+Enable/Disable frame header/payload splitting (default 1).
+.It Va hw.bce.rx_pages
+Set the number of memory pages assigned to recieve packets by the driver.
+Due to alignment issues, this value can only be of the set
+1, 2, 4 or 8 (default 2).
+.It Va hw.bce.tx_pages
+Set the number of memory pages assigned to transmit packets
+by the driver.
+Due to alignment issues, this value can only be of the set
+1, 2, 4 or 8 (default 2).
+.It Va hw.bce.rx_ticks
+Time in microsecond ticks to wait before generating a status
+block updates due to RX processing activity.
+Values from 0-100 are valid.
+A value of 0 disables this status block update.
+Cannot be set to 0 if hw.bce.rx_quick_cons_trip is also 0
+(default 18).
+.It Va hw.bce.rx_ticks_int
+Time in microsecond ticks to wait during RX interrupt
+processing before generating a status block update.
+Values from 0-100 are valid.
+Valid values are in the range from 0-100.
+A value of 0 disables this status block update (default 18).
+.It Va hw.bce.rx_quick_cons_trip
+Number of RX Quick BD Chain entries that must be completed
+before a status block is generated.
+Values from 0-256 are valid.
+A value of 0 disables this status block update.
+Cannot be set to 0 if hw.bce.rx_ticks is also 0 (default 6).
+.It Va hw.bce.rx_quick_cons_trip_int
+Number of RX quick BD entries that must be completed before
+a status block is generated duing interrupt processing.
+Values from 0-256 are valid.
+A value of 0 disables this status block update (default 6).
+.It Va hw.bce.tx_ticks
+Time in microsecond ticks to wait before a status block
+update is generated due to TX activitiy.
+Values from 0-100 are valid.
+A value of 0 disables this status block update.
+Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0
+(default 80).
+.It Va hw.bce.tx_ticks_int
+Time in microsecond ticks to wait in interrupt processing
+before a status block update is generated due to TX activity
+Values from 0-100 are valid.
+A value of 0 disables this status block update (default 80).
+.It Va hw.bce.tx_cons_trip
+How many TX Quick BD Chain entries that must be completed
+before a status block is generated.
+Values from 0-100 are valid.
+A value of 0 disables this status block update.
+Cannot be set to 0 if hw.bce.tx_ticks is also 0 (default 20).
+.It Va hw.bce.tx_cons_trip_int
+How many TX Quick BD Chain entries that must be completed
+before a status block is generated during an interrupt.
+Values from 0-100 are valid.
+A value of 0 disables this status block update (default 20).
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -346,6 +410,10 @@
 A controller hardware failure has occurred.
 If the problem continues replace the controller.
 .El
+.Sh SUPPORT
+For general information and support,
+go to the Broadcom NIC Open Source Developer Resource Site:
+.Pa http://www.broadcom.com/support/ethernet_nic/open_source.php .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/bpf.4
--- a/head/share/man/man4/bpf.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/bpf.4	Wed Jul 25 16:32:50 2012 +0300
@@ -47,7 +47,7 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.\" $FreeBSD: head/share/man/man4/bpf.4 233938 2012-04-06 06:55:21Z melifaro $
+.\" $FreeBSD: head/share/man/man4/bpf.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd June 15, 2010
 .Dt BPF 4
@@ -642,7 +642,7 @@
 	uint32_t	bh_caplen;     /* length of captured portion */
 	uint32_t	bh_datalen;    /* original length of packet */
 	u_short		bh_hdrlen;     /* length of bpf header (this struct
-					  plus alignment padding */
+					  plus alignment padding) */
 };
 
 struct bpf_hdr {
@@ -650,7 +650,7 @@
 	uint32_t	bh_caplen;     /* length of captured portion */
 	uint32_t	bh_datalen;    /* original length of packet */
 	u_short		bh_hdrlen;     /* length of bpf header (this struct
-					  plus alignment padding */
+					  plus alignment padding) */
 };
 .Ed
 .Pp
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/bridge.4
--- a/head/share/man/man4/bridge.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/bridge.4	Wed Jul 25 16:32:50 2012 +0300
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/bridge.4 233422 2012-03-24 13:37:57Z joel $
+.\" $FreeBSD: head/share/man/man4/bridge.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd January 9, 2010
 .Dt IF_BRIDGE 4
@@ -410,7 +410,8 @@
 .Fx
 6.1, 6.2, 6.3, 7.0, 7.1, and 7.2 have a bug in the EtherIP protocol.
 For more details and workaround, see
-.Xr gif 4 manual page.
+.Xr gif 4
+manual page.
 .Sh SEE ALSO
 .Xr gif 4 ,
 .Xr ipf 4 ,
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/bxe.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man4/bxe.4	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,138 @@
+.\" Copyright (c) 2012 Edward Tomasz Napierala <trasz at 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 AUTHORS 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 AUTHORS 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: head/share/man/man4/bxe.4 237636 2012-06-27 10:07:29Z trasz $
+.\"
+.Dd June 25, 2012
+.Dt BXE 4
+.Os
+.Sh NAME
+.Nm bxe
+.Nd "Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet adapter 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 bxe"
+.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
+if_bxe_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for PCIe 10GbE Ethernet adapters based on
+BCM5771x chips.
+The driver supports Jumbo Frames, VLAN tagging, IP, UDP and TCP checksum
+offload, MSI-X, TCP Segmentation Offload (TSO), Large Receive Offload (LRO),
+and Receive Side Steering (RSS).
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+.Sh HARDWARE
+The
+.Nm
+driver provides support for various NICs based on the Broadcom BCM5771x
+family of 10GbE Ethernet controller chips, including the
+following:
+.Pp
+.Bl -bullet -compact
+.It
+Broadcom NetXtreme II BCM57710 10GbE
+.It
+Broadcom NetXtreme II BCM57711 10GbE
+.It
+Broadcom NetXtreme II BCM57711E 10GbE
+.El
+.Sh SYSCTL VARIABLES
+The following variables are available as both
+.Xr sysctl 8
+variables and
+.Xr loader 8
+tunables:
+.Bl -tag -width indent
+.It Va hw.bxe.dcc_enable
+Enable HP Flex-10 support.
+Allowed values are 0 to disable and 1 to enable.
+The default value is 0.
+.It Va hw.bxe.tso_enable
+Enable TCP Segmentation Offload.
+The default value is 1.
+.It Va hw.bxe.int_mode
+Set interrupt mode.
+Allowed values are 0 for IRQ, 1 for MSI/IRQ and 2 for MSI-X/MSI/IRQ.
+The default value is 2.
+.It Va hw.bxe.queue_count
+Specify the number of queues that will be used when a multi-queue
+RSS mode is selected using bxe_multi_mode.
+Allowed values are 0 for Auto or 1 to 16 for fixed number of queues.
+The default value is 0.
+.It Va hw.bxe.multi_mode
+Enable Receive Side Steering.
+Allowed values are 0, which disables all multi-queue/packet sorting
+algorithms, and 1, which assigns incoming frames to receive queues
+according to RSS.
+The default value is 0.
+.It Va hw.bxe.rx_ticks
+Control interrupt coalescing for received frames.
+The first frame always causes an interrupt, but subsequent frames
+are coalesced until the RX/TX ticks timer value expires and another
+interrupt occurs.
+The default value is 25.
+.It Va hw.bxe.tx_ticks
+Control interrupt coalescing for trasmitted frames.
+The first frame always causes an interrupt, but subsequent frames
+are coalesced until the RX/TX ticks timer value expires and another
+interrupt occurs.
+The default value is 50.
+.It Va hw.bxe.mrrs
+Allows to set the PCIe maximum read request size.
+Allowed values are -1 for Auto, 0 for 128B, 1 for 256B, 2 for 512B,
+and 3 for 1kB.
+The default value is -1.
+.El
+.Sh SEE ALSO
+.Xr altq 4 ,
+.Xr arp 4 ,
+.Xr netintro 4 ,
+.Xr ng_ether 4 ,
+.Xr vlan 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 9.0 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Gary Zambrano Aq zambrano at broadcom.com
+and
+.An David Christensen Aq davidch at broadcom.com .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/capsicum.4
--- a/head/share/man/man4/capsicum.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/capsicum.4	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/capsicum.4 228039 2011-11-27 19:44:15Z rwatson $
+.\" $FreeBSD: head/share/man/man4/capsicum.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd September 20, 2011
 .Dt CAPSICUM 4
@@ -55,7 +55,7 @@
 in which access to global OS namespaces (such as the file system and PID
 namespaces) is restricted; only explicitly delegated rights, referenced by
 memory mappings or file descriptors, may be used.
-Once set, the flag is inherited by future children proceses, and may not be
+Once set, the flag is inherited by future children processes, and may not be
 cleared.
 .It capabilities
 File descriptors that wrap other file descriptors, masking operations that can
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/carp.4
--- a/head/share/man/man4/carp.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/carp.4	Wed Jul 25 16:32:50 2012 +0300
@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/carp.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/carp.4 236294 2012-05-30 05:42:40Z bjk $
 .\"
-.Dd January 26, 2012
+.Dd May 30, 2012
 .Dt CARP 4
 .Os
 .Sh NAME
@@ -42,8 +42,8 @@
 .Pp
 To use
 .Nm ,
-the administrator needs to configure at minimum a common virtual host ID
-(vhid) and attach at least one IP address to this vhid on each machine which
+the administrator needs to configure at a minimum a common virtual host ID
+(vhid), and attach at least one IP address to this vhid on each machine which
 is to take part in the virtual group.
 Additional parameters can also be set on a per-vhid basis:
 .Cm advbase
@@ -72,13 +72,13 @@
 and
 .Cm advskew
 are put inside CARP advertisements.
-These configurations can be done using
+These values can be configured using
 .Xr ifconfig 8 ,
 or through the
 .Dv SIOCSVH
 .Xr ioctl 2 .
 .Pp
-CARP virtual hosts can be configured on multicast capable interfaces: Ethernet,
+CARP virtual hosts can be configured on multicast-capable interfaces: Ethernet,
 layer 2 VLAN, FDDI and Token Ring.
 An arbitrary number of virtual host IDs can be configured on an interface.
 An arbitrary number of IPv4 or IPv6 addresses can be attached to a particular
@@ -91,7 +91,7 @@
 .Pp
 Additionally, there are a number of global parameters which can be set using
 .Xr sysctl 8 :
-.Bl -tag -width ".Va net.inet.carp.preempt"
+.Bl -tag -width ".Va net.inet.carp.ifdown_demotion_factor"
 .It Va net.inet.carp.allow
 Accept incoming
 .Nm
@@ -103,14 +103,17 @@
 is announcing itself with a lower advskew.
 Disabled by default.
 .It Va net.inet.carp.log
-Value of 0 disables any logging.
-Value of 1 enables logging state changes of
+Determines what events relating to
+.Nm
+vhids are logged.
+A value of 0 disables any logging.
+A value of 1 enables logging state changes of
 .Nm
 vhids.
 Values above 1 enable logging of bad
 .Nm
 packets.
-Default value is 1.
+The default value is 1.
 .It Va net.inet.carp.demotion
 This value shows current level of CARP demotion.
 The value is added to the actual advskew sent in announcements for
@@ -123,44 +126,48 @@
 .Xr pfsync 4
 interface is not synchronized.
 The demotion value is writable, so that user may alter it
-depending on some external conditions, for example on status of some
+depending on some external conditions, for example on the status of some
 daemon utility.
-However, altering the value should be performed with care, do
+However, altering the value should be performed with care, so as to
 not conflict with subsystems that adjust demotion factor
 automatically:
 .Nm
 and
 .Xr pfsync 4 .
 .It Va net.inet.carp.ifdown_demotion_factor
-Value added to
+This value is added to
 .Va net.inet.carp.demotion
-when interface running a vhid goes down.
-Default value is 240 (maximum advskew value).
+when an interface running a vhid goes down.
+The default value is 240 (the maximum advskew value).
 .It Va net.inet.carp.senderr_demotion_factor
-Value added to
+This value is added to
 .Va net.inet.carp.demotion
 when
 .Nm
 experiences errors sending its announcements.
-Default value is 240 (maximum advskew value).
+The default value is 240 (the maximum advskew value).
 .El
 .\".Sh ARP level load balancing
-.\"The
+.\"A
 .\".Nm
-.\"has limited abilities for load balancing the incoming connections
-.\"between hosts in Ethernet network.
-.\"For load balancing operation, one needs several CARP interfaces that
+.\"interface has limited abilities for load balancing incoming connections
+.\"between hosts in an Ethernet network.
+.\"For load-balancing operation, one needs several CARP interfaces that
 .\"are configured to the same IP address, but to a different vhids.
 .\"Once an ARP request is received, the CARP protocol will use a hashing
 .\"function against the source IP address in the ARP request to determine
-.\"which vhid should this request belong to.
-.\"If the corresponding CARP interface is in master state, the ARP request
-.\"will be replied, otherwise it will be ignored.
+.\"which vhid the request will be assigned to.
+.\"If the corresponding CARP interface is the current
+.\"master interface, a reply will
+.\"be sent to the ARP request;
+.\"otherwise it will be ignored.
 .\"See the
 .\".Sx EXAMPLES
 .\"section for a practical example of load balancing.
 .\".Pp
-.\"The ARP load balancing has some limitations.
+.\"The ARP load balancing implemented in
+.\".Nm
+.\"has some limitations.
 .\"First, ARP balancing only works on the local network segment.
 .\"It cannot balance traffic that crosses a router, because the
 .\"router itself will always be balanced to the same virtual host.
@@ -170,10 +177,11 @@
 .\"is dangerous, because this creates a race condition between
 .\"balanced routers and a host they are serving.
 .\"Imagine an incoming packet creating state on the first router, being
-.\"forwarded to its destination, and destination replying faster
+.\"forwarded to its destination, and the destination replying faster
 .\"than the state information is packed and synced with the second router.
 .\"If the reply would be load balanced to second router, it will be
-.\"dropped due to no state.
+.\"dropped since the second router has not yet received information about
+.\"the connection state.
 .Sh STATE CHANGE NOTIFICATIONS
 Sometimes it is useful to get notified about
 .Nm
@@ -183,11 +191,12 @@
 hooks.
 Master/slave events are signalled under system
 .Dv CARP .
-Subsystem specifies vhid and name of interface, where event occurred.
-Type of the message displays new state of vhid.
+The subsystem specifies the vhid and name of the interface where
+the master/slave event occurred.
+The type of the message displays the new state of the vhid.
 Please see
 .Xr devd.conf 5
-and
+and the
 .Sx EXAMPLES
 section for more information.
 .Sh EXAMPLES
@@ -195,8 +204,8 @@
 failover all of the addresses running
 .Nm
 together, when one of the physical interfaces goes down.
-This is achieved by the preempt option.
-Enable it on both host A and B:
+This is achieved by the use of the preempt option.
+Enable it on both hosts A and B:
 .Pp
 .Dl sysctl net.inet.carp.preempt=1
 .Pp
@@ -295,7 +304,6 @@
 device was imported into
 .Fx 5.4 .
 In
-.Fx 10
-the
+.Fx 10.0 ,
 .Nm
 was significantly rewritten, and is no longer a pseudo-interface.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ch.4
--- a/head/share/man/man4/ch.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ch.4	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ch.4 235317 2012-05-12 03:25:46Z gjb $
 .\" Copyright (c) 1996
 .\"	Julian Elischer <julian at FreeBSD.org>.  All rights reserved.
 .\"
@@ -187,7 +187,7 @@
 This call can be used by applications to query the dimensions of
 the jukebox before using the
 .Dv CHIGSTATUS
-ioctl to query the jukebox' status.
+ioctl to query the jukebox status.
 .It Dv CHIOIELEM
 Perform the
 .Sy INITIALIZE ELEMENT STATUS
@@ -230,7 +230,8 @@
 returned in the array of
 .Vt changer_element_status
 structures pointed to by the
-.Va cesr_element_status field .
+.Va cesr_element_status
+field.
 The application must allocate enough
 memory for
 .Va cesr_element_count
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/cpuctl.4
--- a/head/share/man/man4/cpuctl.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/cpuctl.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/cpuctl.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd June 30, 2009
 .Dt CPUCTL 4
@@ -124,8 +124,8 @@
 .Sh RETURN VALUES
 .Bl -tag -width Er
 .It Bq Er ENXIO
-The operation requested is not supported by the device (e.g. unsupported
-architecture or the CPU is disabled)
+The operation requested is not supported by the device (e.g., unsupported
+architecture or the CPU is disabled).
 .It Bq Er EINVAL
 Incorrect request was supplied, or microcode image is not correct.
 .It Bq Er ENOMEM
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/cpufreq.4
--- a/head/share/man/man4/cpufreq.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/cpufreq.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/cpufreq.4 228743 2011-12-20 17:44:25Z mav $
+.\" $FreeBSD: head/share/man/man4/cpufreq.4 237330 2012-06-20 17:26:22Z sbruno $
 .\"
 .Dd March 3, 2006
 .Dt CPUFREQ 4
@@ -286,6 +286,7 @@
 .Dv CPUFREQ_VAL_UNKNOWN .
 .Sh SEE ALSO
 .Xr acpi 4 ,
+.Xr est 4 ,
 .Xr timecounters 4 ,
 .Xr powerd 8 ,
 .Xr sysctl 8
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/cxgbe.4
--- a/head/share/man/man4/cxgbe.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/cxgbe.4	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2011, Chelsio Inc
+.\" Copyright (c) 2011-2012, Chelsio Inc
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD: head/share/man/man4/cxgbe.4 232158 2012-02-25 15:21:43Z gjb $
+.\" $FreeBSD: head/share/man/man4/cxgbe.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd February 25, 2012
 .Dt CXGBE 4
@@ -145,10 +145,9 @@
 The packet-count index value to use to delay interrupts.
 The packet-count list has the values 1, 8, 16, and 32 by default
 and the index selects a value from this list.
-The default value is 2 for both 10Gb and 1Gb ports, which means 16
-packets (or the holdoff timer going off) before an interrupt is
-generated.
--1 disables packet counting.
+The default value is -1 for both 10Gb and 1Gb ports, which means packet
+counting is disabled and interrupts are generated based solely on the
+holdoff timer value.
 Different cxgbe interfaces can be assigned different values via the
 dev.cxgbe.X.holdoff_pktc_idx sysctl.
 This sysctl works only when the interface has never been marked up (as done by
@@ -221,7 +220,7 @@
 The
 .Nm
 device driver first appeared in
-.Fx 9.0
+.Fx 9.0 .
 .Sh AUTHORS
 .An -nosplit
 The
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/dcons.4
--- a/head/share/man/man4/dcons.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/dcons.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/dcons.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd January 26, 2008
 .Dt DCONS 4
@@ -104,7 +104,7 @@
 as a
 .Xr gdb 1
 port, add the following line into
-.Xr loader.conf 5
+.Xr loader.conf 5 :
 .Bd -literal -offset indent
 dcons_gdb="1"
 .Ed
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ddb.4
--- a/head/share/man/man4/ddb.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ddb.4	Wed Jul 25 16:32:50 2012 +0300
@@ -58,7 +58,7 @@
 .\" 	Created.
 .\" 	[90/08/30            dbg]
 .\"
-.\" $FreeBSD: head/share/man/man4/ddb.4 228570 2011-12-16 11:52:33Z kib $
+.\" $FreeBSD: head/share/man/man4/ddb.4 235353 2012-05-12 19:53:44Z joel $
 .\"
 .Dd December 16, 2011
 .Dt DDB 4
@@ -1031,14 +1031,14 @@
 .Pp
 The very same information might be gathered in the userspace
 with the help of
-.Dq Nm vmstat Fl z
+.Dq Nm vmstat Fl z .
 .\"
 .Pp
 .It Ic show Cm unpcb Ar addr
 Shows UNIX domain socket private control block
 .Vt struct unpcb
 present at the address
-.Ar addr
+.Ar addr .
 .\"
 .Pp
 .It Ic show Cm vmochk
@@ -1305,7 +1305,7 @@
 Scripts consist of a series of
 .Nm
 commands separated with the
-.Ic ;
+.Ql \&;
 character.
 For example:
 .Bd -literal -offset indent
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/divert.4
--- a/head/share/man/man4/divert.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/divert.4	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/divert.4 235450 2012-05-14 16:25:17Z joel $
 .\"
 .Dd December 17, 2004
 .Dt DIVERT 4
@@ -21,7 +21,7 @@
 .Ed
 .Pp
 Alternatively, to load
-.Ns Nm
+the driver
 as a module at boot time, add the following lines into the
 .Xr loader.conf 5
 file:
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/epair.4
--- a/head/share/man/man4/epair.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/epair.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,14 +26,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/epair.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/epair.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 26, 2009
 .Dt EPAIR 4
 .Os
 .Sh NAME
 .Nm epair
-.Nd A pair of virtual back-to-back connected Ethernet interfaces.
+.Nd A pair of virtual back-to-back connected Ethernet interfaces
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following line in your
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/est.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man4/est.4	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,98 @@
+.\"
+.\" Copyright (c) 2012 Sean Bruno <sbruno at 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: head/share/man/man4/est.4 237273 2012-06-19 17:13:14Z sbruno $
+.\"
+.Dd June 12, 2012
+.Dt EST 4
+.Os
+.Sh NAME
+.Nm est
+.Nd Enhanced Speedstep Technology
+.Sh SYNOPSIS
+To compile this capability into your kernel
+place the following line in your kernel
+configuration file:
+.Bd -ragged -offset indent
+.Cd "device cpufreq"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+interface provides support for the Intel Enhanced Speedstep Technology.
+.Pp
+Note that
+.Nm
+capabilities are automatically loaded by the
+.Xr cpufreq 4
+driver.
+.Sh LOADER TUNABLES
+The
+.Nm
+interface is intended to allow
+.Xr cpufreq 4
+to access and implement Intel Enhanced SpeedStep Technology via
+.Xr acpi 4
+and the acpi_perf interface accessors.
+If the default settings are not optimal, the following sysctls can be
+used to modify or monitor
+.Nm
+behavior.
+.Bl -tag -width indent
+.It hw.est.msr_info
+Attempt to infer information from direct probing of the msr.
+Should only be used in diagnostic cases
+.Pq default 0
+.It hw.est.strict
+Validate frequency requested is accepted by the cpu when set.
+It appears that this will only work on single core cpus.
+.Pq default 0
+.El
+.Sh DIAGNOSTICS
+.Bl -diag
+.It "est%d: <Enhanced SpeedStep Frequency Control> on cpu%d"
+.Pp
+Indicates normal startup of this interface.
+.It "est: CPU supports Enhanced Speedstep, but is not recognized."
+.It "est: cpu_vendor GenuineIntel, msr 471c471c0600471c"
+.It "device_attach: est%d attach returned 6"
+.Pp
+Indicates all attempts to attach to this interface have failed.
+This usually indicates an improper BIOS setting restricting O/S
+control of the CPU speeds.
+Consult your BIOS documentation for more details.
+.El
+.Sh COMPATIBILITY
+.Nm
+is only found on supported Intel CPUs.
+.Sh SEE ALSO
+.Xr cpufreq 4
+.Rs
+.%T "Intel 64 and IA-32 Architectures Software Developer Manuals"
+.%U "http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html"
+.Re
+.Sh AUTHORS
+This manual page was written by
+.An Sean Bruno Aq sbruno at FreeBSD.org .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/fdt.4
--- a/head/share/man/man4/fdt.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/fdt.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/fdt.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 12, 2010
 .Dt FDT 4
@@ -143,8 +143,10 @@
 support in the kernel. It covers all low-level and infrastructure parts of
 .Nm
 kernel support, which primarily are the
-.Xr fdtbus 4 and
-.Xr simplebus 4 drivers, as well as helper routines and libraries.
+.Xr fdtbus 4
+and
+.Xr simplebus 4
+drivers, as well as helper routines and libraries.
 .It Va makeoptions FDT_DTS_FILE=<board name>.dts
 Specifies a preferred (default) device tree source (DTS) file for a given
 kernel. The indicated DTS file will be converted (compiled) into a binary form
@@ -163,7 +165,7 @@
 .Sh SEE ALSO
 .Xr fdtbus 4 ,
 .Xr openfirm 4 ,
-.Xr simplebus 4 ,
+.Xr simplebus 4
 .Sh STANDARDS
 IEEE Std 1275: IEEE Standard for Boot (Initialization Configuration) Firmware:
 Core Requirements and Practices
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/fdtbus.4
--- a/head/share/man/man4/fdtbus.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/fdtbus.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/fdtbus.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 12, 2010
 .Dt FDTBUS 4
@@ -51,7 +51,8 @@
 The
 .Nm
 driver provides generic, common infrastructure for all
-.Xr fdt 4 oriented device drivers, and its main responsibilities are the
+.Xr fdt 4
+oriented device drivers, and its main responsibilities are the
 following:
 .Bl -bullet
 .It
@@ -66,7 +67,7 @@
 .Sh SEE ALSO
 .Xr fdt 4 ,
 .Xr openfirm 4 ,
-.Xr simplebus 4 ,
+.Xr simplebus 4
 .Sh STANDARDS
 IEEE Std 1275: IEEE Standard for Boot (Initialization Configuration) Firmware:
 Core Requirements and Practices
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/filemon.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man4/filemon.4	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,178 @@
+.\" Copyright (c) 2012
+.\"	David E. O'Brien <obrien at 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. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgment:
+.\"	This product includes software developed by David E. O'Brien and
+.\"	contributors.
+.\" 4. Neither the name of the author nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" 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 MERCHANT ABILITY 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: head/share/man/man4/filemon.4 236688 2012-06-06 16:51:33Z obrien $
+.\"
+.Dd May 30, 2012
+.Dt FILEMON 4
+.Os
+.Sh NAME
+.Nm filemon
+.Nd the filemon device
+.Sh SYNOPSIS
+.In dev/filemon/filemon.h
+.Sh DESCRIPTION
+The
+.Nm
+device allows a process to collect file operations data of its children.
+The device
+.Pa /dev/filemon
+responds to two
+.Xr ioctl 2
+calls.
+.Pp
+System calls are denoted using the following single letters:
+.Pp
+.Bl -tag -width indent -compact
+.It Ql C
+.Xr chdir 2
+.It Ql D
+.Xr unlink 2
+.It Ql E
+.Xr exec 2
+.It Ql F
+.Xr fork 2 ,
+.Xr vfork 2
+.It Ql L
+.Xr link 2 ,
+.Xr linkat 2 ,
+.Xr symlink 2 ,
+.Xr symlinkat 2
+.It Ql M
+.Xr rename 2
+.It Ql R
+.Xr open 2
+for read
+.It Ql S
+.Xr stat 2
+.It Ql W
+.Xr open 2
+for write
+.It Ql X
+.Xr _exit 2
+.El
+.Pp
+Note that
+.Ql R
+following
+.Ql W
+records can represent a single
+.Xr open 2
+for R/W,
+or two separate
+.Xr open 2
+calls, one for
+.Ql R
+and one for
+.Ql W .
+Note that only successful system calls are captured.
+.Sh IOCTLS
+User mode programs communicate with the
+.Nm
+driver through a number of ioctls which are described below.
+Each takes a single argument.
+.Bl -tag -width ".Dv FILEMON_SET_PID"
+.It Dv FILEMON_SET_FD
+Write the internal tracing buffer to the supplied open file descriptor.
+.It Dv FILEMON_SET_PID
+Child process ID to trace.
+.El
+.Sh RETURN VALUES
+.\" .Rv -std ioctl
+The
+.Fn ioctl
+function returns the value 0 if successful;
+otherwise the value \-1 is returned and the global variable
+.Va errno
+is set to indicate the error.
+.Sh FILES
+.Bl -tag -width ".Pa /dev/filemon"
+.It Pa /dev/filemon
+.El
+.Sh EXAMPLES
+.Bd -literal
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <dev/filemon/filemon.h>
+#include <fcntl.h>
+#include <err.h>
+
+static void
+open_filemon(void)
+{
+	pid_t child;
+	int fm_fd, fm_log;
+
+	if ((fm_fd = open("/dev/filemon", O_RDWR)) == -1)
+		err(1, "open(\e"/dev/filemon\e", O_RDWR)");
+	if ((fm_log = open("filemon.out",
+	    O_CREAT | O_WRONLY | O_TRUNC, DEFFILEMODE)) == -1)
+		err(1, "open(filemon.out)");
+
+	if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) == -1)
+		err(1, "Cannot set filemon log file descriptor");
+	/* Set up these two fd's to close on exec. */
+	(void)fcntl(fm_fd, F_SETFD, FD_CLOEXEC);
+	(void)fcntl(fm_log, F_SETFD, FD_CLOEXEC);
+
+	if ((child = fork()) == 0) {
+		child = getpid();
+		if (ioctl(fm_fd, FILEMON_SET_PID, &child) == -1)
+			err(1, "Cannot set filemon PID");
+		/* Do something here. */
+		return 0;
+	} else {
+		wait(&child);
+		close(fm_fd);
+	}
+	return 0;
+}
+.Ed
+.Pp
+Creates a file named
+.Pa filemon.out
+and configures the
+.Nm
+device to write the
+.Nm
+buffer contents to it.
+.Sh SEE ALSO
+.Xr dtrace 1 ,
+.Xr ktrace 1 ,
+.Xr truss 1 ,
+.Xr ioctl 2
+.Sh HISTORY
+A
+.Nm
+device appeared in
+.Fx 9.1 .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/firewire.4
--- a/head/share/man/man4/firewire.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/firewire.4	Wed Jul 25 16:32:50 2012 +0300
@@ -29,9 +29,9 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/firewire.4 236443 2012-06-02 11:03:14Z joel $
 .\"
-.Dd April 1, 2006
+.Dd May 11, 2012
 .Dt FIREWIRE 4
 .Os
 .Sh NAME
@@ -82,12 +82,20 @@
 On the
 .Nm
 bus, every device is identified by an EUI 64 address.
+.Pp
+Debugging over the firewire interace is possible with the
+.Xr dcons 4
+driver.
+Please see
+.Pa http://wiki.freebsd.org/DebugWithDcons
+for details on how to setup debugging with firewire.
 .Sh FILES
-.Bl -tag -compact
+.Bl -tag -width "Pa /dev/fwmem0.0" -compact
 .It Pa /dev/fw0.0
 .It Pa /dev/fwmem0.0
 .El
 .Sh SEE ALSO
+.Xr dcons 4 ,
 .Xr fwe 4 ,
 .Xr fwip 4 ,
 .Xr fwohci 4 ,
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/gdb.4
--- a/head/share/man/man4/gdb.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/gdb.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/gdb.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd February 8, 2005
 .Dt GDB 4
@@ -508,7 +508,7 @@
 .It Ic checkmem
 Check unallocated memory for modifications.
 This assumes that the kernel has been compiled with
-.Cd "options DIAGNOSTIC"
+.Cd "options DIAGNOSTIC" .
 This causes the contents of free memory to be set to
 .Li 0xdeadc0de .
 .It Ic dmesg
@@ -595,7 +595,7 @@
 Firewire connections do not have this problem.
 .Pp
 The debugging macros
-.Dq "just growed" .
+.Dq "just grown" .
 In general, the person who wrote them did so while looking for a specific
 problem, so they may not be general enough, and they may behave badly when used
 in ways for which they were not intended, even if those ways make sense.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/gpib.4
--- a/head/share/man/man4/gpib.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/gpib.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/gpib.4 238542 2012-07-17 02:05:39Z kevlo $
 .\"
 .Dd January 24, 2010
 .Dt GPIB 4
@@ -63,7 +63,7 @@
 {
 	int dmm;
         unsigned char buf[100];
-        char vbuf[sizeof buf * 4];
+        char vbuf[sizeof(buf) * 4];
 
         /* DVM */
         dmm = ibdev(0, (argc > 1? atoi(argv[1]): 7), 0,
@@ -71,7 +71,7 @@
         if (dmm < 0)
                 errx(1, "ibdev = %d\\n", dmm);
         ibwrt(dmm, "*IDN?\\r\\n", 7);
-        ibrd(dmm, buf, sizeof buf - 1);
+        ibrd(dmm, buf, sizeof(buf) - 1);
         strvisx(vbuf, buf, ibcnt, VIS_WHITE | VIS_CSTYLE);
         printf("%s\\n", vbuf);
         return (0);
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/gre.4
--- a/head/share/man/man4/gre.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/gre.4	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/gre.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/gre.4 235450 2012-05-14 16:25:17Z joel $
 .\"
 .Dd June 20, 2008
 .Dt GRE 4
@@ -37,16 +37,14 @@
 .Nd encapsulating network device
 .Sh SYNOPSIS
 To compile the
-.Ns Nm
-device into the kernel, place the following line in the kernel
+driver into the kernel, place the following line in the kernel
 configuration file:
 .Bd -ragged -offset indent
 .Cd "device gre"
 .Ed
 .Pp
 Alternatively, to load the
-.Ns Nm
-device as a module at boot time, place the following line in
+driver as a module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 if_gre_load="YES"
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/hptrr.4
--- a/head/share/man/man4/hptrr.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/hptrr.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" (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$
+.\" $FreeBSD: head/share/man/man4/hptrr.4 237180 2012-06-17 03:54:10Z eadler $
 .\"
-.Dd November 8, 2009
+.Dd June 6, 2012
 .Dt HPTRR 4
 .Os
 .Sh NAME
@@ -50,8 +50,11 @@
 The following tunables are settable from the loader:
 .Bl -ohang
 .It Va hw.hptrr.attach_generic
-set to 0 to deny driver attach to chips with generic Marvell (non-HighPoint)
-PCI identification. These chips are also supported by ata(4).
+set to 1 to permit driver attach to chips with generic Marvell (non-HighPoint)
+PCI identification. These chips are also supported by
+.Xr ata 4
+and
+.Xr mvs 4 .
 Some vendors are using same chips, but without providing RAID BIOS.
 .El
 .Sh DESCRIPTION
@@ -112,6 +115,7 @@
 .Xr ata 4 ,
 .Xr cam 4 ,
 .Xr hptmv 4 ,
+.Xr mvs 4 ,
 .Xr loader 8
 .Sh HISTORY
 The
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/igb.4
--- a/head/share/man/man4/igb.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/igb.4	Wed Jul 25 16:32:50 2012 +0300
@@ -29,9 +29,9 @@
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
-.\" $FreeBSD: head/share/man/man4/igb.4 233422 2012-03-24 13:37:57Z joel $
+.\" $FreeBSD: head/share/man/man4/igb.4 235347 2012-05-12 18:10:27Z gjb $
 .\"
-.Dd October 11, 2011
+.Dd May 12, 2012
 .Dt IGB 4
 .Os
 .Sh NAME
@@ -160,6 +160,14 @@
 .It Va hw.igb.enable_aim
 If set to 1, enable Adaptive Interrupt Moderation.
 The default is to enable Adaptive Interrupt Moderation.
+.It Va kern.ipc.nmbclusters
+The maximum number of mbuf clusters allowed.
+If the system has more than one igb card or jumbo frames are
+enabled, this value will need to be increased.
+.It Va kern.ipc.nmbjumbo9k
+The maximum number of mbuf 9k jumbo clusters allowed.
+Increasing this to allow for at least 8192 extra clusters
+per interface can allow for an mtu of 8192.
 .El
 .Sh FILES
 .Bl -tag -width /dev/led/igb*
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/io.4
--- a/head/share/man/man4/io.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/io.4	Wed Jul 25 16:32:50 2012 +0300
@@ -25,9 +25,9 @@
 .\" (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$
+.\" $FreeBSD: head/share/man/man4/io.4 236596 2012-06-05 03:14:39Z eadler $
 .\"
-.Dd June 01, 2010
+.Dd June 1, 2010
 .Dt IO 4
 .Os
 .Sh NAME
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ip.4
--- a/head/share/man/man4/ip.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ip.4	Wed Jul 25 16:32:50 2012 +0300
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ip.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD: head/share/man/man4/ip.4 233422 2012-03-24 13:37:57Z joel $
+.\" $FreeBSD: head/share/man/man4/ip.4 237132 2012-06-15 09:12:47Z ru $
 .\"
-.Dd November 14, 2011
+.Dd June 15, 2012
 .Dt IP 4
 .Os
 .Sh NAME
@@ -165,7 +165,7 @@
 .Vt cmsghdr
 fields have the following values:
 .Bd -literal
-cmsg_len = sizeof(struct in_addr)
+cmsg_len = CMSG_LEN(sizeof(struct in_addr))
 cmsg_level = IPPROTO_IP
 cmsg_type = IP_RECVDSTADDR
 .Ed
@@ -184,7 +184,7 @@
 address.
 The cmsghdr fields should have the following values:
 .Bd -literal
-cmsg_len = sizeof(struct in_addr)
+cmsg_len = CMSG_LEN(sizeof(struct in_addr))
 cmsg_level = IPPROTO_IP
 cmsg_type = IP_SENDSRCADDR
 .Ed
@@ -215,7 +215,8 @@
 This is in contrast to the default behavior of the
 system, which is to transmit undirected broadcasts
 via the first network interface with the
-.Dv IFF_BROADCAST flag set.
+.Dv IFF_BROADCAST
+flag set.
 .Pp
 This option allows applications to choose which
 interface is used to transmit an undirected broadcast
@@ -226,7 +227,7 @@
 .Bd -literal
 char msg[512];
 struct sockaddr_in sin;
-u_char onesbcast = 1;	/* 0 = disable (default), 1 = enable */
+int onesbcast = 1;	/* 0 = disable (default), 1 = enable */
 
 setsockopt(s, IPPROTO_IP, IP_ONESBCAST, &onesbcast, sizeof(onesbcast));
 sin.sin_addr.s_addr = inet_addr("192.168.2.255");
@@ -235,12 +236,14 @@
 .Ed
 .Pp
 It is the application's responsibility to set the
-.Dv IP_TTL option
+.Dv IP_TTL
+option
 to an appropriate value in order to prevent broadcast storms.
 The application must have sufficient credentials to set the
 .Dv SO_BROADCAST
 socket level option, otherwise the
-.Dv IP_ONESBCAST option has no effect.
+.Dv IP_ONESBCAST
+option has no effect.
 .Pp
 If the
 .Dv IP_BINDANY
@@ -276,13 +279,36 @@
 .Tn TTL .
 The cmsghdr fields have the following values:
 .Bd -literal
-cmsg_len = sizeof(u_char)
+cmsg_len = CMSG_LEN(sizeof(u_char))
 cmsg_level = IPPROTO_IP
 cmsg_type = IP_RECVTTL
 .Ed
 .\"
 .Pp
 If the
+.Dv IP_RECVTOS
+option is enabled on a
+.Dv SOCK_DGRAM
+socket, the
+.Xr recvmsg 2
+call will return the
+.Tn IP
+.Tn TOS
+(type of service) field for a
+.Tn UDP
+datagram.
+The msg_control field in the msghdr structure points to a buffer
+that contains a cmsghdr structure followed by the
+.Tn TOS .
+The cmsghdr fields have the following values:
+.Bd -literal
+cmsg_len = CMSG_LEN(sizeof(u_char))
+cmsg_level = IPPROTO_IP
+cmsg_type = IP_RECVTOS
+.Ed
+.\"
+.Pp
+If the
 .Dv IP_RECVIF
 option is enabled on a
 .Dv SOCK_DGRAM
@@ -304,7 +330,7 @@
 .Vt cmsghdr
 fields have the following values:
 .Bd -literal
-cmsg_len = sizeof(struct sockaddr_dl)
+cmsg_len = CMSG_LEN(sizeof(struct sockaddr_dl))
 cmsg_level = IPPROTO_IP
 cmsg_type = IP_RECVIF
 .Ed
@@ -851,4 +877,5 @@
 packets received on raw IP sockets had the
 .Va ip_hl
 subtracted from the
-.Va ip_len field.
+.Va ip_len
+field.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ipfirewall.4
--- a/head/share/man/man4/ipfirewall.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ipfirewall.4	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ipfirewall.4 235450 2012-05-14 16:25:17Z joel $
 .\"
 .Dd September 1, 2006
 .Dt IPFW 4
@@ -9,15 +9,14 @@
 .Nd IP packet filter and traffic accounting
 .Sh SYNOPSIS
 To compile
-.Ns Nm
+the driver
 into the kernel, place the following option in the kernel configuration
 file:
 .Bd -ragged -offset indent
 .Cd "options IPFIREWALL"
 .Ed
 .Pp
-Other kernel options related to
-.Ns Nm
+Other related kernel options
 which may also be useful are:
 .Bd -ragged -offset indent
 .Cd "options IPFIREWALL_DEFAULT_TO_ACCEPT"
@@ -27,7 +26,7 @@
 .Ed
 .Pp
 To load
-.Ns Nm
+the driver
 as a module at boot time, add the following line into the
 .Xr loader.conf 5
 file:
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ipmi.4
--- a/head/share/man/man4/ipmi.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ipmi.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ipmi.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/ipmi.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 10, 2007
 .Dt IPMI 4
@@ -130,7 +130,7 @@
 Possible error values:
 .Bl -tag -width Er
 .It Bq Er EFAULT
-An address supplied was invalid
+An address supplied was invalid.
 .It Bq Er ENOMEM
 Buffers could not be allowed for the command, out of memory.
 .El
@@ -146,7 +146,7 @@
 .Ss Unimplemented Ioctls
 .Bl -tag -width indent
 .It Dv IPMICTL_REGISTER_FOR_CMD Pq Vt "struct ipmi_cmdspec"
-Register to receive a specific command
+Register to receive a specific command.
 Possible error values:
 .Bl -tag -width Er
 .It Bq Er EFAULT
@@ -157,7 +157,7 @@
 Could not allocate memory.
 .El
 .It Dv IPMICTL_UNREGISTER_FOR_CMD Pq Vt "struct ipmi_cmdspec"
-Unregister to receive a specific command
+Unregister to receive a specific command.
 Possible error values:
 .Bl -tag -width Er
 .It Bq Er EFAULT
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ipw.4
--- a/head/share/man/man4/ipw.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ipw.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ipw.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/ipw.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd April 13, 2008
 .Dt IPW 4
@@ -147,9 +147,9 @@
 .Xr wlan_tkip 4 ,
 .Xr wlan_wep 4 ,
 .Xr ifconfig 8 ,
-.Xr wpa_supplicant 8 .
+.Xr wpa_supplicant 8
 .Sh AUTHORS
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini at free.fr
+.An Damien Bergamini Aq damien.bergamini at free.fr .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/isci.4
--- a/head/share/man/man4/isci.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/isci.4	Wed Jul 25 16:32:50 2012 +0300
@@ -31,7 +31,7 @@
 .\"
 .\" Author: Jim Harris <jimharris at FreeBSD.org>
 .\"
-.\" $FreeBSD: head/share/man/man4/isci.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/isci.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd January 23, 2012
 .Dt ISCI 4
@@ -98,7 +98,8 @@
 The
 .Nm
 driver first appeared in
-.Fx 8.3 and 9.1 .
+.Fx 8.3
+and 9.1.
 .Sh AUTHORS
 .An -nosplit
 The
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/isp.4
--- a/head/share/man/man4/isp.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/isp.4	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
 .\"
 .\" Additional Copyright (c) 2006 by Marcus Alves Grando
 .\"
-.\" $FreeBSD: head/share/man/man4/isp.4 233422 2012-03-24 13:37:57Z joel $
+.\" $FreeBSD: head/share/man/man4/isp.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd February 28, 2007
 .Dt ISP 4
@@ -64,7 +64,7 @@
 ISP12160).
 .Pp
 Fibre Channel support uses FCP SCSI profile for
-.Tn FibreChannel .
+.Tn FibreChannel ,
 and utilizes Class 3 and Class 2 connections (Qlogic 2100 is Class
 3 only, minor patches to the Qlogic 2200 to force Class 2 mode).
 Support is available for Public and Private loops, and for
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/iwn.4
--- a/head/share/man/man4/iwn.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/iwn.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/iwn.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/iwn.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd March 27, 2012
 .Dt IWN 4
@@ -179,4 +179,4 @@
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini at free.fr
+.An Damien Bergamini Aq damien.bergamini at free.fr .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/mac_lomac.4
--- a/head/share/man/man4/mac_lomac.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/mac_lomac.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/mac_lomac.4 232157 2012-02-25 14:31:25Z gjb $
+.\" $FreeBSD: head/share/man/man4/mac_lomac.4 236854 2012-06-10 15:56:49Z trhodes $
 .\"
 .Dd February 25, 2012
 .Dt MAC_LOMAC 4
@@ -63,7 +63,7 @@
 an information flow policy coupled with the subject demotion
 via floating labels.
 In LOMAC, all system subjects and objects are assigned integrity labels, made
-up of one or more hierarchical grades, depending on the their types.
+up of one or more hierarchical grades, depending on their types.
 Together, these label elements permit all labels to be placed in a partial
 order, with information flow protections and demotion decisions
 based on a dominance operator
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/mac_none.4
--- a/head/share/man/man4/mac_none.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/mac_none.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/mac_none.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd December 1, 2002
 .Dt MAC_NONE 4
@@ -45,7 +45,7 @@
 .Cd "options MAC_NONE"
 .Ed
 .Pp
-Alternately, to load the sample module at boot time, place the following line
+Alternately, to load the none module at boot time, place the following line
 in your kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "options MAC"
@@ -59,7 +59,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-policy module implements a sample MAC policy that has no effect on
+policy module implements a none MAC policy that has no effect on
 access control in the system.
 Unlike
 .Xr mac_stub 4 ,
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/mac_stub.4
--- a/head/share/man/man4/mac_stub.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/mac_stub.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/mac_stub.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd December 1, 2002
 .Dt MAC_STUB 4
@@ -37,7 +37,7 @@
 .Nm mac_stub
 .Nd "MAC policy stub module"
 .Sh SYNOPSIS
-To compile the sample policy
+To compile the stub policy
 into your kernel, place the following lines in your kernel
 configuration file:
 .Bd -ragged -offset indent
@@ -45,7 +45,7 @@
 .Cd "options MAC_STUB"
 .Ed
 .Pp
-Alternately, to load the sample module at boot time, place the following line
+Alternately, to load the stub module at boot time, place the following line
 in your kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "options MAC"
@@ -59,7 +59,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-policy module implements a sample MAC policy that has no effect on
+policy module implements a stub MAC policy that has no effect on
 access control in the system.
 Unlike
 .Xr mac_none 4 ,
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/man4.i386/sbni.4
--- a/head/share/man/man4/man4.i386/sbni.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/man4.i386/sbni.4	Wed Jul 25 16:32:50 2012 +0300
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/man4.i386/sbni.4 236443 2012-06-02 11:03:14Z joel $
 .\"
 .Dd January 8, 2002
 .Dt SBNI 4 i386
@@ -97,7 +97,7 @@
 .Sh FILES
 The sources for the driver reside in:
 .Pp
-.Bl -tag -compact
+.Bl -tag -width ".Pa /sys/dev/sbni/if_sbni.c" -compact
 .It Pa /sys/dev/sbni/if_sbni.c
 .It Pa /sys/dev/sbni/if_sbnireg.h
 .It Pa /sys/dev/sbni/if_sbnivar.h
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/mk48txx.4
--- a/head/share/man/man4/mk48txx.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/mk48txx.4	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/mk48txx.4 235319 2012-05-12 03:46:43Z gjb $
 .\"
 .Dd December 25, 2009
 .Dt MK48TXX 4
@@ -123,7 +123,7 @@
 The offset into the control registers of the
 .Tn Mostek
 chip,
-which is set by the the
+which is set by the
 .Fn mk48txx_attach
 function.
 .It Fa sc_year0
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/mps.4
--- a/head/share/man/man4/mps.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/mps.4	Wed Jul 25 16:32:50 2012 +0300
@@ -32,9 +32,9 @@
 .\" Author: Ken Merry <ken at FreeBSD.org>
 .\"
 .\" $Id: //depot/SpectraBSD/head/share/man/man4/mps.4#6 $
-.\" $FreeBSD: head/share/man/man4/mps.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/mps.4 237836 2012-06-30 13:17:21Z brueffer $
 .\"
-.Dd February 7, 2012
+.Dd June 30, 2012
 .Dt MPS 4
 .Os
 .Sh NAME
@@ -166,7 +166,7 @@
 or via
 .Xr sysctl 8 .
 The following bits have the described effects:
-.Bl -tag -offset indent
+.Bl -tag -width 6n -offset indent
 .It 0x01
 Enable informational prints.
 .It 0x02
@@ -205,11 +205,8 @@
 This driver has a couple of known shortcomings:
 .Bl -bullet -compact
 .It
-Not endian safe.
-It only works on little endian machines (e.g. amd64 and i386).
-.It
 No userland utility available (e.g.
-.Xr mptutil 8)
+.Xr mptutil 8 ) .
 .It
 The driver probes devices sequentially.
 If your system has a large number of devices, the probe will take a while.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/mpt.4
--- a/head/share/man/man4/mpt.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/mpt.4	Wed Jul 25 16:32:50 2012 +0300
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/mpt.4 224284 2011-07-23 22:55:32Z gjb $
+.\" $FreeBSD: head/share/man/man4/mpt.4 236623 2012-06-05 17:49:11Z obrien $
 .\"
 .Dd July 23, 2011
 .Dt MPT 4
@@ -124,15 +124,15 @@
 IBM eServer xSeries 335
 .El
 .Pp
-These systems also contain Integrated Raid Mirroring and Integrated
-Raid Mirroring Enhanced which this driver also supports.
+These systems also contain Integrated RAID Mirroring and Integrated
+RAID Mirroring Enhanced which this driver also supports.
 .Pp
 The
 .Tn SAS
 controller chips are also present on many new AMD/Opteron based systems,
 like the Sun 4100.
 Note that this controller can drive both SAS and SATA
-drives or a mix of them at the same time. The Integrated Raid Mirroring
+drives or a mix of them at the same time. The Integrated RAID Mirroring
 available for these controllers is poorly supported at best.
 .Pp
 The
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/mvs.4
--- a/head/share/man/man4/mvs.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/mvs.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/mvs.4 227515 2011-11-14 22:57:47Z brueffer $
+.\" $FreeBSD: head/share/man/man4/mvs.4 236443 2012-06-02 11:03:14Z joel $
 .\"
 .Dd April 27, 2010
 .Dt MVS 4
@@ -67,7 +67,8 @@
 allowing some power to be saved at the cost of additional command
 latency.
 Possible values:
-.Bl -tag -compact
+.Pp
+.Bl -tag -width 4n -offset indent -compact
 .It 0
 interface Power Management is disabled (default);
 .It 1
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/mwl.4
--- a/head/share/man/man4/mwl.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/mwl.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: head/share/man/man4/mwl.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/mwl.4 235319 2012-05-12 03:46:43Z gjb $
 .\"/
 .Dd July 8, 2009
 .Dt MWL 4
@@ -144,7 +144,7 @@
 ifconfig wlan0 meshid my_mesh mode 11a inet 192.168.0.10/24
 .Ed
 .Pp
-Create two virtual 802.11a host-based access points, one with
+Create two virtual 802.11a host-based access points, one
 with WEP enabled and one with no security, and bridge them to
 the fxp0 (wired) device:
 .Bd -literal -offset indent
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/nand.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man4/nand.4	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,140 @@
+.\"
+.\" Copyright (c) 2012 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Semihalf 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:
+.\" 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: head/share/man/man4/nand.4 235537 2012-05-17 10:11:18Z gber $
+.\"
+.Dd March 8, 2012
+.Dt NAND 4
+.Os
+.Sh NAME
+.Nm nand
+.Nd NAND Flash framework
+.Sh SYNOPSIS
+.Cd "device nand"
+.Sh DESCRIPTION
+The
+.Fx
+.Nm
+framework consists of a set of interfaces that aim to provide an extensible,
+object oriented environement for NAND controllers and NAND Flash memory chips
+from various hardware vendors, and to allow for uniform and flexible
+management of the NAND devices. It comprises of the following major
+components:
+.Bl -bullet
+.It
+NAND Flash controller (NFC) interface.
+.Pp
+Defines methods which allow to send commands as well as send/receive data
+between the controller and a NAND chip. Back-end drivers for specific NAND
+controllers plug into this interface and implement low-level routines for a
+given NAND controller.
+.Pp
+This layer implements basic functionality of a NAND Flash controller. It
+allows to send command and address to chip, drive CS (chip select line), as
+well as read/write to the selected NAND chip. This layer is independent of
+NAND chip devices actually connected to the controller.
+.It
+NAND chip interface.
+.Pp
+Provides basic operations like read page, program page, erase block. Currently
+three generic classes of drivers are available, which provide support for the
+following chips:
+.Bl -bullet
+.It
+large page
+.It
+small page
+.It
+ONFI-compliant
+.El
+.Pp
+This layer implements basic operations to be performed on a NAND chip, like
+read, program, erase, get status etc. Since these operations use specific
+commands (depending on the vendor), each chip has potentially its own
+implementation of the commands set.
+.Pp
+The framework is extensible so it is also possible to create a custom command
+set for a non standard chip support.
+.It
+NANDbus.
+.Pp
+This layer is responsible for enumerating NAND chips in the system and
+establishing the hierarchy between chips and their supervising controllers.
+.Pp
+Its main purpose is detecting type of NAND chips connected to a given chip
+select (CS line). It also allows manages locking access to the NAND
+controller. NANDbus passes requests from an active chip to the chip
+controller.
+.It
+NAND character / GEOM device.
+.Pp
+For each NAND chip found in a system a character and GEOM devices are created
+which allows to read / write directly to a device, as well as perform other
+specific operations (like via ioctl).
+.Pp
+There are two GEOM devices created for each NAND chip:
+.Bl -bullet
+.It
+raw device
+.It
+normal device
+.El
+.Pp
+Raw device allows to bypass ECC checking when reading/writing to it, while
+normal device always uses ECC algorithm to validate the read data.
+.Pp
+NAND character devices will be created for each NAND chip detected while
+probing the NAND controller.
+.El
+.Sh SEE ALSO
+.Xr libnandfs 3 ,
+.Xr gnand 4 ,
+.Xr nandsim 4 ,
+.Xr nandfs 5 ,
+.Xr makefs 8 ,
+.Xr mount_nandfs 8 ,
+.Xr nandfs 8 ,
+.Xr nandsim 8 ,
+.Xr nandtool 8 ,
+.Xr newfs_nandfs 8 ,
+.Xr umount_nandfs 8
+.Sh STANDARDS
+Open NAND Flash Interface Working Group
+.Pq Vt ONFI .
+.Sh HISTORY
+The
+.Nm
+framework support first appeared in
+.Fx 10.0 .
+.Sh AUTHOR
+The
+.Nm
+framework was designed and developed by
+.An Grzegorz Bernacki .
+This manual page was written by
+.An Rafal Jaworowski .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/nandsim.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man4/nandsim.4	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,92 @@
+.\"
+.\" Copyright (c) 2012 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Semihalf 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:
+.\" 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: head/share/man/man4/nandsim.4 235545 2012-05-17 11:53:38Z gber $
+.\"
+.Dd March 8, 2012
+.Dt NANDSIM 4
+.Os
+.Sh NAME
+.Nm nandsim
+.Nd NAND Flash simulator driver
+.Sh SYNOPSIS
+.Cd "device nand"
+.Cd "device nandsim"
+.Cd "options ALQ"
+.Sh DESCRIPTION
+The
+.Nm
+is part of the
+.Fx
+NAND framework
+.Xr nand 4
+and can be characterized with the following highlights:
+.Bl -bullet
+.It
+plugs into the
+.Xr nand 4
+framework APIs as if it were a hardware controller (hanging on the nexus bus)
+with real NAND chips connected to it
+.It
+physically part of the kernel code (either statically linked into the kernel
+image or built as a module)
+.It
+controlled with a user space program
+.Xr nandsim 8
+.El
+.Pp
+From the user perspective, the
+.Nm
+allows for imitating ONFI-compliant NAND Flash devices as if they were
+attached to the system via a virtual controller.
+.Pp
+Some
+.Nm
+features rely on the ability to log contents to a file, which is achieved
+through the
+.Xr alq 9
+facility.
+.Sh SEE ALSO
+.Xr nand 4 ,
+.Xr nandsim.conf 5 ,
+.Xr nandsim 8
+.Sh STANDARDS
+Open NAND Flash Interface Working Group
+.Pq Vt ONFI .
+.Sh HISTORY
+The
+.Nm
+support first appeared in
+.Fx 10.0 .
+.Sh AUTHOR
+The
+.Nm
+kernel driver was developed by
+.An Grzegorz Bernacki .
+This manual page was written by
+.An Rafal Jaworowski .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/net80211.4
--- a/head/share/man/man4/net80211.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/net80211.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGES.
 .\"
-.\" $FreeBSD: head/share/man/man4/net80211.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/net80211.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 10, 2009
 .Dt NET80211 4
@@ -366,7 +366,7 @@
 0 (do not promote, use legacy),
 1 (promote to HT20),
 and
-2 (promote to HT40),
+2 (promote to HT40).
 .It Dv IEEE80211_IOC_HTPROTMODE
 Return, in
 .Va i_val ,
@@ -447,7 +447,7 @@
 .Va i_val .
 .It Dv IEEE80211_IOC_NUMWEPKEYS
 Return the number of WEP keys supported in
-.Va i_val
+.Va i_val .
 .It Dv IEEE80211_IOC_POWERSAVE
 Return the current powersaving mode in
 .Va i_val .
@@ -923,8 +923,8 @@
 .Va i_val .
 .It Dv IEEE80211_IOC_DTIM_PERIOD
 Set the period (in beacon intervals) between DTIM events to the value in
+.Va i_val .
 This request causes a running interface to be restarted.
-.Va i_val .
 .It Dv IEEE80211_IOC_DWDS
 Set whether or not Dynamic WDS support is enabled using the value in
 .Va i_val .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/netmap.4
--- a/head/share/man/man4/netmap.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/netmap.4	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.\" $FreeBSD: head/share/man/man4/netmap.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/netmap.4 235317 2012-05-12 03:25:46Z gjb $
 .\" $Id: netmap.4 9662 2011-11-16 13:18:06Z luigi $: stable/8/share/man/man4/bpf.4 181694 2008-08-13 17:45:06Z ed $
 .\"
 .Dd February 27, 2012
@@ -46,7 +46,7 @@
 which is in charge of validating information through
 .Pa ioctl()
 and
-.Pa select()/poll().
+.Pa select()/poll() .
 .Nm
 can exploit the parallelism in multiqueue devices and
 multicore systems.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ng_etf.4
--- a/head/share/man/man4/ng_etf.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ng_etf.4	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ng_etf.4 231564 2012-02-12 18:29:56Z ed $
+.\" $FreeBSD: head/share/man/man4/ng_etf.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd May 16, 2006
 .Dt NG_ETF 4
@@ -135,7 +135,6 @@
 # Filter two random ethertypes to that hook.
 ngctl 'msg etf: setfilter { matchhook="newproto" ethertype=${MATCH1} }
 ngctl 'msg etf: setfilter { matchhook="newproto" ethertype=${MATCH2} }
-DONE
 .Ed
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ng_ksocket.4
--- a/head/share/man/man4/ng_ksocket.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ng_ksocket.4	Wed Jul 25 16:32:50 2012 +0300
@@ -32,9 +32,9 @@
 .\"
 .\" Author: Archie Cobbs <archie at FreeBSD.org>
 .\"
-.\" $FreeBSD: head/share/man/man4/ng_ksocket.4 229930 2012-01-10 12:45:24Z melifaro $
+.\" $FreeBSD: head/share/man/man4/ng_ksocket.4 236596 2012-06-05 03:14:39Z eadler $
 .\"
-.Dd January 09, 2012
+.Dd January 9, 2012
 .Dt NG_KSOCKET 4
 .Os
 .Sh NAME
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ng_nat.4
--- a/head/share/man/man4/ng_nat.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ng_nat.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ng_nat.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/ng_nat.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd March 1, 2008
 .Dt NG_NAT 4
@@ -61,7 +61,7 @@
 a node is ready for aliasing operation.
 .It Dv NGM_NAT_SET_MODE Pq Li setmode
 Set node's operation mode using supplied
-.Vt "struct ng_nat_mode".
+.Vt "struct ng_nat_mode" .
 .Bd -literal
 struct ng_nat_mode {
 	uint32_t	flags;
@@ -193,7 +193,7 @@
 was used (they are effectively replaced by server pool).
 .It Dv NGM_NAT_LIST_REDIRECTS Pq Li listredirects
 Return list of configured static redirects as
-.Vt "struct ng_nat_list_redirects".
+.Vt "struct ng_nat_list_redirects" .
 .Bd -literal
 struct ng_nat_listrdrs_entry {
 	uint32_t	id;		/* Anything except zero */
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ng_netflow.4
--- a/head/share/man/man4/ng_netflow.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ng_netflow.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ng_netflow.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/ng_netflow.4 237227 2012-06-18 13:56:36Z melifaro $
 .\"
-.Dd March 2, 2011
+.Dd June 16, 2012
 .Dt NG_NETFLOW 4
 .Os
 .Sh NAME
@@ -112,7 +112,18 @@
 Sets data link type on the
 .Va iface Ns Ar N
 hook.
-Currently, supported types are raw IP datagrams and Ethernet.
+Currently, supported types are
+.Cm DLT_RAW
+(raw IP datagrams) and
+.Cm DLT_EN10MB
+(Ethernet).
+DLT_ definitions can be found in
+.In net/bpf.h
+header.
+Currently used values are 1 for
+.Cm DLT_EN10MB
+and 12 for
+.Cm DLT_RAW .
 This message type uses
 .Vt "struct ng_netflow_setdlt"
 as an argument:
@@ -180,18 +191,36 @@
 #define NG_NETFLOW_CONF_EGRESS		2
 #define NG_NETFLOW_CONF_ONCE		4
 #define NG_NETFLOW_CONF_THISONCE	8
+#define NG_NETFLOW_CONF_NOSRCLOOKUP	16
+#define NG_NETFLOW_CONF_NODSTLOOKUP	32
 };
 .Ed
 .Pp
 Configuration is a bitmask of several options. Option NG_NETFLOW_CONF_INGRESS
 enabled by default enables ingress NetFlow generation (for data coming from
-ifaceX hook). Option NG_NETFLOW_CONF_EGRESS enables egress NetFlow (for data
-coming from outX hook). Option NG_NETFLOW_CONF_ONCE defines that packet should
-be accounted only once if it several times passes via netflow node. Option
-NG_NETFLOW_CONF_THISONCE defines that packet should be accounted only once
-if it several times passes via exactly this netflow node. Last two options are
-important to avoid duplicate accounting when both ingress and egress NetFlow
-are enabled.
+ifaceX hook).
+Option
+.Va NG_NETFLOW_CONF_EGRESS
+enables egress NetFlow (for data coming from outX hook).
+Option
+.Va NG_NETFLOW_CONF_ONCE
+defines that packet should be accounted only once if it several times passes
+via netflow node.
+Option
+.Va NG_NETFLOW_CONF_THISONCE
+defines that packet should be accounted only once if it several times passes
+via exactly this netflow node.
+These two options are important to avoid duplicate accounting when both ingress
+and egress NetFlow are enabled.
+Option
+.Va NG_NETFLOW_CONF_NOSRCLOOKUP
+skips radix lookup on flow source address used to fill in network mask.
+Option
+.Va NG_NETFLOW_CONF_NODSTLOOKUP
+skips radix lookup on destination (which fills egress interface id, destination
+mask and gateway).
+If one doesn't need data provided by lookups, he/she can disable them, to reduce
+load on routers.
 .It Dv NGM_NETFLOW_SETTEMPLATE
 Sets various timeouts to announce data flow templates
 (NetFlow v9-specific). This message requires
@@ -218,7 +247,7 @@
 };
 .Ed
 .Pp
-Default is 1500 bytes
+Default is 1500 bytes.
 .It Dv NGM_NETFLOW_SHOW
 This control message asks a node to dump the entire contents of the flow cache.
 It is called from
@@ -284,7 +313,7 @@
 The latter sends us a copy of IP packets, which we analyze and free.
 On
 .Va fxp0:
-we do not use tee, but send packets back to ether node.
+we do not use tee, but send packets back to either node.
 .Bd -literal -offset indent
 /usr/sbin/ngctl -f- <<-SEQ
 	# connect ng0's tee to iface0 hook
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ng_patch.4
--- a/head/share/man/man4/ng_patch.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ng_patch.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ng_patch.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/ng_patch.4 235319 2012-05-12 03:46:43Z gjb $
 .\"
 .Dd March 5, 2012
 .Dt NG_PATCH 4
@@ -140,7 +140,7 @@
 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
+Thus you need to raise TTL of every packet entering link by 2
 to ensure the TTL will not reach zero there.
 So you setup
 .Xr ipfw 8
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ng_socket.4
--- a/head/share/man/man4/ng_socket.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ng_socket.4	Wed Jul 25 16:32:50 2012 +0300
@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie at FreeBSD.org>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ng_socket.4 235317 2012-05-12 03:25:46Z gjb $
 .\" $Whistle: ng_socket.8,v 1.5 1999/01/25 23:46:27 archie Exp $
 .\"
 .Dd January 19, 1999
@@ -93,7 +93,8 @@
 and associated with a
 .Nm
 node.
-.Dv NG_DATA sockets do not automatically
+.Dv NG_DATA
+sockets do not automatically
 have nodes associated with them; they are bound to a specific node via the
 .Xr connect 2
 system call.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/pcm.4
--- a/head/share/man/man4/pcm.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/pcm.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/pcm.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/pcm.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd March 22, 2012
 .Dt SOUND 4
@@ -390,7 +390,7 @@
 Continuation of the bandlimited SINC interpolator, with 100dB stopband, 36
 taps and 90% bandwidth as quality values.
 .It 4
-Continuation of the bandlimited SINC inteprolator, with 100dB stopband, 164
+Continuation of the bandlimited SINC interprolator, with 100dB stopband, 164
 taps and 97% bandwidth as quality values.
 .El
 .It Va hw.snd.feeder_rate_round
@@ -519,7 +519,7 @@
 Available options include:
 .Bl -tag -width 2n
 .It s16le:1.0
-Mono
+Mono.
 .It s16le:2.0
 Stereo, 2 channels (left, right).
 .It s16le:2.1
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/pcn.4
--- a/head/share/man/man4/pcn.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/pcn.4	Wed Jul 25 16:32:50 2012 +0300
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/pcn.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd January 31, 2006
 .Dt PCN 4
@@ -104,7 +104,7 @@
 driver supports the following media options:
 .Bl -tag -width full-duplex
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/psm.4
--- a/head/share/man/man4/psm.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/psm.4	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/psm.4 233580 2012-03-27 23:43:01Z jkim $
+.\" $FreeBSD: head/share/man/man4/psm.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd March 27, 2012
 .Dt PSM 4
@@ -725,7 +725,7 @@
 .Pp
 The first line shows the command byte value of the keyboard
 controller just before the auxiliary port is probed.
-It usually is 4D, 45, 47 or 65, depending on how the motherboard BIOS
+It usually is 40, 45, 47 or 65, depending on how the motherboard BIOS
 initialized the keyboard controller upon power-up.
 .Pp
 The second line shows the result of the keyboard controller's
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ral.4
--- a/head/share/man/man4/ral.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ral.4	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,4 @@
-.\" Copyright (c) 2005, 2006
-.\"     Damien Bergamini <damien.bergamini at free.fr>
+.\" Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini at free.fr>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -13,14 +12,14 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ral.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/ral.4 235237 2012-05-10 18:25:59Z bschmidt $
 .\"
-.Dd July 8, 2009
+.Dd May 10, 2012
 .Dt RAL 4
 .Os
 .Sh NAME
 .Nm ral
-.Nd "Ralink Technology IEEE 802.11 wireless network driver"
+.Nd "Ralink Technology IEEE 802.11a/g/n wireless network device"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -42,31 +41,43 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver supports PCI/CardBus wireless adapters based on the Ralink Technology
-RT2500, RT2501, and RT2600 chipsets.
+driver supports PCI/PCIe/CardBus wireless adapters based on the Ralink RT2500,
+RT2501, RT2600, RT2700, RT2800 and RT3090 chipsets.
 .Pp
 The RT2500 chipset is the first generation of 802.11b/g adapters from Ralink.
-It consists of two integrated chips, a RT2560 MAC/BBP and a RT2525 radio
+It consists of two integrated chips, an RT2560 MAC/BBP and an RT2525 radio
 transceiver.
 .Pp
-The RT2501 chipset is the second generation of 802.11b/g adapters from Ralink.
-It consists of two integrated chips, a RT2561 MAC/BBP and a RT2527 radio
+The RT2501 chipset is the second generation of 802.11a/b/g adapters from
+Ralink.
+It consists of two integrated chips, an RT2561 MAC/BBP and an RT2527 radio
 transceiver.
 This chipset provides support for the IEEE 802.11e standard with multiple
 hardware transmission queues and allows scatter/gather for efficient DMA
 operations.
 .Pp
-The RT2600 chipset consists of two integrated chips, a RT2661 MAC/BBP and a
+The RT2600 chipset consists of two integrated chips, an RT2661 MAC/BBP and an
 RT2529 radio transceiver.
 This chipset uses the MIMO (multiple-input multiple-output) technology with
-multiple antennas to extend the operating range of the adapter and to achieve
-higher throughput.
-MIMO is the basis of the forthcoming IEEE 802.11n standard.
+multiple radio transceivers to extend the operating range of the adapter and
+to achieve higher throughput.
+However, the RT2600 chipset does not support any of the 802.11n features.
 .Pp
-The transmit speed is user-selectable or can be adapted automatically by the
-driver depending on the received signal strength and on the number of hardware
-transmission retries.
+The RT2700 chipset is a low-cost version of the RT2800 chipset.
+It supports a single transmit path and two receiver paths (1T2R).
+It consists of two integrated chips, an RT2760 or RT2790 (PCIe) MAC/BBP and
+an RT2720 (2.4GHz) or RT2750 (2.4GHz/5GHz) radio transceiver.
 .Pp
+The RT2800 chipset is the first generation of 802.11n adapters from Ralink.
+It consists of two integrated chips, an RT2860 or RT2890 (PCIe) MAC/BBP and
+an RT2820 (2.4GHz) or RT2850 (2.4GHz/5GHz) radio transceiver.
+The RT2800 chipset supports two transmit paths and up to three receiver
+paths (2T2R/2T3R).
+It can achieve speeds up to 144Mbps (20MHz bandwidth) and 300Mbps (40MHz
+bandwidth.)
+.Pp
+The RT3090 chipset is the first generation of single-chip 802.11n adapters
+from Ralink.
 .Nm
 supports
 .Cm station ,
@@ -92,13 +103,16 @@
 interfaces may be operated together with a
 .Cm hostap
 interface to construct a wireless repeater device.
+.Pp
+The transmit speed is user-selectable or can be adapted automatically by the
+driver depending on the number of hardware transmission retries.
 For more information on configuring this device, see
 .Xr ifconfig 8 .
 .Sh HARDWARE
 The
 .Nm
-driver supports PCI/CardBus wireless adapters based on the Ralink Technology
-RT2500, RT2501, and RT2600 chipsets, including:
+driver supports PCI/PCIe/CardBus wireless adapters based on Ralink Technology
+chipsets, including:
 .Pp
 .Bl -column -compact ".Li Atlantis Land A02-PCM-W54" "RT2561S" "CardBus"
 .It Em Card Ta Em MAC/BBP Ta Em Bus
@@ -188,9 +202,6 @@
 .It "Zonet ZEW1500" Ta RT2560 Ta CardBus
 .It "Zonet ZEW1600" Ta RT2560 Ta PCI
 .El
-.Pp
-An up to date list can be found at
-.Pa http://damien.bergamini.free.fr/ral/list.html .
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
@@ -238,7 +249,7 @@
 .Xr wlan_xauth 4 ,
 .Xr hostapd 8 ,
 .Xr ifconfig 8 ,
-.Xr wpa_supplicant 8 .
+.Xr wpa_supplicant 8
 .Rs
 .%T "Ralink Technology"
 .%U http://www.ralinktech.com/
@@ -248,12 +259,37 @@
 .Nm
 driver first appeared in
 .Ox 3.7 .
+Support for the RT2501 and RT2600 chipsets was added in
+.Ox 3.9 .
+Support for the RT2800 chipset was added in
+.Ox 4.3 .
+Support for the RT2700 chipset was added in
+.Ox 4.4 .
+Support for the RT3090 chipset was added in
+.Ox 4.9 .
 .Sh AUTHORS
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien at FreeBSD.org .
-.Sh BUGS
-Host AP mode doesn't support client power save.
-Clients using power save mode will experience
+.An Damien Bergamini Aq damien at openbsd.org .
+.Sh CAVEATS
+The
+.Nm
+driver does not make use of the hardware cryptographic engine.
+.Pp
+The
+.Nm
+driver does not support any of the 802.11n capabilities offered by
+the RT2700 and RT2800 chipsets.
+Additional work is required in before those features can be supported.
+.Pp
+Host AP mode doesn't support power saving.
+Clients attempting to use power saving mode may experience significant
 packet loss (disabling power saving on the client will fix this).
+.Pp
+Some PCI
+.Nm
+adapters seem to strictly require a system supporting PCI 2.2 or greater and
+will likely not work in systems based on older revisions of the PCI
+specification.
+Check the board's PCI version before purchasing the card.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/rl.4
--- a/head/share/man/man4/rl.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/rl.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/rl.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd August 22, 2010
 .Dt RL 4
@@ -119,7 +119,7 @@
 driver supports the following media options:
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/run.4
--- a/head/share/man/man4/run.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/run.4	Wed Jul 25 16:32:50 2012 +0300
@@ -14,9 +14,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: head/share/man/man4/run.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/run.4 238274 2012-07-09 06:34:15Z hrs $
 .\"
-.Dd January 12, 2011
+.Dd July 9, 2012
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -112,7 +112,7 @@
 .Bl -tag -width Ds -offset indent -compact
 .It Airlink101 AWLL6090
 .It ASUS USB-N11
-.It ASUS USB-N13
+.It ASUS USB-N13 ver. A1
 .It ASUS WL-160N
 .It Belkin F5D8051 ver 3000
 .It Belkin F5D8053
@@ -122,6 +122,8 @@
 .It Buffalo WLI-UC-G300N
 .It Buffalo WLI-UC-G301N
 .It Buffalo WLI-UC-GN
+.It Buffalo WLI-UC-GNM
+.It Buffalo WLI-UC-GNM2
 .It Corega CG-WLUSB2GNL
 .It Corega CG-WLUSB2GNR
 .It Corega CG-WLUSB300AGN
@@ -142,6 +144,7 @@
 .It Hercules HWNU-300
 .It Linksys WUSB54GC v3
 .It Linksys WUSB600N
+.It Logitec LAN-W150N/U2
 .It Mvix Nubbin MS-811N
 .It Planex GW-USMicroN
 .It Planex GW-US300MiniS
@@ -208,7 +211,7 @@
 .Xr wlan_xauth 4 ,
 .Xr ifconfig 8 ,
 .Xr hostapd 8 ,
-.Xr wpa_supplicant 8 .
+.Xr wpa_supplicant 8
 .Pp
 Ralink Technology:
 .Pa http://www.ralinktech.com/
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/scsi.4
--- a/head/share/man/man4/scsi.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/scsi.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,8 +23,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.Dd March 4, 2010
+.\" $FreeBSD: head/share/man/man4/scsi.4 236712 2012-06-07 10:05:51Z mav $
+.Dd June 7, 2012
 .Dt CAM 4
 .Os
 .Sh NAME
@@ -43,6 +43,7 @@
 .Cd "options CAM_DEBUG_BUS=-1"
 .Cd "options CAM_DEBUG_TARGET=-1"
 .Cd "options CAM_DEBUG_LUN=-1"
+.Cd "options CAM_DEBUG_COMPILE=CAM_DEBUG_INFO|CAM_DEBUG_CDB|CAM_DEBUG_PROBE"
 .Cd "options CAM_DEBUG_FLAGS=CAM_DEBUG_INFO|CAM_DEBUG_CDB"
 .Cd "options CAM_MAX_HIGHPOWER=4"
 .Cd "options SCSI_NO_SENSE_STRINGS"
@@ -72,12 +73,11 @@
 subsystem:
 .Bl -tag -width SCSI_NO_SENSE_STRINGS
 .It Dv CAMDEBUG
-This option enables the
+This option compiles in all the
 .Nm
 debugging printf code.
 This will not actually
 cause any debugging information to be printed out when included by itself.
-Enabling printouts requires additional configuration.
 See below for details.
 .It Dv "CAM_MAX_HIGHPOWER=4"
 This sets the maximum allowable number of concurrent "high power" commands.
@@ -248,54 +248,53 @@
 .Nm
 device entries.
 .Sh DIAGNOSTICS
-When the kernel is compiled with options CAMDEBUG, an XPT_DEBUG CCB can be
-used to enable various amounts of tracing information on any
-specific device.
-Devices not being traced will not produce trace information.
-There are currently four debugging flags that may be turned on:
+An XPT_DEBUG CCB can be used to enable various amounts of tracing information
+on any specific bus/device from the list of options compiled into the kernel.
+There are currently seven debugging flags that may be compiled in and used:
 .Bl -tag -width CAM_DEBUG_SUBTRACE
 .It Dv CAM_DEBUG_INFO
-This debugging flag enables general informational printfs for the device
+This flag enables general informational printfs for the device
 or devices in question.
 .It Dv CAM_DEBUG_TRACE
-This debugging flag enables function-level command flow tracing.
+This flag enables function-level command flow tracing.
 i.e.\&
 kernel printfs will happen at the entrance and exit of various functions.
 .It Dv CAM_DEBUG_SUBTRACE
-This debugging flag enables debugging output internal to various functions.
+This flag enables debugging output internal to various functions.
 .It Dv CAM_DEBUG_CDB
-This debugging flag will cause the kernel to print out all
+This flag will cause the kernel to print out all
+.Tn ATA
+and
 .Tn SCSI
 commands sent to a particular device or devices.
+.It Dv CAM_DEBUG_XPT
+This flag will enable command scheduler tracing.
+.It Dv CAM_DEBUG_PERIPH
+This flag will enable peripheral drivers messages.
+.It Dv CAM_DEBUG_PROBE
+This flag will enable devices probe process tracing.
 .El
 .Pp
 Some of these flags, most notably
 .Dv CAM_DEBUG_TRACE
 and
-.Dv CAM_DEBUG_SUBTRACE
-will produce kernel printfs in EXTREME numbers,
-and because of that, they are not especially useful.
-There are not many things logged at the
-.Dv CAM_DEBUG_INFO
-level, so it is not especially useful.
-The most useful debugging flag is the
-.Dv CAM_DEBUG_CDB
-flag.
+.Dv CAM_DEBUG_SUBTRACE ,
+will produce kernel printfs in EXTREME numbers.
+.Pp
 Users can enable debugging from their kernel config file, by using
 the following kernel config options:
-.Bl -tag -width CAM_DEBUG_TARGET
+.Bl -tag -width CAM_DEBUG_COMPILE
 .It Dv CAMDEBUG
-This enables
+This builds into the kernel all possible
 .Nm
 debugging.
-Without this option, users will not even be able
-to turn on debugging from userland via
-.Xr camcontrol 8 .
-.It Dv CAM_DEBUG_FLAGS
-This allows the user to set the various debugging flags described above
-in a kernel config file.
+.It Dv CAM_DEBUG_COMPILE
+This allows to specify support for which debugging flags described above
+should be built into the kernel.
 Flags may be ORed together if the user wishes to
 see printfs for multiple debugging levels.
+.It Dv CAM_DEBUG_FLAGS
+This allows to set the various debugging flags from a kernel config file.
 .It Dv CAM_DEBUG_BUS
 Specify a bus to debug.
 To debug all busses, set this to -1.
@@ -307,17 +306,9 @@
 To debug all luns, set this to -1.
 .El
 .Pp
-When specifying a bus, target or lun to debug, you
-.Em MUST
-specify all three bus/target/lun options above.
-Using wildcards, you
-should be able to enable debugging on most anything.
-.Pp
-Users may also enable debugging printfs on the fly, if the
-.Dv CAMDEBUG
-option is their config file, by using the
+Users may also enable debugging on the fly by using the
 .Xr camcontrol 8
-utility.
+utility, if wanted options built into the kernel.
 See
 .Xr camcontrol 8
 for details.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/send.4
--- a/head/share/man/man4/send.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/send.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/send.4 235450 2012-05-14 16:25:17Z joel $
 .\"
 .Dd September 19, 2010
 .Dt SEND 4
@@ -38,10 +38,7 @@
 .Ft int
 .Fn socket PF_INET6 SOCK_RAW IPPROTO_SEND
 .Pp
-To enable
-.Ns Nm
-support, load the kernel side SeND as a module.
-To load it at boot time, add the following line to
+To load the driver as a module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 send_load="YES"
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ses.4
--- a/head/share/man/man4/ses.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ses.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ses.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd January 29, 2000
 .Dt SES 4
@@ -101,7 +101,7 @@
 Get the associated help text for an object (not yet implemented).
 .Nm
 devices often have descriptive text for an object which can tell
-you things like location (e.g, "left power supply").
+you things like location (e.g., "left power supply").
 .It Dv SESIOC_INIT
 Initialize the enclosure.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/siftr.4
--- a/head/share/man/man4/siftr.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/siftr.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/siftr.4 233197 2012-03-19 19:27:43Z maxim $
+.\" $FreeBSD: head/share/man/man4/siftr.4 235567 2012-05-17 20:49:44Z gjb $
 .\"
 .Dd November 12, 2010
 .Dt SIFTR 4
@@ -38,14 +38,14 @@
 .Nd Statistical Information For TCP Research
 .Sh SYNOPSIS
 To load
-.Ns Nm
+the driver
 as a module at run-time, run the following command as root:
 .Bd -literal -offset indent
 kldload siftr
 .Ed
 .Pp
 Alternatively, to load
-.Ns Nm
+the driver
 as a module at boot time, add the following line into the
 .Xr loader.conf 5
 file:
@@ -53,13 +53,16 @@
 siftr_load="YES"
 .Ed
 .Sh DESCRIPTION
+The
 .Nm
-.Ns ( Em S Ns tatistical
+.Po
+.Em S Ns tatistical
 .Em I Ns nformation
 .Em F Ns or
 .Em T Ns CP
-.Em R Ns esearch )
-is a kernel module that logs a range of statistics on active TCP connections to
+.Em R Ns esearch
+.Pc
+kernel module logs a range of statistics on active TCP connections to
 a log file.
 It provides the ability to make highly granular measurements of TCP connection
 state, aimed at system administrators, developers and researchers.
@@ -91,7 +94,7 @@
 .Xr sysctl 8
 interface to export its configuration variables to user-space.
 The following variables are available:
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va net.inet.siftr.enabled
 controls whether the module performs its
 measurements or not.
@@ -104,7 +107,7 @@
 .Va net.inet.siftr.enabled
 is set to 1.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va net.inet.siftr.ppl
 controls how many inbound/outbound packets for a given TCP connection will cause
 a log message to be generated for the connection.
@@ -113,13 +116,13 @@
 The value can be set to any integer in the range [1,2^32], and can be changed at
 any time, even while the module is enabled.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va net.inet.siftr.logfile
 controls the path to the file that the module writes its log messages to.
 By default, the file /var/log/siftr.log is used.
 The path can be changed at any time, even while the module is enabled.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va net.inet.siftr.genhashes
 controls whether a hash is generated for each TCP packet seen by
 .Nm .
@@ -137,7 +140,7 @@
 Note: The
 .Qq \e
 present in the example log messages in this section indicates a
-line continuation and is not part of the actual log message
+line continuation and is not part of the actual log message.
 .Pp
 The first type of log message is written to the file when the module is
 enabled and starts collecting data from the running kernel. The text below
@@ -150,36 +153,36 @@
 .Ed
 .Pp
 Field descriptions are as follows:
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va enable_time_secs
 time at which the module was enabled, in seconds since the UNIX epoch.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va enable_time_usecs
 time at which the module was enabled, in microseconds since enable_time_secs.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va siftrver
 version of
 .Nm .
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va hz
 tick rate of the kernel in ticks per second.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va tcp_rtt_scale
-smoothed RTT estimate scaling factor
+smoothed RTT estimate scaling factor.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va sysname
-operating system name
+operating system name.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va sysver
-operating system version
+operating system version.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va ipmode
 IP mode as defined at compile time.
 An ipmode of "4" means IPv6 is not supported and IP addresses are logged in
@@ -202,7 +205,7 @@
 .Ed
 .Pp
 Field descriptions are as follows:
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 1
 Direction of packet that triggered the log message.
 Either
@@ -211,77 +214,77 @@
 .Qq o
 for out.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 2
 Hash of the packet that triggered the log message.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 3
 Time at which the packet that triggered the log message was processed by
 the
 .Xr pfil 9
 hook function, in seconds and microseconds since the UNIX epoch.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 4
 The IPv4 or IPv6 address of the local host, in dotted quad (IPv4 packet)
 or colon-separated hex (IPv6 packet) notation.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 5
 The TCP port that the local host is communicating via.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 6
 The IPv4 or IPv6 address of the foreign host, in dotted quad (IPv4 packet)
 or colon-separated hex (IPv6 packet) notation.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 7
 The TCP port that the foreign host is communicating via.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 8
 The slow start threshold for the flow, in bytes.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 9
 The current congestion window for the flow, in bytes.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 10
 The current bandwidth-controlled window for the flow, in bytes.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 11
 The current sending window for the flow, in bytes.
 The post scaled value is reported, except during the initial handshake (first
 few packets), during which time the unscaled value is reported.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 12
 The current receive window for the flow, in bytes.
 The post scaled value is always reported.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 13
 The current window scaling factor for the sending window.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 14
 The current window scaling factor for the receiving window.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 15
 The current state of the TCP finite state machine, as defined
 in
 .Aq Pa netinet/tcp_fsm.h .
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 16
 The maximum segment size for the flow, in bytes.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 17
 The current smoothed RTT estimate for the flow, in units of TCP_RTT_SCALE * HZ,
 where TCP_RTT_SCALE is a define found in tcp_var.h, and HZ is the kernel's tick
@@ -289,46 +292,46 @@
 Divide by TCP_RTT_SCALE * HZ to get the RTT in secs. TCP_RTT_SCALE and HZ are
 reported in the enable log message.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 18
 SACK enabled indicator. 1 if SACK enabled, 0 otherwise.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 19
 The current state of the TCP flags for the flow.
 See
 .Aq Pa netinet/tcp_var.h
 for information about the various flags.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 20
 The current retransmission timeout length for the flow, in units of HZ, where HZ
 is the kernel's tick timer.
 Divide by HZ to get the timeout length in seconds. HZ is reported in the
 enable log message.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 21
 The current size of the socket send buffer in bytes.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 22
 The current number of bytes in the socket send buffer.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 23
 The current size of the socket receive buffer in bytes.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 24
 The current number of bytes in the socket receive buffer.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 25
 The current number of unacknowledged bytes in-flight.
 Bytes acknowledged via SACK are not excluded from this count.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va 26
 The current number of segments in the reassembly queue.
 .El
@@ -350,82 +353,82 @@
 .Ed
 .Pp
 Field descriptions are as follows:
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va disable_time_secs
 Time at which the module was disabled, in seconds since the UNIX epoch.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va disable_time_usecs
 Time at which the module was disabled, in microseconds since disable_time_secs.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_inbound_tcp_pkts
 Number of TCP packets that traversed up the network stack.
 This only includes inbound TCP packets during the periods when
 .Nm
 was enabled.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_outbound_tcp_pkts
 Number of TCP packets that traversed down the network stack.
 This only includes outbound TCP packets during the periods when
 .Nm
 was enabled.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va total_tcp_pkts
 The summation of num_inbound_tcp_pkts and num_outbound_tcp_pkts.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_inbound_skipped_pkts_malloc
 Number of inbound packets that were not processed because of failed malloc() calls.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_outbound_skipped_pkts_malloc
 Number of outbound packets that were not processed because of failed malloc() calls.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_inbound_skipped_pkts_mtx
 Number of inbound packets that were not processed because of failure to add the
 packet to the packet processing queue.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_outbound_skipped_pkts_mtx
 Number of outbound packets that were not processed because of failure to add the
 packet to the packet processing queue.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_inbound_skipped_pkts_tcb
 Number of inbound packets that were not processed because of failure to find the
 TCP control block associated with the packet.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_outbound_skipped_pkts_tcb
 Number of outbound packets that were not processed because of failure to find
 the TCP control block associated with the packet.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_inbound_skipped_pkts_icb
 Number of inbound packets that were not processed because of failure to find the
 IP control block associated with the packet.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va num_outbound_skipped_pkts_icb
 Number of outbound packets that were not processed because of failure to find
 the IP control block associated with the packet.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va total_skipped_tcp_pkts
 The summation of all skipped packet counters.
 .El
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Va
 .It Va flow_list
 A CSV list of TCP flows that triggered data log messages to be generated since
 the module was loaded.
 Each flow entry in the CSV list is
 formatted as
 .Qq local_ip;local_port-foreign_ip;foreign_port .
-If there are no entries in the list (i.e. no data log messages were generated),
+If there are no entries in the list (i.e., no data log messages were generated),
 the value will be blank.
 If there is at least one entry in the list, a trailing comma will always be
 present.
@@ -498,10 +501,10 @@
 flow.
 With the PPL set to 1, we are in effect sampling each TCP flow's control block
 state as frequently as flow packets enter/leave the system.
-For example, setting PPL to 2 halves the sampling rate i.e. every second flow
+For example, setting PPL to 2 halves the sampling rate i.e., every second flow
 packet (inbound OR outbound) causes a dump of the control block state.
 .Pp
-The distinction between interrogating individual packets vs interrogating the
+The distinction between interrogating individual packets versus interrogating the
 control block is important, because
 .Nm
 does not remove the need for packet capturing tools like
@@ -543,7 +546,7 @@
 This does introduce some additional bounded delay into the kernel's packet
 processing code path.
 .Pp
-In some cases (e.g. low memory, connection termination), TCP packets that enter
+In some cases (e.g., low memory, connection termination), TCP packets that enter
 the
 .Nm
 .Xr pfil 9
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/siis.4
--- a/head/share/man/man4/siis.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/siis.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/siis.4 220449 2011-04-08 12:46:47Z mav $
+.\" $FreeBSD: head/share/man/man4/siis.4 236443 2012-06-02 11:03:14Z joel $
 .\"
 .Dd April 8, 2011
 .Dt SIIS 4
@@ -57,12 +57,13 @@
 allowing some power to be saved at the cost of additional command
 latency.
 Possible values:
-.Bl -tag -compact
+.Bl -tag -width 2n -offset indent
 .It 0
 interface Power Management is disabled (default);
 .It 1
 device is allowed to initiate PM state change, host is passive.
 .El
+.Pp
 Note that interface Power Management is not compatible with
 device presence detection.
 A manual bus reset is needed on device hot-plug.
@@ -107,6 +108,7 @@
 The
 .Nm
 driver supports the following controller chips:
+.Pp
 .Bl -bullet -compact
 .It
 SiI3124 (PCI-X 133MHz/64bit, 4 ports)
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/simplebus.4
--- a/head/share/man/man4/simplebus.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/simplebus.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/simplebus.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 12, 2010
 .Dt SIMPLEBUS 4
@@ -60,11 +60,12 @@
 Note the
 .Nm
 does not manage device resources and passes through any requests to the
-.Xr fdtbus 4 layer.
+.Xr fdtbus 4
+layer.
 .Sh SEE ALSO
 .Xr fdt 4 ,
 .Xr fdtbus 4 ,
-.Xr openfirm 4 ,
+.Xr openfirm 4
 .Sh STANDARDS
 Power.org Standard for Embedded Power Architecture Platform Requirements
 .Pq Vt ePAPR .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/sis.4
--- a/head/share/man/man4/sis.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/sis.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/sis.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd September 2, 2010
 .Dt SIS 4
@@ -113,7 +113,7 @@
 driver supports the following media options:
 .Bl -tag -width full-duplex
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/sk.4
--- a/head/share/man/man4/sk.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/sk.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/sk.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd November 23, 2010
 .Dt SK 4
@@ -127,7 +127,7 @@
 driver supports the following media options:
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/snd_hda.4
--- a/head/share/man/man4/snd_hda.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/snd_hda.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/snd_hda.4 233422 2012-03-24 13:37:57Z joel $
+.\" $FreeBSD: head/share/man/man4/snd_hda.4 236443 2012-06-02 11:03:14Z joel $
 .\"
 .Dd January 25, 2012
 .Dt SND_HDA 4
@@ -184,7 +184,7 @@
 pairs.
 .It Va hint.pcm.%d.rec.autosrc
 Controls automatic recording source feature:
-.Bl -tag -compact
+.Bl -tag -width 2n -compact
 .It 0
 disabled,
 .It 1
@@ -235,10 +235,10 @@
 .Pp
 The sequence numbers 14 and 15 has a special meaning for input associations.
 Their presence in association defines it as multiplexed or mixed respectively.
-If none of them present and there are more then one pin in association,
+If none of them are present and there are more than one pin in association,
 the association will provide multichannel input.
 .Pp
-For multichannel input/output assotiations sequence numbers encode
+For multichannel input/output associations sequence numbers encode
 channel pairs positions:
 0 - Front, 1 - Center/LFE, 2 - Back, 3 - Front Wide Center, 4 - Side.
 Standard combinations are: (0) - Stereo; (0, 2), (0, 4) - Quadro;
@@ -368,7 +368,7 @@
 .It Va dev.hdaa.%d.reconfig
 Setting this to a non-zero value makes driver to destroy existing pcm devices
 and process new pins configuration set via
-.Va dev.hdaa.%d.nid%d_config.
+.Va dev.hdaa.%d.nid%d_config .
 .It Va dev.pcm.%d.play.32bit , dev.pcm.%d.rec.32bit
 HDA controller uses 32bit representation for all samples of more then 16 bits.
 These variables allow to specify how many bits of these 32 should be
@@ -586,7 +586,7 @@
 .Pp
 The
 .Nm
-driver supports more then two hundred different controllers and CODECs.
+driver supports more than two hundred different controllers and CODECs.
 There is no sense to list all of them here, as in most cases specific CODEC
 configuration and wiring are more important then type of the CODEC itself.
 .Sh SEE ALSO
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/snd_hdspe.4
--- a/head/share/man/man4/snd_hdspe.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/snd_hdspe.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,14 +22,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/snd_hdspe.4 232337 2012-03-01 13:10:18Z mav $
+.\" $FreeBSD: head/share/man/man4/snd_hdspe.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd February 13, 2012
 .Dt SND_HDSPE 4
 .Os
 .Sh NAME
 .Nm snd_hdspe
-.Nd "RME HDSPe brigde device driver"
+.Nd "RME HDSPe bridge device driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel, place the following lines in your
 kernel configuration file:
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/splash.4
--- a/head/share/man/man4/splash.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/splash.4	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/splash.4 228445 2011-12-12 21:12:07Z eadler $
+.\" $FreeBSD: head/share/man/man4/splash.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd November 29, 2010
 .Dt SPLASH 4
@@ -234,8 +234,7 @@
 .Pp
 To load a binary ASCII drawing and display this while booting, include the
 following into your
-.Pa /boot/loader.conf
-:
+.Pa /boot/loader.conf :
 .Bd -literal -offset indent
 splash_txt_load="YES"
 bitmap_load="YES"
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ste.4
--- a/head/share/man/man4/ste.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ste.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ste.4 235319 2012-05-12 03:46:43Z gjb $
 .\"
 .Dd December 24, 2009
 .Dt STE 4
@@ -103,7 +103,7 @@
 driver supports the following media options:
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
@@ -136,7 +136,7 @@
 The valid range is 0 to 209712 in units of 1us, the default is
 150 (150us).
 The value 0 effectively disables the RX interrupt moderation.
-The resolution of of timer is about 3.2us so finer tuning than
+The resolution of timer is about 3.2us so finer tuning than
 3.2us wouldn't be available.
 The interface does not need to be brought down and up again before
 a change takes effect.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/termios.4
--- a/head/share/man/man4/termios.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/termios.4	Wed Jul 25 16:32:50 2012 +0300
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)termios.4	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/termios.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd December 26, 2009
 .Dt TERMIOS 4
@@ -197,7 +197,8 @@
 process is orphaned, the
 .Xr read 2
 returns -1 with
-.Va errno set to
+.Va errno
+set to
 .Er EIO
 and no
 signal is sent.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ti.4
--- a/head/share/man/man4/ti.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ti.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ti.4 227514 2011-11-14 22:16:12Z yongari $
+.\" $FreeBSD: head/share/man/man4/ti.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd November 14, 2011
 .Dt TI 4
@@ -144,7 +144,7 @@
 modes.
 .It 1000baseSX
 Set 1000Mbps (Gigabit Ethernet) operation.
-Only full
+Only
 .Ar full-duplex
 mode is supported at this speed.
 .El
@@ -154,7 +154,7 @@
 driver supports the following media options:
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation
+Force full-duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
@@ -240,14 +240,14 @@
 A value of 0 means that this parameter is ignored and receive BDs
 will only be returned when the receive max coalesced BDs value is
 reached.
-The default valus is 170.
+The default value is 170.
 .It Va dev.ti.%d.rx_max_coal_bds
 This value, receive max coalesced BDs, controls the number of
 receive buffer descriptors that will be coalesced before the NIC
 updates the receive return ring producer index.
 If this value is set to 0 it will disable receive buffer descriptor
 coalescing.
-The default valus is 64.
+The default value is 64.
 .It Va dev.ti.%d.ti_tx_coal_ticks
 This value, send coalesced ticks, controls the number of clock
 ticks (of 1 microseconds each) that must elapse before the NIC DMAs
@@ -263,9 +263,9 @@
 This value, send max coalesced BDs, controls the number of send
 buffer descriptors that will be coalesced before the NIC updates
 the send consumer index.
-If this valus is set to 0 it will disable send buffer descriptor
+If this value is set to 0 it will disable send buffer descriptor
 coalescing.
-The default valus is 32.
+The default value is 32.
 .It Va dev.ti.%d.tx_buf_ratio
 This value controls the ratio of the remaining memory in the NIC
 that should be devoted to transmit buffer vs. receive buffer.
@@ -348,7 +348,7 @@
 The argument is
 .Vt "struct tg_mem" .
 .It Dv ALT_READ_TG_REG
-Read the requested register on the Tigon board.
+Read the requested register from the Tigon board.
 The argument is
 .Vt "struct tg_reg" .
 .It Dv ALT_WRITE_TG_REG
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/tl.4
--- a/head/share/man/man4/tl.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/tl.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/tl.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 16, 2005
 .Dt TL 4
@@ -82,9 +82,9 @@
 Also, the PHY will not advertise those modes that have been explicitly
 disabled using the following media options.
 .It 10baseT/UTP
-Set 10Mbps operation
+Set 10Mbps operation.
 .It 100baseTX
-Set 100Mbps (Fast Ethernet) operation
+Set 100Mbps (Fast Ethernet) operation.
 .It 10base5/AUI
 Enable AUI/BNC interface (useful only with the built-in PHY).
 .El
@@ -94,7 +94,7 @@
 driver supports the following media options:
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .It hw-loopback
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/tws.4
--- a/head/share/man/man4/tws.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/tws.4	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\"SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/tws.4 226026 2011-10-04 21:40:25Z delphij $
+.\" $FreeBSD: head/share/man/man4/tws.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd October 4, 2011
 .Dt TWS 4
@@ -74,13 +74,13 @@
 .Xr loader.conf 5 .
 .Bl -tag -width "hw.tws.use_32bit_sgls"
 .It Va hw.tws.cam_depth
-The maximium queued CAM SIM requests for one controller.
+The maximum queued CAM SIM requests for one controller.
 The default value is 256.
 .It Va hw.tws.enable_msi
 This tunable enables MSI support on the controller if set to a non-zero value.
 The default value is 0.
 .It Va hw.tws.queue_depth
-The maximium queued requests for one controller.
+The maximum queued requests for one controller.
 .It Va hw.tws.use_32bit_sgls
 Limit the driver to use only 32-bit SG elements regardless whether the operating
 system is running in 64-bit mode.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ugen.4
--- a/head/share/man/man4/ugen.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ugen.4	Wed Jul 25 16:32:50 2012 +0300
@@ -27,28 +27,19 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ugen.4 238705 2012-07-22 21:43:46Z wblock $
 .\"
-.Dd November 22, 2006
+.Dd July 22, 2012
 .Dt UGEN 4
 .Os
 .Sh NAME
 .Nm ugen
 .Nd USB generic device support
 .Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following line in your
-kernel configuration file:
-.Bd -ragged -offset indent
-.Cd "device ugen"
-.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
-ugen_load="YES"
-.Ed
+.Nm
+is integrated into the
+.Xr usb 4
+kernel module.
 .Sh DESCRIPTION
 The
 .Nm
@@ -65,22 +56,22 @@
 Each of the endpoints will have a different
 device node.
 The four least significant bits in the minor device
-number determines which endpoint the device accesses and the rest
-of the bits determines which USB device.
+number determine which endpoint the device accesses, and the rest
+of the bits determine which USB device.
 .Pp
-If an endpoint address is used both for input and output the device
+If an endpoint address is used both for input and output, the device
 can be opened for both read or write.
 .Pp
-To find out what endpoints that exist there are a series of
+To find out which endpoints exist, there are a series of
 .Xr ioctl 2
-operation on the control endpoint that returns the USB descriptors
+operations on the control endpoint that return the USB descriptors
 of the device, configurations, interfaces, and endpoints.
 .Pp
 The control transfer mode can only happen on the control endpoint
 which is always endpoint 0.
-The control endpoint accepts request
-and may respond with an answer to such request.
-Control request
+The control endpoint accepts a request
+and may respond with an answer to such a request.
+Control requests
 are issued by
 .Xr ioctl 2
 calls.
@@ -129,8 +120,8 @@
 which is shorter than the request specified is reported as an
 error.
 .It Dv USB_SET_TIMEOUT Pq Vt int
-Set the timeout on the device operations, the time is specified
-in milliseconds.
+Set the timeout on the device operations
+The time is specified in milliseconds.
 The value 0 is used to indicate that there is
 no timeout.
 .El
@@ -176,7 +167,7 @@
 Return the device descriptor.
 .It Dv USB_GET_CONFIG_DESC Pq Vt "struct usb_config_desc"
 Return the descriptor for the configuration with the given index.
-For convenience the current configuration can be specified by
+For convenience, the current configuration can be specified by
 .Dv USB_CURRENT_CONFIG_INDEX .
 .Bd -literal
 struct usb_config_desc {
@@ -187,7 +178,7 @@
 .It Dv USB_GET_INTERFACE_DESC Pq Vt "struct usb_interface_desc"
 Return the interface descriptor for an interface specified by its
 configuration index, interface index, and alternative index.
-For convenience the current alternative can be specified by
+For convenience, the current alternative can be specified by
 .Dv USB_CURRENT_ALT_INDEX .
 .Bd -literal
 struct usb_interface_desc {
@@ -251,7 +242,7 @@
 The
 .Va ucr_flags
 field can be used to flag that the request is allowed to
-be shorter than the requested size, and the
+be shorter than the requested size, and
 .Va ucr_actlen
 will contain the actual size on completion.
 .Bd -literal
@@ -270,18 +261,17 @@
 address) are not allowed.
 .It Dv USB_GET_DEVICEINFO Pq Vt "struct usb_device_info"
 Get an information summary for the device.
-This call will not
-issue any USB transactions.
+This call will not issue any USB transactions.
 .El
 .Pp
-Note that there are two different ways of addressing configurations, interfaces,
-alternatives, and endpoints: by index or by number.
+Note that there are two different ways of addressing configurations,
+interfaces, alternatives, and endpoints: by index or by number.
 The index is the ordinal number (starting from 0) of the descriptor
 as presented by the device.
 The number is the respective number of
 the entity as found in its descriptor.
 Enumeration of descriptors
-use the index, getting and setting typically uses numbers.
+uses the index, getting and setting typically uses numbers.
 .Pp
 Example:
 all endpoints (except the control endpoint) for the current configuration
@@ -289,13 +279,13 @@
 .Va interface_index
 from 0 to
 .Va config_desc->bNumInterface Ns \-1
-and for each of these iterating the
+and for each of these, iterating the
 .Va endpoint_index
 from 0 to
 .Va interface_desc->bNumEndpoints .
 The
 .Va config_index
-should set to
+should be set to
 .Dv USB_CURRENT_CONFIG_INDEX
 and
 .Va alt_index
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/uhso.4
--- a/head/share/man/man4/uhso.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/uhso.4	Wed Jul 25 16:32:50 2012 +0300
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/uhso.4 225037 2011-08-20 14:21:32Z hselasky $
+.\" $FreeBSD: head/share/man/man4/uhso.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 20, 2010
 .Dt UHSO 4
@@ -100,7 +100,7 @@
 This behavior can be disabled by setting
 .Va hw.usb.uhso.auto_switch
 to 0 using
-.Xr sysctl 8
+.Xr sysctl 8 .
 .Sh FILES
 .Bl -tag -width "XXXXXX"
 .It Pa /dev/cuaU?.?
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/ulpt.4
--- a/head/share/man/man4/ulpt.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/ulpt.4	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/ulpt.4 233672 2012-03-29 17:04:04Z joel $
+.\" $FreeBSD: head/share/man/man4/ulpt.4 235326 2012-05-12 07:01:21Z joel $
 .\"
 .Dd November 22, 2006
 .Dt ULPT 4
@@ -56,8 +56,8 @@
 bi- or uni-directional protocol.
 The bits in the minor number select various features of the driver.
 .Bl -column "Minor Bit" "Functionxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -offset indent
-.Em "Minor Bit	Function"
-64	"Do not initialize (reset) the device on the port."
+.It Em "Minor Bit" Ta Em "Function"
+.It "64" Ta "Do not initialize (reset) the device on the port."
 .El
 .Pp
 Some printers cannot handle the reset on open; in case of problems try the
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/umcs.4
--- a/head/share/man/man4/umcs.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/umcs.4	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/umcs.4 233466 2012-03-25 16:00:56Z joel $
+.\" $FreeBSD: head/share/man/man4/umcs.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd February 25, 2012
 .Dt UMCS 4
@@ -68,7 +68,7 @@
 Different ports on device are presented as sub-units, like
 .Pa /dev/ttyU0.1
 and
-.Pa /dev/ttyU0.2
+.Pa /dev/ttyU0.2 .
 .Sh HARDWARE
 The
 .Nm
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/usb.4
--- a/head/share/man/man4/usb.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/usb.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/usb.4 232258 2012-02-28 15:47:39Z kevlo $
+.\" $FreeBSD: head/share/man/man4/usb.4 236443 2012-06-02 11:03:14Z joel $
 .\"
 .Dd May 20, 2009
 .Dt USB 4
@@ -58,7 +58,7 @@
 The
 .Nm
 driver has three layers:
-.Bl -tag
+.Bl -tag -width 6n -offset indent
 .It USB Controller (Bus)
 .It USB Device
 .It USB Driver
@@ -85,7 +85,7 @@
 .Tn USB
 is a system where external devices can be connected to a PC.
 The most common USB speeds are:
-.Bl -tag
+.Bl -tag -width 6n -offset indent
 .It Low Speed (1.5MBit/sec)
 .It Full Speed (12MBit/sec)
 .It High Speed (480MBit/sec)
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/uslcom.4
--- a/head/share/man/man4/uslcom.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/uslcom.4	Wed Jul 25 16:32:50 2012 +0300
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: head/share/man/man4/uslcom.4 227750 2011-11-20 12:18:21Z miwi $
+.\" $FreeBSD: head/share/man/man4/uslcom.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd November 20, 2011
 .Dt USLCOM 4
@@ -41,7 +41,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver supports Silicon Laboratories CP2101/CP2102 based serial adapters.
+driver supports Silicon Laboratories CP2101/CP2102 based USB serial adapters.
 .Sh HARDWARE
 The following devices should work with the
 .Nm
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/vge.4
--- a/head/share/man/man4/vge.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/vge.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/vge.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/vge.4 235319 2012-05-12 03:46:43Z gjb $
 .\"
 .Dd May 29, 2011
 .Dt VGE 4
@@ -177,7 +177,7 @@
 Maximum number of time to delay interrupts.
 The valid range is 0 to 5100 in units of 1us, the default is
 150 (150us).
-The resolution of of timer is about 20us so finer tuning than
+The resolution of timer is about 20us so finer tuning than
 20us wouldn't be available.
 The interface should be brought down and up again before a change
 takes effect.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/vlan.4
--- a/head/share/man/man4/vlan.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/vlan.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/vlan.4 226745 2011-10-25 19:10:10Z yongari $
+.\" $FreeBSD: head/share/man/man4/vlan.4 236595 2012-06-05 02:18:54Z wblock $
 .\"
-.Dd October 25, 2011
+.Dd June 4, 2012
 .Dt VLAN 4
 .Os
 .Sh NAME
@@ -33,7 +33,7 @@
 .Nd "IEEE 802.1Q VLAN network interface"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
-place the following lines in your
+place the following line in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device vlan"
@@ -79,16 +79,16 @@
 The VLAN tag should match one of those set up in the switched
 network.
 .Pp
-Initially
 .Nm
-assumes the same minimum length for tagged and untagged frames.
-This mode is selected by the
+initially assumes the same minimum length for tagged and untagged frames.
+This mode is selected by setting the
 .Xr sysctl 8
 variable
 .Va net.link.vlan.soft_pad
-set to 0 (default).
-However, there are network devices that fail to adjust frame length,
-should it fall below the allowed minimum due to untagging.
+to 0
+.Pq default .
+However, there are network devices that fail to adjust frame length
+when it falls below the allowed minimum due to untagging.
 Such devices should be able to interoperate with
 .Nm
 after changing the value of
@@ -97,7 +97,7 @@
 In the latter mode,
 .Nm
 will pad short frames before tagging them
-so that their length stays not less than the minimum value
+so that their length is not less than the minimum value
 after untagging by the non-compliant devices.
 .Sh HARDWARE
 The
@@ -111,7 +111,7 @@
 header and FCS).
 The capabilities may be user-controlled by the respective parameters to
 .Xr ifconfig 8 ,
-.Cm vlanhwtag
+.Cm vlanhwtag ,
 and
 .Cm vlanmtu .
 However, a physical interface is not obliged to react to them:
@@ -119,8 +119,8 @@
 a way to turn it off.
 The whole issue is very specific to a particular device and its driver.
 .Pp
-By now, the list of physical interfaces able of full VLAN processing
-in the hardware is limited to the following devices:
+At present, these devices are capable of full VLAN processing
+in hardware:
 .Xr ae 4 ,
 .Xr age 4 ,
 .Xr alc 4 ,
@@ -146,11 +146,10 @@
 and
 .Xr vge 4 .
 .Pp
-The rest of the Ethernet interfaces can run
-VLANs using software emulation in the
+Other Ethernet interfaces can run VLANs using software emulation in the
 .Nm
 driver.
-However, some of them lack the capability
+However, some lack the capability
 of transmitting and receiving long frames.
 Assigning such an interface as the parent to
 .Nm
@@ -163,9 +162,8 @@
 .Xr icmp 4
 filtering that breaks the Path MTU Discovery mechanism.
 .Pp
-The following interfaces support long frames for
-.Nm
-natively:
+These interfaces natively support long frames for
+.Nm :
 .Xr axe 4 ,
 .Xr bfe 4 ,
 .Xr cas 4 ,
@@ -198,7 +196,7 @@
 use and calculates the appropriate frame MTU based on the
 capabilities of the parent interface.
 Some other interfaces not listed above may handle long frames,
-but they do not advertise this ability of theirs.
+but they do not advertise this ability.
 The MTU setting on
 .Nm
 can be corrected manually if used in conjunction with such a parent interface.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/vr.4
--- a/head/share/man/man4/vr.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/vr.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/vr.4 232157 2012-02-25 14:31:25Z gjb $
+.\" $FreeBSD: head/share/man/man4/vr.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd February 25, 2012
 .Dt VR 4
@@ -109,7 +109,7 @@
 driver supports the following media options:
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/watchdog.4
--- a/head/share/man/man4/watchdog.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/watchdog.4	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/watchdog.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd December 21, 2009
 .Dt WATCHDOG 4
@@ -38,6 +38,7 @@
 .Nm
 facility is used for controlling hardware and software watchdogs.
 .Pp
+The device
 .Pa /dev/fido
 responds to a single
 .Xr ioctl 2
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/wb.4
--- a/head/share/man/man4/wb.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/wb.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/wb.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd July 16, 2005
 .Dt WB 4
@@ -108,7 +108,7 @@
 driver supports the following media options:
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/witness.4
--- a/head/share/man/man4/witness.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/witness.4	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/witness.4 236334 2012-05-30 21:02:12Z jhb $
 .\"
-.Dd February 18, 2001
+.Dd May 30, 2012
 .Dt WITNESS 4
 .Os
 .Sh NAME
@@ -52,11 +52,8 @@
 The
 .Nm
 code also checks various other conditions such as verifying that one
-does not recurse on a non-recursive lock.
-For sleep locks,
-.Nm
-verifies that a new process would not be switched to when a lock is released
-or a lock is blocked on during an acquire while any spin locks are held.
+does not recurse on a non-recursive lock,
+or attempt an upgrade on a shared lock held by another thread.
 If any of these checks fail, then the kernel will panic.
 .Pp
 The flag that controls whether or not the kernel debugger is entered when a
@@ -97,7 +94,7 @@
 A value of 1 specifies that witness is enabled.
 A value of 0 specifies that witness is disabled, but that can be enabled
 again.  This will maintain a small amount of overhead in the system.
-A value of -1 specifies that witness is disabled permanently and that
+A value of -1 specifies that witness is disabled permanently and
 cannot be enabled again.
 The sysctl
 .Va debug.witness.watch
@@ -114,10 +111,22 @@
 .Xr ddb 4
 are compiled into the kernel:
 .Bl -ohang
-.It Ic show locks
-Outputs the list of locks held by the current thread to the kernel console
+.It Ic show locks Op thread
+Outputs the list of locks held by a thread to the kernel console
 along with the filename and line number at which each lock was last acquired
-by this thread.
+by the thread.
+The optional
+.Ar thread
+argument may be either a TID,
+PID,
+or pointer to a thread structure.
+If
+.Ar thread
+is not specified,
+then the locks held by the current thread are displayed.
+.It Ic show all locks
+Outputs the list of locks held by all threads in the system to the
+kernel console.
 .It Ic show witness
 Dump the current order list to the kernel console.
 The code first displays the lock order tree for all of the sleep locks.
@@ -136,9 +145,3 @@
 .Bsx 5.0
 and was imported from there into
 .Fx 5.0 .
-.Sh BUGS
-The
-.Nm
-code currently does not handle recursion of shared
-.Xr sx 9
-locks properly.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/wpi.4
--- a/head/share/man/man4/wpi.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/wpi.4	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/wpi.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/wpi.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd October 5, 2008
 .Dt WPI 4
@@ -56,7 +56,7 @@
 .Nm
 driver provides support for the
 .Tn Intel
-3945ABG Wireless network adapter
+3945ABG Wireless network adapter.
 .Nm
 supports
 .Cm station ,
@@ -124,7 +124,7 @@
 .Xr wlan_tkip 4 ,
 .Xr wlan_wep 4 ,
 .Xr ifconfig 8 ,
-.Xr wpa_supplicant 8 .
+.Xr wpa_supplicant 8
 .Sh AUTHORS
 .An -nosplit
 The original
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/xl.4
--- a/head/share/man/man4/xl.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/xl.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/xl.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd January 23, 2008
 .Dt XL 4
@@ -115,7 +115,7 @@
 driver supports the following media options:
 .Bl -tag -width xxxxxxxxxxxxxxxxxxxx
 .It full-duplex
-Force full duplex operation
+Force full duplex operation.
 .It half-duplex
 Force half duplex operation.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man4/xnb.4
--- a/head/share/man/man4/xnb.4	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man4/xnb.4	Wed Jul 25 16:32:50 2012 +0300
@@ -28,7 +28,7 @@
 .\"
 .\" Authors: Alan Somers         (Spectra Logic Corporation)
 .\"
-.\" $FreeBSD: head/share/man/man4/xnb.4 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man4/xnb.4 235317 2012-05-12 03:25:46Z gjb $
 .\"
 .Dd January 6, 2012
 .Dt XNB 4
@@ -83,7 +83,7 @@
 Runs a builtin suite of unit tests and displays the results.
 Does not affect the operation of the driver in any way.
 Note that the test suite simulates error conditions; this will result in
-error messages being printed to the system system log.
+error messages being printed to the system log.
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
@@ -104,7 +104,7 @@
 .Aq alans at spectralogic.com
 and
 .An John Suykerbuyk
-.Aq johns at spectralogic.com
+.Aq johns at spectralogic.com .
 .Sh CAVEATS
 Packets sent through Xennet pass over shared memory, so the protocol includes
 no form of link-layer checksum or CRC.
@@ -127,7 +127,7 @@
 .Pp
 For this reason, it is recommended that if
 .Nm
-is bridged to a physcal interface, then transmit checksum offloading should be
+is bridged to a physical interface, then transmit checksum offloading should be
 disabled on the netfront.
 The Xennet protocol does not have any mechanism for the netback to request
 the netfront to do this; the operator must do it manually.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/Makefile
--- a/head/share/man/man5/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD: head/share/man/man5/Makefile 230328 2012-01-19 02:49:21Z kevlo $
+#	$FreeBSD: head/share/man/man5/Makefile 235537 2012-05-17 10:11:18Z gber $
 
 .include <bsd.own.mk>
 
@@ -85,6 +85,10 @@
 MAN+=	hesiod.conf.5 
 .endif
 
+.if ${MK_NAND} != "no"
+MAN+=	nandfs.5
+.endif
+
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 _boot.config.5=	boot.config.5
 .endif
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/devfs.conf.5
--- a/head/share/man/man5/devfs.conf.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/devfs.conf.5	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/devfs.conf.5 236278 2012-05-30 02:29:47Z gjb $
 .\"
 .Dd May 17, 2005
 .Dt DEVFS.CONF 5
@@ -91,7 +91,7 @@
 .Xr chmod 1 .
 .El
 .Sh FILES
-.Bl -tag -compact
+.Bl -tag -compact -width Pa
 .It Pa /etc/devfs.conf
 .It Pa /usr/share/examples/etc/devfs.conf
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/devfs.rules.5
--- a/head/share/man/man5/devfs.rules.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/devfs.rules.5	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/devfs.rules.5 236278 2012-05-30 02:29:47Z gjb $
 .\"
 .Dd February 21, 2010
 .Dt DEVFS.RULES 5
@@ -82,7 +82,7 @@
 devfs_system_ruleset="localrules"
 .Ed
 .Sh FILES
-.Bl -tag -compact
+.Bl -tag -compact -width Pa
 .It Pa /etc/defaults/devfs.rules
 Default
 .Nm
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/device.hints.5
--- a/head/share/man/man5/device.hints.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/device.hints.5	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/device.hints.5 235337 2012-05-12 15:08:22Z gjb $
 .\"
 .Dd September 11, 2009
 .Dt DEVICE.HINTS 5
@@ -162,7 +162,7 @@
 .Xr kenv 1 ,
 .Xr loader.conf 5 ,
 .Xr loader 8 ,
-.Xr resource_int_value 9 .
+.Xr resource_int_value 9
 .Sh HISTORY
 The
 .Nm
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/libmap.conf.5
--- a/head/share/man/man5/libmap.conf.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/libmap.conf.5	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/libmap.conf.5 234851 2012-04-30 21:26:35Z bapt $
 .\"
-.Dd January 31, 2004
+.Dd April 28, 2012
 .Dt LIBMAP.CONF 5
 .Os
 .Sh NAME
@@ -43,6 +43,27 @@
 side containing the mapping.
 Dependencies are matched against candidates and replaced with the mappings.
 .Pp
+Two special directives are available:
+.Bl -tag -width indent
+.It Cm include Ar file
+Parse the contents of
+.Ar file
+before continuing with the current file.
+.It Cm includedir Ar dir
+Parse the contents of every file in
+.Ar dir
+that ends in
+.Pa .conf
+before continuing with the current file.
+.El
+.Pp
+Any file or directory encountered while processing
+.Cm include
+or
+.Cm includedir
+directives will be parsed exactly once, even if it is encountered
+multiple times.
+.Pp
 Constrained mappings may be specified by enclosing the name of the
 executable or library in brackets.
 All mappings following a constraint will only be evaluated for that constraint.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/make.conf.5
--- a/head/share/man/man5/make.conf.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/make.conf.5	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man5/make.conf.5 228419 2011-12-11 20:01:37Z gjb $
+.\" $FreeBSD: head/share/man/man5/make.conf.5 236596 2012-06-05 03:14:39Z eadler $
 .\"
-.Dd December 11, 2011
+.Dd May 2, 2012
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -318,7 +318,7 @@
 .It Va SUP_UPDATE
 .Pq Vt bool
 Set this to use
-.Xr cvsup 1
+.Xr csup 1
 to update your
 .Pa src , ports , doc
 and
@@ -575,7 +575,7 @@
 The value should include the full path to the
 .Pa .mc
 file(s), e.g.,
-.Pa /etc/mail/foo.mc
+.Pa /etc/mail/foo.mc ,
 .Pa /etc/mail/bar.mc .
 .It Va SENDMAIL_ALIASES
 .Pq Vt str
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/moduli.5
--- a/head/share/man/man5/moduli.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/moduli.5	Wed Jul 25 16:32:50 2012 +0300
@@ -1,159 +1,125 @@
-.\" $OpenBSD: moduli.5,v 1.3 2001/06/24 18:50:52 provos Exp $
+.\"	$OpenBSD: moduli.5,v 1.16 2011/11/28 08:46:27 eric Exp $
 .\"
-.\" Copyright 1997, 2000 William Allen Simpson <wsimpson at greendragon.com>
-.\" All rights reserved.
+.\" Copyright (c) 2008 Damien Miller <djm at mindrot.org>
 .\"
-.\" 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. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software designed by William Allen Simpson.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\" 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.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/moduli.5 238631 2012-07-20 01:11:53Z delphij $
 .\"
-.Dd July 28, 1997
+.Dd July 19, 2012
 .Dt MODULI 5
 .Os
 .Sh NAME
 .Nm moduli
-.Nd system moduli file
+.Nd Diffie-Hellman moduli
 .Sh DESCRIPTION
 The
+.Pa /etc/ssh/moduli
+file contains prime numbers and generators for use by
+.Xr sshd 8
+in the Diffie-Hellman Group Exchange key exchange method.
+.Pp
+New moduli may be generated with
+.Xr ssh-keygen 1
+using a two-step process.
+An initial
+.Em candidate generation
+pass, using
+.Ic ssh-keygen -G ,
+calculates numbers that are likely to be useful.
+A second
+.Em primality testing
+pass, using
+.Ic ssh-keygen -T ,
+provides a high degree of assurance that the numbers are prime and are
+safe for use in Diffie-Hellman operations by
+.Xr sshd 8 .
+This
 .Nm
-file contains the system-wide Diffie-Hellman prime moduli for the
-.Xr photurisd 8
-and
-.Xr sshd 8
-programs.
+format is used as the output from each pass.
 .Pp
-Each line in this file contains the following fields:
-.Va Time , Type , Tests , Tries , Size , Generator ,
-and
-.Va Modulus .
-The fields are separated by white space (tab or blank).
-.Bl -tag -width indent
-.It Va Time Pq Vt yyyymmddhhmmss
-Specifies the system time that the line was appended to the file.
-The value 00000000000000 means unknown (historic).
-.\"The file is sorted in ascending order.
-.It Va Type Pq Vt decimal
-Specifies the internal structure of the prime modulus.
+The file consists of newline-separated records, one per modulus,
+containing seven space-separated fields.
+These fields are as follows:
+.Bl -tag -width Description -offset indent
+.It timestamp
+The time that the modulus was last processed as YYYYMMDDHHMMSS.
+.It type
+Decimal number specifying the internal structure of the prime modulus.
+Supported types are:
 .Pp
-.Bl -tag -width indent -compact
+.Bl -tag -width 0x00 -compact
 .It 0
-unknown;
-often learned from peer during protocol operation,
-and saved for later analysis.
-.It 1
-unstructured;
-a common large number.
+Unknown, not tested.
 .It 2
-safe (p = 2q + 1);
-meets basic structural requirements.
-.It 3
-Schnorr.
+"Safe" prime; (p-1)/2 is also prime.
 .It 4
-Sophie-Germaine (q = (p-1)/2);
-usually generated in the process of testing safe or strong primes.
-.It 5
-strong;
-useful for RSA public key generation.
-.El
-.It Xo
-.Va Tests Pq Vt decimal
-(bit field)
-.Xc
-Specifies the methods used in checking for primality.
-Usually, more than one test is used.
-.Pp
-.Bl -tag -width indent -compact
-.It 0
-not tested;
-often learned from peer during protocol operation,
-and saved for later analysis.
-.It 1
-composite;
-failed one or more tests.
-In this case, the highest bit specifies the test that failed.
-.It 2
-sieve;
-checked for division by a range of smaller primes.
-.It 4
-Miller-Rabin.
-.It 8
-Jacobi.
-.It 16
-Elliptic Curve.
-.El
-.It Va Tries Pq Vt decimal
-Depends on the value of the highest valid Test bit,
-where the method specified is:
-.Pp
-.Bl -tag -width indent -compact
-.It 0
-not tested
-(always zero).
-.It 1
-composite
-(irrelevant).
-.It 2
-sieve;
-number of primes sieved.
-Commonly on the order of 32,000,000.
-.It 4
-Miller-Rabin;
-number of M-R iterations.
-Commonly on the order of 32 to 64.
-.It 8
-Jacobi;
-unknown
-(always zero).
-.It 16
-Elliptic Curve;
-unused
-(always zero).
-.El
-.It Va Size Pq Vt decimal
-Specifies the number of significant bits.
-.It Va Generator Pq Vt "hex string"
-Specifies the best generator for a Diffie-Hellman exchange.
-0 = unknown or variable,
-2, 3, 5, etc.
-.It Va Modulus Pq Vt "hex string"
-The prime modulus.
+Sophie Germain; 2p+1 is also prime.
 .El
 .Pp
-The file is searched for moduli that meet the appropriate
-.Va Time , Size
-and
-.Va Generator
-criteria.
-When more than one meet the criteria,
-the selection should be weighted toward newer moduli,
-without completely disqualifying older moduli.
-.Sh FILES
-.Bl -tag -width ".Pa /etc/ssh/moduli" -compact
-.It Pa /etc/ssh/moduli
+Moduli candidates initially produced by
+.Xr ssh-keygen 1
+are Sophie Germain primes (type 4).
+Further primality testing with
+.Xr ssh-keygen 1
+produces safe prime moduli (type 2) that are ready for use in
+.Xr sshd 8 .
+Other types are not used by OpenSSH.
+.It tests
+Decimal number indicating the type of primality tests that the number
+has been subjected to represented as a bitmask of the following values:
+.Pp
+.Bl -tag -width 0x00 -compact
+.It 0x00
+Not tested.
+.It 0x01
+Composite number \(en not prime.
+.It 0x02
+Sieve of Eratosthenes.
+.It 0x04
+Probabilistic Miller-Rabin primality tests.
 .El
+.Pp
+The
+.Xr ssh-keygen 1
+moduli candidate generation uses the Sieve of Eratosthenes (flag 0x02).
+Subsequent
+.Xr ssh-keygen 1
+primality tests are Miller-Rabin tests (flag 0x04).
+.It trials
+Decimal number indicating the number of primality trials
+that have been performed on the modulus.
+.It size
+Decimal number indicating the size of the prime in bits.
+.It generator
+The recommended generator for use with this modulus (hexadecimal).
+.It modulus
+The modulus itself in hexadecimal.
+.El
+.Pp
+When performing Diffie-Hellman Group Exchange,
+.Xr sshd 8
+first estimates the size of the modulus required to produce enough
+Diffie-Hellman output to sufficiently key the selected symmetric cipher.
+.Xr sshd 8
+then randomly selects a modulus from
+.Fa /etc/ssh/moduli
+that best meets the size requirement.
 .Sh SEE ALSO
-.Xr photurisd 8 ,
+.Xr ssh-keygen 1 ,
 .Xr sshd 8
+.Rs
+.%R RFC 4419
+.%T "Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol"
+.%D 2006
+.Re
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/nandfs.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man5/nandfs.5	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,128 @@
+.\"
+.\" Copyright (c) 2010 Semihalf
+.\" 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: head/share/man/man5/nandfs.5 235542 2012-05-17 11:29:22Z joel $
+.\"
+.Dd Nov 11, 2010
+.Dt NANDFS 5
+.Os
+.Sh NAME
+.Nm nandfs
+.Nd NAND Flash file system
+.Sh SYNOPSIS
+To compile support for the
+.Nm ,
+place the following in your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "options NANDFS"
+.Ed
+.Pp
+Even though the NAND FS can be used with any storage media, it has been
+optimized and designed towards NAND Flash devices, so typically the following
+driver is used:
+.Bd -ragged -offset indent
+.Cd "device nand"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver enables
+.Fx
+with support for NAND-oriented file system.
+.Pp
+It is a log-structured style file system with the following major features and
+characteristics:
+.Bl -bullet
+.It
+Hard links, symbolic links support
+.It
+Block journaling
+.It
+Copy-On-Write
+.It
+Snapshots (continuous, taken automatically, simultaneously mountable)
+.It
+Quick crash recovery at mount time
+.It
+64-bit data structures; supports many files, large files and volumes
+.It
+POSIX file permissions
+.It
+Checksum / ECC
+.El
+.Sh EXAMPLES
+The most common usage is mounting the file system:
+.Pp
+.Dl "mount -t nandfs /dev/<gnandN> /mnt"
+.Pp
+or:
+.Dl "mount_nandfs /dev/<gnandN> /mnt"
+.Pp
+where
+.Ar gnandN
+is the GEOM device representing a Flash partition (slice) containing the
+.Nm
+structure, and
+.Pa /mnt
+is a mount point.
+.Pp
+It is possible to define an entry in
+.Pa /etc/fstab
+for the
+.Nm :
+.Bd -literal
+/dev/gnand0		/flash	nandfs		rw	0	0
+.Ed
+.Pp
+This will mount a
+.Nm
+partition at the specified mount point during system boot.
+.Sh SEE ALSO
+.Xr gnand 4 ,
+.Xr nand 4 ,
+.Xr mount_nandfs 8 ,
+.Xr nandfs 8 ,
+.Xr nandsim 8 ,
+.Xr nandtool 8 ,
+.Xr umount_nandfs 8
+.Sh HISTORY
+The NAND FS concepts are based on NILFS principles and initial implementation
+was derived from early NILFS NetBSD code (read only). Since then the NAND FS
+code diverged significantly and is by no means compatible with NILFS.
+.Pp
+The NAND Flash file system first appeared in
+.Fx 10.0 .
+.Sh AUTHOR
+The NAND FS was written by
+.An Grzegorz Bernacki with the help of
+.An Mateusz Guzik ,
+based on the NetBSD code created by
+.An Reinoud Zandijk .
+Additional help and support by
+.An Lukasz Plachno ,
+.An Jan Sieka and
+.An Lukasz Wojcik .
+This manual page was written by
+.An Rafal Jaworowski .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/nsmb.conf.5
--- a/head/share/man/man5/nsmb.conf.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/nsmb.conf.5	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man5/nsmb.conf.5 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man5/nsmb.conf.5 235337 2012-05-12 15:08:22Z gjb $
 .\"
 .Dd October 19, 2010
 .Dt NSMB.CONF 5
@@ -96,7 +96,6 @@
 .Bl -tag -width ".Pa /etc/nsmb.conf"
 .It Pa /etc/nsmb.conf
 The default remote mount-point configuration file.
-.Pa "~/nsmb.conf"
 .It Pa ~/nsmb.conf
 The user specific remote mount-point configuration file.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/passwd.5
--- a/head/share/man/man5/passwd.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/passwd.5	Wed Jul 25 16:32:50 2012 +0300
@@ -33,9 +33,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: head/share/man/man5/passwd.5 232254 2012-02-28 15:07:05Z kevlo $
+.\" $FreeBSD: head/share/man/man5/passwd.5 237581 2012-06-25 22:39:37Z bjk $
 .\"
-.Dd May 8, 2007
+.Dd June 23, 2012
 .Dt PASSWD 5
 .Os
 .Sh NAME
@@ -203,7 +203,8 @@
 .Dv UTC ,
 until the
 password for the account must be changed.
-This field may be left empty to turn off the password aging feature.
+This field may be left empty to turn off the password aging feature;
+a value of zero is equivalent to leaving the field empty.
 .Pp
 The
 .Ar expire
@@ -211,7 +212,8 @@
 .Dv UTC ,
 until the
 account expires.
-This field may be left empty to turn off the account aging feature.
+This field may be left empty to turn off the account aging feature;
+a value of zero is equivalent to leaving the field empty.
 .Pp
 The
 .Ar gecos
@@ -271,7 +273,8 @@
 is to set its
 .Ar shell
 to
-.Xr nologin 8 .
+.Pa /sbin/nologin
+.Pq see Xr nologin 8 .
 .Sh HESIOD SUPPORT
 If
 .Sq Li dns
@@ -363,7 +366,7 @@
 from the Hesiod domain or the
 .Tn NIS
 maps.
-As well, if the
+Likewise, if the
 .Ar gecos ,
 .Ar dir
 or
@@ -399,7 +402,8 @@
 .Ar change
 and
 .Ar expire
-are added, but are turned off by default.
+are added, but are turned off by default
+.Pq setting these fields to zero is equivalent to leaving them blank .
 Class is currently not implemented, but change and expire are; to set them,
 use the current day in seconds from the epoch + whatever number of seconds
 of offset you want.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/periodic.conf.5
--- a/head/share/man/man5/periodic.conf.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/periodic.conf.5	Wed Jul 25 16:32:50 2012 +0300
@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man5/periodic.conf.5 231171 2012-02-08 00:08:21Z gjb $
+.\" $FreeBSD: head/share/man/man5/periodic.conf.5 236352 2012-05-31 07:16:50Z eadler $
 .\"
-.Dd February 7, 2012
+.Dd May 30, 2012
 .Dt PERIODIC.CONF 5
 .Os
 .Sh NAME
@@ -504,6 +504,12 @@
 .Dq Li YES
 to compare the modes and modification times of setuid executables with
 the previous day's values.
+.It Va daily_status_security_chkportsum_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+to verify checksums of all installed packages against the known checksums in
+.Pa /var/db/pkg .
 .It Va daily_status_security_neggrpperm_enable
 .Pq Vt bool
 Set to
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/portsnap.conf.5
--- a/head/share/man/man5/portsnap.conf.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/portsnap.conf.5	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/portsnap.conf.5 235337 2012-05-12 15:08:22Z gjb $
 .\"
 .Dd January 30, 2005
 .Dt PORTSNAP.CONF 5
@@ -47,7 +47,8 @@
 This is equivalent to the
 .Fl s Ar server
 option to
-.Xr portsnap 8 , and will be ignored if the command-line
+.Xr portsnap 8 ,
+and will be ignored if the command-line
 option is used.
 .Pp
 A line of the form
@@ -58,7 +59,8 @@
 This is equivalent to the
 .Fl k Ar KEY
 option to
-.Xr portsnap 8 , and will be ignored if the command-line
+.Xr portsnap 8 ,
+and will be ignored if the command-line
 option is used.
 .Pp
 A line of the form
@@ -68,7 +70,8 @@
 This is equivalent to the
 .Fl d Ar workdir
 option to
-.Xr portsnap 8 , and will be ignored if the command-line option
+.Xr portsnap 8 ,
+and will be ignored if the command-line option
 is used.
 .Pp
 A line of the form
@@ -82,7 +85,8 @@
 This is equivalent to the
 .Fl p Ar portsdir
 option to
-.Xr portsnap 8 , and will be ignored if the command-line option
+.Xr portsnap 8 ,
+and will be ignored if the command-line option
 is used.
 .Pp
 If more than one line of any of the above forms is included in
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/rc.conf.5
--- a/head/share/man/man5/rc.conf.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/rc.conf.5	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man5/rc.conf.5 232243 2012-02-28 03:11:02Z gjb $
+.\" $FreeBSD: head/share/man/man5/rc.conf.5 238707 2012-07-22 23:21:21Z gjb $
 .\"
-.Dd February 27, 2012
+.Dd July 22, 2012
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -386,7 +386,7 @@
 this variable should be set to an empty string.
 If this value remains unset when the system is done booting
 your console login will display the default hostname of
-.Dq Amnesiac.
+.Dq Amnesiac .
 .It Va nisdomainname
 .Pq Vt str
 The NIS domain name of this host, or
@@ -501,6 +501,16 @@
 This is equivalent to the
 .Dv IPFIREWALL_VERBOSE
 kernel option.
+.It Va firewall_logif
+.Pq Vt bool
+Set to
+.Dq Li YES
+to create pseudo interface
+.Li ipfw0
+for logging.
+For more details, see
+.Xr ipfw 8
+manual page.
 .It Va firewall_flags
 .Pq Vt str
 Flags passed to
@@ -1299,6 +1309,7 @@
 ifconfig_net0="inet 192.0.2.1 netmask 0xffffff00"
 .Ed
 .It Va ipv6_enable
+.Pq Vt bool
 This variable is deprecated.
 Use
 .Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6
@@ -1306,7 +1317,6 @@
 .Va ipv6_activate_all_interfaces
 if necessary.
 .Pp
-.Pq Vt bool
 If the variable is
 .Dq Li YES ,
 .Dq Li inet6 accept_rtadv
@@ -1317,12 +1327,12 @@
 is defined as
 .Dq Li YES .
 .It Va ipv6_prefer
+.Pq Vt bool
 This variable is deprecated.
 Use
 .Va ip6addrctl_policy
 instead.
 .Pp
-.Pq Vt bool
 If the variable is
 .Dq Li YES ,
 the default address selection policy table set by
@@ -2086,6 +2096,19 @@
 is set to
 .Dq Li YES
 this is the path to Kerberos 5 Password-Changing Daemon.
+.It Va kfd_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+to start
+.Xr kfd 8 ,
+the Kerberos 5 ticket forwarding daemon, at the boot time.
+.It Va kfd_program
+.Pq Vt str
+Path to
+.Xr kfd 8
+(default
+.Pa /usr/libexec/kfd ) .
 .It Va rwhod_enable
 .Pq Vt bool
 If set to
@@ -2911,6 +2934,34 @@
 .Dq Li YES
 this enables IPv4 mapped IPv6 address communication (like
 .Li ::ffff:a.b.c.d ) .
+.It Va rtsold_enable
+.Pq Vt bool
+Set to
+.Dq Li YES
+to enable the
+.Xr rtsold 8
+daemon to send ICMPv6 Router Solicitation messages.
+.It Va rtsold_flags
+.Pq Vt str
+If
+.Va rtsold_enable
+is set to
+.Dq Li YES ,
+these are the flags to pass to
+.Xr rtsold 8 .
+.It Va rtsol_flags
+.Pq Vt str
+For interfaces configured with the
+.Dq Li inet6 accept_rtadv
+keyword, these are the flags to pass to
+.Xr rtsol 8 .
+.Pp
+Note that
+.Va rtsold_enable
+is mutually exclusive to
+.Va rtsol_flags ;
+.Va rtsold_enable
+takes precedence.
 .It Va atm_enable
 .Pq Vt bool
 Set to
@@ -3273,9 +3324,10 @@
 daemon is started for a non-default port, the
 .Va "moused_" Ns Ar XXX Ns Va "_flags"
 set of options has precedence over and replaces the default
-.Va moused_flags (where
+.Va moused_flags
+(where
 .Ar XXX
-is the name of the non-default port, i.e.\&
+is the name of the non-default port, i.e.,\&
 .Ar ums0 ) .
 By setting
 .Va "moused_" Ns Ar XXX Ns Va "_flags"
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/src.conf.5
--- a/head/share/man/man5/src.conf.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/src.conf.5	Wed Jul 25 16:32:50 2012 +0300
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
-.\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru
-.\" $FreeBSD: head/share/man/man5/src.conf.5 233645 2012-03-29 03:04:59Z jmallett $
-.Dd March 25, 2012
+.\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb
+.\" $FreeBSD: head/share/man/man5/src.conf.5 238448 2012-07-14 10:17:47Z zeising $
+.Dd July 14, 2012
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -207,9 +207,9 @@
 Set to enable the http statistics interface for named.
 This requires ports/textproc/libxml2 to be installed in /usr/local.
 .It Va WITHOUT_BINUTILS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 222090 2011-05-19 05:13:25Z imp
+.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 235342 2012-05-12 16:12:36Z gjb
 Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib,
-ld, nm, objcopy, objdump, readelf, size and strip)
+ld, nm, objcopy, objdump, readelf, size and strip).
 .Bf -symbolic
 The option does not generally work for build targets, unless some alternative
 toolchain is enabled.
@@ -220,6 +220,9 @@
 .It Va WITHOUT_BOOT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BOOT 156932 2006-03-21 07:50:50Z ru
 Set to not build the boot blocks and loader.
+.It Va WITH_BSDCONFIG
+.\" from FreeBSD: head/tools/build/options/WITH_BSDCONFIG 238438 2012-07-14 03:16:57Z dteske
+Set to install bsdconfig(8), a BSD-licensed configuration/management utility.
 .It Va WITHOUT_BSD_CPIO
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BSD_CPIO 179813 2008-06-16 05:48:15Z dougb
 Set to not build the BSD licensed version of cpio based on
@@ -289,14 +292,12 @@
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim
 Set to build additional clang and llvm tools, such as bugpoint.
 .It Va WITH_CLANG_IS_CC
-.\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 232322 2012-02-29 22:58:51Z dim
+.\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 235342 2012-05-12 16:12:36Z gjb
 Set to install the Clang C/C++ compiler as
-.Pa /usr/bin/cc
-,
+.Pa /usr/bin/cc ,
 .Pa /usr/bin/c++
 and
-.Pa /usr/bin/cpp
-.
+.Pa /usr/bin/cpp .
 .It Va WITHOUT_CPP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru
 Set to not build
@@ -367,6 +368,11 @@
 and
 .Pa /sbin
 dynamically.
+.It Va WITHOUT_ED_CRYPTO
+.\" from FreeBSD: head/tools/build/options/WITHOUT_ED_CRYPTO 235660 2012-05-19 20:05:27Z marcel
+Set to build
+.Xr ed 1
+without support for encryption/decryption.
 .It Va WITHOUT_EXAMPLES
 .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru
 Set to avoid installing examples to
@@ -434,6 +440,9 @@
 .It
 .Va WITHOUT_GNU_SUPPORT
 .El
+.It Va WITH_GNU_SORT
+.\" from FreeBSD: head/tools/build/options/WITH_GNU_SORT 237629 2012-06-27 05:59:01Z gabor
+Install GNU-licensed sort as 'sort' instead of BSD sort.
 .It Va WITHOUT_GNU_SUPPORT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_SUPPORT 156932 2006-03-21 07:50:50Z ru
 Set to build some programs without optional GNU support.
@@ -508,6 +517,16 @@
 For example when creating a
 .Xr nanobsd 8
 image.
+.It Va WITH_INSTALL_AS_USER
+.\" from FreeBSD: head/tools/build/options/WITH_INSTALL_AS_USER 238021 2012-07-02 20:24:01Z marcel
+Set to make install targets succeed for non-root users by installing
+files with owner and group attributes set to that of the user running
+the
+.Xr make 1
+command.
+The user still has to set the
+.Va DESTDIR
+variable to point to a directory where the user has write permissions.
 .It Va WITHOUT_IPFILTER
 .\" from FreeBSD: head/tools/build/options/WITHOUT_IPFILTER 156932 2006-03-21 07:50:50Z ru
 Set to not build IP Filter package.
@@ -666,6 +685,11 @@
 Set to not build
 .Xr lpr 1
 and related programs.
+.It Va WITHOUT_LS_COLORS
+.\" from FreeBSD: head/tools/build/options/WITHOUT_LS_COLORS 235660 2012-05-19 20:05:27Z marcel
+Set to build
+.Xr ls 1
+without support for colors to distinguish file types.
 .It Va WITHOUT_MAIL
 .\" from FreeBSD: head/tools/build/options/WITHOUT_MAIL 183242 2008-09-21 22:02:26Z sam
 Set to not build any mail support (MUA or MTA).
@@ -708,6 +732,9 @@
 .Xr whatis 1 ,
 .Xr manctl 8 ,
 and related support files.
+.It Va WITH_NAND
+.\" from FreeBSD: head/tools/build/options/WITH_NAND 235537 2012-05-17 10:11:18Z gber
+Set to build the NAND Flash components.
 .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
@@ -825,6 +852,11 @@
 .It
 .Va WITHOUT_AUTHPF
 .El
+.It Va WITHOUT_PKGBOOTSTRAP
+.\" from FreeBSD: head/tools/build/options/WITHOUT_PKGBOOTSTRAP 238023 2012-07-02 20:26:11Z marcel
+Set to not build
+.Xr pkg 1
+bootstrap tool
 .It Va WITHOUT_PKGTOOLS
 .\" from FreeBSD: head/tools/build/options/WITHOUT_PKGTOOLS 183242 2008-09-21 22:02:26Z sam
 Set to not build
@@ -891,6 +923,13 @@
 Set to not build the
 .Bx 4.4
 legacy docs.
+.It Va WITH_SHARED_TOOLCHAIN
+.\" from FreeBSD: head/tools/build/options/WITH_SHARED_TOOLCHAIN 235342 2012-05-12 16:12:36Z gjb
+Set to build the toolchain binaries shared.
+The set includes
+.Xr cc 1 ,
+.Xr make 1
+and necessary utilities like assembler, linker and library archive manager.
 .It Va WITHOUT_SOURCELESS
 .\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS 230972 2012-02-04 00:54:43Z rmh
 Set to not build kernel modules that include sourceless code (either microcode or native code for host CPU).
@@ -1007,11 +1046,11 @@
 .\" from FreeBSD: head/tools/build/options/WITHOUT_ZFS 168409 2007-04-06 02:13:30Z pjd
 Set to not build ZFS file system.
 .It Va WITHOUT_ZONEINFO
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ZONEINFO 171994 2007-08-27 20:01:08Z remko
-Set to not build the timezone database
+.\" from FreeBSD: head/tools/build/options/WITHOUT_ZONEINFO 235342 2012-05-12 16:12:36Z gjb
+Set to not build the timezone database.
 .El
 .Sh FILES
-.Bl -tag -compact
+.Bl -tag -compact -width Pa
 .It Pa /etc/src.conf
 .It Pa /usr/share/mk/bsd.own.mk
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man5/tmpfs.5
--- a/head/share/man/man5/tmpfs.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man5/tmpfs.5	Wed Jul 25 16:32:50 2012 +0300
@@ -47,9 +47,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man5/tmpfs.5 234611 2012-04-23 17:15:06Z marcel $
 .\"
-.Dd February 16, 2010
+.Dd April 23, 2012
 .Dt TMPFS 5
 .Os
 .Sh NAME
@@ -141,9 +141,4 @@
 This manual page was written by
 .An Xin LI Aq delphij at FreeBSD.org .
 .Sh BUGS
-The
-.Nm
-kernel implementation is currently considered as
-an experimental feature.
-Some file system mount
-time options are not well supported.
+Some file system mount time options may not be well-supported.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man7/build.7
--- a/head/share/man/man7/build.7	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man7/build.7	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man7/build.7 226172 2011-10-09 20:21:07Z gjb $
+.\" $FreeBSD: head/share/man/man7/build.7 238008 2012-07-02 17:52:43Z wblock $
 .\"
-.Dd September 29, 2011
+.Dd July 2, 2012
 .Dt BUILD 7
 .Os
 .Sh NAME
@@ -39,6 +39,11 @@
 .Pa /usr/doc ,
 and
 .Pa /usr/ports .
+These directories may be initially empty or non-existent until updated with
+.Xr csup 1 ,
+.Xr svn 1 ,
+or
+.Xr portsnap 8 .
 Directory
 .Pa /usr/src
 contains the
@@ -489,7 +494,7 @@
 .It Va NO_SHARE
 If set, the build does not descend into the
 .Pa /usr/src/share
-subdirectory (i.e. manpages, locale data files, timezone data files and
+subdirectory (i.e., manpages, locale data files, timezone data files and
 other
 .Pa /usr/src/share
 files will not be rebuild from their sources).
@@ -594,14 +599,17 @@
 .Ed
 .Sh SEE ALSO
 .Xr cc 1 ,
+.Xr csup 1 ,
 .Xr install 1 ,
 .Xr make 1 ,
+.Xr svn 1 ,
 .Xr make.conf 5 ,
 .Xr src.conf 5 ,
 .Xr ports 7 ,
 .Xr release 7 ,
 .Xr config 8 ,
 .Xr mergemaster 8 ,
+.Xr portsnap 8 ,
 .Xr reboot 8 ,
 .Xr shutdown 8
 .Sh AUTHORS
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man7/c99.7
--- a/head/share/man/man7/c99.7	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man7/c99.7	Wed Jul 25 16:32:50 2012 +0300
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man7/c99.7 222493 2011-05-30 10:28:55Z bcr $
+.\" $FreeBSD: head/share/man/man7/c99.7 235691 2012-05-20 16:09:40Z gjb $
 .\"
 .Dd May 30, 2011
 .Dt C 7
@@ -103,7 +103,7 @@
 ISO/IEC 9899 AM1 in 1995.
 This contained, for example, the wide-character support in wchar.h and
 wctype.h.
-Two corregenda were also published: Technical Corrigendum 1 as
+Two corrigenda were also published: Technical Corrigendum 1 as
 ISO/IEC 9899 TCOR1 in 1995 and Technical Corrigendum 2 as ISO/IEC 9899 TCOR1
 in 1996.
 The continuous development and growth made it necessary to work out a new
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man7/development.7
--- a/head/share/man/man7/development.7	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man7/development.7	Wed Jul 25 16:32:50 2012 +0300
@@ -21,9 +21,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man7/development.7 236596 2012-06-05 03:14:39Z eadler $
 .\"
-.Dd December 21, 2002
+.Dd May 2, 2012
 .Dt DEVELOPMENT 7
 .Os
 .Sh NAME
@@ -89,7 +89,7 @@
 partition of at least 5GB.
 .Pp
 On the master server, use
-.Xr cvsup 1 Pq Pa ports/net/cvsup
+.Xr csup 1
 to automatically pull down and maintain
 the
 .Fx
@@ -108,23 +108,23 @@
 job should look something like this (please randomize the time of
 day!).
 Note that you can use the
-.Xr cvsup 1
+.Xr csup 1
 configuration file example directly from
 .Pa /usr/share/examples
 without modification by supplying appropriate arguments
 to
-.Xr cvsup 1 .
+.Xr csup 1 .
 .Bd -literal -offset 4n
-33 6 * * *      /usr/local/bin/cvsup -g -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile
+33 6 * * *      /usr/bin/csup -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile
 .Ed
 .Pp
 Run the
-.Xr cvsup 1
+.Xr csup 1
 manually the first time to pull down the archive.
 It could take
 all day depending on how fast your connection is!
 You will run all
-.Xr cvsup 1
+.Xr csup 1
 and
 .Xr cvs 1
 operations as
@@ -555,7 +555,7 @@
 tree is based on CVS, the former is convenient.
 .Pp
 First, you need to modify your
-.Xr cvsup 1
+.Xr csup 1
 environment to avoid it modifying
 the local changes you have committed to the repository.
 It is important to remove the
@@ -568,7 +568,7 @@
 .Pa refuse
 file.
 For more information, see
-.Xr cvsup 1 .
+.Xr csup 1 .
 .Pp
 The
 .Fx
@@ -598,13 +598,13 @@
 .Pp
 .Sy WARNING!
 The
-.Xr cvsup 1
+.Xr csup 1
 utility may blow away changes made on a local branch in
 some situations.
 This has been reported to occur when the master CVS repository is
 directly manipulated or an RCS file is changed.
 At this point,
-.Xr cvsup 1
+.Xr csup 1
 notices that the client and server have entirely
 different RCS files, so it does a full replace instead of trying to
 send just deltas.
@@ -619,7 +619,7 @@
 should back it up before every update.
 .Sh UPDATING VIA CVS
 The advantage of using
-.Xr cvsup 1
+.Xr csup 1
 to maintain an updated copy of the CVS
 repository instead of using it to maintain source trees directly is that you
 can then pick and choose when you bring your source tree (or pieces of your
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man7/release.7
--- a/head/share/man/man7/release.7	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man7/release.7	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man7/release.7 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man7/release.7 236274 2012-05-30 01:52:01Z gjb $
 .\"
 .Dd January 14, 2012
 .Dt RELEASE 7
@@ -221,7 +221,7 @@
 the Handbook) is built during the
 .Cm base.txz
 target invoked by
-.Cm packagesystem.
+.Cm packagesystem .
 .El
 .Sh ENVIRONMENT
 Optional variables:
@@ -283,7 +283,7 @@
 .Va TARGET .
 .El
 .Sh FILES
-.Bl -tag -compact
+.Bl -tag -compact -width Pa
 .It Pa /usr/doc/Makefile
 .It Pa /usr/doc/share/mk/doc.project.mk
 .It Pa /usr/ports/Mk/bsd.port.mk
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man7/tuning.7
--- a/head/share/man/man7/tuning.7	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man7/tuning.7	Wed Jul 25 16:32:50 2012 +0300
@@ -21,9 +21,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man7/tuning.7 235319 2012-05-12 03:46:43Z gjb $
 .\"
-.Dd October 16, 2010
+.Dd May 11, 2012
 .Dt TUNING 7
 .Os
 .Sh NAME
@@ -148,15 +148,15 @@
 system source
 .Pq Pa /usr/src
 on the machine, you can get away with
-a 1 gigabyte
+a 1 GB
 .Pa /usr
 partition.
 However, if you install a lot of ports
 (especially window managers and Linux-emulated binaries), we recommend
-at least a 2 gigabyte
+at least a 2 GB
 .Pa /usr
 and if you also intend to keep system source
-on the machine, we recommend a 3 gigabyte
+on the machine, we recommend a 3 GB
 .Pa /usr .
 Do not underestimate the
 amount of space you will need in this partition, it can creep up and
@@ -218,22 +218,22 @@
 .Em cylinders/group .
 .Pp
 .Fx
-performs best when using 8K or 16K file system block sizes.
-The default file system block size is 16K,
+performs best when using 16K or 32K file system block sizes.
+The default file system block size is 32K,
 which provides best performance for most applications,
 with the exception of those that perform random access on large files
 (such as database server software).
 Such applications tend to perform better with a smaller block size,
 although modern disk characteristics are such that the performance
 gain from using a smaller block size may not be worth consideration.
-Using a block size larger than 16K
+Using a block size larger than 32K
 can cause fragmentation of the buffer cache and
 lead to lower performance.
 .Pp
 The defaults may be unsuitable
 for a file system that requires a very large number of i-nodes
 or is intended to hold a large number of very small files.
-Such a file system should be created with an 8K or 4K block size.
+Such a file system should be created with an 4K, 8K, or 16K block size.
 This also requires you to specify a smaller
 fragment size.
 We recommend always using a fragment size that is 1/8
@@ -256,13 +256,13 @@
 unless you are actually storing large files on the partition, because if you
 overcompensate you can wind up with a file system that has lots of free
 space remaining but cannot accommodate any more files.
-Using 32768, 65536, or 262144 bytes/i-node is recommended.
+Using 65536, 131072, or 262144 bytes/i-node is recommended.
 You can go higher but
 it will have only incremental effects on
 .Xr fsck 8
 recovery times.
 For example,
-.Dq Li "newfs -i 32768 ..." .
+.Dq Li "newfs -i 65536 ..." .
 .Pp
 .Xr tunefs 8
 may be used to further tune a file system.
@@ -447,7 +447,7 @@
 Increasing this value to a higher setting, such as `25165824' might
 improve performance on systems where space for mapping pipe buffers
 is quickly exhausted.
-This exhaustion is not fatal; however, and it will only cause pipes to
+This exhaustion is not fatal; however, and it will only cause pipes
 to fall back to using double-copy.
 .Pp
 The
@@ -525,8 +525,8 @@
 to pre-read if the heuristics algorithm decides that the reads are
 issued sequentially.
 It is used by the UFS, ext2fs and msdosfs file systems.
-With the default UFS block size of 16 KiB, a setting of 32 will allow
-speculatively reading up to 512 KiB.
+With the default UFS block size of 32 KiB, a setting of 64 will allow
+speculatively reading up to 2 MiB.
 This setting may be increased to get around disk I/O latencies, especially
 where these latencies are large such as in virtual machine emulated
 environments.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man8/picobsd.8
--- a/head/share/man/man8/picobsd.8	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man8/picobsd.8	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 .\" -*- nroff-fill -*-
-.\" $FreeBSD: head/share/man/man8/picobsd.8 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man8/picobsd.8 235873 2012-05-24 02:24:03Z wblock $
 .Dd June 25, 2009
 .Dt PICOBSD 8
 .Os
@@ -54,7 +54,7 @@
 .Fl src ,
 .Fl init ,
 .Fl n and
-.Fl v.
+.Fl v .
 .Bl -tag -width indent
 .\"
 .It Fl -all_in_mfs
@@ -94,7 +94,10 @@
 images.
 .\"
 .It Fl -iso
-Generate an ISO image, picobsd.iso, in addition to the disk image picobsd.bin
+Generate an ISO image,
+.Pa picobsd.iso ,
+in addition to the disk image
+.Pa picobsd.bin .
 .\"
 .It Fl -modules
 Also build kernel modules.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man8/rc.8
--- a/head/share/man/man8/rc.8	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man8/rc.8	Wed Jul 25 16:32:50 2012 +0300
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: head/share/man/man8/rc.8 230116 2012-01-14 21:51:44Z dougb $
+.\" $FreeBSD: head/share/man/man8/rc.8 235873 2012-05-24 02:24:03Z wblock $
 .\"
 .Dd January 14, 2012
 .Dt RC 8
@@ -253,7 +253,7 @@
 but a script can stop the boot if necessary by invoking the
 .Fn stop_boot
 function (from
-.Xr rc.subr 8 ).
+.Xr rc.subr 8 ) .
 .El
 .Pp
 Each script should contain
@@ -452,7 +452,7 @@
 Following tradition, all startup files reside in
 .Pa /etc .
 .Sh FILES
-.Bl -tag -compact
+.Bl -tag -compact -width Pa
 .It Pa /etc/rc
 .It Pa /etc/rc.conf
 .It Pa /etc/rc.conf.local
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/BUF_ISLOCKED.9
--- a/head/share/man/man9/BUF_ISLOCKED.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/BUF_ISLOCKED.9	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/BUF_ISLOCKED.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd January 22, 2008
 .Dt BUF_ISLOCKED 9
@@ -52,7 +52,7 @@
 .It Dv LK_EXCLUSIVE
 An exclusive lock is held by curthread.
 .It Dv LK_EXCLOTHER
-An exclusive lock is held by someone other than curthread
+An exclusive lock is held by someone other than curthread.
 .It Dv LK_SHARED
 A shared lock is held.
 .It Li 0
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/DB_COMMAND.9
--- a/head/share/man/man9/DB_COMMAND.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/DB_COMMAND.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/DB_COMMAND.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/DB_COMMAND.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd August 27, 2008
 .Dt DB_COMMAND 9
@@ -32,7 +32,7 @@
 .Nm DB_COMMAND ,
 .Nm DB_SHOW_COMMAND ,
 .Nm DB_SHOW_ALL_COMMAND
-.Nd Extends the ddb command set.
+.Nd Extends the ddb command set
 .Sh SYNOPSIS
 .In ddb/ddb.h
 .Fo DB_COMMAND
@@ -71,7 +71,7 @@
 .Ar address Ns Op Li , Ns Ar count ,
 translates into the following parameters for
 .Fa command_function :
-.Bl -tag
+.Bl -tag -width Fa -offset indent
 .It Fa addr
 The address passed to the command as an argument.
 .It Fa have_addr
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/DECLARE_GEOM_CLASS.9
--- a/head/share/man/man9/DECLARE_GEOM_CLASS.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/DECLARE_GEOM_CLASS.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/DECLARE_GEOM_CLASS.9 235371 2012-05-12 20:41:40Z gjb $
 .\"
 .Dd August 13, 2007
 .Dt DECLARE_GEOM_CLASS 9
@@ -49,7 +49,7 @@
 The arguments to
 .Fn DECLARE_GEOM_CLASS
 are:
-.Bl -tag -offset indent
+.Bl -tag -offset indent -width Fa
 .It Fa class
 The
 .Vt g_class
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/EVENTHANDLER.9
--- a/head/share/man/man9/EVENTHANDLER.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/EVENTHANDLER.9	Wed Jul 25 16:32:50 2012 +0300
@@ -21,9 +21,9 @@
 .\" 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$
+.\" $FreeBSD: head/share/man/man9/EVENTHANDLER.9 235744 2012-05-21 22:13:48Z melifaro $
 .\"
-.Dd January 7, 2005
+.Dd May 11, 2012
 .Dt EVENTHANDLER 9
 .Os
 .Sh NAME
@@ -197,6 +197,8 @@
 Callbacks invoked when a new network interface appears.
 .It Vt ifnet_departure_event
 Callbacks invoked when a network interface is taken down.
+.It Vt bpf_track
+Callbacks invoked when a BPF listener attaches to/detaches from network interface.
 .It Vt power_profile_change
 Callbacks invoked when the power profile of the system changes.
 .It Vt process_exec
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/VOP_GETACL.9
--- a/head/share/man/man9/VOP_GETACL.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/VOP_GETACL.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/VOP_GETACL.9 235319 2012-05-12 03:46:43Z gjb $
 .\"
 .Dd December 23, 1999
 .Dt VOP_GETACL 9
@@ -79,7 +79,7 @@
 .It Bq Er EINVAL
 The ACL type passed is invalid for this vnode.
 .It Bq Er EACCES
-The the caller does not have the appropriate privilege.
+The caller does not have the appropriate privilege.
 .It Bq Er ENOMEM
 Sufficient memory is not available to fulfill the request.
 .It Bq Er EOPNOTSUPP
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/VOP_GETEXTATTR.9
--- a/head/share/man/man9/VOP_GETEXTATTR.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/VOP_GETEXTATTR.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/VOP_GETEXTATTR.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd December 23, 1999
 .Dt VOP_GETEXTATTR 9
@@ -71,7 +71,7 @@
 .Dv NULL
 when
 .Fa size
-is not, and vise versa.
+is not, and vice versa.
 .It Fa cred
 The user credentials to use in authorizing the request.
 .It Fa td
@@ -102,7 +102,7 @@
 .It Bq Er ENOATTR
 The requested attribute was not defined for this vnode.
 .It Bq Er EACCES
-The the caller does not have the appropriate privilege.
+The caller does not have the appropriate privilege.
 .It Bq Er ENXIO
 The request was not valid in this file system for the specified vnode and
 attribute name.
@@ -113,7 +113,7 @@
 .It Bq Er EINVAL
 The
 .Fa name ,
-.Fa namespace,
+.Fa namespace ,
 or
 .Fa uio
 argument is invalid.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/VOP_GETPAGES.9
--- a/head/share/man/man9/VOP_GETPAGES.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/VOP_GETPAGES.9	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/VOP_GETPAGES.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd September 27, 2003
 .Dt VOP_GETPAGES 9
@@ -115,7 +115,7 @@
 medium or protocol.
 .It Dv VM_PAGER_FAIL
 Treated identically to
-.Dv VM_PAGER_ERROR
+.Dv VM_PAGER_ERROR .
 .It Dv VM_PAGER_AGAIN
 The page was not handled by this request.
 .El
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/VOP_GETVOBJECT.9
--- a/head/share/man/man9/VOP_GETVOBJECT.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/VOP_GETVOBJECT.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/VOP_GETVOBJECT.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd September 10, 2000
 .Dt VOP_CREATEVOBJECT 9
@@ -53,7 +53,7 @@
 The VM object being returned, or
 .Dv NULL
 if the caller wants to test for the existence
-of the VM object).
+of the VM object.
 .El
 .Pp
 .Xr VFS 9
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/VOP_SETACL.9
--- a/head/share/man/man9/VOP_SETACL.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/VOP_SETACL.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/VOP_SETACL.9 235319 2012-05-12 03:46:43Z gjb $
 .\"
 .Dd December 23, 1999
 .Dt VOP_SETACL 9
@@ -84,7 +84,7 @@
 .It Bq Er EINVAL
 The ACL type passed is invalid for this vnode, or the ACL data is invalid.
 .It Bq Er EACCES
-The the caller does not have the appropriate privilege.
+The caller does not have the appropriate privilege.
 .It Bq Er ENOMEM
 Sufficient memory is not available to fulfill the request.
 .It Bq Er EOPNOTSUPP
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/VOP_SETEXTATTR.9
--- a/head/share/man/man9/VOP_SETEXTATTR.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/VOP_SETEXTATTR.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/VOP_SETEXTATTR.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd December 23, 1999
 .Dt VOP_SETEXTATTR 9
@@ -91,12 +91,12 @@
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er EACCES
-The the caller does not have the appropriate privilege.
+The caller does not have the appropriate privilege.
 .It Bq Er ENXIO
 The request was not valid in this file system for the specified vnode and
 attribute name.
 .It Bq Er ENOMEM
-Insufficient memory available to fulfill request
+Insufficient memory available to fulfill the request.
 .It Bq Er EFAULT
 The uio structure refers to an invalid userspace address.
 .It Bq Er EINVAL
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/acl.9
--- a/head/share/man/man9/acl.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/acl.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/acl.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd September 18, 2009
 .Dt ACL 9
@@ -210,7 +210,7 @@
 .Xr vaccess_acl_nfs4 9 ,
 .Xr vaccess_acl_posix1e 9 ,
 .Xr VFS 9 ,
-.Xr vnaccess 9 ,
+.Xr vaccess 9 ,
 .Xr VOP_ACLCHECK 9 ,
 .Xr VOP_GETACL 9 ,
 .Xr VOP_SETACL 9
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/bpf.9
--- a/head/share/man/man9/bpf.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/bpf.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/bpf.9 235744 2012-05-21 22:13:48Z melifaro $
 .\"
-.Dd December 13, 2006
+.Dd May 11, 2012
 .Dt BPF 9
 .Os
 .\"
@@ -246,9 +246,31 @@
 function
 returns 0 when the program is not a valid filter program.
 .\"
+.Sh EVENT HANDLERS
+.Nm
+invokes
+.Fa bpf_track
+.Xr EVENTHANDLER 9
+event each time listener attaches to or detaches from an interface.
+Pointer to
+.Pq Vt "struct ifnet *"
+is passed as the first argument, interface
+.Fa dlt
+follows. Last argument indicates listener is attached (1) or
+detached (0).
+Note that handler is invoked with
+.Nm
+global lock held, which implies restriction on sleeping and calling
+.Nm
+subsystem inside
+.Xr EVENTHANDLER 9
+dispatcher.
+Note that handler is not called for write-only listeners.
+.\"
 .Sh SEE ALSO
 .Xr tcpdump 1 ,
-.Xr bpf 4
+.Xr bpf 4 ,
+.Xr EVENTHANDLER 9
 .\"
 .Sh HISTORY
 The Enet packet filter was created in 1980 by Mike Accetta and
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/bus_generic_print_child.9
--- a/head/share/man/man9/bus_generic_print_child.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/bus_generic_print_child.9	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/bus_generic_print_child.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd June 16, 1998
 .Dt BUS_GENERIC_PRINT_CHILD 9
@@ -51,7 +51,7 @@
 bus_generic_print_child itself calls two functions
 .Fn bus_print_child_header
 and
-.Fn bus_print_child_footer
+.Fn bus_print_child_footer .
 The former prints "foo0: <FooCard 1234>" and the latter "on bar0".
 These routines should be used if possible in your own code if
 .Fn bus_generic_print_child
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/bus_release_resource.9
--- a/head/share/man/man9/bus_release_resource.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/bus_release_resource.9	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/bus_release_resource.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd May 18, 2000
 .Dt BUS_RELEASE_RESOURCE 9
@@ -71,7 +71,7 @@
 .It
 .Fa r
 is the pointer to
-.Va struct res ,
+.Va struct resource ,
 i.e., the resource itself,
 returned by
 .Xr bus_alloc_resource 9 .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/bus_space.9
--- a/head/share/man/man9/bus_space.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/bus_space.9	Wed Jul 25 16:32:50 2012 +0300
@@ -56,7 +56,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/bus_space.9 231564 2012-02-12 18:29:56Z ed $
+.\" $FreeBSD: head/share/man/man9/bus_space.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd June 13, 2005
 .Dt BUS_SPACE 9
@@ -1380,7 +1380,8 @@
 They may also be executed out
 of order with respect to other pending read and write operations unless
 order is enforced by use of the
-.Fn bus_space_barrier function .
+.Fn bus_space_barrier
+function.
 There is no way to insert barriers between reads or writes of
 individual bus space locations executed by the
 .Fn bus_space_copy_region_N
@@ -1610,7 +1611,7 @@
 .Fn bus_space_*_stream_N
 functions.
 .Pp
-.Bl -tag -compact
+.Bl -tag -compact -width Fn
 .It Fn bus_space_read_stream_1
 .It Fn bus_space_read_stream_2
 .It Fn bus_space_read_stream_4
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/byteorder.9
--- a/head/share/man/man9/byteorder.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/byteorder.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/byteorder.9 232254 2012-02-28 15:07:05Z kevlo $
+.\" $FreeBSD: head/share/man/man9/byteorder.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd April 29, 2002
 .Dt BYTEORDER 9
@@ -158,7 +158,7 @@
 The
 .Fn hto*
 and
-.Fn toh*
+.Fn *toh
 functions first appeared in
 .Fx 5.0 ,
 and were originally developed by the
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/cd.9
--- a/head/share/man/man9/cd.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/cd.9	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/cd.9 237937 2012-07-01 19:40:51Z schweikh $
 .\"
 .Dd September 2, 2003
 .Dt CD 9
@@ -57,7 +57,7 @@
 The following is a list of quirks that the driver recognize.
 .Bl -tag -width CD_Q_BCD_TRACKS
 .It Dv CD_Q_NO_TOUCH
-This flag tell the driver not to probe the drive at attach time to see if
+This flag tells the driver not to probe the drive at attach time to see if
 there is a disk in the drive and find out what size it is.
 This flag is currently unimplemented in the CAM
 .Nm
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/devclass_get_maxunit.9
--- a/head/share/man/man9/devclass_get_maxunit.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/devclass_get_maxunit.9	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/devclass_get_maxunit.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/devclass_get_maxunit.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd September 10, 2010
 .Dt DEVCLASS_GET_MAXUNIT 9
@@ -49,7 +49,7 @@
 function returns -1 if
 .Fa dc
 is
-.Dv NULL;
+.Dv NULL ,
 otherwise it returns the next unit
 number in
 .Fa dc's
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/device_find_child.9
--- a/head/share/man/man9/device_find_child.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/device_find_child.9	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/device_find_child.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd February 8, 2005
 .Dt DEVICE_FIND_CHILD 9
@@ -41,7 +41,7 @@
 .Fn device_find_child "device_t dev" "const char *classname" "int unit"
 .Sh DESCRIPTION
 This function looks for a specific child of
-.Dv dev .
+.Dv dev
 with the given
 .Fa classname
 and
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/disk.9
--- a/head/share/man/man9/disk.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/disk.9	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/disk.9 237518 2012-06-24 04:29:03Z ken $
 .\"
 .Dd February 18, 2004
 .Dt DISK 9
@@ -145,6 +145,16 @@
 .Xr dumpon 8 ,
 this function is invoked from a very restricted system state after a
 kernel panic to record a copy of the system RAM to the disk.
+.It Vt "disk_getattr_t *" Va d_getattr
+Optional: if this method is provided, it gives the disk driver the
+opportunity to override the default GEOM response to BIO_GETATTR requests.
+This function should return -1 if the attribute is not handled, 0 if the
+attribute is handled, or an errno to be passed to g_io_deliver().
+.It Vt "disk_gone_t *" Va d_gone
+Optional: if this method is provided, it will be called after disk_gone()
+is called, once GEOM has finished its cleanup process.
+Once this callback is called, it is safe for the disk driver to free all of
+its resources, as it will not be receiving further calls from GEOM.
 .El
 .Ss Mandatory Media Properties
 The following fields identify the size and granularity of the disk device.
@@ -180,7 +190,23 @@
 .Pa src/sys/geom/notes
 for details.
 .It Vt char Va d_ident[DISK_IDENT_SIZE]
-This field can and should be used to store disk's serial number.
+This field can and should be used to store disk's serial number if the
+d_getattr method described above isn't implemented, or if it does not
+support the GEOM::ident attribute.
+.It Vt char Va d_descr[DISK_IDENT_SIZE]
+This field can be used to store the disk vendor and product description.
+.It Vt uint16_t Va d_hba_vendor
+This field can be used to store the PCI vendor ID for the HBA connected to
+the disk.
+.It Vt uint16_t Va d_hba_device
+This field can be used to store the PCI device ID for the HBA connected to
+the disk.
+.It Vt uint16_t Va d_hba_subvendor
+This field can be used to store the PCI subvendor ID for the HBA connected to
+the disk.
+.It Vt uint16_t Va d_hba_subdevice
+This field can be used to store the PCI subdevice ID for the HBA connected to
+the disk.
 .El
 .Ss Driver Private Data
 This field may be used by the device driver to store a pointer to
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/eventtimers.9
--- a/head/share/man/man9/eventtimers.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/eventtimers.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/eventtimers.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/eventtimers.9 235373 2012-05-12 20:46:19Z gjb $
 .\"
 .Dd December 14, 2011
 .Dt EVENTTIMERS 9
@@ -86,7 +86,7 @@
 Event timers are responsible for generating interrupts at specified time
 or periodically, to run different time-based events.
 Subsystem consists of three main parts:
-.Bl -tag
+.Bl -tag -width "Consumers"
 .It Drivers
 Manage hardware to generate requested time events.
 .It Consumers
@@ -107,7 +107,7 @@
 To register its functionality driver allocates that structure and calls
 .Fn et_register .
 Driver should fill following fields there:
-.Bl -tag
+.Bl -tag -width Va
 .It Va et_name
 Unique name of the event timer for management purposes.
 .It Va et_flags
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/fail.9
--- a/head/share/man/man9/fail.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/fail.9	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/fail.9 233422 2012-03-24 13:37:57Z joel $
+.\" $FreeBSD: head/share/man/man9/fail.9 235373 2012-05-12 20:46:19Z gjb $
 .\"
 .Dd May 10, 2009
 .Dt FAIL 9
@@ -166,7 +166,7 @@
 The fail point term is only executed when invoked by a process with a
 matching p_pid.
 .Sh EXAMPLES
-.Bl -tag
+.Bl -tag -width Sy
 .It Sy sysctl debug.fail_point.foobar="2.1%return(5)"
 21/1000ths of the time, execute
 .Fa code
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/firmware.9
--- a/head/share/man/man9/firmware.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/firmware.9	Wed Jul 25 16:32:50 2012 +0300
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/firmware.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/firmware.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd August 2, 2008
 .Dt FIRMWARE 9
@@ -101,11 +101,13 @@
 the firmware subsystem will try to load it using the
 mechanisms specified below (typically, a kernel module
 with
-.Nm the same name
+.Nm
+the same name
 as the image).
 .Sh API DESCRIPTION
 The kernel
-.Nm firmware API
+.Nm
+firmware API
 is made of the following functions:
 .Pp
 .Fn firmware_register
@@ -225,7 +227,7 @@
 If you need to embed firmware images into a system, you should write
 appropriate entries in the <files.arch> file, e.g. this example is
 from
-.Nm sys/arm/xscale/ixp425/files.ixp425:
+.Nm sys/arm/xscale/ixp425/files.ixp425 :
 .Bd -literal
 ixp425_npe_fw.c                         optional npe_fw                 \\
         compile-with    "${AWK} -f $S/tools/fw_stub.awk			\\
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/hashinit.9
--- a/head/share/man/man9/hashinit.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/hashinit.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,13 +23,13 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/hashinit.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd October 10, 2004
 .Dt HASHINIT 9
 .Os
 .Sh NAME
-.Nm hashinit , hashinit_flags, hashdestroy , phashinit
+.Nm hashinit , hashinit_flags , hashdestroy , phashinit
 .Nd manage kernel hash tables
 .Sh SYNOPSIS
 .In sys/malloc.h
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/ieee80211_node.9
--- a/head/share/man/man9/ieee80211_node.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/ieee80211_node.9	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/ieee80211_node.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/ieee80211_node.9 238542 2012-07-17 02:05:39Z kevlo $
 .\"
 .Dd April 28, 2010
 .Dt IEEE80211_NODE 9
@@ -185,7 +185,7 @@
 {
         struct iwi_node *in;
 
-        in = malloc(sizeof (struct iwi_node), M_80211_NODE,
+        in = malloc(sizeof(struct iwi_node), M_80211_NODE,
 		M_NOWAIT | M_ZERO);
         if (in == NULL)
                 return NULL;
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/ieee80211_proto.9
--- a/head/share/man/man9/ieee80211_proto.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/ieee80211_proto.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/ieee80211_proto.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/ieee80211_proto.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd August 4, 2009
 .Dt IEEE80211_PROTO 9
@@ -238,4 +238,4 @@
 The state machine concept was part of the original
 .Nm ieee80211
 code base that first appeared in
-.Nx 1.5 ,
+.Nx 1.5 .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/ifnet.9
--- a/head/share/man/man9/ifnet.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/ifnet.9	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/ifnet.9 233370 2012-03-23 16:24:07Z pluknet $
+.\" $FreeBSD: head/share/man/man9/ifnet.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd March 23, 2012
 .Dt IFNET 9
@@ -637,7 +637,7 @@
 .Aq D
 This interface blocks transmission of packets and discards incoming
 packets after BPF processing.
-Used to monitor network trafic but not interact
+Used to monitor network traffic but not interact
 with the network in question.
 .It Dv IFF_STATICARP
 .Aq D
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/kernel_mount.9
--- a/head/share/man/man9/kernel_mount.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/kernel_mount.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/kernel_mount.9 238542 2012-07-17 02:05:39Z kevlo $
 .\"
 .Dd December 13, 2004
 .Dt KERNEL_MOUNT 9
@@ -153,12 +153,12 @@
 
 	if (data == NULL)
 		return (EINVAL);
-	error = copyin(data, &args, sizeof args);
+	error = copyin(data, &args, sizeof(args));
 	if (error)
 		return (error);
 
 	ma = mount_argsu(ma, "from", args.fspec, MAXPATHLEN);
-	ma = mount_arg(ma, "export", &args.export, sizeof args.export);
+	ma = mount_arg(ma, "export", &args.export, sizeof(args.export));
 	ma = mount_argf(ma, "uid", "%d", args.uid);
 	ma = mount_argf(ma, "gid", "%d", args.gid);
 	ma = mount_argf(ma, "mask", "%d", args.mask);
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/kqueue.9
--- a/head/share/man/man9/kqueue.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/kqueue.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/kqueue.9 233505 2012-03-26 09:34:17Z melifaro $
+.\" $FreeBSD: head/share/man/man9/kqueue.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd March 26, 2012
 .Dt KQUEUE 9
@@ -260,8 +260,7 @@
 If used, the
 .Vt knlist
 must be initialized with either
-.Fn knlist_init
-,
+.Fn knlist_init ,
 .Fn knlist_init_mtx
 or
 .Fn knlist_init_rw_reader .
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/lock.9
--- a/head/share/man/man9/lock.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/lock.9	Wed Jul 25 16:32:50 2012 +0300
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/lock.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/lock.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd November 16, 2011
 .Dt LOCK 9
@@ -230,7 +230,7 @@
 The
 .Fn lockmgr_disown
 function switches the owner from the current thread to be
-.Dv LK_KERNPROC,
+.Dv LK_KERNPROC ,
 if the lock is already held.
 .Pp
 The
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/locking.9
--- a/head/share/man/man9/locking.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/locking.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/locking.9 233681 2012-03-29 20:55:45Z joel $
+.\" $FreeBSD: head/share/man/man9/locking.9 237619 2012-06-27 01:13:37Z julian $
 .\"
-.Dd November 3, 2010
+.Dd May 25, 2012
 .Dt LOCKING 9
 .Os
 .Sh NAME
@@ -37,11 +37,19 @@
 several different synchronization primitives to allow the developers
 to safely access and manipulate the many data types required.
 .Ss Mutexes
-Mutexes (also called "sleep mutexes") are the most commonly used
+Mutexes (also erroneously called "sleep mutexes") are the most commonly used
 synchronization primitive in the kernel.
-Thread acquires (locks) a mutex before accessing data shared with other
+A thread acquires (locks) a mutex before accessing data shared with other
 threads (including interrupt threads), and releases (unlocks) it afterwards.
-If the mutex cannot be acquired, the thread requesting it will sleep.
+If the mutex cannot be acquired, the thread requesting it will wait.
+Mutexes are by default adaptive, meaning that
+if the owner of a contended mutex is currently running on another CPU,
+then a thread attempting to acquire the mutex will briefly spin
+in the hope that the owner is only briefly holding it,
+and might release it shortly.
+If the owner does not do so, the waiting thread proceeds to yield the processor,
+allowing other threads to run.
+If the owner is not currently actually running then the spin step is skipped.
 Mutexes fully support priority propagation.
 .Pp
 See
@@ -49,9 +57,10 @@
 for details.
 .Ss Spin mutexes
 Spin mutexes are variation of basic mutexes; the main difference between
-the two is that spin mutexes never sleep - instead, they spin, waiting
-for the thread holding the lock, which runs on another CPU, to release it.
-Differently from ordinary mutex, spin mutexes disable interrupts when acquired.
+the two is that spin mutexes never yield the processor - instead, they spin,
+waiting for the thread holding the lock,
+(which must be running on another CPU), to release it.
+Spin mutexes disable interrupts while the held so as to not get pre-empted.
 Since disabling interrupts is expensive, they are also generally slower.
 Spin mutexes should be used only when necessary, e.g. to protect data shared
 with interrupt filter code (see
@@ -122,7 +131,7 @@
 They don't support priority propagation.
 They should be considered to be closely related to
 .Xr sleep 9 .
-In fact it could in some cases be
+They could in some cases be
 considered a conditional sleep.
 .Pp
 See
@@ -146,8 +155,8 @@
 .Fn cv_wait* ,
 functions.
 When a thread waits on a condition, the mutex
-is atomically released before the thread is blocked, then reacquired
-before the function call returns.
+is atomically released before the thread thread yields the processor,
+then reacquired before the function call returns.
 .Pp
 See
 .Xr condvar 9
@@ -255,14 +264,14 @@
 .Xr witness 4
 code.
 .Ss Bounded vs. unbounded sleep
-The following primitives perform bounded sleep: mutexes, pool mutexes,
-reader/writer locks and read-mostly locks.
+The following primitives perform bounded sleep:
+ mutexes, pool mutexes, reader/writer locks and read-mostly locks.
 .Pp
-The following primitives block (perform unbounded sleep): shared/exclusive locks,
-counting semaphores, condition variables, sleep/wakeup and lockmanager locks.
+The following primitives may perform an unbounded sleep:
+shared/exclusive locks, counting semaphores, condition variables, sleep/wakeup and lockmanager locks.
 .Pp
-It is an error to do any operation that could result in any kind of sleep while
-holding spin mutex.
+It is an error to do any operation that could result in yielding the processor
+while holding a spin mutex.
 .Pp
 As a general rule, it is an error to do any operation that could result
 in unbounded sleep while holding any primitive from the 'bounded sleep' group.
@@ -280,25 +289,26 @@
 good knowledge of all of the call graph above the place where
 .Fn mtx_sleep
 is being called and assumptions the calling code has made.
-Because the lock gets dropped during sleep, one one must re-test all
+Because the lock gets dropped during sleep, one must re-test all
 the assumptions that were made before, all the way up the call graph to the
 place where the lock was acquired.
 .Pp
-It is an error to do any operation that could result in any kind of sleep when
-running inside an interrupt filter.
+It is an error to do any operation that could result in yielding of
+the processor when running inside an interrupt filter.
 .Pp
 It is an error to do any operation that could result in unbounded sleep when
 running inside an interrupt thread.
 .Ss Interaction table
 The following table shows what you can and can not do while holding
 one of the synchronization primitives discussed:
-.Bl -column ".Ic xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent
-.It Em "You have: You want:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep
+.Bl -column ".Ic xxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent
+.It Em "       You want:" Ta spin-mtx Ta mutex Ta rwlock Ta rmlock Ta sx Ta sleep
+.It Em "You have:     " Ta ------ Ta ------ Ta ------ Ta ------ Ta ------ Ta ------
 .It spin mtx  Ta \&ok-1 Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-3
-.It mutex     Ta \&ok Ta \&ok-1 Ta \&no Ta \&ok Ta \&ok Ta \&no-3
-.It sx        Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&ok Ta \&ok-4
-.It rwlock    Ta \&ok Ta \&ok Ta \&no Ta \&ok-2 Ta \&ok Ta \&no-3
-.It rmlock    Ta \&ok Ta \&ok Ta \&ok-5 Ta \&ok Ta \&ok-2 Ta \&ok-5
+.It mutex     Ta \&ok Ta \&ok-1 Ta \&ok Ta \&ok Ta \&no Ta \&no-3
+.It rwlock    Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&no Ta \&no-3
+.It rmlock    Ta \&ok Ta \&ok Ta \&ok Ta \&ok-2 Ta \&no-5 Ta \&no-5
+.It sx        Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&no-2 Ta \&ok-4
 .El
 .Pp
 .Em *1
@@ -315,8 +325,7 @@
 .Fn mtx_sleep ,
 .Fn rw_sleep
 and
-.Fn msleep_spin
-).
+.Fn msleep_spin ) .
 .Pp
 .Em *4
 Though one can sleep holding an sx lock, one can also use
@@ -358,6 +367,6 @@
 functions appeared in
 .Bsx 4.1
 through
-.Fx 7.0
+.Fx 7.0 .
 .Sh BUGS
 There are too many locking primitives to choose from.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/malloc.9
--- a/head/share/man/man9/malloc.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/malloc.9	Wed Jul 25 16:32:50 2012 +0300
@@ -27,7 +27,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
-.\" $FreeBSD: head/share/man/man9/malloc.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/malloc.9 238542 2012-07-17 02:05:39Z kevlo $
 .\"
 .Dd January 28, 2012
 .Dt MALLOC 9
@@ -197,7 +197,7 @@
 /* sys/something/foo_subr.c */
 
 \&...
-buf = malloc(sizeof *buf, M_FOOBUF, M_NOWAIT);
+buf = malloc(sizeof(*buf), M_FOOBUF, M_NOWAIT);
 
 .Ed
 .Pp
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/mbuf.9
--- a/head/share/man/man9/mbuf.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/mbuf.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/mbuf.9 220787 2011-04-18 15:30:25Z glebius $
+.\" $FreeBSD: head/share/man/man9/mbuf.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd April 18, 2011
 .Dt MBUF 9
@@ -403,7 +403,8 @@
 Associate externally managed data with
 .Fa mbuf .
 Any internal data contained in the mbuf will be discarded, and the
-.Dv M_EXT flag will be set.
+.Dv M_EXT
+flag will be set.
 The
 .Fa buf
 and
@@ -722,7 +723,8 @@
 .Fa mbuf ,
 so they are accessible with
 .Fn mtod mbuf type .
-.Fa len must be smaller than, or equal to, the size of an
+.Fa len
+must be smaller than, or equal to, the size of an
 .Vt mbuf cluster .
 Return a pointer to an intermediate
 .Vt mbuf
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/mod_cc.9
--- a/head/share/man/man9/mod_cc.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/mod_cc.9	Wed Jul 25 16:32:50 2012 +0300
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/mod_cc.9 225583 2011-09-15 12:15:36Z lstewart $
+.\" $FreeBSD: head/share/man/man9/mod_cc.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd September 15, 2011
 .Dt MOD_CC 9
@@ -287,7 +287,7 @@
 .Va ack_received
 and is set when the connection's ability to send data is currently constrained
 by the value of the congestion window.
-Algorithms should use the abscence of this flag being set to avoid accumulating
+Algorithms should use the absence of this flag being set to avoid accumulating
 a large difference between the congestion window and send window.
 .Sh SEE ALSO
 .Xr cc_chd 4 ,
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/namei.9
--- a/head/share/man/man9/namei.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/namei.9	Wed Jul 25 16:32:50 2012 +0300
@@ -31,7 +31,7 @@
 .\" If you integrate this manpage in another OS, I'd appreciate a note
 .\"	- eivind at FreeBSD.org
 .\"
-.\" $FreeBSD: head/share/man/man9/namei.9 232350 2012-03-01 18:17:45Z jh $
+.\" $FreeBSD: head/share/man/man9/namei.9 235371 2012-05-12 20:41:40Z gjb $
 .\"
 .Dd March 1, 2012
 .Dt NAMEI 9
@@ -316,7 +316,7 @@
 .Fn namei
 will return 0, otherwise it will return an error.
 .Sh FILES
-.Bl -tag
+.Bl -tag -width Pa
 .It Pa src/sys/kern/vfs_lookup.c
 .El
 .Sh ERRORS
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/netisr.9
--- a/head/share/man/man9/netisr.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/netisr.9	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/netisr.9 231564 2012-02-12 18:29:56Z ed $
+.\" $FreeBSD: head/share/man/man9/netisr.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd February 22, 2010
 .Dt NETISR 9
@@ -78,7 +78,7 @@
 .Fn netisr_getqdrops ,
 .Fn netisr_getqlimit ,
 and
-.Fn netisr_setqlimit.
+.Fn netisr_setqlimit .
 .Pp
 .Nm
 supports multi-processor execution of handlers, and relies on a combination
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/pci.9
--- a/head/share/man/man9/pci.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/pci.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/pci.9 232571 2012-03-05 20:04:28Z pluknet $
+.\" $FreeBSD: head/share/man/man9/pci.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd March 5, 2012
 .Dt PCI 9
@@ -488,7 +488,7 @@
 .Fn pci_count_msi
 function returns the maximum number of MSI messages supported by the
 device
-.Fa dev.
+.Fa dev .
 If the device does not support MSI,
 then
 .Fn pci_count_msi
@@ -567,7 +567,8 @@
 returns zero.
 For MSI-X messages,
 the resource ID for each
-.Dv SYS_RES_IRQ resource identifies the index in the MSI-X table of the
+.Dv SYS_RES_IRQ
+resource identifies the index in the MSI-X table of the
 corresponding message.
 A resource ID of one maps to the first index of the MSI-X table;
 a resource ID two identifies the second index in the table, etc.
@@ -608,7 +609,7 @@
 table entries via the
 .Fn pci_remap_msix
 function.
-Note that this function must be called after a succesful call to
+Note that this function must be called after a successful call to
 .Fn pci_alloc_msix
 but before any of the
 .Dv SYS_RES_IRQ
@@ -649,7 +650,8 @@
 .Fn pci_alloc_msix .
 MSI-X table entries that with a vector of zero will not have an
 associated
-.Dv SYS_RES_IRQ resource.
+.Dv SYS_RES_IRQ
+resource.
 Additionally,
 if any of the original messages allocated by
 .Fn pci_alloc_msix
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/rmlock.9
--- a/head/share/man/man9/rmlock.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/rmlock.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,10 +23,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/rmlock.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/rmlock.9 236768 2012-06-08 21:30:35Z jhb $
 .\"
 .\" Based on rwlock.9 man page
-.Dd November 16, 2011
+.Dd June 8, 2012
 .Dt RMLOCK 9
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm rm_wunlock ,
 .Nm rm_wowned ,
 .Nm RM_SYSINIT
-.Nd kernel reader/writer lock optimized for mostly read access patterns
+.Nd kernel reader/writer lock optimized for read-mostly access patterns
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/lock.h
@@ -67,7 +67,7 @@
 .In sys/kernel.h
 .Fn RM_SYSINIT "name" "struct rmlock *rm" "const char *desc" "int opts"
 .Sh DESCRIPTION
-Mostly reader locks allow shared access to protected data by multiple threads,
+Read-mostly locks allow shared access to protected data by multiple threads,
 or exclusive access by a single thread.
 The threads with shared access are known as
 .Em readers
@@ -76,83 +76,82 @@
 .Em writer
 since it can modify protected data.
 .Pp
-Read mostly locks are designed to be efficient for locks almost exclusively
+Read-mostly locks are designed to be efficient for locks almost exclusively
 used as reader locks and as such should be used for protecting data that
 rarely changes.
-Acquiring an exclusive lock after the lock had been locked for shared access
+Acquiring an exclusive lock after the lock has been locked for shared access
 is an expensive operation.
 .Pp
-Although reader/writer locks look very similar to
-.Xr sx 9
-locks, their usage pattern is different.
-Reader/writer locks can be treated as mutexes (see
-.Xr mutex 9 )
-with shared/exclusive semantics unless initialized with
-.Dv RM_SLEEPABLE .
+Normal read-mostly locks are similar to
+.Xr rwlock 9
+locks and follow the same lock ordering rules as
+.Xr rwlock 9
+locks.
+Read-mostly locks have full priority propagation like mutexes.
 Unlike
-.Xr sx 9 ,
-an
-.Nm
-can be locked while holding a non-spin mutex, and an
-.Nm
-cannot be held while sleeping, again unless initialized with
-.Dv RM_SLEEPABLE .
-The
-.Nm
-locks have full priority propagation like mutexes.
-The
+.Xr rwlock 9 ,
+read-mostly locks propagate priority to both readers and writers.
+This is implemented via the
 .Va rm_priotracker
-structure argument supplied in
+structure argument supplied to
 .Fn rm_rlock
 and
-.Fn rm_runlock
-is used to keep track of the read owner(s).
-Another important property is that shared holders of
-.Nm
-can recurse if the lock has been initialized with the
-.Dv LO_RECURSABLE
-option, however exclusive locks are not allowed to recurse.
+.Fn rm_runlock .
+Readers can recurse if the lock is initialized with the
+.Dv RM_RECURSE
+option;
+however, writers are never allowed to recurse.
+.Pp
+Sleepable read-mostly locks are created by passing
+.Dv RM_SLEEPABLE
+to
+.Fn rm_init_flags .
+Unlike normal read-mostly locks,
+sleepable read-mostly locks follow the same lock ordering rules as
+.Xr sx 9
+locks.
+Sleepable read-mostly locks do not propagate priority to writers,
+but they do propagate priority to readers.
+Writers are permitted to sleep while holding a read-mostly lock,
+but readers are not.
+Unlike other sleepable locks such as
+.Xr sx 9
+locks,
+readers must use try operations on other sleepable locks to avoid sleeping.
 .Ss Macros and Functions
 .Bl -tag -width indent
 .It Fn rm_init "struct rmlock *rm" "const char *name"
-Initialize structure located at
-.Fa rm
-as mostly reader lock, described by
-.Fa name .
-The name description is used solely for debugging purposes.
+Initialize the read-mostly lock
+.Fa rm .
+The
+.Fa name
+description is used solely for debugging purposes.
 This function must be called before any other operations
 on the lock.
 .It Fn rm_init_flags "struct rmlock *rm" "const char *name" "int opts"
-Initialize the rm lock just like the
-.Fn rm_init
-function, but specifying a set of optional flags to alter the
-behaviour of
-.Fa rm ,
-through the
+Similar to
+.Fn rm_init ,
+initialize the read-mostly lock
+.Fa rm
+with a set of optional flags.
+The
 .Fa opts
-argument.
-It contains one or more of the following flags:
+arguments contains one or more of the following flags:
 .Bl -tag -width ".Dv RM_NOWITNESS"
 .It Dv RM_NOWITNESS
 Instruct
 .Xr witness 4
 to ignore this lock.
 .It Dv RM_RECURSE
-Allow threads to recursively acquire exclusive locks for
+Allow threads to recursively acquire shared locks for
 .Fa rm .
 .It Dv RM_SLEEPABLE
-Allow writers to sleep while holding the lock.
-Readers must not sleep while holding the lock and can avoid to sleep on
-taking the lock by using
-.Fn rm_try_rlock
-instead of
-.Fn rm_rlock .
+Create a sleepable read-mostly lock.
 .El
 .It Fn rm_rlock "struct rmlock *rm" "struct rm_priotracker* tracker"
 Lock
 .Fa rm
-as a reader.
-Using
+as a reader using
 .Fa tracker
 to track read owners of a lock for priority propagation.
 This data structure is only used internally by
@@ -161,28 +160,32 @@
 .Fn rm_runlock
 has been called.
 This data structure can be allocated on the stack since
-rmlocks cannot be held while sleeping.
+readers cannot sleep.
 If any thread holds this lock exclusively, the current thread blocks,
 and its priority is propagated to the exclusive holder.
 If the lock was initialized with the
-.Dv LO_RECURSABLE
+.Dv RM_RECURSE
 option the
 .Fn rm_rlock
-function can be called when the thread has already acquired reader
+function can be called when the current thread has already acquired reader
 access on
 .Fa rm .
-This is called
-.Dq "recursing on a lock" .
 .It Fn rm_try_rlock "struct rmlock *rm" "struct rm_priotracker* tracker"
 Try to lock
 .Fa rm
 as a reader.
 .Fn rm_try_rlock
 will return 0 if the lock cannot be acquired immediately;
-otherwise the lock will be acquired and a non-zero value will be returned.
+otherwise,
+the lock will be acquired and a non-zero value will be returned.
 Note that
 .Fn rm_try_rlock
 may fail even while the lock is not currently held by a writer.
+If the lock was initialized with the
+.Dv RM_RECURSE
+option,
+.Fn rm_try_rlock
+will succeed if the current thread has already acquired reader access.
 .It Fn rm_wlock "struct rmlock *rm"
 Lock
 .Fa rm
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/rtalloc.9
--- a/head/share/man/man9/rtalloc.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/rtalloc.9	Wed Jul 25 16:32:50 2012 +0300
@@ -26,9 +26,9 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/rtalloc.9 228499 2011-12-14 14:52:50Z glebius $
+.\" $FreeBSD: head/share/man/man9/rtalloc.9 238093 2012-07-04 07:42:12Z glebius $
 .\"
-.Dd December 14, 2011
+.Dd July 4, 2012
 .Dt RTALLOC 9
 .Os
 .Sh NAME
@@ -52,6 +52,7 @@
 .Fn RT_UNLOCK "struct rt_entry *rt"
 .Fn RT_ADDREF "struct rt_entry *rt"
 .Fn RT_REMREF "struct rt_entry *rt"
+.Fn RO_RTFREE "struct route *ro"
 .Ft void
 .Fn rtfree "struct rt_entry *rt"
 .Ft "struct rtentry *"
@@ -203,6 +204,14 @@
 .Fn RT_ADDREF .
 .Pp
 The
+.Fn RO_RTFREE
+macro is used to free route entry that is referenced by struct route.
+At certain circumstances the latter may not hold a reference on rtentry,
+and
+.Fn RO_RTFREE
+treats such routes correctly.
+.Pp
+The
 .Fn rtfree
 function does the actual free of the routing table entry, and shouldn't
 be called directly by facilities, that just perform routing table lookups.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/rwlock.9
--- a/head/share/man/man9/rwlock.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/rwlock.9	Wed Jul 25 16:32:50 2012 +0300
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/rwlock.9 227588 2011-11-16 21:51:17Z pjd $
+.\" $FreeBSD: head/share/man/man9/rwlock.9 236680 2012-06-06 13:35:30Z jhb $
 .\"
 .Dd November 16, 2011
 .Dt RWLOCK 9
@@ -114,12 +114,10 @@
 The
 .Nm
 locks have priority propagation like mutexes, but priority
-can be propagated only to an exclusive holder.
-This limitation comes from the fact that shared owners
+can be propagated only to writers.
+This limitation comes from the fact that readers
 are anonymous.
-Another important property is that shared holders of
-.Nm
-can recurse,
+Another important property is that readers can always recurse,
 and exclusive locks can be made recursive selectively.
 .Ss Macros and Functions
 .Bl -tag -width indent
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/spl.9
--- a/head/share/man/man9/spl.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/spl.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/spl.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/spl.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd July 21, 1996
 .Dt SPL 9
@@ -112,8 +112,7 @@
 the
 .Em xxx
 group to be called at a priority >=
-.Ns spl Ns Em xxx
-\&().
+.Em spl Ns Fn xxx
 .Pp
 The function
 .Fn splx
@@ -221,7 +220,8 @@
 The historical number scheme can be considered as a
 simple linearly ordered set of interrupt priority groups.
 .Pp
-.Fx 5.0 eliminated spl entirely in favor of locking primitives which scale
+.Fx 5.0
+eliminated spl entirely in favor of locking primitives which scale
 to more than one processor.
 .Sh AUTHORS
 This manual page was written by
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/store.9
--- a/head/share/man/man9/store.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/store.9	Wed Jul 25 16:32:50 2012 +0300
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/store.9 235319 2012-05-12 03:46:43Z gjb $
 .\"
 .Dd October 5, 2009
 .Dt STORE 9
@@ -76,13 +76,13 @@
 Stores a word of data to the user-space address
 .Pa base .
 .It Fn suword16
-Stores 16 bits of of data to the user-space address
+Stores 16 bits of data to the user-space address
 .Pa base .
 .It Fn suword32
-Stores 32 bits of of data to the user-space address
+Stores 32 bits of data to the user-space address
 .Pa base .
 .It Fn suword64
-Stores 64 bits of of data to the user-space address
+Stores 64 bits of data to the user-space address
 .Pa base .
 .It Fn suswintr
 Stores a short word of data to the user-space address
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/sysctl.9
--- a/head/share/man/man9/sysctl.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/sysctl.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/sysctl.9 232321 2012-02-29 22:41:40Z thompsa $
+.\" $FreeBSD: head/share/man/man9/sysctl.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd January 16, 2010
 .Dt SYSCTL 9
@@ -107,7 +107,7 @@
 This is an opaque data structure.
 .It Dv CTLTYPE_STRUCT
 Alias for
-.Dv CTLTYPE_OPAQUE.
+.Dv CTLTYPE_OPAQUE .
 .It Dv CTLTYPE_UINT
 This is an unsigned integer.
 .It Dv CTLTYPE_LONG
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/taskqueue.9
--- a/head/share/man/man9/taskqueue.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/taskqueue.9	Wed Jul 25 16:32:50 2012 +0300
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/taskqueue.9 233648 2012-03-29 05:02:12Z eadler $
+.\" $FreeBSD: head/share/man/man9/taskqueue.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd April 26, 2011
 .Dt TASKQUEUE 9
@@ -189,8 +189,8 @@
 count is cleared, and the old value returned in the reference
 parameter
 .Fa pendp ,
-if it is non-
-.Dv NULL .
+if it is
+.Pf non- Dv NULL .
 If the task is currently running,
 .Dv EBUSY
 is returned, otherwise 0.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/usbdi.9
--- a/head/share/man/man9/usbdi.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/usbdi.9	Wed Jul 25 16:32:50 2012 +0300
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD: head/share/man/man9/usbdi.9 233648 2012-03-29 05:02:12Z eadler $
+.\"	$FreeBSD: head/share/man/man9/usbdi.9 235693 2012-05-20 16:43:47Z gjb $
 .Dd June 24, 2009
 .Dt USBDI 9
 .Os
@@ -435,7 +435,7 @@
 device speed.
 .
 Depending on the endpoint type, this field has different meaning:
-.Bl -tag
+.Bl -tag -width "UE_ISOCHRONOUS"
 .It UE_INTERRUPT
 "0" use the default interrupt interval based on endpoint descriptor.
 "Else" use the given value for polling rate.
@@ -461,7 +461,7 @@
 .Fa frames
 field sets the maximum number of frames. If zero is specified it will
 yield the following results:
-.Bl -tag
+.Bl -tag -width "UE_INTERRUPT"
 .It UE_BULK
 xfer->nframes = 1;
 .It UE_INTERRUPT
@@ -487,7 +487,7 @@
 .Fa flags
 field has type "struct usb_xfer_flags" and allows one to set initial
 flags an USB transfer. Valid flags are:
-.Bl -tag
+.Bl -tag -width "force_short_xfer"
 .It force_short_xfer
 This flag forces the last transmitted USB packet to be short.  A short
 packet has a length of less than "xfer->max_packet_size", which
@@ -507,7 +507,7 @@
 queue except in the case of "xfer->error" equal to
 "USB_ERR_CANCELLED". No other USB transfers in the affected PIPE queue
 will be started until either:
-.Bl -tag
+.Bl -tag -width "1"
 .It 1
 The failing USB transfer is stopped using "usbd_transfer_stop()".
 .It 2
@@ -524,7 +524,7 @@
 .
 This flag can be changed during operation.
 .Pp
-"BOF" is short for "Block On Failure"
+"BOF" is short for "Block On Failure".
 .Pp
 NOTE: This flag should be set on all BULK and INTERRUPT USB transfers
 which use an endpoint that can be shared between userland and kernel.
@@ -574,7 +574,7 @@
 .
 .
 .It stall_pipe
-.Bl -tag
+.Bl -tag -width "Device Side Mode"
 .It Device Side Mode
 Setting this flag will cause STALL pids to be sent to the endpoint
 belonging to this transfer before the transfer is started.
diff -r 49f3e3227aef -r 58bcef12a717 head/share/man/man9/vm_page_aflag.9
--- a/head/share/man/man9/vm_page_aflag.9	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/man/man9/vm_page_aflag.9	Wed Jul 25 16:32:50 2012 +0300
@@ -24,10 +24,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/vm_page_aflag.9 225419 2011-09-06 10:40:21Z kib $
+.\" $FreeBSD: head/share/man/man9/vm_page_aflag.9 235693 2012-05-20 16:43:47Z gjb $
 .\"
 .Dd August 31, 2011
-.Dt VM_PAGE_FLAG 9
+.Dt VM_PAGE_AFLAG 9
 .Os
 .Sh NAME
 .Nm vm_page_aflag_clear , vm_page_aflag_set , vm_page_reference
diff -r 49f3e3227aef -r 58bcef12a717 head/share/misc/bsd-family-tree
--- a/head/share/misc/bsd-family-tree	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/misc/bsd-family-tree	Wed Jul 25 16:32:50 2012 +0300
@@ -253,7 +253,7 @@
  *--FreeBSD    |      |      |                 |                       |
  |    9.0      |      |      |                 |               DragonFly 3.0.1
  |     v    FreeBSD   |      |                 |                       |
- |            8.3     |      |                 |                       |
+ |            8.3     |      |             OpenBSD 5.1                 |
  |                    |      |                 |                       |
 FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
@@ -546,6 +546,7 @@
 FreeBSD 9.0		2012-01-12 [FBD]
 DragonFly 3.0.1		2012-02-21 [DFB]
 FreeBSD 8.3		2012-04-18 [FBD]
+OpenBSD 5.1		2012-05-01 [OBD]
 
 Bibliography
 ------------------------
@@ -606,4 +607,4 @@
 Copyright (c) 1997-2012 Wolfram Schneider <wosch at FreeBSD.ORG>
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
 
-$FreeBSD: head/share/misc/bsd-family-tree 234423 2012-04-18 15:23:21Z maxim $
+$FreeBSD: head/share/misc/bsd-family-tree 235199 2012-05-09 16:06:20Z pluknet $
diff -r 49f3e3227aef -r 58bcef12a717 head/share/misc/committers-doc.dot
--- a/head/share/misc/committers-doc.dot	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/misc/committers-doc.dot	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/misc/committers-doc.dot 232313 2012-02-29 20:13:53Z pluknet $
+# $FreeBSD: head/share/misc/committers-doc.dot 238058 2012-07-03 07:28:57Z zeising $
 
 # This file is meant to list all FreeBSD doc+www committers and describe the
 # mentor-mentee relationships between them.
@@ -32,15 +32,19 @@
 ache [label="Andrey Chernov\nache at FreeBSD.org\n1997/06/13\n2010/12/11"]
 bmah [label="Bruce A. Mah\nbmah at FreeBSD.org\n2000/08/22\n2009/09/13"]
 bvs [label="Vitaly Bogdanov\nbvs at FreeBSD.org\n2005/10/03\n2010/12/11"]
+ceri [label="Ceri Davies\nceri at FreeBSD.org\n2002/03/17\n2012/02/29"]
 den [label="Denis Peplin\nden at FreeBSD.org\n2003/09/13\n2009/07/09"]
 garys [label="Gary W. Swearingen\ngarys at FreeBSD.org\n2005/08/21\n2008/03/02"]
 jcamou [label="Jesus R. Camou\njcamou at FreeBSD.org\n2005/03/02\n2008/12/20"]
 jesusr [label="Jesus Rodriguez Cuesta\njesusr at FreeBSD.org\n1998/12/10\n2010/12/11"]
 jim [label="Jim Mock\njim at FreeBSD.org\n1999/08/11\n2003/12/15"]
 josef [label="Josef El-Rayes\njosef at FreeBSD.org\n2004/01/15\n2008/03/29"]
+marcel [label="Marcel Moolenaar\nmarcel at FreeBSD.org\n1999/07/03\n2012/04/25"]
 mheinen [label="Martin Heinen\nmheinen at FreeBSD.org\n2002/10/04\n2006/04/26"]
+murray [label="Murray Stokely\nmurray at FreeBSD.org\n2000/04/05\n2012/04/25"]
 nik [label="Nik Clayton\nnik at FreeBSD.org\n1998/02/26\n2008/12/20"]
 pgj [label="Gabor Pali\npgj at FreeBSD.org\n2008/04/21\n2010/12/01"]
+roam [label="Peter Pentchev\nroam at FreeBSD.org\n2003/02/14\n2012/02/29"]
 
 node [color=lightblue2, style=filled, bgcolor=black];
 
@@ -51,7 +55,6 @@
 blackend [label="Marc Fonvieille\nblackend at FreeBSD.org\n2002/06/16"]
 brd [label="Brad Davis\nbrd at FreeBSD.org\n2005/06/01"]
 brueffer [label="Christian Brueffer\nbrueffer at FreeBSD.org\n2003/01/13"]
-ceri [label="Ceri Davies\nceri at FreeBSD.org\n2002/03/17"]
 chinsan [label="Chinsan Huang\nchinsan at FreeBSD.org\n2006/09/20"]
 danger [label="Daniel Gerzo\ndanger at FreeBSD.org\n2006/08/20"]
 delphij [label="Xin Li\ndelphij at FreeBSD.org\n2004/09/14"]
@@ -60,27 +63,26 @@
 gavin [label="Gavin Atkinson\ngavin at FreeBSD.org\n2011/07/18"]
 gjb [label="Glen Barber\ngjb at FreeBSD.org\n2010/09/01"]
 hrs [label="Hiroki Sato\nhrs at FreeBSD.org\n2000/07/06"]
+issyl0 [label="Isabell Long\nissyl0 at FreeBSD.org\n2012/04/25"]
 jkois [label="Johann Kois\njkois at FreeBSD.org\n2004/11/11"]
 joel [label="Joel Dahl\njoel at FreeBSD.org\n2005/04/05"]
 keramida [label="Giorgos Keramidas\nkeramida at FreeBSD.org\n2001/10/12"]
 linimon [label="Mark Linimon\nlinimon at FreeBSD.org\n2004/03/31"]
 loader [label="Fukang Chen\nloader at FreeBSD.org\n2007/07/30"]
 manolis [label="Manolis Kiagias\nmanolis at FreeBSD.org\n2008/05/24"]
-marcel [label="Marcel Moolenaar\nmarcel at FreeBSD.org\n1999/07/03"]
 marck [label="Dmitry Morozovsky\nmarck at FreeBSD.org\n2004/08/10"]
 maxim [label="Maxim Konovalov\nmaxim at FreeBSD.org\n2002/02/07"]
 miwi [label="Martin Wilke\nmiwi at FreeBSD.org\n2007/10/26"]
-murray [label="Murray Stokely\nmurray at FreeBSD.org\n2000/04/05"]
 pav [label="Pav Lucistnik\npav at FreeBSD.org\n2005/08/12"]
 pluknet [label="Sergey Kandaurov\npluknet at FreeBSD.org\n2012/02/14"]
 remko [label="Remko Lodder\nremko at FreeBSD.org\n2004/10/16"]
 rene [label="Rene Ladan\nrene at FreeBSD.org\n2008/11/03"]
-roam [label="Peter Pentchev\nroam at FreeBSD.org\n2003/02/14"]
 ryusuke [label="Ryusuke Suzuki\nryusuke at FreeBSD.org\n2009/12/21"]
 simon [label="Simon L. Nielsen\nsimon at FreeBSD.org\n2003/07/20"]
 taras [label="Taras Korenko\ntaras at FreeBSD.org\n2010/06/25"]
 trhodes [label="Tom Rhodes\ntrhodes at FreeBSD.org\n2002/03/25"]
 wblock [label="Warren Block\nwblock at FreeBSD.org\n2011/09/12"]
+zeising [label="Niclas Zeising\nzeising at FreeBSD.org\n2012/07/03"]
 
 # Here are the mentor/mentee relationships.
 # Group together all the mentees for a particular mentor.
@@ -107,6 +109,7 @@
 gabor -> pgj
 gabor -> manolis
 gabor -> taras
+gabor -> issyl0
 
 gjb -> wblock
 
@@ -121,6 +124,8 @@
 jkois -> gavin
 jkois -> gjb
 
+joel -> zeising
+
 keramida -> blackend
 keramida -> danger
 keramida -> gabor
diff -r 49f3e3227aef -r 58bcef12a717 head/share/misc/committers-ports.dot
--- a/head/share/misc/committers-ports.dot	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/misc/committers-ports.dot	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/misc/committers-ports.dot 234343 2012-04-16 15:08:01Z sperber $
+# $FreeBSD: head/share/misc/committers-ports.dot 238058 2012-07-03 07:28:57Z zeising $
 
 # This file is meant to list all FreeBSD ports committers and describe the
 # mentor-mentee relationships between them.
@@ -59,8 +59,8 @@
 bapt [label="Baptiste Daroussin\nbapt at FreeBSD.org\n2010/07/27"]
 beat [label="Beat Gaetzi\nbeat at FreeBSD.org\n2009/01/28"]
 beech [label="Beech Rintoul\nbeech at FreeBSD.org\n2007/05/30"]
+bf [label="Brendan Fabeny\nbf at FreeBSD.org\n2010/06/02"]
 bland [label="Alexander Nedotsukov\nbland at FreeBSD.org\n2003/08/14"]
-bf [label="Brendan Fabeny\nbf at FreeBSD.org\n2010/06/02"]
 brix [label="Henrik Brix Andersen\nbrix at FreeBSD.org\n2007/10/31"]
 brooks [label="Brooks Davies\nbrooks at FreeBSD.org\n2004/05/03"]
 bsam [label="Boris Samorodov\nbsam at FreeBSD.org\n2006/07/20"]
@@ -93,6 +93,7 @@
 gahr [label="Pietro Cerutti\ngahr at FreeBSD.org\n2008/02/20"]
 garga [label="Renato Botelho\ngarga at FreeBSD.org\n2005/07/11"]
 gerald [label="Gerald Pfeifer\ngerald at FreeBSD.org\n2002/04/03"]
+gjb [label="Glen Barber\ngjb at FreeBSD.org\n2012/06/19"]
 glarkin [label="Greg Larkin\nglarkin at FreeBSD.org\n2008/07/17"]
 glewis [label="Greg Lewis\nglewis at FreeBSD.org\n2002/04/08"]
 hq [label="Herve Quiroz\nhq at FreeBSD.org\n2004/08/05"]
@@ -100,6 +101,7 @@
 itetcu [label="Ion-Mihai Tetcu\nitetcu at FreeBSD.org\n2006/06/07"]
 jacula [label="Giuseppe Pilichi\njacula at FreeBSD.org\n2010/04/05"]
 jadawin [label="Philippe Audeoud\njadawin at FreeBSD.org\n2008/03/02"]
+jase [label="Jase Thew\njase at FreeBSD.org\n2012/05/30"]
 jgh [label="Jason Helfman\njgh at FreeBSD.org\n2011/12/16"]
 jkim [label="Jung-uk Kim\njkim at FreeBSD.org\n2007/09/12"]
 jlaffaye [label="Julien Laffaye\njlaffaye at FreeBSD.org\n2011/06/06"]
@@ -111,11 +113,11 @@
 jsa [label="Joseph S. Atkinson\njsa at FreeBSD.org\n2010/07/15"]
 jylefort [label="Jean-Yves Lefort\njylefort at FreeBSD.org\n2005/04/12"]
 kevlo [label="Kevin Lo\nkevlo at FreeBSD.org\n2003/02/21"]
+kmoore [label="Kris Moore\nkmoore at FreeBSD.org\n2009/04/14"]
 knu [label="Akinori Musha\nknu at FreeBSD.org\n2000/03/22"]
+koitsu [label="Jeremy Chadwick\nkoitsu at FreeBSD.org\n2006/11/10"]
 krion [label="Kirill Ponomarew\nkrion at FreeBSD.org\n2003/07/20"]
-kmoore [label="Kris Moore\nkmoore at FreeBSD.org\n2009/04/14"]
 kwm [label="Koop Mast\nkwm at FreeBSD.org\n2004/09/14"]
-koitsu [label="Jeremy Chadwick\nkoitsu at FreeBSD.org\n2006/11/10"]
 laszlof [label="Frank Laszlo\nlaszlof at FreeBSD.org\n2006/11/07"]
 lawrance [label="Sam Lawrance\nlawrance at FreeBSD.org\n2005/04/11\n2007/02/21"]
 lbr [label="Lars Balker Rasmussen\nlbr at FreeBSD.org\n2006/04/30"]
@@ -138,6 +140,7 @@
 mat [label="Mathieu Arnold\nmat at FreeBSD.org\n2003/08/15"]
 matthew [label="Matthew Seaman\nmatthew at FreeBSD.org\n2012/02/07"]
 mezz [label="Jeremy Messenger\nmezz at FreeBSD.org\n2004/04/30"]
+mharo [label="Michael Haro\nmharo at FreeBSD.org\n1999/04/13"]
 miwi [label="Martin Wilke\nmiwi at FreeBSD.org\n2006/06/04"]
 mm [label="Martin Matuska\nmm at FreeBSD.org\n2007/04/04"]
 mnag [label="Marcus Alves Grando\nmnag at FreeBSD.org\n2005/09/15"]
@@ -149,14 +152,14 @@
 novel [label="Roman Bogorodskiy\nnovel at FreeBSD.org\n2005/03/07"]
 nox [label="Juergen Lock\nnox at FreeBSD.org\n2006/12/22"]
 obrien [label="David E. O'Brien\nobrien at FreeBSD.org\n1996/10/29"]
-mharo [label="Michael Haro\nmharo at FreeBSD.org\n1999/04/13"]
+olivierd [label="Olivier Duchateau\nolivierd at FreeBSD.org\n2012/05/29"]
 osa [label="Sergey A. Osokin\nosa at FreeBSD.org\n2003/06/04"]
 pat [label="Patrick Li\npat at FreeBSD.org\n2001/11/14"]
 pav [label="Pav Lucistnik\npav at FreeBSD.org\n2003/11/12"]
 pawel [label="Pawel Pekala\npawel at FreeBSD.org\n2011/03/11"]
 pgj [label="Gabor Pali\npgj at FreeBSD.org\n2009/04/12"]
+pgollucci [label="Philip M. Gollucci\npgollucci at FreeBSD.org\n2008/07/21"]
 philip [label="Philip Paeps\nphilip at FreeBSD.org\n2005/10/19"]
-pgollucci [label="Philip M. Gollucci\npgollucci at FreeBSD.org\n2008/07/21"]
 rafan [label="Rong-En Fan\nrafan at FreeBSD.org\n2006/06/23"]
 rakuco [label="Raphael Kubo da Costa\nrakuco at FreeBSD.org\n2011/08/22"]
 rene [label="Rene Ladan\nrene at FreeBSD.org\n2010/04/11"]
@@ -178,22 +181,24 @@
 stefan [label="Stefan Walter\nstefan at FreeBSD.org\n2006/05/07"]
 stephen [label="Stephen Montgomery-Smith\nstephen at FreeBSD.org\n2011/06/13"]
 sunpoet [label="Po-Chuan Hsieh\nsunpoet at FreeBSD.org\n2010/09/21"]
+swills [label="Steve Wills\nswills at FreeBSD.org\n2010/09/03"]
 sylvio [label="Sylvio Cesar Teixeira\nsylvio at FreeBSD.org\n2009/10/29"]
-swills [label="Steve Wills\nswills at FreeBSD.org\n2010/09/03"]
 tabthorpe [label="Thomas Abthorpe\ntabthorpe at FreeBSD.org\n2007/08/20"]
 tdb [label="Tim Bishop\ntdb at FreeBSD.org\n2005/11/30"]
+thierry [label="Thierry Thomas\nthierry at FreeBSD.org\n2004/03/15"]
 timur [label="Timur Bakeyev\ntimur at FreeBSD.org\n2007/06/07"]
+tj [label="Tom Judge\ntj at FreeBSD.org\n2012/05/28"]
+tmclaugh [label="Tom McLaughlin\ntmclaugh at FreeBSD.org\n2005/09/15"]
 tota [label="TAKATSU Tomonari\ntota at FreeBSD.org\n2009/03/30"]
 trasz [label="Edward Tomasz Napierala\ntrasz at FreeBSD.org\n2007/04/12"]
 trhodes [label="Tom Rhodes\ntrhodes at FreeBSD.org\n2004/07/06"]
-thierry [label="Thierry Thomas\nthierry at FreeBSD.org\n2004/03/15"]
-tmclaugh [label="Tom McLaughlin\ntmclaugh at FreeBSD.org\n2005/09/15"]
 uqs [label="Ulrich Spoerlein\nuqs at FreeBSD.org\n2012/01/19"]
 vd [label="Vasil Dimov\nvd at FreeBSD.org\n2006/01/19"]
 wen [label="Wen Heping\nwen at FreeBSD.org\n2010/12/13"]
 wxs [label="Wesley Shields\nwxs at FreeBSD.org\n2008/01/03"]
 xride [label="Soeren Straarup\nxride at FreeBSD.org\n2006/09/27"]
 yzlin [label="Yi-Jheng Lin\nyzlin at FreeBSD.org\n2009/07/19"]
+zeising [label="Niclas Zeising\nzeising at FreeBSD.org\n2012/07/03"]
 zi [label="Ryan Steinmetz\nzi at FreeBSD.org\n2011/07/14"]
 znerd [label="Ernst de Haan\nznerd at FreeBSD.org\n2001/11/15"]
 
@@ -242,9 +247,14 @@
 clsung -> lwhsu
 clsung -> tabthorpe
 
+crees -> gjb
 crees -> jgh
 crees -> madpilot
 
+culot -> jase
+
+db -> tj
+
 decke -> sperber
 
 delphij -> nemoliu
@@ -253,6 +263,8 @@
 demon -> mat
 
 eadler -> ak
+eadler -> gjb
+eadler -> tj
 
 edwin -> cperciva
 edwin -> erwin
@@ -277,6 +289,8 @@
 fjoe -> krion
 fjoe -> osa
 
+flo -> jase
+
 flz -> garga
 flz -> johans
 flz -> laszlof
@@ -332,6 +346,7 @@
 krion -> sergei
 
 kwm -> jsa
+kwm -> zeising
 
 lawrance -> itetcu
 
@@ -371,6 +386,7 @@
 miwi -> mandree
 miwi -> mva
 miwi -> nox
+miwi -> olivierd
 miwi -> pawel
 miwi -> rm
 miwi -> sbz
@@ -379,6 +395,7 @@
 miwi -> tabthorpe
 miwi -> trasz
 miwi -> wen
+miwi -> zeising
 
 mnag -> jmelo
 
@@ -413,6 +430,7 @@
 
 rene -> crees
 rene -> jgh
+rene -> olivierd
 
 sahil -> culot
 sahil -> eadler
diff -r 49f3e3227aef -r 58bcef12a717 head/share/misc/committers-src.dot
--- a/head/share/misc/committers-src.dot	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/misc/committers-src.dot	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/misc/committers-src.dot 234430 2012-04-18 18:35:19Z dteske $
+# $FreeBSD: head/share/misc/committers-src.dot 236974 2012-06-12 20:55:57Z jhb $
 
 # This file is meant to list all FreeBSD src committers and describe the
 # mentor-mentee relationships between them.
@@ -39,6 +39,7 @@
 bmah [label="Bruce A. Mah\nbmah at FreeBSD.org\n2002/01/29\n2009/09/13"]
 bmilekic [label="Bosko Milekic\nbmilekic at FreeBSD.org\n2000/09/21\n2008/11/10"]
 bushman [label="Michael Bushkov\nbushman at FreeBSD.org\n2007/03/10\n2010/04/29"]
+ceri [label="Ceri Davies\nceri at FreeBSD.org\n2006/11/07\n2012/03/07"]
 cjc [label="Crist J. Clark\ncjc at FreeBSD.org\n2001/06/01\n2006/12/29"]
 dds [label="Diomidis Spinellis\ndds at FreeBSD.org\n2003/06/20\n2010/09/22"]
 dhartmei [label="Daniel Hartmeier\ndhartmei at FreeBSD.org\n2004/04/06\n2008/12/08"]
@@ -58,20 +59,21 @@
 kbyanc [label="Kelly Yancey\nkbyanc at FreeBSD.org\n2000/07/11\n2006/07/25"]
 keichii [label="Michael Wu\nkeichii at FreeBSD.org\n2001/03/07\n2006/04/28"]
 linimon [label="Mark Linimon\nlinimon at FreeBSD.org\n2006/09/30\n2008/05/04"]
+lulf [label="Ulf Lilleengen\nlulf at FreeBSD.org\n2007/10/24\n2012/01/19"]
 mb [label="Maxim Bolotin\nmb at FreeBSD.org\n2000/04/06\n2003/03/08"]
 marks [label="Mark Santcroos\nmarks at FreeBSD.org\n2004/03/18\n2008/09/29"]
 mike [label="Mike Barcroft\nmike at FreeBSD.org\n2001/07/17\n2006/04/28"]
 msmith [label="Mike Smith\nmsmith at FreeBSD.org\n????/??/??\n2003/12/15"]
 murray [label="Murray Stokely\nmurray at FreeBSD.org\n2000/04/05\n2010/07/25"]
+mux [label="Maxime Henrion\nmux at FreeBSD.org\n2002/03/03\n2011/06/22"]
 nate [label="Nate Willams\nnate at FreeBSD.org\n1993/06/12\n2003/12/15"]
 njl [label="Nate Lawson\nnjl at FreeBSD.org\n2002/08/07\n2008/02/16"]
 non [label="Noriaki Mitsnaga\nnon at FreeBSD.org\n2000/06/19\n2007/03/06"]
 onoe [label="Atsushi Onoe\nonoe at FreeBSD.org\n2000/07/21\n2008/11/10"]
+randi [label="Randi Harper\nrandi at FreeBSD.org\n2010/04/20\n2012/05/10"]
 rgrimes [label="Rod Grimes\nrgrimes at FreeBSD.org\n1993/06/12\n2003/03/08"]
 rink [label="Rink Springer\nrink at FreeBSD.org\n2006/01/16\n2010/11/04"]
 robert [label="Robert Drehmel\nrobert at FreeBSD.org\n2001/08/23\n2006/05/13"]
-rmh [label="Robert Millan\nrmh at FreeBSD.org\n2011/09/18"]
-rpaulo [label="Rui Paulo\nrpaulo at FreeBSD.org\n2007/09/25\n2010/12/03"]
 sah [label="Sam Hopkins\nsah at FreeBSD.org\n2004/12/15\n2008/11/10"]
 shafeeq [label="Shafeeq Sinnamohideen\nshafeeq at FreeBSD.org\n2000/06/19\n2006/04/06"]
 sheldonh [label="Sheldon Hearn\nsheldonh at FreeBSD.org\n1999/06/14\n2006/05/13"]
@@ -82,6 +84,7 @@
 toshi [label="Toshihiko Arai\ntoshi at FreeBSD.org\n2000/07/06\n2003/03/08"]
 tshiozak [label="Takuya SHIOZAKI\ntshiozak at FreeBSD.org\n2001/04/25\n2003/03/08"]
 uch [label="UCHIYAMA Yasushi\nuch at FreeBSD.org\n2000/06/21\n2002/04/24"]
+yar [label="Yar Tikhiy\nyar at FreeBSD.org\n2001/03/25\n2012/05/23"]
 
 
 node [color=lightblue2, style=filled, bgcolor=black];
@@ -112,7 +115,6 @@
 bruno [label="Bruno Ducrot\nbruno at FreeBSD.org\n2005/07/18"]
 bschmidt [label="Bernhard Schmidt\nbschmidt at FreeBSD.org\n2010/02/06"]
 bz [label="Bjoern A. Zeeb\nbz at FreeBSD.org\n2004/07/27"]
-ceri [label="Ceri Davies\nceri at FreeBSD.org\n2006/11/07"]
 cognet [label="Olivier Houchard\ncognet at FreeBSD.org\n2002/10/09"]
 cokane [label="Coleman Kane\ncokane at FreeBSD.org\n2000/06/19"]
 cperciva [label="Colin Percival\ncperciva at FreeBSD.org\n2004/01/20"]
@@ -128,6 +130,7 @@
 dim [label="Dimitry Andric\ndim at FreeBSD.org\n2010/08/30"]
 dougb [label="Doug Barton\ndougb at FreeBSD.org\n2000/10/26"]
 dteske [label="Devin Teske\ndteske at FreeBSD.org\n2012/04/10"]
+dumbbell [label="Jean-Sebastien Pedron\ndumbbell at FreeBSD.org\n2004/11/29"]
 dwmalone [label="David Malone\ndwmalone at FreeBSD.org\n2000/07/11"]
 ed [label="Ed Schouten\ned at FreeBSD.org\n2008/05/22"]
 edwin [label="Edwin Groothuis\nedwin at FreeBSD.org\n2007/06/25"]
@@ -169,12 +172,14 @@
 jinmei [label="JINMEI Tatuya\njinmei at FreeBSD.org\n2007/03/17"]
 jkim [label="Jung-uk Kim\njkim at FreeBSD.org\n2005/07/06"]
 jkoshy [label="A. Joseph Koshy\njkoshy at FreeBSD.org\n1998/05/13"]
+jlh [label="Jeremie Le Hen\njlh at FreeBSD.org\n2012/04/22"]
 jls [label="Jordan Sissel\njls at FreeBSD.org\n2006/12/06"]
 joerg [label="Joerg Wunsch\njoerg at FreeBSD.org\n1993/11/14"]
 jon [label="Jonathan Chen\njon at FreeBSD.org\n2000/10/17"]
 jonathan [label="Jonathan Anderson\njonathan at FreeBSD.org\n2010/10/07"]
 jpaetzel [label="Josh Paetzel\njpaetzel at FreeBSD.org\n2011/01/21"]
 julian [label="Julian Elischer\njulian at FreeBSD.org\n1993/??/??"]
+jwd [label="John De Boskey\njwd at FreeBSD.org\n2000/05/19"]
 kaiw [label="Kai Wang\nkaiw at FreeBSD.org\n2007/09/26"]
 kan [label="Alexander Kabaev\nkan at FreeBSD.org\n2002/07/21"]
 kargl [label="Steven G. Kargl\nkargl at FreeBSD.org\n2011/01/17"]
@@ -184,7 +189,6 @@
 kmacy [label="Kip Macy\nkmacy at FreeBSD.org\n2005/06/01"]
 le [label="Lukas Ertl\nle at FreeBSD.org\n2004/02/02"]
 lstewart [label="Lawrence Stewart\nlstewart at FreeBSD.org\n2008/10/06"]
-lulf [label="Ulf Lilleengen\nlulf at FreeBSD.org\n2007/10/24"]
 marcel [label="Marcel Moolenaar\nmarcel at FreeBSD.org\n1999/07/03"]
 marius [label="Marius Strobl\nmarius at FreeBSD.org\n2004/04/17"]
 markm [label="Mark Murray\nmarkm at FreeBSD.org\n199?/??/??"]
@@ -196,10 +200,10 @@
 mdodd [label="Matthew N. Dodd\nmdodd at FreeBSD.org\n1999/07/27"]
 melifaro [label="Alexander V. Chernikov\nmelifaro at FreeBSD.org\n2011/10/04"]
 mjacob [label="Matt Jacob\nmjacob at FreeBSD.org\n1997/08/13"]
+mjg [label="Mateusz Guzik\nmjg at FreeBSD.org\n2012/06/04"]
 mlaier [label="Max Laier\nmlaier at FreeBSD.org\n2004/02/10"]
 monthadar [label="Monthadar Al Jaberi\nmonthadar at FreeBSD.org\n2012/04/02"]
 mr [label="Michael Reifenberger\nmr at FreeBSD.org\n2001/09/30"]
-mux [label="Maxime Henrion\nmux at FreeBSD.org\n2002/03/03"]
 neel [label="Neel Natu\nneel at FreeBSD.org\n2009/09/20"]
 netchild [label="Alexander Leidinger\nnetchild at FreeBSD.org\n2005/03/31"]
 nork [label="Norikatsu Shigemura\nnork at FreeBSD.org\n2009/06/09"]
@@ -210,7 +214,7 @@
 peadar [label="Peter Edwards\npeadar at FreeBSD.org\n2004/03/08"]
 peter [label="Peter Wemm\npeter at FreeBSD.org\n????/??/??"]
 pfg [label="Pedro Giffuni\npfg at FreeBSD.org\n2011/12/01"]
-philip [label="Philip Paeps\nphilip at FreBSD.org\n2004/01/21"]
+philip [label="Philip Paeps\nphilip at FreeBSD.org\n2004/01/21"]
 phk [label="Poul-Henning Kamp\nphk at FreeBSD.org\n1994/02/21"]
 pho [label="Peter Holm\npho at FreeBSD.org\n2008/11/16"]
 pjd [label="Pawel Jakub Dawidek\npjd at FreeBSD.org\n2004/02/02"]
@@ -218,14 +222,15 @@
 ps [label="Paul Saab\nps at FreeBSD.org\n2000/02/23"]
 qingli [label="Qing Li\nqingli at FreeBSD.org\n2005/04/13"]
 rafan [label="Rong-En Fan\nrafan at FreeBSD.org\n2007/01/31"]
-randi [label="Randi Harper\nrandi at FreeBSD.org\n2010/04/20"]
 ray [label="Aleksandr Rybalko\nray at FreeBSD.org\n2011/05/25"]
 rdivacky [label="Roman Divacky\nrdivacky at FreeBSD.org\n2008/03/13"]
 remko [label="Remko Lodder\nremko at FreeBSD.org\n2007/02/23"]
 rik [label="Roman Kurakin\nrik at FreeBSD.org\n2003/12/18"]
 rmacklem [label="Rick Macklem\nrmacklem at FreeBSD.org\n2009/03/27"]
+rmh [label="Robert Millan\nrmh at FreeBSD.org\n2011/09/18"]
 rnoland [label="Robert Noland\nrnoland at FreeBSD.org\n2008/09/15"]
 roberto [label="Ollivier Robert\nroberto at FreeBSD.org\n1995/02/22"]
+rpaulo [label="Rui Paulo\nrpaulo at FreeBSD.org\n2007/09/25"]
 rrs [label="Randall R Stewart\nrrs at FreeBSD.org\n2007/02/08"]
 rse [label="Ralf S. Engelschall\nrse at FreeBSD.org\n1997/07/31"]
 rstone [label="Ryan Stone\nrstone at FreeBSD.org\n2010/04/19"]
@@ -263,7 +268,6 @@
 wilko [label="Wilko Bulte\nwilko at FreeBSD.org\n2000/01/13"]
 wollman [label="Garrett Wollman\nwollman at FreeBSD.org\n????/??/??"]
 wsalamon [label="Wayne Salamon\nwsalamon at FreeBSD.org\n2005/06/25"]
-yar [label="Yar Tikhiy\nyar at FreeBSD.org\n2001/03/25"]
 yongari [label="Pyun YongHyeon\nyongari at FreeBSD.org\n2004/08/01"]
 zack [label="Zack Kirsch\nzack at FreeBSD.org\n2010/11/05"]
 zec [label="Marko Zec\nzec at FreeBSD.org\n2008/06/22"]
@@ -432,10 +436,12 @@
 jhb -> jeff
 jhb -> kbyanc
 jhb -> rnoland
+jhb -> pfg
 
 jkh -> imp
 jkh -> jlemon
 jkh -> joerg
+jkh -> jwd
 jkh -> phk
 jkh -> wes
 jkh -> yar
@@ -462,6 +468,7 @@
 
 kib -> ae
 kib -> dchagin
+kib -> jlh
 kib -> jpaetzel
 kib -> lulf
 kib -> melifaro
@@ -504,6 +511,7 @@
 murray -> delphij
 
 mux -> cognet
+mux -> dumbbell
 
 netchild -> ariff
 
@@ -537,6 +545,8 @@
 
 rgrimes -> markm
 
+rmacklem -> jwd
+
 rpaulo -> avg
 rpaulo -> bschmidt
 rpaulo -> dim
@@ -594,6 +604,7 @@
 thompsa -> eri
 
 trasz -> jh
+trasz -> mjg
 
 ume -> jinmei
 ume -> suz
diff -r 49f3e3227aef -r 58bcef12a717 head/share/misc/organization.dot
--- a/head/share/misc/organization.dot	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/misc/organization.dot	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/share/misc/organization.dot 238396 2012-07-12 12:11:32Z gavin $
 
 # This file is meant to show the infrastructural organization of the
 # FreeBSD Project; what kind of teams we have and how they relate to
@@ -25,13 +25,13 @@
 
 # Development teams go here alphabetically sorted
 
-core [label="Core Team\ncore at FreeBSD.org\nwilko, brooks, keramida, imp,\ngnn, wes, hrs, murray,\nrwatson"]
-coresecretary [label="Core Team Secretary\ncore-secretary at FreeBSD.org\njoel"]
+core [label="Core Team\ncore at FreeBSD.org\ntabthorpe, gavin, jhb, kib,\ntheraven, attilio, hrs,\npeter, miwi"]
+coresecretary [label="Core Team Secretary\ncore-secretary at FreeBSD.org\ngavin"]
 doccommitters [label="Doc/www Committers\ndoc-committers at FreeBSD.org"]
-doceng [label="Documentation Engineering Team\ndoceng at FreeBSD.org\nnik, blackend, hrs,\nkeramida"]
+doceng [label="Documentation Engineering Team\ndoceng at FreeBSD.org\ngjb, blackend,\ngabor, hrs"]
 portscommitters [label="Ports Committers\nports-committers at FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr at FreeBSD.org\nmarcus, kris, erwin,\nlinimon, pav, krion"]
-portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary at FreeBSD.org\nerwin"]
+portmgr [label="Port Management Team\nportmgr at FreeBSD.org\ntabthorpe, marcus, bapt, beat,\nerwin, linimon, pav,\nitetcu, flz, miwi"]
+portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary at FreeBSD.org\ntabthorpe"]
 re [label="Primary Release Engineering Team\nre at FreeBSD.org\nmux, bmah, hrs, kensmith,\nmurray, rwatson, dwhite"]
 realpha [label="FreeBSD/alpha Release Engineering Team\nre-alpha at FreeBSD.org\nwilko, murray, rwatson"]
 reamd64 [label="FreeBSD/amd64 Release Engineering Team\nre-amd64 at FreeBSD.org\nobrien"]
@@ -40,7 +40,7 @@
 repc98 [label="FreeBSD/pc98 Release Engineering Team\nre-pc98 at FreeBSD.org\nnyan"]
 reppc [label="FreeBSD/ppc Release Engineering Team\nre-ppc at FreeBSD.org\ngrehan"]
 resparc64 [label="FreeBSD/sparc64 Release Engineering Team\nre-sparc64 at FreeBSD.org\njake, phk, tmm, obrien,\nkensmith, murray, rwatson"]
-secteam [label="Security Team\nsecteam at FreeBSD.org\nmnag, remko, gnn, simon, philip,\ncperciva, csjp, des,\nnectar, rwatson"]
+secteam [label="Security Team\nsecteam at FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"]
 secteamsecretary [label="Security Team Secretary\nsecteam-secretary at FreeBSD.org\nremko"]
 securityofficer [label="Security Officer Team\nsecurity-officer at FreeBSD.org\ncperciva, simon, nectar"]
 srccommitters [label="Src Committers\nsrc-committers at FreeBSD.org"]
diff -r 49f3e3227aef -r 58bcef12a717 head/share/mk/bsd.README
--- a/head/share/mk/bsd.README	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/mk/bsd.README	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: head/share/mk/bsd.README 235928 2012-05-24 20:00:58Z marcel $
 
 This is the README file for the "include" files for the FreeBSD
 source tree.  The files are installed in /usr/share/mk, and are by
@@ -228,7 +228,7 @@
 		For example, to load with the compatibility and utility
 		libraries, use:
 
-			LDFILES=-lutil -lcompat
+			LDADD=-lutil -lcompat
 
 LDFLAGS		Additional loader flags.
 
@@ -261,7 +261,7 @@
 		libraries.  For example, to depend on the compatibility and
 		utility libraries use:
 
-			SRCLIB=${LIBCOMPAT} ${LIBUTIL}
+			DPADD=${LIBCOMPAT} ${LIBUTIL}
 
 		There is a predefined identifier for each (non-profiled,
 		non-shared) library and object.  Library file names are
@@ -352,6 +352,10 @@
 		to .c files of the same name.  (This is not the default for
 		versions of make.)
 
+SHLIB_LDSCRIPT	Template file to generate shared library linker script.
+		Unless used, a simple symlink is created to the real
+		shared object.
+
 The include file <bsd.lib.mk> includes the file named "../Makefile.inc"
 if it exists, as well as the include file <bsd.man.mk>.
 
diff -r 49f3e3227aef -r 58bcef12a717 head/share/mk/bsd.crunchgen.mk
--- a/head/share/mk/bsd.crunchgen.mk	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/mk/bsd.crunchgen.mk	Wed Jul 25 16:32:50 2012 +0300
@@ -25,7 +25,7 @@
 # If CRUNCH_GENERATE_LINKS is set to no, no links will be generated.
 #
 
-# $FreeBSD: head/share/mk/bsd.crunchgen.mk 229658 2012-01-05 21:49:43Z adrian $
+# $FreeBSD: head/share/mk/bsd.crunchgen.mk 237574 2012-06-25 21:56:36Z obrien $
 
 ##################################################################
 #  The following is pretty nearly a generic crunchgen-handling makefile
@@ -105,7 +105,7 @@
 .MAKEFLAGS:= ${.MAKEFLAGS:N-P}
 .ORDER: $(OUTPUTS) objs
 $(OUTPUTS): $(CONF)
-	MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \
+	MAKE=${MAKE} MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \
 	    -c $(OUTC) $(CONF)
 
 $(PROG): $(OUTPUTS) objs
diff -r 49f3e3227aef -r 58bcef12a717 head/share/mk/bsd.lib.mk
--- a/head/share/mk/bsd.lib.mk	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/mk/bsd.lib.mk	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-# $FreeBSD: head/share/mk/bsd.lib.mk 228307 2011-12-06 11:28:17Z kib $
+# $FreeBSD: head/share/mk/bsd.lib.mk 236810 2012-06-09 11:41:29Z dim $
 #
 
 .include <bsd.init.mk>
@@ -74,7 +74,7 @@
 	${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
-.cc.o:
+.cc.o .C.o .cpp.o .cxx.o:
 	${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
 .cc.po .C.po .cpp.po .cxx.po:
@@ -270,6 +270,25 @@
 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
 .if defined(SHLIB_LINK)
+# ${_SHLIBDIRPREFIX} and ${_LDSCRIPTROOT} are both needed when cross-building
+# and when building 32 bits library shims.  ${_SHLIBDIRPREFIX} is the directory
+# prefix where shared objects will be installed.  ${_LDSCRIPTROOT} is the
+# directory prefix that will be used in generated ld(1) scripts.  They cannot
+# be coalesced because of the way ld(1) handles the sysroot prefix (used in the
+# cross-toolchain):
+# - 64 bits libs are located under sysroot, so ${_LDSCRIPTROOT} must be empty.
+# - 32 bits shims are not, so ${_LDSCRIPTROOT} is used to specify their full
+#   path.  Note that ld(1) scripts are generated both during buildworld and
+#   installworld; in the later case ${_LDSCRIPTROOT} must be obviously empty.
+# On the other hand, the use of ${_SHLIBDIRPREFIX} is more consistent since it
+# does not involve the logic of a tool we do not own.
+.if defined(SHLIB_LDSCRIPT) && !empty(SHLIB_LDSCRIPT) && exists(${.CURDIR}/${SHLIB_LDSCRIPT})
+	sed -e 's,@@[email protected]@,${_LDSCRIPTROOT}${SHLIBDIR}/${SHLIB_NAME},g' \
+	    -e 's,@@[email protected]@,${_LDSCRIPTROOT}${LIBDIR},g' \
+	    ${.CURDIR}/${SHLIB_LDSCRIPT} > lib${LIB}.ld
+	${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    ${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+.else
 .if ${SHLIBDIR} == ${LIBDIR}
 	ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
 .else
@@ -280,8 +299,9 @@
 	rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME}
 .endif
 .endif
-.endif
-.endif
+.endif # SHLIB_LDSCRIPT
+.endif # SHLIB_LINK
+.endif # SHIB_NAME
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
@@ -349,6 +369,9 @@
 .endif
 .if defined(SHLIB_NAME)
 .if defined(SHLIB_LINK)
+.if defined(SHLIB_LDSCRIPT) && exists(${.CURDIR}/${SHLIB_LDSCRIPT})
+	rm -f lib${LIB}.ld
+.endif
 	rm -f ${SHLIB_LINK}
 .endif
 .if defined(LIB) && !empty(LIB)
diff -r 49f3e3227aef -r 58bcef12a717 head/share/mk/bsd.libnames.mk
--- a/head/share/mk/bsd.libnames.mk	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/mk/bsd.libnames.mk	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/mk/bsd.libnames.mk 233294 2012-03-22 08:48:42Z stas $
+# $FreeBSD: head/share/mk/bsd.libnames.mk 235641 2012-05-19 04:57:37Z marcel $
 
 # The include file <bsd.libnames.mk> define library names.
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
@@ -135,6 +135,7 @@
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
+LIBPROCSTAT?=	${DESTDIR}${LIBDIR}/libprocstat.a
 LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
 LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
 LIBREADLINE?=	${DESTDIR}${LIBDIR}/libreadline.a
diff -r 49f3e3227aef -r 58bcef12a717 head/share/mk/bsd.own.mk
--- a/head/share/mk/bsd.own.mk	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/mk/bsd.own.mk	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/mk/bsd.own.mk 232322 2012-02-29 22:58:51Z dim $
+# $FreeBSD: head/share/mk/bsd.own.mk 238438 2012-07-14 03:16:57Z dteske $
 #
 # The include file <bsd.own.mk> set common variables for owner,
 # group, mode, and directories. Defaults are in brackets.
@@ -339,6 +339,7 @@
     CXX \
     DICT \
     DYNAMICROOT \
+    ED_CRYPTO \
     EXAMPLES \
     FLOPPY \
     FORTH \
@@ -372,6 +373,7 @@
     LOCALES \
     LOCATE \
     LPR \
+    LS_COLORS \
     MAIL \
     MAILWRAPPER \
     MAKE \
@@ -389,6 +391,7 @@
     OPENSSL \
     PAM \
     PF \
+    PKGBOOTSTRAP \
     PKGTOOLS \
     PMC \
     PORTSNAP \
@@ -424,14 +427,19 @@
     BIND_LIBS \
     BIND_SIGCHASE \
     BIND_XML \
+    BSDCONFIG \
     CLANG_EXTRAS \
     CLANG_IS_CC \
     CTF \
+    GNU_SORT \
     HESIOD \
     ICONV \
     IDEA \
+    INSTALL_AS_USER \
     LIBCPLUSPLUS \
-    OFED
+    NAND \
+    OFED \
+    SHARED_TOOLCHAIN
 
 #
 # Default behaviour of some options depends on the architecture.  Unfortunately
@@ -640,12 +648,23 @@
 
 .if ${MK_CTF} != "no"
 CTFCONVERT_CMD=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.elif ${MAKE_VERSION} >= 5201111300
+.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300
 CTFCONVERT_CMD=
 .else
 CTFCONVERT_CMD=	@:
 .endif 
 
+.if ${MK_INSTALL_AS_USER} != "no"
+_uid!=	id -un
+.if ${_uid} != 0
+_gid!=	id -gn
+.for x in BIN CONF DOC INFO KMOD LIB MAN NLS SHARE
+$xOWN=	${_uid}
+$xGRP=	${_gid}
+.endfor
+.endif
+.endif
+
 .endif # !_WITHOUT_SRCCONF
 
 .endif	# !target(__<bsd.own.mk>__)
diff -r 49f3e3227aef -r 58bcef12a717 head/share/mk/bsd.sys.mk
--- a/head/share/mk/bsd.sys.mk	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/mk/bsd.sys.mk	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/mk/bsd.sys.mk 234353 2012-04-16 21:23:25Z dim $
+# $FreeBSD: head/share/mk/bsd.sys.mk 236528 2012-06-03 20:35:41Z dim $
 #
 # This file contains common settings used for building FreeBSD
 # sources.
@@ -61,7 +61,8 @@
 CWARNFLAGS+=	-Wno-pointer-sign
 # Clang has more warnings enabled by default, and when using -Wall, so if WARNS
 # is set to low values, these have to be disabled explicitly.
-.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
+.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && \
+    !defined(EARLY_BUILD)
 .if ${WARNS} <= 6
 CWARNFLAGS+=	-Wno-empty-body -Wno-string-plus-int
 .endif # WARNS <= 6
@@ -88,7 +89,8 @@
 .if ${WFORMAT} > 0
 #CWARNFLAGS+=	-Wformat-nonliteral -Wformat-security -Wno-format-extra-args
 CWARNFLAGS+=	-Wformat=2 -Wno-format-extra-args
-.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
+.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && \
+    !defined(EARLY_BUILD)
 .if ${WARNS} <= 3
 CWARNFLAGS+=	-Wno-format-nonliteral
 .endif # WARNS <= 3
@@ -109,7 +111,8 @@
 CWARNFLAGS+=	-Wno-unknown-pragmas
 .endif # IGNORE_PRAGMA
 
-.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
+.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && \
+    !defined(EARLY_BUILD)
 CLANG_NO_IAS=	 -no-integrated-as
 CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
 		 -mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret
diff -r 49f3e3227aef -r 58bcef12a717 head/share/mk/sys.mk
--- a/head/share/mk/sys.mk	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/mk/sys.mk	Wed Jul 25 16:32:50 2012 +0300
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-# $FreeBSD: head/share/mk/sys.mk 233644 2012-03-29 02:54:35Z jmallett $
+# $FreeBSD: head/share/mk/sys.mk 234575 2012-04-22 17:14:11Z imp $
 
 unix		?=	We run FreeBSD, not UNIX.
 .FreeBSD	?=	true
@@ -123,6 +123,10 @@
 
 MAKE		?=	make
 
+.if !defined(%POSIX)
+NM		?=	nm
+.endif
+
 OBJC		?=	cc
 OBJCFLAGS	?=	${OBJCINCLUDES} ${CFLAGS} -Wno-import
 
diff -r 49f3e3227aef -r 58bcef12a717 head/share/skel/dot.cshrc
--- a/head/share/skel/dot.cshrc	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/skel/dot.cshrc	Wed Jul 25 16:32:50 2012 +0300
@@ -1,15 +1,16 @@
-# $FreeBSD$
+# $FreeBSD: head/share/skel/dot.cshrc 234823 2012-04-29 22:29:48Z eadler $
 #
 # .cshrc - csh resource script, read at beginning of execution by each shell
 #
 # see also csh(1), environ(7).
+# more examples available at /usr/share/examples/csh/
 #
 
 alias h		history 25
 alias j		jobs -l
-alias la	ls -a
+alias la	ls -aF
 alias lf	ls -FA
-alias ll	ls -lA
+alias ll	ls -lAF
 
 # A righteous umask
 umask 22
@@ -17,18 +18,29 @@
 set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin)
 
 setenv	EDITOR	vi
-setenv	PAGER	more
+setenv	PAGER	less
 setenv	BLOCKSIZE	K
 
 if ($?prompt) then
 	# An interactive shell -- set some stuff up
+	if ($uid == 0) then
+		set user = root
+	endif
+	set prompt = "%[email protected]%m:%/ %# "
+	set promptchars = "%#"
+
 	set filec
-	set history = 100
-	set savehist = 100
+	set history = 1000
+	set savehist = (1000 merge)
+	set autolist = ambiguous
+	# Use history to aid expansion
+	set autoexpand
+	set autorehash
 	set mail = (/var/mail/$USER)
 	if ( $?tcsh ) then
 		bindkey "^W" backward-delete-word
 		bindkey -k up history-search-backward
 		bindkey -k down history-search-forward
 	endif
+
 endif
diff -r 49f3e3227aef -r 58bcef12a717 head/share/syscons/keymaps/INDEX.keymaps
--- a/head/share/syscons/keymaps/INDEX.keymaps	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/syscons/keymaps/INDEX.keymaps	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/syscons/keymaps/INDEX.keymaps 225538 2011-09-13 21:15:23Z gavin $
+# $FreeBSD: head/share/syscons/keymaps/INDEX.keymaps 238205 2012-07-07 17:35:34Z eadler $
 #
 # database for kbdmap(8) 
 #
@@ -378,6 +378,8 @@
 ru.koi8-r.win.kbd:es:Ruso koi8-r (winkeys)
 ru.koi8-r.win.kbd:uk:òÏÓ¦ÊÓØËÁ koi8-r (winkeys)
 
+spanish.dvorak.kbd:en:Spanish Dvorak
+
 spanish.iso.kbd:en:Spanish ISO-8859-1
 spanish.iso.kbd:de:Spanisch ISO-8859-1
 spanish.iso.kbd:fr:Espagnol ISO-8859-1
diff -r 49f3e3227aef -r 58bcef12a717 head/share/syscons/keymaps/Makefile
--- a/head/share/syscons/keymaps/Makefile	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/syscons/keymaps/Makefile	Wed Jul 25 16:32:50 2012 +0300
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/share/syscons/keymaps/Makefile 235251 2012-05-10 23:38:34Z eadler $
 
 FILES=	INDEX.keymaps \
 	be.iso.kbd be.iso.acc.kbd \
@@ -36,6 +36,7 @@
 	ru.cp866.kbd ru.iso5.kbd \
 	si.iso.kbd \
 	sk.iso2.kbd \
+	spanish.dvorak.kbd \
 	spanish.iso.kbd spanish.iso.acc.kbd spanish.iso15.acc.kbd \
 	swedish.iso.kbd swedish.cp850.kbd \
 	swissfrench.iso.kbd swissfrench.iso.acc.kbd swissfrench.cp850.kbd \
diff -r 49f3e3227aef -r 58bcef12a717 head/share/syscons/keymaps/spanish.dvorak.kbd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/syscons/keymaps/spanish.dvorak.kbd	Wed Jul 25 16:32:50 2012 +0300
@@ -0,0 +1,139 @@
+# $FreeBSD: head/share/syscons/keymaps/spanish.dvorak.kbd 235251 2012-05-10 23:38:34Z eadler $
+#                                                         alt
+# scan                       cntrl          alt    alt   cntrl lock
+# code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
+# ------------------------------------------------------------------
+  000   nop    nop    nop    nop    nop    nop    nop    nop     O
+  001   esc    esc    esc    esc    esc    esc    debug  esc     O
+  002   '1'    '!'    nop    nop    '|'    '!'    nop    nop     O
+  003   '2'    '"'    nop    nop    '@'    '"'    nop    nop     O
+  004   '3'    183    nop    nop    '#'    '#'    nop    nop     O
+  005   '4'    '$'    nop    nop    '~'    '~'    nop    nop     O
+  006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
+  007   '6'    '&'    nop    nop    172    172    nop    nop     O
+  008   '7'    '/'    nop    nop    '7'    '/'    nop    nop     O
+  009   '8'    '('    nop    nop    '8'    '('    nop    nop     O
+  010   '9'    ')'    nop    nop    '9'    ')'    nop    nop     O
+  011   '0'    '='    nop    nop    '0'    '='    nop    nop     O
+  012   '''    '?'    nop    nop    '''    '?'    nop    nop     O
+  013   161    191    nop    nop    161    191    nop    nop     O
+  014   bs     bs     del    del    bs     bs     del    del     O
+  015   ht     btab   nop    nop    ht     btab   nop    nop     O
+  016   '.'    ':'    nop    nop    '.'    ':'    nop    nop     O
+  017   ','    ';'    nop    nop    ','    ';'    nop    nop     O
+  018   241    209    nop    nop    '~'    '~'    nop    nop     O
+  019   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
+  020   'y'    'Y'    em     em     'y'    'Y'    em     em      C
+  021   'f'    'F'    ack    ack    'f'    'F'    ack    ack     C
+  022   'g'    'G'    bel    bel    'g'    'G'    bel    bel     C
+  023   'c'    'C'    etx    etx    'c'    'C'    etx    etx     C
+  024   'h'    'H'    bs     bs     'h'    'H'    bs     bs      C
+  025   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
+  026   dgra   dcir   esc    esc    '['    '['    esc    esc     O
+  027   '+'    '*'    gs     gs     ']'    ']'    gs     gs      O
+  028   cr     cr     nl     nl     cr     cr     nl     nl      O
+  029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
+  030   'a'    'A'    soh    soh    'a'    'A'    soh    soh     C
+  031   'o'    'O'    si     si     243    211    si     si      C
+  032   'e'    'E'    enq    enq    164    164    enq    enq     C
+  033   'u'    'U'    nak    nak    250    218    nak    nak     C
+  034   'i'    'I'    ht     ht     237    205    ht     ht      C
+  035   'd'    'D'    eot    eot    'd'    'D'    eot    eot     C
+  036   'r'    'R'    dc2    dc2    'r'    'R'    dc2    dc2     C
+  037   't'    'T'    dc4    dc4    't'    'T'    dc4    dc4     C
+  038   'n'    'N'    so     so     'n'    'N'    so     so      C
+  039   's'    'S'    dc3    dc3    's'    'S'    dc3    dc3     C
+  040   dacu   duml   nop    nop    '{'    '{'    nop    nop     O
+  041   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  042   lshift lshift lshift lshift lshift lshift lshift lshift  O
+  043   231    199    rs     rs     '}'    '}'    rs     rs      O
+  044   '-'    '_'    us     us     '-'    '_'    us     us      O
+  045   'q'    'Q'    dc1    dc1    'q'    'Q'    dc1    dc1     C
+  046   'j'    'J'    nl     nl     'j'    'J'    nl     nl      C
+  047   'k'    'K'    vt     vt     'k'    'K'    vt     vt      C
+  048   'x'    'X'    can    can    'x'    'X'    can    can     C
+  049   'b'    'B'    stx    stx    'b'    'B'    stx    stx     C
+  050   'm'    'M'    cr     cr     'm'    'M'    cr     cr      C
+  051   'w'    'W'    etb    etb    'w'    'W'    etb    etb     C
+  052   'v'    'V'    syn    syn    'v'    'V'    syn    syn     C
+  053   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C
+  054   rshift rshift rshift rshift rshift rshift rshift rshift  O
+  055   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
+  056   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
+  057   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
+  058   clock  clock  clock  clock  clock  clock  clock  clock   O
+  059   fkey01 fkey13 fkey25 fkey37 scr01  scr11  scr01  scr11   O
+  060   fkey02 fkey14 fkey26 fkey38 scr02  scr12  scr02  scr12   O
+  061   fkey03 fkey15 fkey27 fkey39 scr03  scr13  scr03  scr13   O
+  062   fkey04 fkey16 fkey28 fkey40 scr04  scr14  scr04  scr14   O
+  063   fkey05 fkey17 fkey29 fkey41 scr05  scr15  scr05  scr15   O
+  064   fkey06 fkey18 fkey30 fkey42 scr06  scr16  scr06  scr16   O
+  065   fkey07 fkey19 fkey31 fkey43 scr07  scr07  scr07  scr07   O
+  066   fkey08 fkey20 fkey32 fkey44 scr08  scr08  scr08  scr08   O
+  067   fkey09 fkey21 fkey33 fkey45 scr09  scr09  scr09  scr09   O
+  068   fkey10 fkey22 fkey34 fkey46 scr10  scr10  scr10  scr10   O
+  069   nlock  nlock  nlock  nlock  nlock  nlock  nlock  nlock   O
+  070   slock  slock  slock  slock  slock  slock  slock  slock   O
+  071   fkey49 '7'    '7'    '7'    '7'    '7'    '7'    '7'     N
+  072   fkey50 '8'    '8'    '8'    '8'    '8'    '8'    '8'     N
+  073   fkey51 '9'    '9'    '9'    '9'    '9'    '9'    '9'     N
+  074   fkey52 '-'    '-'    '-'    '-'    '-'    '-'    '-'     N
+  075   fkey53 '4'    '4'    '4'    '4'    '4'    '4'    '4'     N
+  076   fkey54 '5'    '5'    '5'    '5'    '5'    '5'    '5'     N
+  077   fkey55 '6'    '6'    '6'    '6'    '6'    '6'    '6'     N
+  078   fkey56 '+'    '+'    '+'    '+'    '+'    '+'    '+'     N
+  079   fkey57 '1'    '1'    '1'    '1'    '1'    '1'    '1'     N
+  080   fkey58 '2'    '2'    '2'    '2'    '2'    '2'    '2'     N
+  081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
+  082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
+  083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
+  084   nop    nop    nop    nop    nop    nop    nop    nop     O
+  085   nop    nop    nop    nop    nop    nop    nop    nop     O
+  086   '<'    '>'    nop    nop    '<'    '>'    nop    nop     O
+  087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
+  088   fkey12 fkey24 fkey36 fkey48 scr12  scr12  scr12  scr12   O
+  089   cr     cr     nl     nl     cr     cr     nl     nl      O
+  090   rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl   O
+  091   '/'    '/'    '/'    '/'    '/'    '/'    '/'    '/'     N
+  092   nscr   pscr   debug  debug  nop    nop    nop    nop     O
+  093   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
+  094   fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49  O
+  095   fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50  O
+  096   fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51  O
+  097   fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53  O
+  098   fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55  O
+  099   fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57  O
+  100   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
+  101   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
+  102   fkey60 paste  fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
+  103	fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
+  104   slock  saver  slock  saver  susp   nop    susp   nop     O
+  105   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
+  106   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
+  107   fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
+  108   nop    nop    nop    nop    nop    nop    nop    nop     O
+
+  dgra  '`'  ( 'a' 224 ) ( 'A' 192 ) ( 'e' 232 ) ( 'E' 200 ) 
+             ( 'i' 236 ) ( 'I' 204 ) ( 'o' 242 ) ( 'O' 210 ) 
+             ( 'u' 249 ) ( 'U' 217 )
+  dacu  180  ( 'a' 225 ) ( 'A' 193 ) ( 'e' 233 ) ( 'E' 201 ) 
+             ( 'i' 237 ) ( 'I' 205 ) ( 'o' 243 ) ( 'O' 211 ) 
+             ( 'u' 250 ) ( 'U' 218 ) ( 'y' 253 ) ( 'Y' 221 ) 
+  dcir  '^'  ( 'a' 226 ) ( 'A' 194 ) ( 'e' 234 ) ( 'E' 202 ) 
+             ( 'i' 238 ) ( 'I' 206 ) ( 'o' 244 ) ( 'O' 212 ) 
+             ( 'u' 251 ) ( 'U' 219 )
+  dtil  '~'  ( 'a' 227 ) ( 'A' 195 ) ( 'n' 241 ) ( 'N' 209 ) 
+             ( 'o' 245 ) ( 'O' 213 )
+  dmac  000
+  dbre  000
+  ddot  000
+  duml  168  ( 'a' 228 ) ( 'A' 196 ) ( 'e' 235 ) ( 'E' 203 ) 
+             ( 'i' 239 ) ( 'I' 207 ) ( 'o' 246 ) ( 'O' 214 ) 
+             ( 'u' 252 ) ( 'U' 220 ) ( 'y' 255 )
+  dsla  000
+  drin  176  ( 'a' 229 ) ( 'A' 197 )
+  dced  184  ( 'c' 231 ) ( 'C' 199 )
+  dapo  000
+  ddac  000
+  dogo  000
+  dcar  000
diff -r 49f3e3227aef -r 58bcef12a717 head/share/termcap/termcap.5
--- a/head/share/termcap/termcap.5	Wed Jul 25 16:31:11 2012 +0300
+++ b/head/share/termcap/termcap.5	Wed Jul 25 16:32:50 2012 +0300
@@ -51,7 +51,7 @@
 .\" *                                                                          *
 .\" ***************************************************************************/
 .\"
-.\" $FreeBSD: head/share/termcap/termcap.5 233459 2012-03-25 09:23:10Z joel $
+.\" $FreeBSD: head/share/termcap/termcap.5 235337 2012-05-12 15:08:22Z gjb $
 .\"
 .Dd December 13, 2009
 .Dt TERMCAP 5
@@ -1821,7 +1821,7 @@
 .Sy \&ts
 and
 .Sy \&fs .
-.Pf ( Xr \&fs
+.Pf ( Sy \&fs
 must leave the cursor position in the same place that it was before
 .Sy \&ts .
 If necessary, the
@@ -2067,7 +2067,7 @@
 .Pp
 Other specific terminal problems may be corrected by adding more
 capabilities of the form
-.Sy x Em x .
+.Sy x Ns Em x .
 .Ss Similar Terminals
 If there are two very similar terminals,
 one can be defined as being just like the other with certain exceptions.



More information about the Zrouter-src-freebsd mailing list