Merge head@256284

author: sjg <sjg@FreeBSD.org> 2013-10-13 02:35:19 +0000
committer: sjg <sjg@FreeBSD.org> 2013-10-13 02:35:19 +0000
commit: 7fcd33c1faf567506b5c0b4148c7a15a10788a5d (patch)
tree: 2c6f4d1ca5d1c643faea64e1f4c90105a1ab406a /share
parent: 2a59274eda20cc626e28052fff7aa8b7bf6a3683 (diff)
parent: 5cca672bb0892f1c5da630c34a1f98e2de4d7064 (diff)
download: FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.zip
FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.tar.gz
47 files changed, 1148 insertions, 884 deletions
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 3f36375..1ec57e8 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -5,7 +5,6 @@
 
 SUBDIR=	${_IPv6} \
 	${_atf} \
-	${_bind9} \
 	legal \
 	${_llvm} \
 	${_roffdocs}
@@ -14,10 +13,6 @@ SUBDIR=	${_IPv6} \
 _atf= atf
 .endif
 
-.if ${MK_BIND} != "no"
-_bind9=	bind9
-.endif
-
 .if ${MK_CLANG} != "no"
 _llvm=	llvm
 .endif
diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile
deleted file mode 100644
index 620a386..0000000
--- a/share/doc/bind9/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $FreeBSD$
-
-BIND_DIR=	${.CURDIR}/../../../contrib/bind9
-SRCDIR=		${BIND_DIR}/doc
-
-.PATH: ${BIND_DIR} ${SRCDIR}/arm ${SRCDIR}/misc
-
-
-FILESGROUPS=	TOP ARM MISC
-TOP=		CHANGES COPYRIGHT FAQ HISTORY README
-TOPDIR=		${DOCDIR}/bind9
-ARM=		Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html \
-		Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html \
-		Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html \
-		Bv9ARM.ch10.html Bv9ARM.html Bv9ARM.pdf \
-		man.arpaname.html man.ddns-confgen.html man.dig.html \
-		man.dnssec-dsfromkey.html man.dnssec-keyfromlabel.html \
-		man.dnssec-keygen.html man.dnssec-revoke.html \
-		man.dnssec-settime.html man.dnssec-signzone.html \
-		man.dnssec-verify.html \
-		man.genrandom.html man.host.html man.isc-hmac-fixup.html \
-		man.named-checkconf.html man.named-checkzone.html \
-		man.named-journalprint.html man.named.html \
-		man.nsec3hash.html man.nsupdate.html \
-		man.rndc-confgen.html man.rndc.conf.html man.rndc.html
-ARMDIR=		${TOPDIR}/arm
-MISC=		dnssec format-options.pl ipv6 migration migration-4to9 \
-		options rfc-compliance roadmap sdb sort-options.pl
-MISCDIR=	${TOPDIR}/misc
-
-.include <bsd.prog.mk>
diff --git a/share/doc/bind9/Makefile.depend b/share/doc/bind9/Makefile.depend
deleted file mode 100644
index 57b7e10..0000000
--- a/share/doc/bind9/Makefile.depend
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated - do NOT edit!
-
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
-DIRDEPS = \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index 73a7162..2e1bb38 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -31,7 +31,7 @@ LOADER=/usr/sbin/bhyveload
 BHYVECTL=/usr/sbin/bhyvectl
 FBSDRUN=/usr/sbin/bhyve
 
-DEFAULT_MEMSIZE=512
+DEFAULT_MEMSIZE=512M
 DEFAULT_CPUS=2
 DEFAULT_TAPDEV=tap0
 
@@ -47,7 +47,7 @@ usage() {
 	echo "       -g: listen for connection from kgdb at <gdbport>"
 	echo "       -i: force boot of the Installation CDROM image"
 	echo "       -I: Installation CDROM image location (default is ${DEFAULT_ISOFILE})"
-	echo "       -m: memory size in MB (default is ${DEFAULT_MEMSIZE}MB)"
+	echo "       -m: memory size (default is ${DEFAULT_MEMSIZE})"
 	echo "       -t: tap device for virtio-net (default is $DEFAULT_TAPDEV)"
 	echo ""
 	echo "       This script needs to be executed with superuser privileges"
diff --git a/share/i18n/csmapper/Makefile b/share/i18n/csmapper/Makefile
index 54746f9..7bca3ab 100644
--- a/share/i18n/csmapper/Makefile
+++ b/share/i18n/csmapper/Makefile
@@ -7,10 +7,11 @@ SUBDIR=	APPLE AST BIG5 CNS CP EBCDIC GB GEORGIAN ISO646 ISO-8859 JIS \
 	KAZAKH KOI KS MISC TCVN
 
 mapper.dir: ${SUBDIR}
-	> ${.TARGET}
-.for i in ${SUBDIR}
-	cat ${i}/mapper.dir.${i} >> ${.TARGET}
-.endfor
+	newfile=$$(for i in ${SUBDIR}; do \
+		cat $$i/mapper.dir.$$i; \
+	done); \
+	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
+		printf '%s\n' "$$newfile" >${.TARGET}
 mapper.dir.db: mapper.dir
 	${MKCSMAPPER} -m -o ${.TARGET} ${.ALLSRC}
 
@@ -18,10 +19,11 @@ FILES+=	mapper.dir mapper.dir.db
 CLEANFILES+= mapper.dir mapper.dir.db
 
 charset.pivot: ${SUBDIR}
-	> ${.TARGET}
-.for i in ${SUBDIR}
-	cat ${i}/charset.pivot.${i} >> ${.TARGET}
-.endfor
+	newfile=$$(for i in ${SUBDIR}; do \
+		cat $$i/charset.pivot.$$i; \
+	done); \
+	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
+		printf '%s\n' "$$newfile" >${.TARGET}
 charset.pivot.pvdb: charset.pivot
 	${MKCSMAPPER} -p -o ${.TARGET} ${.ALLSRC}
 
diff --git a/share/i18n/esdb/Makefile b/share/i18n/esdb/Makefile
index 3cd372c..2b16d90 100644
--- a/share/i18n/esdb/Makefile
+++ b/share/i18n/esdb/Makefile
@@ -10,18 +10,20 @@ FILES+=	esdb.dir esdb.dir.db esdb.alias esdb.alias.db
 CLEANFILES= ${FILES}
 
 esdb.dir: ${SUBDIR}
-	> $@
-.for i in ${SUBDIR}
-	cat ${i}/esdb.dir.${i} >>${.TARGET}
-.endfor
+	newfile=$$(for i in ${SUBDIR}; do \
+		cat $$i/esdb.dir.$$i; \
+	done); \
+	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
+		printf '%s\n' "$$newfile" >${.TARGET}
 esdb.dir.db: esdb.dir
 	${MKESDB} -m -o ${.TARGET} ${.ALLSRC}
 
 esdb.alias: ${SUBDIR}
-	> $@
-.for i in ${SUBDIR}
-	cat ${i}/esdb.alias.${i} >>${.TARGET}
-.endfor
+	newfile=$$(for i in ${SUBDIR}; do \
+		cat $$i/esdb.alias.$$i; \
+	done); \
+	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
+		printf '%s\n' "$$newfile" >${.TARGET}
 esdb.alias.db: esdb.alias
 	${MKESDB} -m -o ${.TARGET} ${.ALLSRC}
 
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index e51ad39..e221795 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -154,6 +154,7 @@ MAN=	aac.4 \
 	geom_uzip.4 \
 	gif.4 \
 	gpib.4 \
+	gpio.4 \
 	gre.4 \
 	h_ertt.4 \
 	hatm.4 \
diff --git a/share/man/man4/altera_avgen.4 b/share/man/man4/altera_avgen.4
index fee8f54..2ba9360 100644
--- a/share/man/man4/altera_avgen.4
+++ b/share/man/man4/altera_avgen.4
@@ -56,11 +56,11 @@ entries configure the address, size, I/O disposition, and
 .Pa /dev
 device node name that will be used.
 The
-.Xr open ,
-.Xr read ,
-.Xr write ,
+.Xr open 2 ,
+.Xr read 2 ,
+.Xr write 2 ,
 and
-.Xr mmap
+.Xr mmap 2
 system calls (and variations) may be used on
 .Nm
 device nodes, subject to constraints imposed using
diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4
index 7b6fc4c..1effdb2 100644
--- a/share/man/man4/altq.4
+++ b/share/man/man4/altq.4
@@ -126,6 +126,7 @@ They have been applied to the following hardware drivers:
 .Xr bce 4 ,
 .Xr bfe 4 ,
 .Xr bge 4 ,
+.Xr bxe 4 ,
 .Xr cas 4 ,
 .Xr cxgbe 4 ,
 .Xr dc 4 ,
diff --git a/share/man/man4/bxe.4 b/share/man/man4/bxe.4
index 588900f..be9ba25 100644
--- a/share/man/man4/bxe.4
+++ b/share/man/man4/bxe.4
@@ -1,35 +1,38 @@
-.\" Copyright (c) 2012 Edward Tomasz Napierala <trasz@FreeBSD.org>
-.\" All rights reserved.
+.\" Copyright (c) 2013 Broadcom Corporation. 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. Neither the name of Broadcom Corporation nor the name of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written consent.
 .\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+.\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 25, 2012
+.Dd April 29, 2012
 .Dt BXE 4
 .Os
 .Sh NAME
 .Nm bxe
-.Nd "Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet adapter driver"
+.Nd Broadcom NetXtreme II Ethernet 10Gb PCIe adapter driver
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -38,8 +41,8 @@ kernel configuration file:
 .Cd "device bxe"
 .Ed
 .Pp
-Alternatively, to load the driver as a
-module at boot time, place the following line in
+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"
@@ -47,77 +50,276 @@ if_bxe_load="YES"
 .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 .
+driver provides support for PCIe 10Gb Ethernet adapters based on the Broadcom
+NetXtreme II family of 10Gb chips.
+The driver supports Jumbo Frames, VLAN
+tagging, checksum offload (IPv4, TCP, UDP, IPv6-TCP, IPv6-UDP), MSI-X
+interrupts, TCP Segmentation Offload (TSO), Large Receive Offload (LRO), and
+Receive Side Scaling (RSS).
 .Sh HARDWARE
 The
 .Nm
-driver provides support for various NICs based on the Broadcom BCM5771x
-family of 10GbE Ethernet controller chips, including the
-following:
+driver provides support for various NICs based on the Broadcom NetXtreme II
+family of 10Gb Ethernet controller chips, including the following:
 .Pp
 .Bl -bullet -compact
 .It
-Broadcom NetXtreme II BCM57710 10GbE
+Broadcom NetXtreme II BCM57710 10Gb
+.It
+Broadcom NetXtreme II BCM57711 10Gb
+.It
+Broadcom NetXtreme II BCM57711E 10Gb
+.It
+Broadcom NetXtreme II BCM57712 10Gb
+.It
+Broadcom NetXtreme II BCM57712-MF 10Gb
+.It
+Broadcom NetXtreme II BCM57800 10Gb
 .It
-Broadcom NetXtreme II BCM57711 10GbE
+Broadcom NetXtreme II BCM57800-MF 10Gb
 .It
-Broadcom NetXtreme II BCM57711E 10GbE
+Broadcom NetXtreme II BCM57810 10Gb
+.It
+Broadcom NetXtreme II BCM57810-MF 10Gb
+.It
+Broadcom NetXtreme II BCM57840 10Gb / 20Gb
+.It
+Broadcom NetXtreme II BCM57840-MF 10Gb
 .El
-.Sh SYSCTL VARIABLES
-The following variables are available as both
-.Xr sysctl 8
-variables and
-.Xr loader 8
-tunables:
+.Sh CONFIGURATION
+There a number of configuration parameters that can be set to tweak the
+driver's behavior.
+These parameters can be set via the
+.Xr loader.conf 5
+file to take affect during the next system boot.
+The following parameters affect
+ALL instances of the driver.
 .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.debug
+DEFAULT = 0
+.br
+Sets the default logging level of the driver.
+See the Diagnostics and Debugging
+section below for more details.
+.It Va hw.bxe.interrupt_mode
+DEFAULT = 2
+.br
+Sets the default interrupt mode: 0=IRQ, 1=MSI, 2=MSIX.
+If set to MSIX and
+allocation fails, the driver will roll back and attempt MSI allocation.
+If MSI
+allocation fails, the driver will roll back and attempt fixed level IRQ
+allocation.
+If IRQ allocation fails, then the driver load fails.
+With MSI/MSIX,
+the driver attempts to allocate a vector for each queue in addition to one more
+for default processing.
 .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.
+DEFAULT = 4
+.br
+Sets the default number of fast path packet processing queues.
+Note that one
+MSI/MSIX interrupt vector is allocated per-queue.
+.It Va hw.bxe.max_rx_bufs
+DEFAULT = 0
+.br
+Sets the maximum number of receive buffers to allocate per-queue.
+Zero(0) means
+to allocate a receive buffer for every buffer descriptor.
+By default this
+equates to 4080 buffers per-queue which is the maximum value for this config
+parameter.
+.It Va hw.bxe.hc_rx_ticks
+DEFAULT = 25
+.br
+Sets the number of ticks for host interrupt coalescing in the receive path.
+.It Va hw.bxe.hc_tx_ticks
+DEFAULT = 50
+.br
+Sets the number of ticks for host interrupt coalescing in the transmit path.
+.It Va hw.bxe.rx_budget
+DEFAULT = 0xffffffff
+.br
+Sets the maximum number of receive packets to process in an interrupt.
+If the
+budget is reached then the remaining/pending packets will be processed in a
+scheduled taskqueue.
+.It Va hw.bxe.max_aggregation_size
+DEFAULT = 32768
+.br
+Sets the maximum LRO aggregration byte size.
+The higher the value the more
+packets the hardware will aggregate.
+Maximum is 65K.
 .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.
+DEFAULT = -1
+.br
+Sets the PCI MRRS: -1=Auto, 0=128B, 1=256B, 2=512B, 3=1KB
+.It Va hw.bxe.autogreeen
+DEFAULT = 0
+.br
+Set AutoGrEEEN: 0=HW_DEFAULT, 1=FORCE_ON, 2=FORCE_OFF
+.It Va hw.bxe.udp_rss
+DEFAULT = 0
+.br
+Enable/Disable 4-tuple RSS for UDP: 0=DISABLED, 1=ENABLED
 .El
+.Pp
+Special care must be taken when modifying the number of queues and receive
+buffers.
+FreeBSD imposes a limit on the maximum number of
+.Xr mbuf 9
+allocations.
+If buffer allocations fail, the interface initialization will fail
+and the interface will not be usable.
+The driver does not make a best effort
+for buffer allocations.
+It is an all or nothing effort.
+.Pp
+You can tweak the
+.Xr mbuf 9
+allocation limit using
+.Xr sysctl 8
+and view the current usage with
+.Xr netstat 1
+as follows:
+.Bd -literal -offset indent
+# netstat -m
+# sysctl kern.ipc.nmbclusters
+# sysctl kern.ipc.nmbclusters=<#>
+.Ed
+.Pp
+There are additional configuration parameters that can be set on a per-instance
+basis to dynamically override the default configuration.
+The '#' below must be
+replaced with the driver instance / interface unit number:
+.Bl -tag -width indent
+.It Va dev.bxe.#.debug
+DEFAULT = 0
+.br
+Sets the default logging level of the driver instance.
+See
+.Va hw.bxe.debug
+above and
+the Diagnostics and Debugging section below for more details.
+.It Va dev.bxe.#.rx_budget
+DEFAULT = 0xffffffff
+.br
+Sets the maximum number of receive packets to process in an interrupt for the
+driver instance.
+See
+.Va hw.bxe.rx_budget
+above for more details.
+.El
+.Pp
+Additional items can be configured using
+.Xr ifconfig 8 :
+.Bl -tag -width indent
+.It Va MTU - Maximum Transmission Unit
+DEFAULT = 1500
+.br
+RANGE = 46-9184
+.br
+# ifconfig bxe# mtu <n>
+.It Va Promiscuous Mode
+DEFAULT = OFF
+.br
+# ifconfig bxe# [ promisc | -promisc ]
+.It Va Rx/Tx Checksum Offload
+DEFAULT = RX/TX CSUM ON
+.br
+Note that the Rx and Tx settings are not independent.
+.br
+# ifconfig bxe# [ rxcsum | -rxcsum | txcsum | -txcsum ]
+.It Va TSO - TCP Segmentation Offload
+DEFAULT = ON
+.br
+# ifconfig bxe# [ tso | -tso | tso6 | -tso6 ]
+.It Va LRO - TCP Large Receive Offload
+DEFAULT = ON
+.br
+# ifconfig bxe# [ lro | -lro ]
+.El
+.Sh DIAGNOSTICS AND DEBUGGING
+There are many statistics exposed by
+.Nm
+via
+.Xr sysctl 8 .
+.Pp
+To dump the default driver configuration:
+.Bd -literal -offset indent
+# sysctl -a | grep hw.bxe
+.Ed
+.Pp
+To dump every instance's configuration and detailed statistics:
+.Bd -literal -offset indent
+# sysctl -a | grep dev.bxe
+.Ed
+.Pp
+To dump information for a single instance (replace the '#' with the driver
+instance / interface unit number):
+.Bd -literal -offset indent
+# sysctl -a | grep dev.bxe.#
+.Ed
+.Pp
+To dump information for all the queues of a single instance:
+.Bd -literal -offset indent
+# sysctl -a | grep dev.bxe.#.queue
+.Ed
+.Pp
+To dump information for a single queue of a single instance (replace the
+additional '#' with the queue number):
+.Bd -literal -offset indent
+# sysctl -a | grep dev.bxe.#.queue.#
+.Ed
+.Pp
+The
+.Nm
+driver has the ability to dump a ton of debug messages to the system
+log.
+The default level of logging can be set with the
+.Va hw.bxe.debug
+.Xr sysctl 8 .
+Take care with this setting as it can result in too
+many logs being dumped.
+Since this parameter is the default one, it affects
+every instance and will dramatically change the timing in the driver.
+A better
+alternative to aid in debugging is to dynamically change the debug level of a
+specific instance with the
+.Va dev.bxe.#.debug
+.Xr sysctl 8 .
+This allows
+you to turn on/off logging of various debug groups on-the-fly.
+.Pp
+The different debug groups that can be toggled are:
+.Bd -literal -offset indent
+DBG_LOAD   0x00000001 /* load and unload    */
+DBG_INTR   0x00000002 /* interrupt handling */
+DBG_SP     0x00000004 /* slowpath handling  */
+DBG_STATS  0x00000008 /* stats updates      */
+DBG_TX     0x00000010 /* packet transmit    */
+DBG_RX     0x00000020 /* packet receive     */
+DBG_PHY    0x00000040 /* phy/link handling  */
+DBG_IOCTL  0x00000080 /* ioctl handling     */
+DBG_MBUF   0x00000100 /* dumping mbuf info  */
+DBG_REGS   0x00000200 /* register access    */
+DBG_LRO    0x00000400 /* lro processing     */
+DBG_ASSERT 0x80000000 /* debug assert       */
+DBG_ALL    0xFFFFFFFF /* flying monkeys     */
+.Ed
+.Pp
+For example, to debug an issue in the receive path on bxe0:
+.Bd -literal -offset indent
+# sysctl dev.bxe.0.debug=0x22
+.Ed
+.Pp
+When finished turn the logging back off:
+.Bd -literal -offset indent
+# sysctl dev.bxe.0.debug=0
+.Ed
 .Sh SEE ALSO
+.Xr netstat 1 ,
 .Xr altq 4 ,
 .Xr arp 4 ,
 .Xr netintro 4 ,
@@ -133,6 +335,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Gary Zambrano Aq zambrano@broadcom.com
+.An Eric Davis Aq edavis@broadcom.com ,
+.An David Christensen Aq davidch@broadcom.com ,
 and
-.An David Christensen Aq davidch@broadcom.com .
+.An Gary Zambrano Aq zambrano@broadcom.com .
diff --git a/share/man/man4/capsicum.4 b/share/man/man4/capsicum.4
index 84ddb91..b2a157d 100644
--- a/share/man/man4/capsicum.4
+++ b/share/man/man4/capsicum.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 21, 2013
+.Dd September 17, 2013
 .Dt CAPSICUM 4
 .Os
 .Sh NAME
@@ -62,7 +62,7 @@ File descriptors that wrap other file descriptors, masking operations that can
 be called on them; for example, a file descriptor returned by
 .Xr open 2
 may be refined using
-.Xr cap_new 2
+.Xr cap_rights_limit 2
 so that only
 .Xr read 2
 and
@@ -89,8 +89,8 @@ associated with file descriptors; described in greater detail in
 .Sh SEE ALSO
 .Xr cap_enter 2 ,
 .Xr cap_getmode 2 ,
-.Xr cap_getrights 2 ,
-.Xr cap_new 2 ,
+.Xr cap_rights_get 2 ,
+.Xr cap_rights_limit 2 ,
 .Xr fchmod 2 ,
 .Xr open 2 ,
 .Xr pdfork 2 ,
diff --git a/share/man/man4/ctl.4 b/share/man/man4/ctl.4
index 89f737c..7122a92 100644
--- a/share/man/man4/ctl.4
+++ b/share/man/man4/ctl.4
@@ -75,8 +75,11 @@ Error injection support
 .It
 All I/O handled in-kernel, no userland context switch overhead
 .El
+.Pp
+It also serves as a kernel component of the native iSCSI target.
 .Sh SEE ALSO
 .Xr ctladm 8 ,
+.Xr ctld 8 ,
 .Xr ctlstat 8
 .Sh HISTORY
 The
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index d8a2d9b..452e1c2 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -60,7 +60,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 16, 2011
+.Dd September 30, 2013
 .Dt DDB 4
 .Os
 .Sh NAME
@@ -219,6 +219,8 @@ look at by bytes (8 bits)
 look at by half words (16 bits)
 .It Cm l
 look at by long words (32 bits)
+.It Cm g
+look at by quad words (64 bits)
 .It Cm a
 print the location being displayed
 .It Cm A
diff --git a/share/man/man4/geom_linux_lvm.4 b/share/man/man4/geom_linux_lvm.4
index 30b875e..7dee047 100644
--- a/share/man/man4/geom_linux_lvm.4
+++ b/share/man/man4/geom_linux_lvm.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 20, 2008
+.Dd October 1, 2013
 .Dt GEOM_LINUX_LVM 4
 .Os
 .Sh NAME
@@ -72,7 +72,7 @@ Providers:
    Sectorsize: 512
    Mode: r0w0e0
 Consumers:
-1. Name: ad0s1
+1. Name: ada0s1
    Mediasize: 80023716864 (75G)
    Sectorsize: 512
    Mode: r0w0e0
diff --git a/share/man/man4/gpio.4 b/share/man/man4/gpio.4
new file mode 100644
index 0000000..614a722
--- /dev/null
+++ b/share/man/man4/gpio.4
@@ -0,0 +1,176 @@
+.\" Copyright (c) 2013, Sean Bruno <sbruno@freebsd.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 13, 2013
+.Dt GPIO 4
+.Os
+.Sh NAME
+.Nm gpiobus
+.Nd GPIO bus system
+.Sh SYNOPSIS
+To compile these devices into your kernel and use the device hints, place the
+following lines in your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device gpiobus"
+.Cd "device gpioiic"
+.Cd "device gpio"
+.Cd "device gpioc"
+.Cd "device gpioled"
+.Ed
+.Pp
+Additional device entries for the
+.Li ARM
+architecure include:
+.Bd -ragged -offset indent
+.Cd "device a10_gpio"
+.Cd "device bcm_gpio"
+.Cd "device imx51_gpio"
+.Cd "device lpcgpio"
+.Cd "device mv_gpio"
+.Cd "device ti_gpio"
+.Cd "device gpio_avila"
+.Cd "device gpio_cambria"
+.Cd "device zy7_gpio"
+.Cd "device pxagpio"
+.Ed
+.Pp
+Additional device entries for the
+.Li MIPS
+architecure include:
+.Bd -ragged -offset indent
+.Cd "device ar71xxx_gpio"
+.Cd "device octeon_gpio"
+.Cd "device rt305_gpio"
+.Ed
+.Pp
+Additional device entries for the
+.Li POWERPC
+architecure include:
+.Bd -ragged -offset indent
+.Cd "device wiigpio"
+.Cd "device macgpio"
+.Ed
+.Sh DESCRIPTION
+The
+.Em gpiobus
+system provides a simple interface to the bit banging style GPIO bus
+found on embedded architectures.
+.Pp
+The acronym
+.Li GPIO
+means
+.Dq General-Purpose Input/Output.
+.Pp
+The BUS physically consists of multiple pins that can be configured
+for input/output, IRQ delivery, SDA/SCL
+.Em iicbus
+use, etc.
+On most embedded architechtures (mips/arm), discovery of the bus and
+configuration of the pins is done via
+.Xr device.hints 5
+in the platform's kernel
+.Xr config 5
+file.
+.Pp
+Assignment of
+.Xr gpioiic 4
+bus variables is done via:
+.Bl -tag -width ".Va hint.gpioiic.%d.atXXX"
+.It Va hint.gpioiic.%d.at
+Normally just gpiobus0.
+.It Va hint.gpioiic.%d.pins
+This is a bitmask of the pins on the gpio board that are to be used for
+SCLOCK and SDATA from the IIC bus.
+To configure pin 0 and 7, use the bitmask of
+10000001 and convert it to a hexadecimal value of 0x0081.
+Should only ever have two bits set in mask.
+.It Va hint.gpioiic.%d.scl
+Indicates which bit in the
+.Va hint.gpioiic.%d.pins
+should be used as the SCLOCK
+source.
+.It Va hint.gpioiic.%d.sda
+Indicates which bit in the
+.Va hint.gpioiic.%d.pins
+should be used as the SDATA
+source.
+.El
+.Pp
+The following are only provided by the
+.Cd ar71xx_gpio
+driver.
+.Bl -tag -width ".Va hint.gpioiic.%d.atXXX"
+.It Va hint.gpio.%d.pinmask
+This is a bitmask of pins on the gpio board that we would like to expose
+for use to the host o/s.
+To expose pin 0, 4 and 7, use the bitmask of
+10010001 converted to the hexadecimal value 0x0091.
+.It Va hint.gpio.%d.pinon
+This is a bitmask of pins on the gpio board that will be set to ON at host
+start.
+To set pin 2, 5 and 13 to be set ON at boot, use the bitmask of
+10000000010010 converted to the hexadecimal value 0x2012.
+.It Va hint.gpio.function_set
+.It Va hint.gpio.function_clear
+These are a bitmask of pins that will remap a pin to handle a specific
+function (USB, UART TX/RX, etc) in the Atheros function registers.
+This is mainly used to set/clear functions that we need when they are setup or
+not setup by uBoot.
+.El
+.Pp
+These values are configureable from the
+.Xr gpioled 4
+interface and help create
+.Xr led 4
+compatible devices in
+.Pa /dev/led/<name> .
+.Bl -tag -width ".Va hint.gpioiic.%d.atXXX"
+.It Va hint.gpioled.%d.at
+Normally assigned to gpiobus0.
+.It Va hint.gpioled.%d.name
+Arbitrary name of device in
+.Pa /dev/led/
+to create for
+.Xr led 4
+interfaces.
+.It Va hint.gpioled.%d.pins
+Which pin on the GPIO interface to map to this instance.
+.El
+.Pp
+Simply put, each pin of the GPIO interface is connected to an input/output
+of some device in a system.
+.Sh SEE ALSO
+.Xr iicbus 4 ,
+.Xr gpioctl 8
+.Sh HISTORY
+The
+.Nm
+manual page first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+This
+manual page was written by
+.An Sean Bruno Aq sbruno@FreeBSD.org .
diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4
index deed0c1..3b72417 100644
--- a/share/man/man4/netmap.4
+++ b/share/man/man4/netmap.4
@@ -28,7 +28,7 @@
 .\" $FreeBSD$
 .\" $Id: netmap.4 11563 2012-08-02 08:59:12Z luigi $: stable/8/share/man/man4/bpf.4 181694 2008-08-13 17:45:06Z ed $
 .\"
-.Dd February 27, 2012
+.Dd September 23, 2013
 .Dt NETMAP 4
 .Os
 .Sh NAME
@@ -267,14 +267,14 @@ The following code implements a traffic generator
 #include <net/netmap_user.h>
 struct netmap_if *nifp;
 struct netmap_ring *ring;
-struct netmap_request nmr;
+struct nmreq nmr;
 
 fd = open("/dev/netmap", O_RDWR);
 bzero(&nmr, sizeof(nmr));
-strcpy(nmr.nm_name, "ix0");
-nmr.nm_version = NETMAP_API;
+strcpy(nmr.nr_name, "ix0");
+nmr.nr_version = NETMAP_API;
 ioctl(fd, NIOCREG, &nmr);
-p = mmap(0, nmr.memsize, fd);
+p = mmap(0, nmr.nr_memsize, fd);
 nifp = NETMAP_IF(p, nmr.offset);
 ring = NETMAP_TXRING(nifp, 0);
 fds.fd = fd;
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 99835fb..6ecb65c 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -460,7 +460,7 @@ typedef struct synapticshw {
     int infoHardware;	/* hardware model */
     int infoNewAbs;	/* supports the newabs format */
     int capPen;		/* can detect a pen */
-    int infoSimpleC;	/* supports simple commands */
+    int infoSimplC;	/* supports simple commands */
     int infoGeometry;	/* touchpad dimensions */
     int capExtended;	/* supports extended packets */
     int capSleep;	/* can be suspended/resumed */
@@ -468,6 +468,9 @@ typedef struct synapticshw {
     int capMultiFinger;	/* can detect multiple fingers */
     int capPalmDetect;	/* can detect a palm */
     int capPassthrough;	/* can passthrough guest packets */
+    int capMiddle;	/* has a physical middle button */
+    int nExtendedButtons; /* has N additionnal buttons */
+    int nExtendedQueries; /* supports N extended queries */
 } synapticshw_t;
 .Ed
 .Pp
diff --git a/share/man/man4/rsu.4 b/share/man/man4/rsu.4
index fa9767a..5d5c56c 100644
--- a/share/man/man4/rsu.4
+++ b/share/man/man4/rsu.4
@@ -35,9 +35,9 @@ place the following lines in your kernel configuration file:
 .Pp
 Alternatively, to load the driver as a module at boot time,
 place the following line in
-.Xr loader.conf 5:
+.Xr loader.conf 5 :
 .Bd -literal -offset indent
-.Xr if_rsu_load="YES"
+if_rsu_load="YES"
 .Ed
 .Pp
 After you have read the license in /usr/share/doc/legal/realtek
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index c6dfa29..aaf667d 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd July 7, 2013
+.Dd October 6, 2013
 .Dt URTWN 4
 .Os
 .Sh NAME
@@ -57,18 +57,6 @@ The RTL8192CU is a highly integrated multiple-in, multiple-out (MIMO)
 802.11n adapter that combines a MAC, a 2T2R capable baseband and an
 RF in a single chip.
 It operates in the 2GHz spectrum only.
-.Pp
-The driver needs at least version 1.1p0 of the following firmware files,
-which are loaded when an interface is attached:
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It urtwn-rtl8192cfwT
-.It urtwn-rtl8192cfwU
-.It urtwn-rtl8723fw
-.El
-.Pp
-The firmware is available as part of the FreeBSD Ports collection in
-net/urtwn-firmware-kmod.
 .Sh HARDWARE
 The following adapters should work:
 .Pp
diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index 4717d2a..e134f44 100644
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -127,6 +127,7 @@ in hardware:
 .Xr ale 4 ,
 .Xr bce 4 ,
 .Xr bge 4 ,
+.Xr bxe 4 ,
 .Xr cxgb 4 ,
 .Xr cxgbe 4 ,
 .Xr em 4 ,
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 5a337b8..6e4aa84 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -26,7 +26,6 @@ MAN=	acct.5 \
 	fbtab.5 \
 	fdescfs.5 \
 	forward.5 \
-	freebsd-update.conf.5 \
 	fs.5 \
 	fstab.5 \
 	group.5 \
@@ -87,6 +86,10 @@ ATF=			${.CURDIR}/../../../contrib/atf
 _atf_formats.5=		atf-formats.5
 .endif
 
+.if ${MK_FREEBSD_UPDATE} != "no"
+MAN+=	freebsd-update.conf.5
+.endif
+
 .if ${MK_HESIOD} != "no"
 MAN+=	hesiod.conf.5 
 .endif
diff --git a/share/man/man5/ext2fs.5 b/share/man/man5/ext2fs.5
index a74e599..536561b 100644
--- a/share/man/man5/ext2fs.5
+++ b/share/man/man5/ext2fs.5
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 16, 2006
+.Dd October 1, 2013
 .Dt EXT2FS 5
 .Os
 .Sh NAME
@@ -53,9 +53,9 @@ file systems.
 To mount a
 .Nm
 volume located on
-.Pa /dev/ad1s1 :
+.Pa /dev/ada1s1 :
 .Pp
-.Dl "mount -t ext2fs /dev/ad1s1 /mnt"
+.Dl "mount -t ext2fs /dev/ada1s1 /mnt"
 .Sh SEE ALSO
 .Xr nmount 2 ,
 .Xr unmount 2 ,
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index adfe70f..4099495 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -32,7 +32,7 @@
 .\"     @(#)fstab.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd July 15, 2013
+.Dd September 10, 2013
 .Dt FSTAB 5
 .Os
 .Sh NAME
@@ -378,9 +378,45 @@ The file
 resides in
 .Pa /etc .
 .El
+.Sh EXAMPLES
+.Bd -literal
+# Device	Mountpoint	FStype	Options		Dump	Pass#
+#
+# UFS file system.
+/dev/da0p2	/		ufs	rw		1	1
+#
+# Swap space on a block device.
+/dev/da0p1	none		swap	sw		0	0
+#
+# Swap space using a block device with GBDE/GELI encyption.
+# aalgo, ealgo, keylen, sectorsize options are available
+# for .eli devices.
+/dev/da1p1.bde	none		swap	sw		0	0
+/dev/da1p2.eli	none		swap	sw		0	0
+#
+# tmpfs.
+tmpfs		/tmp		tmpfs	rw,size=1g,mode=1777	0 0
+#
+# UFS file system on a swap-backed md(4).  /dev/md10 is
+# automatically created.  If it is "md", a unit number
+# will be automatically selected.
+md10		/scratch	mfs	rw,-s1g		0	0
+#
+# Swap space on a vnode-backed md(4).
+md11		none		swap	sw,file=/swapfile	0 0
+#
+# CDROM.  "noauto" option is typically used because the
+# media is removable.
+/dev/cd0	/cdrom		cd9660	ro,noauto	0	0
+#
+# NFS-exported file system.  "serv" is an NFS server name
+# or IP address.
+serv:/export	/nfs		nfs	rw,noinet6	0	0
+.Ed
 .Sh SEE ALSO
 .Xr getfsent 3 ,
 .Xr getvfsbyname 3 ,
+.Xr strunvis 3 ,
 .Xr ccd 4 ,
 .Xr dump 8 ,
 .Xr fsck 8 ,
@@ -388,7 +424,6 @@ resides in
 .Xr mount 8 ,
 .Xr quotacheck 8 ,
 .Xr quotaon 8 ,
-.Xr strunvis 3 ,
 .Xr swapon 8 ,
 .Xr umount 8
 .Sh HISTORY
diff --git a/share/man/man5/libmap.conf.5 b/share/man/man5/libmap.conf.5
index 784d5d0..b97160f 100644
--- a/share/man/man5/libmap.conf.5
+++ b/share/man/man5/libmap.conf.5
@@ -1,4 +1,5 @@
 .\" Copyright (c) 2003 Matthew N. Dodd <winter@jurai.net>
+.\" Copyright (c) 2013 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 28, 2012
+.Dd September 16, 2013
 .Dt LIBMAP.CONF 5
 .Os
 .Sh NAME
@@ -35,109 +36,105 @@ The
 .Nm libmap
 functionality of
 .Xr ld-elf.so.1 1
-allows dynamic object dependencies to be mapped to arbitrary
-names.
+allows dynamic object dependencies to be mapped to arbitrary names.
 .Pp
-The configuration file consists of two whitespace separated columns; the
-left hand side containing the mapping candidate and the right hand
-side containing the mapping.
-Dependencies are matched against candidates and replaced with the mappings.
-.Pp
-Two special directives are available:
+Each line in
+.Pa /etc/libmap.conf
+can have one of five forms:
 .Bl -tag -width indent
+.It Ar origin Ar target
+Whenever a dependency on
+.Ar origin
+is encountered while loading a dynamic object, use
+.Ar target
+instead of searching for
+.Ar origin
+in the normal library search paths.
+.It Ar path1 Ar path2
+When iterating through a library search path, replace any element that
+matches
+.Ar path1
+exactly with
+.Ar path2 .
+.It Bq Ar constraint
+Apply
+.Ar constraint
+to all subsequent mappings until the next constraint line or the end
+of the file.
+See the
+.Sx Constraints
+section for details.
 .It Cm include Ar file
 Parse the contents of
 .Ar file
 before continuing with the current file.
+Nesting depth is limited only by available memory, but each file
+encountered is processed only once, and loops are silently ignored.
 .It Cm includedir Ar dir
-Parse the contents of every file in
+Recurse through
 .Ar dir
-that ends in
+and parse the contents of any file that ends in
 .Pa .conf
 before continuing with the current file.
+Nesting depth is limited only by available memory, but each directory
+or file encountered is processed only once, and loops are silently
+ignored.
 .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.
-Constraints can be one of three types:
+.Ss Constraints
+Constrained mappings only apply when processing binaries or libraries
+that satisfy the constraint.
+There are three types of constraints:
 .Bl -tag -width indent
 .It Exact
 The constraint is matched literally so that only an executable with an
-identical fully qualified pathname will match the constraint.
+identical fully qualified pathname will satisfy the constraint.
 This means that the executable
 .Pa /usr/bin/foo
-will not match a constraint for
-.Pa /usr/bin/./foo
+will not satisfy the constraint
+.Bq Pa /usr/bin/./foo ,
 and vice-versa.
 This is the default constraint type.
 .It Basename
 A constraint with no path is matched against the basename of the
 executable.
-.Pa foo
+For instance, the constraint
+.Bq Pa foo
 will match
 .Pa /bin/foo ,
 .Pa /usr/local/sbin/foo ,
 or any other executable named
 .Pa foo ,
-no matter what its path is.
+no matter what directory it is in.
 .It Directory
-A constraint with a trailing slash is prefix-matched against the full
-pathname of the executable.
-.Pa /usr/bin/
-will match any executable with a path starting with /usr/bin.
+A constraint with a trailing slash is satisfied if the full pathname
+begins with the constraint string.
+For instance, the constraint
+.Bq Pa /usr/bin/
+will match any executable with a path starting with
+.Pa /usr/bin/ .
 .El
 .Pp
-Note that the executable path matched against is the
-.Fa path
-parameter in an
-.Fn exec*
-function call.
-The Directory or Exact constraints can only match when the executable
-is called with a full pathname.
+Note that the constraints are matched against the path that was passed
+as the first argument to whichever
+.Xr exec 3
+function was used to execute the binary in question.
 Most programs executed from a shell are run without a full path, via
-.Fn exec*p ,
-so the Basename constraint type is the most useful.
+.Xr execvp 3
+or similar, so the basename constraint type is the most useful.
 .Pp
+.Bf -symbolic
 WARNING!
-Constrained mappings must never appear first in the configuration file.
-While there is a way to specify the
-.Dq default
-constraint, its use is not recommended.
-.Pp
-The most common use at the date of writing is for allowing multiple
-.Tn POSIX
-threading libraries to be used on a system without relinking or
-changing symlinks.
-.Pp
-On 64-bit architectures that provide 32-bit runtime support,
-the libmap mechanism is available for 32-bit binaries too.
-The mappings has to be written into separate configuration file
+Constraints apply to all mappings until the next constraint or the end
+of the file.
+Hence, unconstrained mappings must be placed at the top of the file.
+.Ef
+.Ss ABI compatibility
+On 64-bit architectures that provide 32-bit binary compatibility, the
+mappings in
+.Pa /etc/libmap.conf
+apply only to 64-bit binaries.
+Mappings for 32-bit binaries must be placed in
 .Pa /etc/libmap32.conf .
-Currently only supported on amd64.
-.Pp
-This mechanism has also been used to create shims to allow Linux
-shared libraries to be dynamically loaded into
-.Fx
-binaries.
-In this case, an Exact constraint is used for the Linux shared library,
-mapping libraries it depends on to a wrapper.
-The wrapper then defines any needed symbols for the Linux shared library
-and relies on its libraries not being mapped to provide actual
-implementations.
-It appears that only libraries loaded via
-.Xr dlopen 3
-will work correctly.
-The symbol version information in shared libraries is checked at
-link time, but at run time the version information is currently
-ignored.
 .Sh FILES
 .Bl -tag -width ".Pa /etc/libmap32.conf" -compact
 .It Pa /etc/libmap.conf
@@ -147,9 +144,8 @@ The libmap configuration file for 32-bit binaries on 64-bit system.
 .El
 .Sh EXAMPLES
 .Bd -literal
-# /etc/libmap.conf
 #
-# candidate		mapping
+# origin		target
 #
 libc_r.so.6		libpthread.so.2	# Everything that uses 'libc_r'
 libc_r.so		libpthread.so	# now uses 'libpthread'
@@ -174,11 +170,11 @@ libdl.so.2		pluginwrapper/pips.so
 .Xr rtld 1
 .Sh HISTORY
 The
-.Nm
-manual page and
 .Nm libmap
-functionality first appeared in
+mechanism first appeared in
 .Fx 5.1 .
 .Sh AUTHORS
 This manual page was written by
-.An Matthew N. Dodd Aq winter@jurai.net .
+.An Matthew N. Dodd Aq winter@jurai.net
+and extensively rewritten by
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
diff --git a/share/man/man5/msdosfs.5 b/share/man/man5/msdosfs.5
index 933577a..70cfe50 100644
--- a/share/man/man5/msdosfs.5
+++ b/share/man/man5/msdosfs.5
@@ -2,7 +2,7 @@
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
-.Dd August 22, 2007
+.Dd October 1, 2013
 .Dt MSDOSFS 5
 .Os
 .Sh NAME
@@ -21,7 +21,7 @@ based file systems.
 .Pp
 The most common usage follows:
 .Pp
-.Dl "mount -t msdosfs /dev/ad0sN /mnt"
+.Dl "mount -t msdosfs /dev/ada0sN /mnt"
 .Pp
 where
 .Ar N
@@ -40,7 +40,7 @@ It is possible to define an entry in
 .Pa /etc/fstab
 that looks similar to:
 .Bd -literal
-/dev/ad0sN		/dos	msdosfs		rw	0	0
+/dev/ada0sN		/dos	msdosfs		rw	0	0
 .Ed
 .Pp
 This will mount an
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 3312c6f..effbd96 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 22, 2013
+.Dd October 10, 2013
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1192,10 +1192,8 @@ be added since the search would
 stop with the missing
 .Dq Li alias3
 entry.
-Due to this difficult to manage behavior, the
-.Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n
-form is deprecated.
-There is
+Because of this difficult to manage behavior,
+there is
 .Va ifconfig_ Ns Ao Ar interface Ac Ns Va _aliases
 variable, which has the same functionality as
 .Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n
@@ -2043,6 +2041,13 @@ is set to
 .Dq Li YES ,
 these are the flags to pass to
 .Xr hastd 8 .
+.It Va local_unbound_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+run the
+.Xr unbound 8
+daemon as a local caching resolver.
 .It Va named_enable
 .Pq Vt bool
 If set to
@@ -3886,14 +3891,32 @@ indicates that the highest frequency (less power savings) should be used.
 If set to
 .Dq Li NO ,
 any configured jails will not be started.
+.It Va jail_conf
+.Pq Vt str
+The configuration filename used by
+.Xr jail 8
+utility.
+The default value is
+.Pa /etc/jail.conf .
 .It Va jail_parallel_start
 .Pq Vt bool
 If set to
 .Dq Li YES ,
 all configured jails will be started in the background (in parallel).
+.It Va jail_flags
+.Pq Vt str
+Unset by default.
+When set, use as default value for
+.Va jail_ Ns Ao Ar jname Ac Ns Va _flags
+for every jail in
+.Va jail_list .
 .It Va jail_list
 .Pq Vt str
 A space separated list of names for jails.
+If this variable is empty,
+all of
+.Xr jail 8
+instances in the configuration file will be configured.
 This is purely a configuration aid to help identify and
 configure multiple jails.
 The names specified in this list will be used to
@@ -3903,171 +3926,41 @@ The literal jail name of
 .Dq Li 0
 .Pq zero
 is not allowed.
-.Pp
-Assuming that the jail in question was named
-.Li vjail ,
-you would have the following dependent variables:
-.Bd -literal
-jail_vjail_hostname="jail.example.com"
-jail_vjail_ip="192.0.2.100"
-jail_vjail_rootdir="/var/jails/vjail/root"
-.Ed
-.Pp
-.It Va jail_flags
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _flags
-for every jail in
-.Va jail_list .
-.It Va jail_interface
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _interface
-for every jail in
-.Va jail_list .
-.It Va jail_fstab
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
-for every jail in
-.Va jail_list .
-.It Va jail_mount_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _mount_enable
-to
-.Dq Li YES
-by default for every jail in
-.Va jail_list .
-.It Va jail_devfs_ruleset
-.Pq Vt str
-Unset by default.
-When set, sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset
-to given value for every jail in
-.Va jail_list .
-.It Va jail_devfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_enable
-to
-.Dq Li YES
-by default for every jail in
-.Va jail_list .
-.It Va jail_fdescfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
-to
-.Dq Li YES
-by default for every jail in
-.Va jail_list .
-.It Va jail_procfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
-to
-.Dq Li YES
-by default for every jail in
-.Va jail_list .
-.It Va jail_exec_prestart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestart Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_exec_start
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start
-for every jail in
-.Va jail_list .
-.It Va jail_exec_afterstart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_afterstart Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_exec_poststart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststart Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_exec_prestop Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestop Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_exec_stop
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
-for every jail in
-.Va jail_list .
-.It Va jail_exec_poststop Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststop Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _rootdir
-.Pq Vt str
-Unset by default.
-Set to the root directory used by jail
-.Va jname .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _hostname
-.Pq Vt str
-Unset by default.
-Set to the fully qualified domain name (FQDN) assigned to jail
-.Va jname .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _parameters
-.Pq Vt str
-Unset by default.
-Set extra parameters for jail
-.Va jname ,
-such as
-.Dq Li allow.chflags
-or
-.Dq Li children.max .
-See
+.It Va jail_* variables
+Note that older releases supported per-jail configuration via
+.Xr rc.conf 5
+variables.
+For example,
+hostname of a jail named
+.Li vjail
+was able to be set by
+.Li jail_vjail_hostname .
+These per-jail configuration variables are now obsolete in favor of
+.Xr jail 8
+configuration file.
+For backward compatibility,
+when per-jail configuration variables are defined,
 .Xr jail 8
-for a list of available parameters.
-Note that the following parameters are already defined by
+configuration files are created as
+.Pa /var/run/jail. Ns Ao Ar jname Ac Ns Pa .conf
+and used.
+.Pp
+The following per-jail parameters are handled by
 .Pa rc.d/jail
 script out of their corresponding
 .Nm
-variables:
+variables.
+In addition to them, parameters in
+.Va jail_ Ns Ao Ar jname Ac Ns Va _parameters
+will be added to the configuration file.
+They must be a semi-colon
+.Pq Ql \&;
+delimited list of
+.Dq key=value .
+For more details,
+see
+.Xr jail 8
+manual page.
 .Bl  -tag -width "host.hostname" -offset indent
 .It Li path
 set from
@@ -4075,202 +3968,90 @@ set from
 .It Li host.hostname
 set from
 .Va jail_ Ns Ao Ar jname Ac Ns Va _hostname
-.It Li command
+.It Li exec.consolelog
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _consolelog .
+The default value is
+.Pa /var/log/jail_ Ao Ar jname Ac Pa _console.log .
+.It Li interface
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _interface .
+.It Li vnet.interface
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _vnet_interface .
+This implies
+.Li vnet
+parameter will be enabled and cannot be specified with
+.Va jail_ Ns Ao Ar jname Ac Ns Va _interface ,
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip
+and/or
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
+at the same time.
+.It Li fstab
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
+.It Li mount
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
+or
+.Va jail_ Ns Ao Ar jname Ac Ns Va _procfs_enable.
+.It Li exec.fib
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fib
+.It Li exec.start
 set from
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start .
+The parameter name was
+.Li command
+in some older releases.
+.It Li exec.prestart
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestart
+.It Li exec.poststart
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststart
+.It Li exec.stop
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
+.It Li exec.prestop
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestop
+.It Li exec.poststop
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststop
 .It Li ip4.addr
 set if
 .Va jail_ Ns Ao Ar jname Ac Ns Va _ip
-contains IPv4 addresses
+or
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
+contain IPv4 addresses
 .It Li ip6.addr
 set if
-.Va jail_ Ns Ao Ar jname Ac Ns Va _ip6
-contains IPv6 addresses
-.El
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _ip
-.Pq Vt str
-Unset by default.
-Set to the (primary) IPv4 and/or IPv6 address(es) assigned to the jail.
-The argument can be a sole address or a comma separated list of addresses.
-Additionally each address can be prefixed by the name of an interface
-followed by a pipe to overwrite
-.Va jail_ Ns Ao Ar jname Ac Ns Va _interface
-or
-.Va jail_interface
-and/or suffixed by a netmask, prefixlen or prefix.
-In case no netmask, prefixlen or prefix is given,
-.Sq /32
-will be used for IPv4 and
-.Sq /128
-will be used for an IPv6 address.
-If no address is given for the jail then the jail will be started with
-no networking support.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
-.Pq Vt str
-Unset by default.
-Set additional IPv4 and/or IPv6 address(es) assigned to the jail.
-The sequence starts with
-.Dq Li _multi0
-and the numbers have to be strictly ascending.
-These entries follow the same syntax as their primary
 .Va jail_ Ns Ao Ar jname Ac Ns Va _ip
-entry.
-The order of the entries can be important as the first address for
-each address family found will be the primary address of the jail.
-See
-.Va ip-addresses
-option in
-.Xr jail 8
-for more details.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _flags
-.Pq Vt str
-Set to
-.Dq Li -l -U root
-by default.
-These are flags to pass to
-.Xr jail 8 .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _interface
-.Pq Vt str
-Unset by default.
-When set, sets the interface to use when setting IP address alias.
-Note that the alias is created at jail startup and removed at jail shutdown.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _fib
-.Pq Vt str
-Unset by default.
-When set, the jail is started with the specified forwarding table (sometimes
-referred to as a routing table) via
-.Xr setfib 1 .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
-.Pq Vt str
-Set to
-.Pa /etc/fstab. Ns Aq Ar jname
-by default.
-This is the file system information file to use for jail
-.Va jname .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _mount_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-mount all file systems from
-.Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
-at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset
-.Pq Vt str
-Unset by default.
-When set, defines the device file system ruleset file to use for jail
-.Va jname .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-mount the device file system inside jail
-.Ar jname
-at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-mount the file-descriptor file system inside jail
-.Ar jname
-at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _procfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-mount the process file system inside jail
-.Ar jname
-at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-before jail startup, where
-.Ar N
-is 0, 1, and so on.
-It is run outside the jail.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start
-.Pq Vt str
-Set to
-.Dq Li /bin/sh /etc/rc
-by default.
-This is the command executed in a jail at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_afterstart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-in a jail
-after jail startup, where
-.Ar N
-is 1, 2, and so on.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-after jail startup, where
-.Ar N
-is 0, 1, and so on.
-It is run outside the jail.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestop Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-before jail shutdown, where
-.Ar N
-is 0, 1, and so on.
-It is run outside the jail.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
-.Pq Vt str
-Set to
-.Dq Li /bin/sh /etc/rc.shutdown
-by default.
-This is the command executed in a jail at jail shutdown.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststop Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-after jail shutdown, where
-.Ar N
-is 0, 1, and so on.
-It is run outside the jail.
-.It Va jail_set_hostname_allow
-.Pq Vt bool
-If set to
-.Dq Li NO ,
-do not allow the root user in a jail to set its hostname.
-.It Va jail_socket_unixiproute_only
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-do not allow any sockets,
-besides UNIX/IP/route sockets,
-to be used within a jail.
-.It Va jail_sysvipc_allow
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-allow applications within a jail to use System V IPC.
+or
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
+contain IPv6 addresses
+.It Li allow.mount
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _mount_enable
+.It Li mount.devfs
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_enable
+.It Li devfs_ruleset
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset .
+This must be an integer,
+not a string.
+.It Li allow.set_hostname
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _set_hostname_allow
+.It Li allow.rawsocket
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _socket_unixiproute_only
+.It Li allow.sysvipc
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _sysvipc_allow
+.El
 .\" -----------------------------------------------------
 .It Va harvest_interrupt
 .Pq Vt bool
@@ -4788,6 +4569,7 @@ The default is 30.
 .Xr sysctl 8 ,
 .Xr syslogd 8 ,
 .Xr timed 8 ,
+.Xr unbound 8 ,
 .Xr usbconfig 8 ,
 .Xr wlandebug 8 ,
 .Xr yp 8 ,
diff --git a/share/man/man5/reiserfs.5 b/share/man/man5/reiserfs.5
index 2f3eaee..c610f5e 100644
--- a/share/man/man5/reiserfs.5
+++ b/share/man/man5/reiserfs.5
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 23, 2011
+.Dd October 1, 2013
 .Dt REISERFS 5
 .Os
 .Sh NAME
@@ -53,9 +53,9 @@ file systems.
 To mount a
 .Nm
 volume located on
-.Pa /dev/ad1s1 :
+.Pa /dev/ada1s1 :
 .Pp
-.Dl "mount -t reiserfs /dev/ad1s1 /mnt"
+.Dl "mount -t reiserfs /dev/ada1s1 /mnt"
 .Sh SEE ALSO
 .Xr nmount 2 ,
 .Xr unmount 2 ,
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 3623b0e..aad4004 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
-.\" from FreeBSD: head/tools/build/options/makeman 253304 2013-07-12 23:08:44Z bapt
+.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd September 6, 2013
+.Dd October 6, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -127,94 +127,9 @@ Set to not build audit support into system programs.
 .\" from FreeBSD: head/tools/build/options/WITHOUT_AUTHPF 156932 2006-03-21 07:50:50Z ru
 Set to not build
 .Xr authpf 8 .
-.It Va WITHOUT_BIND
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND 156932 2006-03-21 07:50:50Z ru
-Setting this variable will prevent any part of BIND from being built.
-When set, it also enforces the following options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_BIND_DNSSEC
-.It
-.Va WITHOUT_BIND_ETC
-.It
-.Va WITHOUT_BIND_LIBS
-.It
-.Va WITHOUT_BIND_LIBS_LWRES
-.It
-.Va WITHOUT_BIND_MTREE
-.It
-.Va WITHOUT_BIND_NAMED
-.It
-.Va WITHOUT_BIND_UTILS
-.El
-.It Va WITHOUT_BIND_DNSSEC
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_DNSSEC 156932 2006-03-21 07:50:50Z ru
-Set to avoid building or installing the DNSSEC related binaries,
-.Xr dnssec-keygen 8
-and
-.Xr dnssec-signzone 8 .
-.It Va WITHOUT_BIND_ETC
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_ETC 156932 2006-03-21 07:50:50Z ru
-Set to avoid installing the default files to
-.Pa /var/named/etc/namedb .
-.It Va WITH_BIND_IDN
-.\" from FreeBSD: head/tools/build/options/WITH_BIND_IDN 193280 2009-06-01 21:58:59Z dougb
-Set to enable IDN support for dig, host, and nslookup.
-This requires ports/dns/idnkit to be installed in /usr/local.
-.It Va WITH_BIND_LARGE_FILE
-.\" from FreeBSD: head/tools/build/options/WITH_BIND_LARGE_FILE 193280 2009-06-01 21:58:59Z dougb
-Set to enable 64-bit file support.
-.It Va WITH_BIND_LIBS
-.\" from FreeBSD: head/tools/build/options/WITH_BIND_LIBS 193280 2009-06-01 21:58:59Z dougb
-Set to install BIND libraries and include files.
-.It Va WITHOUT_BIND_LIBS_LWRES
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_LIBS_LWRES 156932 2006-03-21 07:50:50Z ru
-Set to avoid installing the lightweight resolver library in
-.Pa /usr/lib .
-.It Va WITHOUT_BIND_MTREE
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_MTREE 157717 2006-04-13 10:37:29Z ru
-Set to avoid running
-.Xr mtree 8
-to create the chroot directory structure under
-.Pa /var/named ,
-and avoid creating an
-.Pa /etc/namedb
-symlink to the chroot directory.
-When set, it also enforces the following options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_BIND_ETC
-.El
-.It Va WITHOUT_BIND_NAMED
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_NAMED 156932 2006-03-21 07:50:50Z ru
-Set to avoid building or installing
-.Xr named 8 ,
-.Xr named.reload 8 ,
-.Xr named-checkconf 8 ,
-.Xr named-checkzone 8 ,
-.Xr rndc 8 ,
-and
-.Xr rndc-confgen 8 .
-.It Va WITH_BIND_SIGCHASE
-.\" from FreeBSD: head/tools/build/options/WITH_BIND_SIGCHASE 193280 2009-06-01 21:58:59Z dougb
-Set to enable DNSSEC validation support for dig, host, and nslookup.
-.It Va WITHOUT_BIND_UTILS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_UTILS 156932 2006-03-21 07:50:50Z ru
-Set to avoid building or installing the BIND userland utilities,
-.Xr dig 1 ,
-.Xr host 1 ,
-.Xr nslookup 1 ,
-and
-.Xr nsupdate 8 .
-.It Va WITH_BIND_XML
-.\" from FreeBSD: head/tools/build/options/WITH_BIND_XML 193280 2009-06-01 21:58:59Z dougb
-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 235342 2012-05-12 16:12:36Z gjb
-Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib,
+.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 255974 2013-10-01 17:40:56Z emaste
+Set to not install binutils (as, c++-filt, gconv,
 ld, nm, objcopy, objdump, readelf, size and strip).
 .Bf -symbolic
 The option does not generally work for build targets, unless some alternative
@@ -285,7 +200,7 @@ When set, it also enforces the following options:
 Set to not build the Clang C/C++ compiler.
 .Pp
 It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
 When set, it also enforces the following options:
 .Pp
 .Bl -item -compact
@@ -295,6 +210,8 @@ When set, it also enforces the following options:
 .Va WITHOUT_CLANG_FULL
 .It
 .Va WITHOUT_CLANG_IS_CC
+.It
+.Va WITHOUT_LLDB
 .El
 .It Va WITH_CLANG
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 11:14:40Z ru
@@ -311,7 +228,7 @@ Set to avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of
 the Clang C/C++ compiler.
 .Pp
 It is a default setting on
-arm/arm, arm/armeb, arm/armv6, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
 .It Va WITH_CLANG_FULL
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim
 Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the
@@ -328,7 +245,13 @@ and
 .Pa /usr/bin/cpp .
 .Pp
 It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_LLDB
+.El
 .It Va WITH_CLANG_IS_CC
 .\" 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
@@ -403,6 +326,8 @@ When set, it also enforces the following options:
 .Va WITHOUT_CLANG_IS_CC
 .It
 .Va WITHOUT_GROFF
+.It
+.Va WITHOUT_LLDB
 .El
 .It Va WITH_DEBUG_FILES
 .\" from FreeBSD: head/tools/build/options/WITH_DEBUG_FILES 251512 2013-06-07 21:40:02Z emaste
@@ -444,7 +369,7 @@ Set to build Flattened Device Tree support as part of the base system.
 This includes the device tree compiler (dtc) and libfdt support library.
 .Pp
 It is a default setting on
-arm/arm, arm/armeb, arm/armv6, arm/armv6eb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64.
+arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64.
 .It Va WITHOUT_FLOPPY
 .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru
 Set to not build or install programs
@@ -481,7 +406,7 @@ amd64/amd64, arm/arm, arm/armv6 and i386/i386.
 Set to build and install gcc and g++.
 .Pp
 It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITHOUT_GCOV
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GCOV 156932 2006-03-21 07:50:50Z ru
 Set to not build the
@@ -518,7 +443,7 @@ Build the GNU C++ stack (g++, libstdc++).
 This is the default on platforms where gcc is the system compiler.
 .Pp
 It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .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.
@@ -686,26 +611,22 @@ Set to build some programs without optional
 .Nm libkvm
 support.
 .It Va WITHOUT_LDNS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_LDNS 246827 2013-02-15 13:44:18Z des
-Setting this variable will prevent LDNS from being built.
+.\" from FreeBSD: head/tools/build/options/WITHOUT_LDNS 255591 2013-09-15 13:11:13Z des
+Setting this variable will prevent the LDNS library from being built.
 When set, it also enforces the following options:
 .Pp
 .Bl -item -compact
 .It
 .Va WITHOUT_LDNS_UTILS
+.It
+.Va WITHOUT_UNBOUND
 .El
-.It Va WITH_LDNS_UTILS
-.\" from FreeBSD: head/tools/build/options/WITH_LDNS_UTILS 246830 2013-02-15 13:57:51Z des
-Setting this variable will enable the LDNS-based versions of
-.Xr dig 1
+.It Va WITHOUT_LDNS_UTILS
+.\" from FreeBSD: head/tools/build/options/WITHOUT_LDNS_UTILS 255850 2013-09-24 14:33:31Z des
+Setting this variable will prevent building the LDNS utilities
+.Xr drill 1
 and
 .Xr host 1 .
-When set, it also enforces the following options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_BIND_UTILS
-.El
 .It Va WITHOUT_LEGACY_CONSOLE
 .\" from FreeBSD: head/tools/build/options/WITHOUT_LEGACY_CONSOLE 249966 2013-04-27 04:09:09Z eadler
 Set to not build programs that support a legacy PC console; e.g.,
@@ -733,22 +654,6 @@ When set, it also enforces the following options:
 .Pp
 .Bl -item -compact
 .It
-.Va WITHOUT_BIND
-.It
-.Va WITHOUT_BIND_DNSSEC
-.It
-.Va WITHOUT_BIND_ETC
-.It
-.Va WITHOUT_BIND_LIBS
-.It
-.Va WITHOUT_BIND_LIBS_LWRES
-.It
-.Va WITHOUT_BIND_MTREE
-.It
-.Va WITHOUT_BIND_NAMED
-.It
-.Va WITHOUT_BIND_UTILS
-.It
 .Va WITHOUT_LIBTHR
 .El
 .It Va WITHOUT_LIBTHR
@@ -757,26 +662,9 @@ Set to not build the
 .Nm libthr
 (1:1 threading)
 library.
-When set, it also enforces the following options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_BIND
-.It
-.Va WITHOUT_BIND_DNSSEC
-.It
-.Va WITHOUT_BIND_ETC
-.It
-.Va WITHOUT_BIND_LIBS
-.It
-.Va WITHOUT_BIND_LIBS_LWRES
-.It
-.Va WITHOUT_BIND_MTREE
-.It
-.Va WITHOUT_BIND_NAMED
-.It
-.Va WITHOUT_BIND_UTILS
-.El
+.It Va WITH_LLDB
+.\" from FreeBSD: head/tools/build/options/WITH_LLDB 255722 2013-09-20 01:52:02Z emaste
+Set to build the LLDB debugger.
 .It Va WITHOUT_LOCALES
 .\" from FreeBSD: head/tools/build/options/WITHOUT_LOCALES 156932 2006-03-21 07:50:50Z ru
 Set to not build localization files; see
@@ -1147,7 +1035,14 @@ When set, it also enforces the following options:
 .Va WITHOUT_GCC
 .It
 .Va WITHOUT_GDB
+.It
+.Va WITHOUT_LLDB
 .El
+.It Va WITHOUT_UNBOUND
+.\" from FreeBSD: head/tools/build/options/WITHOUT_UNBOUND 255597 2013-09-15 14:51:23Z des
+Set to not build
+.Xr unbound 8
+and related programs.
 .It Va WITHOUT_USB
 .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru
 Set to not build USB-related programs and libraries.
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index f4c403e..e117fe4 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -1,6 +1,6 @@
 .\" -*- nroff-fill -*-
 .\" $FreeBSD$
-.Dd June 25, 2009
+.Dd October 1, 2013
 .Dt PICOBSD 8
 .Os
 .Sh NAME
@@ -20,7 +20,7 @@ utility is a script which produces a minimal implementation of
 which typically fits on a small media such as a floppy disk,
 or can be downloaded as a
 single image file from some media such as CDROM, flash memory, or through
-.Xr etherboot .
+etherboot.
 .Pp
 The
 .Nm
@@ -64,7 +64,7 @@ kernel.
 This is the default behaviour, and is
 extremely useful as the kernel itself can be loaded,
 using
-.Xr etherboot
+etherboot
 or
 .Xr pxeboot 8 ,
 .\"
@@ -378,9 +378,7 @@ If the build is successful, the directory
 .Pa build_dir-bridge/
 will contain a
 .Pa kernel
-that can be downloaded with
-.Xr etherboot ,
-a floppy image called
+that can be downloaded with etherboot, a floppy image called
 .Pa picobsd.bin ,
 plus the products of the compilation in other directories.
 If you want to modify the source tree in
@@ -408,9 +406,9 @@ and the floppy is ready to boot.
 The same process can be used to store the image on a hard disk
 (entire volume or one of the slices):
 .Bd -literal -offset indent
-dd if=picobsd.bin of=/dev/ad2
-dd if=picobsd.bin of=/dev/ad2s3
-dd if=picobsd.bin of=/dev/ad2 oseek=NN
+dd if=picobsd.bin of=/dev/ada2
+dd if=picobsd.bin of=/dev/ada2s3
+dd if=picobsd.bin of=/dev/ada2 oseek=NN
 .Ed
 .Pp
 The first form will install the image on the entire disk, and it
@@ -435,8 +433,8 @@ You have to use the
 command to properly initialize the label (do not ask why!).
 One way to do this is
 .Bd -literal -offset indent
-disklabel -w ad0s2 auto
-disklabel -e ad0s2
+disklabel -w ada0s2 auto
+disklabel -e ada0s2
 .Ed
 .Pp
 and from the editor enter a line corresponding to the actual partition, e.g.\&
@@ -480,9 +478,7 @@ Booting from a floppy is normally rather slow (in the order of 1-2
 minutes), things are much faster if you store your image on
 a hard disk, Compact Flash, or CDROM.
 .Pp
-You can also use
-.Xr etherboot
-to load the preloaded, uncompressed kernel image
+You can also use etherboot to load the preloaded, uncompressed kernel image
 which is a byproduct of the
 .Nm
 build.
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index cca05d4..32d0ade 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -35,7 +35,7 @@
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd January 14, 2012
+.Dd September 23, 2013
 .Dt RC 8
 .Os
 .Sh NAME
@@ -312,6 +312,9 @@ Defaults to displaying the process ID of the program (if running).
 If the script starts a process (rather than performing a one-off
 operation), wait for the command to exit.
 Otherwise it is not necessary to support this argument.
+.It Cm enabled
+Return 0 if the service is enabled and 1 if it is not.
+This command does not print anything.
 .It Cm rcvar
 Display which
 .Xr rc.conf 5
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 8ed2470..7c3b654 100644
--- a/share/man/man8/rc.subr.8
+++ b/share/man/man8/rc.subr.8
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 14, 2012
+.Dd September 23, 2012
 .Dt RC.SUBR 8
 .Os
 .Sh NAME
@@ -379,6 +379,9 @@ Perform a
 then a
 .Cm start .
 Defaults to displaying the process ID of the program (if running).
+.It Cm enabled
+Return 0 if the service is enabled and 1 if it is not.
+This command does not print anything.
 .It Cm rcvar
 Display which
 .Xr rc.conf 5
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index e85c7ad..026ffea 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -343,7 +343,9 @@ MAN=	accept_filter.9 \
 	vnode.9 \
 	VOP_ACCESS.9 \
 	VOP_ACLCHECK.9 \
+	VOP_ADVISE.9 \
 	VOP_ADVLOCK.9 \
+	VOP_ALLOCATE.9 \
 	VOP_ATTRIB.9 \
 	VOP_BWRITE.9 \
 	VOP_CREATE.9 \
@@ -1304,22 +1306,24 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \
 	sysctl.9 SYSCTL_NODE.9 \
 	sysctl.9 SYSCTL_OPAQUE.9 \
 	sysctl.9 SYSCTL_PROC.9 \
+	sysctl.9 SYSCTL_QUAD.9 \
 	sysctl.9 SYSCTL_STRING.9 \
 	sysctl.9 SYSCTL_STRUCT.9 \
 	sysctl.9 SYSCTL_UINT.9 \
 	sysctl.9 SYSCTL_ULONG.9 \
-	sysctl.9 SYSCTL_QUAD.9
+	sysctl.9 SYSCTL_UQUAD.9
 MLINKS+=sysctl_add_oid.9 SYSCTL_ADD_INT.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_LONG.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_NODE.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_OID.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_OPAQUE.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_PROC.9 \
+	sysctl_add_oid.9 SYSCTL_ADD_QUAD.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_STRING.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_STRUCT.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_UINT.9 \
 	sysctl_add_oid.9 SYSCTL_ADD_ULONG.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_QUAD.9 \
+	sysctl_add_oid.9 SYSCTL_ADD_UQUAD.9 \
 	sysctl_add_oid.9 SYSCTL_CHILDREN.9 \
 	sysctl_add_oid.9 sysctl_move_oid.9 \
 	sysctl_add_oid.9 sysctl_remove_oid.9 \
diff --git a/share/man/man9/VOP_ADVISE.9 b/share/man/man9/VOP_ADVISE.9
new file mode 100644
index 0000000..250be52
--- /dev/null
+++ b/share/man/man9/VOP_ADVISE.9
@@ -0,0 +1,88 @@
+.\" -*- nroff -*-
+.\"
+.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Written by: John H. Baldwin <jhb@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 3, 2013
+.Dt VOP_ADVISE 9
+.Os
+.Sh NAME
+.Nm VOP_ADVISE
+.Nd apply advice about use of file data
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/vnode.h
+.Ft int
+.Fn VOP_ADVISE "struct vnode *vp" "off_t start" "off_t end" "int advice"
+.Sh DESCRIPTION
+This call applies advice for a range of a file's data.
+It is used to implement the
+.Xr posix_fadvise
+system call.
+.Pp
+Its arguments are:
+.Bl -tag -width offset
+.It Fa vp
+The vnode of the file.
+.It Fa start
+The start of the range of file data.
+.It Fa end
+The end of the range of file data.
+.It Fa advice
+The type of operation to apply to the file data.
+Possible values are:
+.Bl -tag -width POSIX_FADV_WILLNEED
+.It Dv POSIX_FADV_WILLNEED
+Initiate an asynchronous read of the file data if it is not already resident.
+.It Dv POSIX_FADV_DONTNEED
+Decrease the in-memory priority of clean file data or discard clean file data.
+.El
+.El
+.Pp
+If the
+.Fa start
+and
+.Fa end
+offsets are both zero,
+then the operation should be applied to the entire file.
+Note that this call is advisory only and may perform the requested
+operation on a subset of the requested range
+.Pq including not performing it at all
+and still return success.
+.Sh LOCKS
+The file should be unlocked on entry.
+.Sh RETURN VALUES
+Zero is returned if the call is successful, otherwise an appropriate
+error code is returned.
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er EINVAL
+An invalid value was given for
+.Fa advice .
+.El
+.Sh SEE ALSO
+.Xr vnode 9
diff --git a/share/man/man9/VOP_ALLOCATE.9 b/share/man/man9/VOP_ALLOCATE.9
new file mode 100644
index 0000000..314410d
--- /dev/null
+++ b/share/man/man9/VOP_ALLOCATE.9
@@ -0,0 +1,84 @@
+.\" -*- nroff -*-
+.\"
+.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Written by: John H. Baldwin <jhb@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 3, 2013
+.Dt VOP_ALLOCATE 9
+.Os
+.Sh NAME
+.Nm VOP_ALLOCATE
+.Nd allocate storage for a file
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/vnode.h
+.Ft int
+.Fn VOP_ALLOCATE "struct vnode *vp" "off_t *offset" "off_t *len"
+.Sh DESCRIPTION
+This call allocates storage for a range of offsets in a file.
+It is used to implement the
+.Xr posix_fallocate
+system call.
+.Pp
+Its arguments are:
+.Bl -tag -width offset
+.It Fa vp
+The vnode of the file.
+.It Fa offset
+The start of the range to allocate storage for in the file.
+.It Fa len
+The length of the range to allocate storage for in the file.
+.El
+.Pp
+The
+.Fa offset
+and
+.Fa len
+arguments are updated to reflect the portion of the range that
+still needs to be allocated on return.
+A partial allocation is considered a successful operation.
+The file's contents are not changed.
+.Sh LOCKS
+The file should be exclusively locked on entry and will still be locked on exit.
+.Sh RETURN VALUES
+Zero is returned if the call is successful, otherwise an appropriate
+error code is returned.
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er EFBIG
+An attempt was made to write a file that exceeds the process's file size
+limit or the maximum file size.
+.It Bq Er ENOSPC
+The file system is full.
+.It Bq Er EPERM
+An append-only flag is set on the file, but the caller is attempting to
+write before the current end of file.
+.El
+.Sh SEE ALSO
+.Xr vnode 9 ,
+.Xr VOP_READ 9 ,
+.Xr VOP_WRITE 9
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index e457f84..76e114f 100644
--- a/share/man/man9/VOP_FSYNC.9
+++ b/share/man/man9/VOP_FSYNC.9
@@ -65,15 +65,6 @@ Push data not written by file system syncer.
 .It Fa td
 The calling thread.
 .El
-.Pp
-The argument
-.Fa waitfor
-is either
-.Dv MNT_WAIT
-or
-.Dv MNT_NOWAIT
-and specifies whether or not the function should wait for the writes
-to finish before returning.
 .Sh LOCKS
 The file should be locked on entry.
 .Sh RETURN VALUES
diff --git a/share/man/man9/firmware.9 b/share/man/man9/firmware.9
index 807099d..4811921 100644
--- a/share/man/man9/firmware.9
+++ b/share/man/man9/firmware.9
@@ -254,8 +254,8 @@ IxNpeMicrocode.dat                      optional npe_fw                 \\
 .Pp
 Note that generating the firmware modules in this way requires
 the availability of the following tools:
-.Xr awk ,
-.Xr make ,
+.Xr awk 1 ,
+.Xr make 1 ,
 the compiler and the linker.
 .Sh SEE ALSO
 .Xr kld 4 ,
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index fd608d4..cb77686 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 16, 2011
+.Dd October 6, 2013
 .Dt LOCK 9
 .Os
 .Sh NAME
@@ -164,11 +164,17 @@ If an exclusive lock has been recursed, the system will
 .Xr panic 9 .
 .It Dv LK_UPGRADE
 Upgrade a shared lock to an exclusive lock.
-If this call fails, the shared lock is lost.
+If this call fails, the shared lock is lost, even if the
+.Dv LK_NOWAIT
+flag is specified.
 During the upgrade, the shared lock could
 be temporarily dropped.
 Attempts to upgrade an exclusive lock will cause a
 .Xr panic 9 .
+.It Dv LK_TRYUPGRADE
+Try to upgrade a shared lock to an exclusive lock.
+The failure to upgrade does not result in the dropping
+of the shared lock ownership.
 .It Dv LK_RELEASE
 Release the lock.
 Releasing a lock that is not held can cause a
@@ -333,7 +339,9 @@ fail if:
 was requested and another thread had already requested a lock upgrade.
 .It Bq Er EBUSY
 .Dv LK_NOWAIT
-was set, and a sleep would have been required.
+was set, and a sleep would have been required, or
+.Dv LK_TRYUPGRADE
+operation was not able to upgrade the lock.
 .It Bq Er ENOLCK
 .Dv LK_SLEEPFAIL
 was set and
diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9
index 5399b56..b9a9fe5 100644
--- a/share/man/man9/sysctl.9
+++ b/share/man/man9/sysctl.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 16, 2010
+.Dd September 12, 2013
 .Dt SYSCTL 9
 .Os
 .Sh NAME
@@ -35,11 +35,12 @@
 .Nm SYSCTL_NODE ,
 .Nm SYSCTL_OPAQUE ,
 .Nm SYSCTL_PROC ,
+.Nm SYSCTL_QUAD ,
 .Nm SYSCTL_STRING ,
 .Nm SYSCTL_STRUCT ,
 .Nm SYSCTL_UINT ,
 .Nm SYSCTL_ULONG ,
-.Nm SYSCTL_QUAD
+.Nm SYSCTL_UQUAD
 .Nd Static sysctl declaration functions
 .Sh SYNOPSIS
 .In sys/types.h
@@ -50,11 +51,12 @@
 .Fn SYSCTL_NODE parent nbr name access handler descr
 .Fn SYSCTL_OPAQUE parent nbr name access ptr len fmt descr
 .Fn SYSCTL_PROC parent nbr name access ptr arg handler fmt descr
+.Fn SYSCTL_QUAD parent nbr name access ptr val descr
 .Fn SYSCTL_STRING parent nbr name access arg len descr
 .Fn SYSCTL_STRUCT parent nbr name access ptr type descr
 .Fn SYSCTL_UINT parent nbr name access ptr val descr
 .Fn SYSCTL_ULONG parent nbr name access ptr val descr
-.Fn SYSCTL_QUAD parent nbr name access ptr val descr
+.Fn SYSCTL_UQUAD parent nbr name access ptr val descr
 .Sh DESCRIPTION
 The
 .Nm SYSCTL
@@ -76,12 +78,13 @@ New nodes are declared using one of
 .Fn SYSCTL_NODE ,
 .Fn SYSCTL_OPAQUE ,
 .Fn SYSCTL_PROC ,
+.Fn SYSCTL_QUAD ,
 .Fn SYSCTL_STRING ,
 .Fn SYSCTL_STRUCT ,
 .Fn SYSCTL_UINT ,
 .Fn SYSCTL_ULONG ,
 and
-.Fn SYSCTL_QUAD .
+.Fn SYSCTL_UQUAD .
 Each macro accepts a parent name, as declared using
 .Fn SYSCTL_DECL ,
 an OID number, typically
@@ -118,15 +121,23 @@ This is an unsigned long.
 This is a 64-bit unsigned integer.
 .El
 .Pp
-All sysctl types except for new node declarations require one or more flags
-to be set indicating the read and write disposition of the sysctl:
+All sysctl types except for new node declarations require one of the following
+flags to be set indicating the read and write disposition of the sysctl:
 .Bl -tag -width ".Dv CTLFLAG_ANYBODY"
 .It Dv CTLFLAG_RD
 This is a read-only sysctl.
+.It Dv CTLFLAG_RDTUN
+This is a read-only sysctl which can be set by a system tunable.
 .It Dv CTLFLAG_WR
 This is a writable sysctl.
 .It Dv CTLFLAG_RW
 This sysctl is readable and writable.
+.It Dv CTLFLAG_RWTUN
+This sysctl is readable and writable and can also be set by a system tunable.
+.El
+.Pp
+Additionally, any of the following optional flags may also be specified:
+.Bl -tag -width ".Dv CTLFLAG_ANYBODY"
 .It Dv CTLFLAG_ANYBODY
 Any user or process can write to this sysctl.
 .It Dv CTLFLAG_SECURE
@@ -139,9 +150,6 @@ This sysctl can be written to by processes in
 When iterating the sysctl name space, do not list this sysctl.
 .It Dv CTLFLAG_TUN
 Advisory flag that a system tunable also exists for this variable.
-.It Dv CTLFLAG_RDTUN
-Advisory flag that a system tunable also exists for this variable;
-however, the run-time variable is read-only.
 .El
 .Pp
 When creating new sysctls, careful attention should be paid to the security
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index 74e76d7..bffc6db 100644
--- a/share/man/man9/sysctl_add_oid.9
+++ b/share/man/man9/sysctl_add_oid.9
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 15, 2000
+.Dd September 12, 2013
 .Dt SYSCTL_ADD_OID 9
 .Os
 .Sh NAME
@@ -157,6 +157,16 @@
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_UQUAD
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int access"
+.Fa "uint64_t *arg"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_OPAQUE
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
diff --git a/share/man/man9/vm_map_find.9 b/share/man/man9/vm_map_find.9
index 1d21bae..106854e 100644
--- a/share/man/man9/vm_map_find.9
+++ b/share/man/man9/vm_map_find.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 10, 2008
+.Dd September 12, 2013
 .Dt VM_MAP_FIND 9
 .Os
 .Sh NAME
@@ -38,8 +38,8 @@
 .Ft int
 .Fo vm_map_find
 .Fa "vm_map_t map" "vm_object_t object" "vm_ooffset_t offset"
-.Fa "vm_offset_t *addr" "vm_size_t length" "int find_space"
-.Fa "vm_prot_t prot" "vm_prot_t max" "int cow"
+.Fa "vm_offset_t *addr" "vm_size_t length" "vm_offset_t max_addr"
+.Fa "int find_space" "vm_prot_t prot" "vm_prot_t max" "int cow"
 .Fc
 .Sh DESCRIPTION
 The
@@ -47,9 +47,13 @@ The
 function attempts to find a free region in the target
 .Fa map ,
 with the given
-.Fa length ,
-and will also optionally create a mapping of
-.Fa object .
+.Fa length.
+If a free region is found,
+.Fn vm_map_find
+creates a mapping of
+.Fa object
+via a call to
+.Xr vm_map_insert 9 .
 .Pp
 The arguments
 .Fa offset ,
@@ -69,26 +73,56 @@ the reference count on the object must be incremented
 by the caller before calling this function to account for the new entry.
 .Pp
 If
+.Fa max_addr
+is non-zero,
+it specifies an upper bound on the mapping.
+The mapping will only succeed if a free region can be found that resides
+entirely below
+.Fa max_addr .
+.Pp
+The
 .Fa find_space
-is either
-.Dv VMFS_ALIGNED_SPACE
-or
-.Dv VMFS_ANY_SPACE ,
-the function will call
+argument specifies the strategy to use when searching for a free region of
+the requested length.
+For all values other than
+.Dv VMFS_NO_SPACE ,
 .Xr vm_map_findspace 9
-to discover a free region.
-Moreover, if
-.Fa find_space
+is called to locate a free region of the requested length with a starting
+address at or above
+.Fa *addr .
+The following strategies are supported:
+.Bl -tag -width "Dv VMFS_ALIGNED_SPACE Ns"
+.It Dv VMFS_NO_SPACE
+The mapping will only succeed if there is a free region of the requested
+length at the given address
+.Fa *addr .
+.It Dv VMFS_ANY_SPACE
+The mapping will succeed as long as there is a free region.
+.It Dv VMFS_SUPER_SPACE
+The mapping will succeed as long as there is a free region that begins on
+a superpage boundary.
+If
+.Fa object
 is
-.Dv VMFS_ALIGNED_SPACE ,
-the address of the free region will be optimized for the use of superpages.
-Otherwise, if
-.Fa find_space
+.Pf non- Dv NULL
+and is already backed by superpages,
+then the mapping will require a free region that aligns relative to the
+existing superpages rather than one beginning on a superpage boundary.
+.It Dv VMFS_OPTIMAL_SPACE
+The mapping will succeed as long as there is a free region.
+However, if
+.Fa object
 is
-.Dv VMFS_NO_SPACE ,
-.Xr vm_map_insert 9
-is called with the given address,
-.Fa addr .
+.Pf non- Dv NULL
+and is already backed by superpages,
+this strategy will attempt to find a free region aligned relative to
+the existing superpages.
+.It Dv VMFS_ALIGNED_SPACE Ns Pq Fa n
+The mapping will succeed as long as there is a free region that aligns on
+a
+.Pf 2^ Fa n
+boundary.
+.El
 .Sh IMPLEMENTATION NOTES
 This function acquires a lock on
 .Fa map
diff --git a/share/man/man9/vm_page_grab.9 b/share/man/man9/vm_page_grab.9
index cfab9de..ff9aae9 100644
--- a/share/man/man9/vm_page_grab.9
+++ b/share/man/man9/vm_page_grab.9
@@ -64,7 +64,7 @@ function sleeps for any reason, the object lock is temporary dropped.
 The
 .Fn vm_page_grab
 supports all of the flags supported by
-.Xr vm_page_alloc .
+.Xr vm_page_alloc 9 .
 In addition,
 .Fn vm_page_grab
 supports the following flags:
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index eba208f..652d972 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -163,7 +163,9 @@ intertwining of VM Objects and Vnodes.
 .Xr malloc 9 ,
 .Xr VOP_ACCESS 9 ,
 .Xr VOP_ACLCHECK 9 ,
+.Xr VOP_ADVISE 9 ,
 .Xr VOP_ADVLOCK 9 ,
+.Xr VOP_ALLOCATE 9 ,
 .Xr VOP_ATTRIB 9 ,
 .Xr VOP_BWRITE 9 ,
 .Xr VOP_CREATE 9 ,
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index f32f136..74a9287 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -253,23 +253,37 @@ FreeBSD 5.2           |      |                 |                       |
  *--FreeBSD    |      |      | |      |        |                       |
  |    9.0      |      |      | |   NetBSD      |               DragonFly 3.0.1
  |     |    FreeBSD   |      | |    5.1.2      |                       |
- |     |      8.3     |      | |           OpenBSD 5.1                 |
+ |     |      8.3     |      | |      |        |                       |
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    5.1.3      |                       |
+ |     |       |      |      | |           OpenBSD 5.1                 |
  |     |       |   Mac OS X  | `----.          |                       |
  |     |       |     10.8    |       \         |                       |
  |     |       |      |   NetBSD 6.0  |        |                       |
  |     |       |      |      | | |    |    OpenBSD 5.2         DragonFly 3.2.1
  |  FreeBSD    |      |      | | | NetBSD      |                       |
  |    9.1      |      |      | | |   5.2       |                       |
- |             |      |      | |  \            |                       |
- |             |      |      | |   NetBSD      |                       |
- |             |      |      | |    6.0.1      |                       |
- |             |      |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
- |             |      |      | |   NetBSD      |                       |
- |             |      |      | |    6.0.2      |                       |
- |             |      |      | |               |                       |
- |             |      |      |  `-NetBSD 6.1   |                       |
- |          FreeBSD   |      |                 |                       |
- |            8.4     |      |                 |                       |
+ |     |       |      |      | | |    |        |                       |
+ |     |       |      |      | | | NetBSD      |                       |
+ |     |       |      |      | | |  5.2.1      |                       |
+ |     |       |      |      | | |             |                       |
+ |     |       |      |      | |  \            |                       |
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    6.0.1      |                       |
+ |     |       |      |      | |      |        |                       |
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    6.0.2      |                       |
+ |     |       |      |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    6.0.2      |                       |
+ |     |       |      |      | |               |                       |
+ |     |       |      |      | |`-NetBSD 6.1   |                       |
+ |     |    FreeBSD   |      |       |         |                       |
+ |     |      8.4     |      |    NetBSD 6.1.1 |                       |
+ |     |              |      |       |         |                       |
+ |  FreeBSD           |      |    NetBSD 6.1.2 |                       |
+ |    9.2             |      |                 |                       |
+ |                    |      |                 |                       |
  |                    |      |                 |                       |
  |                    |      |                 |                       |
  |                    |      |                 |                       |
@@ -580,6 +594,12 @@ OpenBSD 5.3		2013-05-01 [OBD]
 NetBSD 6.0.2		2013-05-18 [NBD] (security/critical release)
 NetBSD 6.1		2013-05-18 [NBD]
 FreeBSD 8.4		2013-06-07 [FBD]
+NetBSD 6.1.1		2013-08-22 [NBD]
+NetBSD 5.1.3		2013-09-29 [NBD]
+NetBSD 5.2.1		2013-09-29 [NBD]
+FreeBSD 9.2		2013-09-30 [FBD]
+NetBSD 6.0.3		2013-09-30 [NBD]
+NetBSD 6.1.2		2013-09-30 [NBD]
 
 Bibliography
 ------------------------
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index 79831dc..c727cd7 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -77,6 +77,7 @@ cs [label="Carlo Strub\ncs@FreeBSD.org\n2011/09/13"]
 culot [label="Frederic Culot\nculot@FreeBSD.org\n2010/10/16"]
 daichi [label="Daichi Goto\ndaichi@FreeBSD.org\n2002/10/17"]
 danfe [label="Alexey Dokuchaev\ndanfe@FreeBSD.org\n2004/08/20"]
+danilo [label="Danilo E. Gondolfo\ndanilo@FreeBSD.org\n2013/09/23"]
 db [label="Diane Bruce\ndb@FreeBSD.org\n2007/01/18"]
 dbn [label="David Naylor\ndbn@FreeBSD.org\n2013/01/14"]
 decke [label="Bernhard Froehlich\ndecke@FreeBSD.org\n2010/03/21"]
@@ -278,9 +279,10 @@ crees -> madpilot
 crees -> gblach
 crees -> tijl
 
+culot -> danilo
 culot -> jase
-culot -> wg
 culot -> marino
+culot -> wg
 
 db -> tj
 
@@ -532,6 +534,7 @@ wen -> cs
 wen -> culot
 wen -> pawel
 
+wg -> danilo
 wg -> nemysis
 
 will -> lioux
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index a273cf9..b9729cc 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -145,6 +145,7 @@ dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeBSD.org\n2004/11/29"]
 dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"]
 eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/01/18"]
 ed [label="Ed Schouten\ned@FreeBSD.org\n2008/05/22"]
+edavis [label="Eric Davis\nedavis@FreeBSD.org\n2013/10/09"]
 edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"]
 eivind [label="Eivind Eklund\neivind@FreeBSD.org\n1997/02/02"]
 emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/04"]
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 00d38ff..8ef6e7a 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -19,10 +19,6 @@ LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
 LIBAUDITD?=	${DESTDIR}${LIBDIR}/libauditd.a
 LIBAVL?=	${DESTDIR}${LIBDIR}/libavl.a
 LIBBEGEMOT?=	${DESTDIR}${LIBDIR}/libbegemot.a
-.if ${MK_BIND_LIBS} != "no"
-LIBBIND?=	${DESTDIR}${LIBDIR}/libbind.a
-LIBBIND9?=	${DESTDIR}${LIBDIR}/libbind9.a
-.endif
 LIBBLUETOOTH?=	${DESTDIR}${LIBDIR}/libbluetooth.a
 LIBBSDXML?=	${DESTDIR}${LIBDIR}/libbsdxml.a
 LIBBSDYML?=	${DESTDIR}${LIBDIR}/libbsdyml.a
@@ -74,11 +70,6 @@ LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
 .if ${MK_IPX} != "no"
 LIBIPX?=	${DESTDIR}${LIBDIR}/libipx.a
 .endif
-.if ${MK_BIND_LIBS} != "no"
-LIBISC?=	${DESTDIR}${LIBDIR}/libisc.a
-LIBISCCC?=	${DESTDIR}${LIBDIR}/libisccc.a
-LIBISCCFG?=	${DESTDIR}${LIBDIR}/libisccfg.a
-.endif
 LIBJAIL?=	${DESTDIR}${LIBDIR}/libjail.a
 LIBKADM5CLNT?=	${DESTDIR}${LIBDIR}/libkadm5clnt.a
 LIBKADM5SRV?=	${DESTDIR}${LIBDIR}/libkadm5srv.a
@@ -93,9 +84,6 @@ LIBL?=		${DESTDIR}${LIBDIR}/libl.a
 LIBLDNS?=	${DESTDIR}${LIBPRIVATEDIR}/libldns.a
 .endif
 LIBLN?=		"don't use LIBLN, use LIBL"
-.if ${MK_BIND} != "no"
-LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-.endif
 LIBLZMA?=	${DESTDIR}${LIBDIR}/liblzma.a
 LIBM?=		${DESTDIR}${LIBDIR}/libm.a
 LIBMAGIC?=	${DESTDIR}${LIBDIR}/libmagic.a
@@ -164,6 +152,9 @@ LIBTINFO?=	"don't use LIBTINFO, use LIBNCURSES"
 LIBUFS?=	${DESTDIR}${LIBDIR}/libufs.a
 LIBUGIDFW?=	${DESTDIR}${LIBDIR}/libugidfw.a
 LIBUMEM?=	${DESTDIR}${LIBDIR}/libumem.a
+.if ${MK_UNBOUND} != "no"
+LIBUNBOUND?=	${DESTDIR}${LIBPRIVATEDIR}/libunbound.a
+.endif
 LIBUSBHID?=	${DESTDIR}${LIBDIR}/libusbhid.a
 LIBUSB?=	${DESTDIR}${LIBDIR}/libusb.a
 LIBULOG?=	${DESTDIR}${LIBDIR}/libulog.a
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index dd88b78..b79d0bd 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -258,13 +258,6 @@ __DEFAULT_YES_OPTIONS = \
     ATM \
     AUDIT \
     AUTHPF \
-    BIND \
-    BIND_DNSSEC \
-    BIND_ETC \
-    BIND_LIBS_LWRES \
-    BIND_MTREE \
-    BIND_NAMED \
-    BIND_UTILS \
     BINUTILS \
     BLUETOOTH \
     BMAKE \
@@ -311,6 +304,7 @@ __DEFAULT_YES_OPTIONS = \
     KERNEL_SYMBOLS \
     KVM \
     LDNS \
+    LDNS_UTILS \
     LEGACY_CONSOLE \
     LIB32 \
     LIBPTHREAD \
@@ -361,6 +355,7 @@ __DEFAULT_YES_OPTIONS = \
     TELNET \
     TEXTPROC \
     TOOLCHAIN \
+    UNBOUND \
     USB \
     UTMPX \
     WIRELESS \
@@ -370,11 +365,6 @@ __DEFAULT_YES_OPTIONS = \
 
 __DEFAULT_NO_OPTIONS = \
     AUTO_OBJ \
-    BIND_IDN \
-    BIND_LARGE_FILE \
-    BIND_LIBS \
-    BIND_SIGCHASE \
-    BIND_XML \
     BSD_GREP \
     BSD_PATCH \
     CLANG_EXTRAS \
@@ -384,7 +374,7 @@ __DEFAULT_NO_OPTIONS = \
     HESIOD \
     LIBICONV_COMPAT \
     INSTALL_AS_USER \
-    LDNS_UTILS \
+    LLDB \
     META_MODE \
     NAND \
     NMTREE \
@@ -509,34 +499,13 @@ MK_${var}:=	no
 MK_LIBTHR:=	no
 .endif
 
-.if ${MK_LIBTHR} == "no"
-MK_BIND:=	no
-.endif
-
-.if ${MK_BIND} == "no"
-MK_BIND_DNSSEC:= no
-MK_BIND_ETC:=	no
-MK_BIND_LIBS:=	no
-MK_BIND_LIBS_LWRES:= no
-MK_BIND_MTREE:=	no
-MK_BIND_NAMED:=	no
-MK_BIND_UTILS:=	no
-.endif
-
 .if ${MK_ICONV} == "no"
 MK_LIBICONV_COMPAT:=	no
 .endif
 
 .if ${MK_LDNS} == "no"
 MK_LDNS_UTILS:=	no
-.endif
-
-.if ${MK_LDNS_UTILS} != "no"
-MK_BIND_UTILS:=	no
-.endif
-
-.if ${MK_BIND_MTREE} == "no"
-MK_BIND_ETC:=	no
+MK_UNBOUND:= no
 .endif
 
 .if ${MK_SOURCELESS} == "no"
@@ -606,6 +575,10 @@ MK_STAGING:=	no
 MK_STAGING_PROG:= no
 .endif
 
+.if ${MK_CLANG_IS_CC} == "no"
+MK_LLDB:= no
+.endif
+
 #
 # Set defaults for the MK_*_SUPPORT variables.
 #
author	sjg <sjg@FreeBSD.org>	2013-10-13 02:35:19 +0000
committer	sjg <sjg@FreeBSD.org>	2013-10-13 02:35:19 +0000
commit	7fcd33c1faf567506b5c0b4148c7a15a10788a5d (patch)
tree	2c6f4d1ca5d1c643faea64e1f4c90105a1ab406a /share
parent	2a59274eda20cc626e28052fff7aa8b7bf6a3683 (diff)
parent	5cca672bb0892f1c5da630c34a1f98e2de4d7064 (diff)
download	FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.zip FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.tar.gz