22 files changed, 360 insertions, 404 deletions
diff --git a/share/man/man3/pthread_set_name_np.3 b/share/man/man3/pthread_set_name_np.3
index 3bf430a..aad2fd6 100644
--- a/share/man/man3/pthread_set_name_np.3
+++ b/share/man/man3/pthread_set_name_np.3
@@ -44,9 +44,6 @@ function sets internal name for thread specified by
 argument to string value specified by
 .Fa name
 argument.
-.Pp
-This is a debugging interface and using it on a day-by-day basis makes
-no sense.
 .Sh ERRORS
 Because of the debugging nature of this function, all errors that may
 appear inside are silently ignored.
diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index e11c85a..156aa61 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -30,12 +30,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 16, 2011
+.Dd July 14, 2011
 .Dt AXE 4
 .Os
 .Sh NAME
 .Nm axe
-.Nd "ASIX Electronics AX88172/178/772 USB Ethernet driver"
+.Nd "ASIX Electronics AX88x7x/760 USB Ethernet driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -59,12 +59,14 @@ if_axe_load="YES"
 The
 .Nm
 driver provides support for USB Ethernet adapters based on the ASIX
-Electronics AX88172, AX88178 and AX88772 USB 2.0 chipsets.
+Electronics AX88172, AX88178, AX88772, AX88772A, AX88772B and AX88760
+USB 2.0 chipsets.
 .Pp
-The AX88172 and AX88178 are USB 2.0 devices that contain a 10/100
+The AX88172, AX88772, AX88772A, AX88772B and AX88760 contain a 10/100
 Ethernet MAC with MII interface and are designed to work with both
 Ethernet and HomePNA transceivers.
-The AX88772 will additionally support 10/100/1000 MACs.
+The AX88178 has a 10/100/1000 Ethernet MAC with GMII/RGMII interface
+for interfacing with Gigabit Ethernet PHY.
 .Pp
 These devices will operate with
 both USB 1.x and USB 2.0 controllers, however performance with 1.x
@@ -85,43 +87,48 @@ driver supports the following media types:
 .It Cm autoselect
 Enable autoselection of the media type and options.
 The user can manually override
-the autoselected mode by adding media options to the
-.Pa /etc/rc.conf
-file.
+the autoselected mode by adding media options to
+.Xr rc.conf 5 .
 .It Cm 10baseT/UTP
 Set 10Mbps operation.
 The
+.Xr ifconfig 8
 .Cm mediaopt
-option can also be used to enable
-.Cm full-duplex
-operation.
-Not specifying
+option can also be used to select either
 .Cm full-duplex
-implies
+or
 .Cm half-duplex
-mode.
+modes.
 .It Cm 100baseTX
 Set 100Mbps (Fast Ethernet) operation.
 The
+.Xr ifconfig 8
 .Cm mediaopt
-option can also be used to enable
+option can also be used to select either
 .Cm full-duplex
-operation.
-Not specifying
+or
+.Cm half-duplex
+modes.
+.It Cm 1000baseT
+Set 1000Mbps (Gigabit Ethernet) operation (AX88178 only).
+The
+.Xr ifconfig 8
+.Cm mediaopt
+option can also be used to select either
 .Cm full-duplex
-implies
+or
 .Cm half-duplex
-mode.
+modes.
 .El
 .Pp
 The
 .Nm
 driver supports the following media options:
-.Bl -tag -width ".Cm 10baseT/UTP"
+.Bl -tag -width ".Cm full-duplex"
 .It Cm full-duplex
 Force full duplex operation.
-The interface will operate in
-half duplex mode if this media option is not specified.
+.It Cm half-duplex
+Force half duplex operation.
 .El
 .Pp
 For more information on configuring this device, see
@@ -129,8 +136,8 @@ For more information on configuring this device, see
 .Sh HARDWARE
 The
 .Nm
-driver supports ASIX Electronics AX88172/AX88178/AX88772 based USB Ethernet
-adapters including:
+driver supports ASIX Electronics AX88172/AX88178/AX88772/AX88772A/AX88772B/AX88760
+based USB Ethernet adapters including:
 .Pp
 AX88172:
 .Bl -bullet -compact
@@ -139,6 +146,8 @@ AboCom UF200
 .It
 Acer Communications EP1427X2
 .It
+ASIX AX88172
+.It
 ATen UC210T
 .It
 Billionton SnapPort
@@ -167,6 +176,8 @@ System TALKS Inc.\& SGC-X2UL
 AX88178:
 .Bl -bullet -compact
 .It
+ASIX AX88178
+.It
 Belkin F5D5055
 .It
 Logitec LAN-GTJ/U2A
@@ -181,9 +192,9 @@ Sitecom Europe LN-028
 AX88772:
 .Bl -bullet -compact
 .It
-Buffalo (Melco Inc.) LUA3-U2-ATX
+ASIX AX88772
 .It
-Cisco-Linksys USB200Mv2
+Buffalo (Melco Inc.) LUA3-U2-ATX
 .It
 D-Link DUBE100B1
 .It
@@ -191,6 +202,26 @@ Planex UE-200TX-G
 .It
 Planex UE-200TX-G2
 .El
+.Pp
+AX88772A:
+.Bl -bullet -compact
+.It
+ASIX AX88772A
+.It
+Cisco-Linksys USB200Mv2
+.El
+.Pp
+AX88772B:
+.Bl -bullet -compact
+.It
+ASIX AX88772B
+.El
+.Pp
+AX88760:
+.Bl -bullet -compact
+.It
+ASIX AX88760
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "axe%d: watchdog timeout"
@@ -209,7 +240,7 @@ The driver failed to allocate an mbuf for the receiver ring.
 .Xr rgephy 4 ,
 .Xr ifconfig 8
 .Rs
-.%T "ASIX AX88172 AX88178 and AX88772 data sheets"
+.%T "ASIX AX88x7x and AX88760 data sheets"
 .%U http://www.asix.com.tw
 .Re
 .Sh HISTORY
diff --git a/share/man/man4/jme.4 b/share/man/man4/jme.4
index 4220ab5..0bcf652 100644
--- a/share/man/man4/jme.4
+++ b/share/man/man4/jme.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 20, 2010
+.Dd June 29, 2011
 .Dt JME 4
 .Os
 .Sh NAME
@@ -178,3 +178,17 @@ address once station address is reprogrammed via eFuse.
 It is highly recommended not to reprogram station address and
 it is responsibility of administrator to store original station
 address into a safe place when station address should be changed.
+.Pp
+There are two known 1000baseT link establishment issues with JMC25x.
+If the full mask revision number of JMC25x controller is less than
+or equal to 4 and link partner enabled IEEE 802.3az Energy Efficient
+Ethernet feature,  the controller would not be able to establish a
+1000baseT link.
+Also if the length of cable is longer than 120 meters, controller
+can not establish a 1000baseT link.
+The known workaround for the issue is to force manual link
+configuration with 100baseTX instead of relying on auto-negotiation.
+The full mask revision number of controller could be checked with
+verbose kernel boot option.
+Use lower nibble of chip revision number to get full mask revision of
+the controller. 
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index 9fd409d..6ca5c11 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -34,7 +34,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 4, 2006
+.Dd June 23, 2011
 .Dt NG_ETHER 4
 .Os
 .Sh NAME
@@ -183,7 +183,6 @@ Detach from underlying Ethernet interface and shut down node.
 Upon receipt of the
 .Dv NGM_SHUTDOWN
 control message, all hooks are disconnected, promiscuous mode is disabled,
-and the source address override flag is re-enabled,
 but the node is not removed.
 Node can be shut down only using
 .Dv NGM_ETHER_DETACH
diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4
index 9325788..6dedb02 100644
--- a/share/man/man4/snd_hda.4
+++ b/share/man/man4/snd_hda.4
@@ -668,16 +668,20 @@ and
 A few Hardware/OEM vendors tend to screw up BIOS settings, thus
 rendering the
 .Nm
-driver useless, which usually results in a state where the
+driver useless.
+This usually results in a state where the
 .Nm
-driver seems to attach and work, but without any sound. Some of
-that cases can be solved by tuning loader.conf variables. But before
-trying to fix problem that way, make sure that problem is really exists
-and the PCM audio device you are using really corresponds to expected
+driver seems to attach and work, but no sound is played.
+Some cases can be solved by tuning
+.Pa loader.conf
+variables.
+Before trying to fix problem that way, make sure that there really is a problem
+and that the PCM audio device in use really corresponds to the expected
 audio connector.
 .Pp
-Some vendors use non-standardized General Purpose I/O (GPIO) pins of codec
-to control external amplifiers. In some cases setting proper combination of
-GPIO bits may be needed to make sound work on specific device.
+Some vendors use non-standardized General Purpose I/O (GPIO) pins of the codec
+to control external amplifiers.
+In some cases setting a combination of GPIO bits may be needed to make
+sound work on a specific device.
 .Pp
 HDMI and DisplayPort audio may also require support from video driver.
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index fb2617a..660e33e 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -1,7 +1,6 @@
 .\"     $KAME: stf.4,v 1.35 2001/05/02 06:24:49 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
-.\" Copyright (c) 2010 Hiroki Sato <hrs@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -30,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 23, 2010
+.Dd April 27, 2001
 .Dt STF 4
 .Os
 .Sh NAME
@@ -43,11 +42,21 @@ tunnel interface
 .Sh DESCRIPTION
 The
 .Nm
-interface supports IPv6 in IPv4 encapsulation by
-tunneling IPv6 traffic over IPv4, as specified in
-.Li RFC3056 Pq 6to4
-and
-.Li RFC5569 Pq 6rd .
+interface supports
+.Dq 6to4
+IPv6 in IPv4 encapsulation.
+It can tunnel IPv6 traffic over IPv4, as specified in
+.Li RFC3056 .
+.Pp
+For ordinary nodes in 6to4 site, you do not need
+.Nm
+interface.
+The
+.Nm
+interface is necessary for site border router
+(called
+.Dq 6to4 router
+in the specification).
 .Pp
 Each
 .Nm
@@ -63,28 +72,12 @@ variable in
 .Pp
 Due to the way 6to4 protocol is specified,
 .Nm
-interface requires certain configuration to work properly.  Two
-different protocols defined in RFC3056 and RFC5569 are basically the
-same as each other except for address handling, so
-.Nm
-decides its behavior based on the configured IPv6 addresses as
-explained in the following.
-The
-.Nm
-interface can be configured with multiple IPv6 addresses including
-both 6to4 and 6rd.
-.Sh RFC3056 (a.k.a. 6to4)
+interface requires certain configuration to work properly.
 Single
-.Pq no more than 1 valid 6to4 address needs to be configured to the interface.
-.Dq a valid 6to4 address
-is an address which has the following properties.  For ordinary nodes
-in 6to4 site, you do not need
-.Nm
-interface; it is necessary only for site border router
-(called
-.Dq 6to4 router
-in the specification).
-.Pp
+(no more than 1)
+valid 6to4 address needs to be configured to the interface.
+.Dq A valid 6to4 address
+is an address which has the following properties.
 If any of the following properties are not satisfied,
 .Nm
 raises runtime error on packet transmission.
@@ -117,78 +110,6 @@ you may want to configure IPv6 prefix length as
 .Nm
 interface will check the IPv4 source address on packets,
 if the IPv6 prefix length is larger than 16.
-.Sh RFC5569 (a.k.a. 6rd)
-The
-.Nm
-interface works in the 6rd mode when one or more IPv6 addresses that
-consists of an IPv6 prefix and 32-bit IPv4 part with a prefix length
-equal to or shorter than 64.  In 6rd protocol, an IPv6 address
-.Li 2001:db8:c000:205::1/32
-means the following, for example:
-.Bl -bullet
-.It
-The 6rd relay prefix is
-.Li 2001:db8::/32 .
-.It
-The 6rd router's IPv4 address is
-.Li 192.0.2.5 .
-.El
-.Pp
-As you can see the IPv4 address is embedded in the IPv6 address just
-after the prefix.  While you can choose an IPv6 prefix length other
-than 32, it must be from 0 to 32.
-.Pp
-Assuming this address is configured on the
-.Nm
-interface, it does the following:
-.Bl -bullet
-.It
-An incoming IPv6 packet on
-.Nm
-will be encapsuled in an IPv4 packet with the source address
-.Li 192.0.2.5
-and then the IPv4 packet is delivered based on the IPv4 routing table.
-The IPv4 destination address is calculated from the destination
-address of the original IPv6 packet in the same way as the source.
-.It
-An incoming IPv4 packet which encapsules an IPv6 packet whose
-destination address matches a 6rd prefix with embedded IPv4 address
-configured on the
-.Nm
-interface, the IPv6 packet will be decapsulated and delivered based on
-the IPv6 routing table.  Note that
-.Nm
-interface normally has a route which covers whole range of a 6rd relay
-prefix, the delivered IPv6 packet can return to
-.Nm
-if there is no more specific route.  In that case, the returned packet
-will be discarded silently.
-.El
-.\" XXX: example configuration will be added
-.\" .Pp
-.\" By using this interface, you can configure a 6rd domain.  For simplicity,
-.\" we assume the following here:
-.\" .Bl -bullet
-.\" .It
-.\" A 6rd Customer, who has an IPv6/IPv4 LAN and an IPv4-only access
-.\" toward network of his Internet Service Provider.  The Customer has
-.\" a router called
-.\" .Dq CE Pq Customer Edge
-.\" Router, which can communicate between his LAN and the ISP over IPv4
-.\" and encapsulate  
-.\" his networks.
-.\" .It
-.\" A 6rd Provider, who provides IPv6 Internet reachability by using 6rd
-.\" protocol.  The Provider offers access to a router called
-.\" .Dq PE Pq Provider Edge
-.\" Router, which can communicate with 
-.\" .El
-.\" .Pp
-.\" A 6rd customer
-.\" needs to configure
-.\" .Nm
-.\" on his CE (Customer Edge) router.
-.Sh Other Functionality of the Interface
 .Pp
 .Nm
 can be configured to be ECN friendly.
@@ -226,6 +147,9 @@ Packets with IPv4 multicast address as outer IPv4 source/destination
 Packets with limited broadcast address as outer IPv4 source/destination
 .Pq Li 255.0.0.0/8
 .It
+Packets with private address as outer IPv4 source/destination
+.Pq Li 10.0.0.0/8 , 172.16.0.0/12 , 192.168.0.0/16
+.It
 Packets with subnet broadcast address as outer IPv4 source/destination.
 The check is made against subnet broadcast addresses for
 all of the directly connected subnets.
@@ -240,11 +164,6 @@ The same set of rules are applied against the IPv4 address embedded into
 inner IPv6 address, if the IPv6 address matches 6to4 prefix.
 .El
 .Pp
-In addition to them, packets with private address as outer IPv4
-source/destination
-.Pq Li 10.0.0.0/8 , 172.16.0.0/12 , 192.168.0.0/16
-are filtered out only in the 6to4 mode.
-.Pp
 It is recommended to filter/audit
 incoming IPv4 packet with IP protocol number 41, as necessary.
 It is also recommended to filter/audit encapsulated IPv6 packets as well.
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 0f9e70d..c424a1e 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 15, 2009
+.Dd June 16, 2011
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -181,7 +181,11 @@ options.
 .Pq Vt bool
 Set this to use
 .Xr cvs 1
-to update your ports with
+to update your
+.Pa src , ports
+and
+.Pa doc
+trees with
 .Dq Li "make update" .
 .It Va CXXFLAGS
 .Pq Vt str
@@ -202,8 +206,8 @@ The documentation
 .Ar supfile
 to use when doing a
 .Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/doc\-supfile .
+For example,
+.Pa /usr/share/examples/cvsup/doc-supfile .
 .It Va INSTALL
 .Pq Vt str
 the default install command.
@@ -259,14 +263,18 @@ Set this to not update the doc tree during
 .Pq Vt bool
 Set this to not update the ports tree during
 .Dq Li "make update" .
+.It Va NO_WWWUPDATE
+.Pq Vt bool
+Set this to not update the www tree during
+.Dq Li "make update" .
 .It Va PORTSSUPFILE
 .Pq Vt str
 The ports
 .Ar supfile
 to use when doing a
 .Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/ports\-supfile .
+For example,
+.Pa /usr/share/examples/cvsup/ports-supfile .
 .It Va SUP
 .Pq Vt str
 The location of the
@@ -281,24 +289,20 @@ The first
 .Ar supfile
 to use when doing a
 .Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/standard\-supfile .
+For example,
+.Pa /usr/share/examples/cvsup/standard-supfile .
 .It Va SUPFILE1
 .Pq Vt str
 The second
 .Ar supfile
 to use when doing a
 .Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/secure\-supfile .
 .It Va SUPFILE2
 .Pq Vt str
 The third
 .Ar supfile
 to use when doing a
 .Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/secure\-supfile .
 .It Va SUPFLAGS
 .Pq Vt str
 The flag for the
@@ -315,16 +319,28 @@ The hostname of the sup server to use when doing
 .Pq Vt bool
 Set this to use
 .Xr cvsup 1
-to update your ports with
+to update your
+.Pa src , ports , doc
+and
+.Pa www
+trees with
+.Dq Li "make update" .
+.It Va SVN_UPDATE
+.Pq Vt bool
+Set this to use
+.Xr svn 1
+to update your
+.Pa src
+tree with
 .Dq Li "make update" .
 .It Va WWWSUPFILE
 .Pq Vt str
 The www
 .Ar supfile
 to use when doing a
-.Dq Li "make update"
-This defaults to
-.Pa /usr/share/examples/cvsup/www\-supfile .
+.Dq Li "make update" .
+For example,
+.Pa /usr/share/examples/cvsup/www-supfile .
 .El
 .Ss "BUILDING THE KERNEL"
 The following list provides a name and short description for variables
@@ -730,6 +746,7 @@ filter, or both.
 .Bl -tag -width ".Pa /usr/share/examples/etc/make.conf" -compact
 .It Pa /etc/make.conf
 .It Pa /usr/doc/Makefile
+.It Pa /usr/ports/Makefile
 .It Pa /usr/share/examples/etc/make.conf
 .It Pa /usr/share/mk/sys.mk
 .It Pa /usr/src/Makefile
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index cf062c5..d7d52c1 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 27, 2011
+.Dd June 19, 2011
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -196,6 +196,14 @@ Configuration file for
 .Xr ddb 8 .
 Default
 .Pa /etc/ddb.conf .
+.It Va kld_list
+.Pq Vt str
+A list of kernel modules to load right after the local
+disks are mounted.
+Loading modules at this point in the boot process is
+much faster than doing it via
+.Pa /boot/loader.conf
+for those modules not necessary for mounting local disk.
 .It Va kldxref_enable
 .Pq Vt bool
 Set to
@@ -4285,6 +4293,61 @@ Bus address of the USB Bluetooth controller.
 Check the output of
 .Xr usbconfig 8
 on your system to find this information.
+.It Va netwait_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+delays the start of network-reliant services until
+.Va netwait_if
+is up and ICMP packets to a destination defined in
+.Va netwait_ip
+are flowing.
+Link state is examined first, followed by
+.Dq Li pinging
+an IP address to verify network usability.
+If no destination can be reached or timeouts are exceeded,
+network services are started anyway with no guarantee that
+the network is usable.
+Use of this variable requires both
+.Va netwait_ip
+and
+.Va netwait_if
+to be set.
+.It Va netwait_ip
+.Pq Vt str
+Empty by default.
+This variable contains a space-delimited list of IP addresses to
+.Xr ping 8 .
+DNS hostnames should not be used as resolution is not guaranteed
+to be functional at this point.
+If multiple IP addresses are specified,
+each will be tried until one is successful or the list is exhausted.
+.It Va netwait_timeout
+.Pq Vt int
+Indicates the total number of seconds to perform a
+.Dq Li ping
+against each IP address in
+.Va netwait_ip ,
+at a rate of one ping per second.
+If any of the pings are successful,
+full network connectivity is considered reliable.
+The default is 60.
+.It Va netwait_if
+.Pq Vt str
+Empty by default.
+Defines the name of the network interface on which watch for link.
+.Xr ifconfig 8
+is used to monitor the interface, looking for
+.Dq Li status: no carrier .
+Once gone, the link is considered up.
+This can be a
+.Xr vlan 4
+interface if desired.
+.It Va netwait_if_timeout
+.Pq Vt int
+Defines the total number of seconds to wait for link to become usable,
+polled at a 1-second interval.
+The default is 30.
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact
@@ -4356,6 +4419,7 @@ on your system to find this information.
 .Xr ntpdate 8 ,
 .Xr pfctl 8 ,
 .Xr pflogd 8 ,
+.Xr ping 8 ,
 .Xr powerd 8 ,
 .Xr quotacheck 8 ,
 .Xr quotaon 8 ,
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index f0b9905..544344c 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 221733 2011-05-10 13:01:11Z ru
 .\" $FreeBSD$
-.Dd May 22, 2011
+.Dd June 17, 2011
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -78,11 +78,11 @@ The following list provides a name and short description for variables
 that can be used for source builds.
 .Bl -tag -width indent
 .It Va WITHOUT_ACCT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ACCT 221540 2011-05-06 19:13:03Z ru
+.\" from FreeBSD: head/tools/build/options/WITHOUT_ACCT 223201 2011-06-17 20:47:44Z ed
 Set to not build process accounting tools such as
-.Xr ac 8
+.Xr accton 8
 and
-.Xr accton 8 .
+.Xr sa 8 .
 .It Va WITHOUT_ACPI
 .\" from FreeBSD: head/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru
 Set to not build
@@ -225,8 +225,8 @@ Set to not build the boot blocks and loader.
 Set to not build the BSD licensed version of cpio based on
 .Xr libarchive 3 .
 .It Va WITH_BSD_GREP
-.\" from FreeBSD: head/tools/build/options/WITH_BSD_GREP 211701 2010-08-23 10:04:26Z gabor
-Build BSD-licensed grep instead of GNU grep.
+.\" from FreeBSD: head/tools/build/options/WITH_BSD_GREP 222273 2011-05-25 01:04:12Z obrien
+Install BSD-licensed grep as '[ef]grep' instead of GNU grep.
 .It Va WITHOUT_BSNMP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BSNMP 183306 2008-09-23 16:15:42Z sam
 Set to not build or install
@@ -916,6 +916,17 @@ When set, it also enforces the following options:
 .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.
+.It Va WITHOUT_UTMPX
+.\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 223209 2011-06-17 21:30:21Z ed
+Set to not build user accounting tools such as
+.Xr last 1 ,
+.Xr users 1 ,
+.Xr who 1 ,
+.Xr wtmpcvt 1 ,
+.Xr ac 8 ,
+.Xr lastlogin 8
+and
+.Xr utxrm 8 .
 .It Va WITHOUT_WIRELESS
 .\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS 183242 2008-09-21 22:02:26Z sam
 Set to not build programs used for 802.11 wireless networks; especially
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 22305b7..b43a961 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 18, 2011
+.Dd June 16, 2011
 .Dt BUILD 7
 .Os
 .Sh NAME
@@ -517,6 +517,10 @@ target.
 If set, the update process does not update the Ports tree as part of the
 .Dq make update
 target.
+.It Va NO_WWWUPDATE
+If set, the update process does not update the www tree as part of the
+.Dq make update
+target.
 .El
 .Pp
 Builds under directory
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index 21ddb71..e95786d 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -647,7 +647,8 @@ already exists on disk (e.g.\& as a result of a previous update).
 .Sh SEE ALSO
 .Xr crunchgen 1 ,
 .Xr mdconfig 8 ,
-.Xr swapon 8
+.Xr nanobsd 8 ,
+.Xr swapon 8 
 .Sh AUTHORS
 .An -nosplit
 .An Andrzej Bialecki Aq abial@FreeBSD.org ,
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 50edf73..a04cb68 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -296,7 +296,6 @@ MAN=	accept_filter.9 \
 	vm_fault_prefault.9 \
 	vm_map.9 \
 	vm_map_check_protection.9 \
-	vm_map_clean.9 \
 	vm_map_create.9 \
 	vm_map_delete.9 \
 	vm_map_entry_resize_free.9 \
@@ -314,11 +313,11 @@ MAN=	accept_filter.9 \
 	vm_map_simplify_entry.9 \
 	vm_map_stack.9 \
 	vm_map_submap.9 \
+	vm_map_sync.9 \
 	vm_map_wire.9 \
 	vm_page_alloc.9 \
 	vm_page_bits.9 \
 	vm_page_cache.9 \
-	vm_page_copy.9 \
 	vm_page_deactivate.9 \
 	vm_page_dontneed.9 \
 	vm_page_flag.9 \
@@ -328,12 +327,10 @@ MAN=	accept_filter.9 \
 	vm_page_insert.9 \
 	vm_page_io.9 \
 	vm_page_lookup.9 \
-	vm_page_protect.9 \
 	vm_page_rename.9 \
 	vm_page_sleep_if_busy.9 \
 	vm_page_wakeup.9 \
 	vm_page_wire.9 \
-	vm_page_zero_fill.9 \
 	vm_set_page_size.9 \
 	vn_fullpath.9 \
 	vn_isdisk.9 \
@@ -551,8 +548,10 @@ MLINKS+=config_intrhook.9 config_intrhook_disestablish.9 \
 	config_intrhook.9 config_intrhook_establish.9
 MLINKS+=contigmalloc.9 contigfree.9
 MLINKS+=copy.9 copyin.9 \
+	copy.9 copyin_nofault.9 \
 	copy.9 copyinstr.9 \
 	copy.9 copyout.9 \
+	copy.9 copyout_nofault.9 \
 	copy.9 copystr.9
 MLINKS+=critical_enter.9 critical.9 \
 	critical_enter.9 critical_exit.9
@@ -860,6 +859,22 @@ MLINKS+=\
 	mbuf.9 mtod.9 \
 	mbuf.9 M_TRAILINGSPACE.9 \
 	mbuf.9 M_WRITABLE.9
+MLINKS+=\
+	mbuf_tags.9 m_tag_alloc.9 \
+	mbuf_tags.9 m_tag_copy.9 \
+	mbuf_tags.9 m_tag_copy_chain.9 \
+	mbuf_tags.9 m_tag_delete.9 \
+	mbuf_tags.9 m_tag_delete_chain.9 \
+	mbuf_tags.9 m_tag_delete_nonpersistent.9 \
+	mbuf_tags.9 m_tag_find.9 \
+	mbuf_tags.9 m_tag_first.9 \
+	mbuf_tags.9 m_tag_free.9 \
+	mbuf_tags.9 m_tag_get.9 \
+	mbuf_tags.9 m_tag_init.9 \
+	mbuf_tags.9 m_tag_locate.9 \
+	mbuf_tags.9 m_tag_next.9 \
+	mbuf_tags.9 m_tag_prepend.9 \
+	mbuf_tags.9 m_tag_unlink.9
 MLINKS+=MD5.9 MD5Init.9 \
 	MD5.9 MD5Transform.9
 MLINKS+=mdchain.9 md_append_record.9 \
@@ -1268,7 +1283,8 @@ MLINKS+=uidinfo.9 uifind.9 \
 	uidinfo.9 uifree.9 \
 	uidinfo.9 uihashinit.9 \
 	uidinfo.9 uihold.9
-MLINKS+=uio.9 uiomove.9
+MLINKS+=uio.9 uiomove.9 \
+	uio.9 uiomove_nofault.9
 MLINKS+=usbdi.9 usbd_do_request.9 \
 	usbdi.9 usbd_do_request_flags.9 \
 	usbdi.9 usbd_errstr.9 \
diff --git a/share/man/man9/copy.9 b/share/man/man9/copy.9
index b6b975f..37c7a0c 100644
--- a/share/man/man9/copy.9
+++ b/share/man/man9/copy.9
@@ -34,13 +34,15 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 7, 1996
+.Dd July 9, 2011
 .Dt COPY 9
 .Os
 .Sh NAME
 .Nm copy ,
 .Nm copyin ,
+.Nm copyin_nofault ,
 .Nm copyout ,
+.Nm copyout_nofault ,
 .Nm copystr ,
 .Nm copyinstr
 .Nd kernel copy functions
@@ -50,8 +52,12 @@
 .Ft int
 .Fn copyin "const void *uaddr" "void *kaddr" "size_t len"
 .Ft int
+.Fn copyin_nofault "const void *uaddr" "void *kaddr" "size_t len"
+.Ft int
 .Fn copyout "const void *kaddr" "void *uaddr" "size_t len"
 .Ft int
+.Fn copyout_nofault "const void *kaddr" "void *uaddr" "size_t len"
+.Ft int
 .Fn copystr "const void *kfaddr" "void *kdaddr" "size_t len" "size_t *done"
 .Ft int
 .Fn copyinstr "const void *uaddr" "void *kaddr" "size_t len" "size_t *done"
@@ -67,25 +73,40 @@ All but
 copy data from user-space to kernel-space or vice-versa.
 .Pp
 The
-.Nm
-routines provide the following functionality:
-.Bl -tag -width "copyoutstr()"
-.It Fn copyin
-Copies
+.Fn copyin
+and
+.Fn copyin_nofault
+functions copy
 .Fa len
 bytes of data from the user-space address
 .Fa uaddr
 to the kernel-space address
 .Fa kaddr .
-.It Fn copyout
-Copies
+.Pp
+The
+.Fn copyout
+and
+.Fn copyout_nofault
+functions copy
 .Fa len
 bytes of data from the kernel-space address
 .Fa kaddr
 to the user-space address
 .Fa uaddr .
-.It Fn copystr
-Copies a NUL-terminated string, at most
+.Pp
+The
+.Fn copyin_nofault
+and
+.Fn copyout_nofault
+functions require that the kernel-space and user-space data be
+accessible without incurring a page fault.
+The source and destination addresses must be physically mapped for
+read and write access, respectively, and neither the source nor
+destination addresses may be pageable.
+.Pp
+The
+.Fn copystr
+function copies a NUL-terminated string, at most
 .Fa len
 bytes long, from kernel-space address
 .Fa kfaddr
@@ -98,8 +119,10 @@ NUL, is returned in
 .Fa done
 is
 .No non- Ns Dv NULL ) .
-.It Fn copyinstr
-Copies a NUL-terminated string, at most
+.Pp
+The
+.Fn copyinstr
+function copies a NUL-terminated string, at most
 .Fa len
 bytes long, from user-space address
 .Fa uaddr
@@ -121,7 +144,6 @@ is
 .\" The number of bytes actually copied, including the terminating
 .\" NUL, is returned in
 .\" .Fa *done .
-.El
 .Sh RETURN VALUES
 The
 .Nm
@@ -129,7 +151,13 @@ functions return 0 on success or
 .Er EFAULT
 if a bad address is encountered.
 In addition, the
-.Fn copystr ,
+.Fn copyin_nofault
+and
+.Fn copyout_nofault
+functions return
+.Er EFAULT
+if a page fault occurs, and the
+.Fn copystr
 and
 .Fn copyinstr
 .\" .Fn copyinstr ,
diff --git a/share/man/man9/device_get_sysctl.9 b/share/man/man9/device_get_sysctl.9
index 4dcc2ab..d838ac7 100644
--- a/share/man/man9/device_get_sysctl.9
+++ b/share/man/man9/device_get_sysctl.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 23, 2006
+.Dd June 18, 2011
 .Dt DEVICE_GET_SYSCTL 9
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@ This node can be accessed with the
 .Fn device_get_sysctl_tree
 function.
 The context for the node can be obtained with the
-.Fn device_get_sysctl_ctl
+.Fn device_get_sysctl_ctx
 function.
 .Sh SEE ALSO
 .Xr device 9
diff --git a/share/man/man9/fail.9 b/share/man/man9/fail.9
index e367eff..0973cea 100644
--- a/share/man/man9/fail.9
+++ b/share/man/man9/fail.9
@@ -116,6 +116,7 @@ The sysctl variable may be set using the following grammar:
       ( (<float> "%") | (<integer> "*" ) )*
       <type>
       [ "(" <integer> ")" ]
+      [ "[pid " <integer> "]" ]
 
   <float> ::
       <integer> [ "." <integer> ] |
@@ -161,6 +162,10 @@ For the purpose of this operator, the return() and print() operators
 are the only types that cascade.
 A return() term only cascades if the code executes, and a print()
 term only cascades when passed a non-zero argument.
+A pid can optionally be specified.
+The fail point term is only executed when invoked by a process with a
+matching p_pid.
+.Pp
 .Sh EXAMPLES
 .Bl -tag
 .It Sy sysctl debug.fail_point.foobar="2.1%return(5)"
@@ -181,6 +186,8 @@ After that, 1/1000th of the time, return 22.
 Return 5 for 1 in 1000 executions, but only 5 times total.
 .It Sy sysctl debug.fail_point.foobar="1%*sleep(50)"
 1/100th of the time, sleep 50ms.
+.It Sy sysctl debug.fail_point.foobar="1*return(5)[pid 1234]"
+Return 5 once, when pid 1234 executes the fail point.
 .El
 .Sh AUTHORS
 .An -nosplit
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index e9dbab5..05264dc 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 1, 2009
+.Dd July 3, 2011
 .Dt IFNET 9
 .Os
 .Sh NAME
@@ -1169,11 +1169,12 @@ list.
 Caller must have appropriate privilege.
 (No call-down to driver.)
 .It Dv SIOCGIFCAP
+.It Dv SIOCGIFFIB
 .It Dv SIOCGIFFLAGS
 .It Dv SIOCGIFMETRIC
 .It Dv SIOCGIFMTU
 .It Dv SIOCGIFPHYS
-Get interface capabilities, flags, metric, MTU, medium selection.
+Get interface capabilities, FIB, flags, metric, MTU, medium selection.
 (No call-down to driver.)
 .Pp
 .It Dv SIOCSIFCAP
@@ -1192,6 +1193,12 @@ and
 .Va if_data.ifi_hwassist
 appropriately.
 .Pp
+.It Dv SIOCSIFFIB
+Sets interface FIB.
+Caller must have appropriate privilege.
+FIB values start at 0 and values greater or equals than
+.Va net.fibs
+are considered invalid.
 .It Dv SIOCSIFFLAGS
 Change interface flags.
 Caller must have appropriate privilege.
diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9
index fb27c9c..9d569b7 100644
--- a/share/man/man9/uio.9
+++ b/share/man/man9/uio.9
@@ -25,12 +25,13 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2010
+.Dd July 9, 2011
 .Dt UIO 9
 .Os
 .Sh NAME
 .Nm uio ,
-.Nm uiomove
+.Nm uiomove ,
+.Nm uiomove_nofault
 .Nd device driver I/O routines
 .Sh SYNOPSIS
 .In sys/types.h
@@ -48,11 +49,15 @@ struct uio {
 .Ed
 .Ft int
 .Fn uiomove "void *buf" "int howmuch" "struct uio *uiop"
+.Ft int
+.Fn uiomove_nofault "void *buf" "int howmuch" "struct uio *uiop"
 .Sh DESCRIPTION
-The function
+The functions
 .Fn uiomove
-is used to handle transfer of data between buffers and I/O vectors
-that might possibly also cross the user/kernel space boundary.
+and
+.Fn uiomove_nofault
+are used to transfer data between buffers and I/O vectors that might
+possibly cross the user/kernel space boundary.
 .Pp
 As a result of any
 .Xr read 2 ,
@@ -71,6 +76,8 @@ being passed.
 The transfer request is encoded in this structure.
 The driver itself should use
 .Fn uiomove
+or
+.Fn uiomove_nofault
 to get at the data in this structure.
 .Pp
 The fields in the
@@ -99,7 +106,7 @@ Do not copy, already in object.
 .El
 .It Va uio_rw
 The direction of the desired transfer, either
-.Dv UIO_READ ,
+.Dv UIO_READ
 or
 .Dv UIO_WRITE .
 .It Va uio_td
@@ -110,10 +117,24 @@ for the associated thread; used if
 indicates that the transfer is to be made from/to a process's address
 space.
 .El
+.Pp
+The function
+.Fn uiomove_nofault
+requires that the buffer and I/O vectors be accessible without
+incurring a page fault.
+The source and destination addresses must be physically mapped for
+read and write access, respectively, and neither the source nor
+destination addresses may be pageable.
+Thus, the function
+.Fn uiomove_nofault
+can be called from contexts where acquiring virtual memory system
+locks or sleeping are prohibited.
 .Sh RETURN VALUES
 On success
 .Fn uiomove
-will return 0, on error it will return an appropriate errno.
+and
+.Fn uiomove_nofault
+will return 0; on error they will return an appropriate error code.
 .Sh EXAMPLES
 The idea is that the driver maintains a private buffer for its data,
 and processes the request in chunks of maximal the size of this
@@ -156,6 +177,8 @@ fooread(dev_t dev, struct uio *uio, int flag)
 .Ed
 .Sh ERRORS
 .Fn uiomove
+and
+.Fn uiomove_nofault
 will fail and return the following error code if:
 .Bl -tag -width Er
 .It Bq Er EFAULT
@@ -166,6 +189,14 @@ or
 returned
 .Er EFAULT
 .El
+.Pp
+In addition,
+.Fn uiomove_nofault
+will fail and return the following error code if:
+.Bl -tag -width Er
+.It Bq Er EFAULT
+A page fault occurs.
+.El
 .Sh SEE ALSO
 .Xr read 2 ,
 .Xr readv 2 ,
diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9
index 12112cd..f45be0b 100644
--- a/share/man/man9/vm_map.9
+++ b/share/man/man9/vm_map.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 26, 2004
+.Dd July 9, 2011
 .Dt VM_MAP 9
 .Os
 .Sh NAME
@@ -223,13 +223,9 @@ a user process's address space:
 .Bl -tag -width ".Va max_protection"
 .It Va protection
 Memory protection bits applied to this region.
-These are identical to those defined for
-.Xr vm_page_protect 9 .
 .It Va max_protection
 Mask for the memory protection bits which may be actually be applied to
 this region.
-These are identical to those defined for
-.Xr vm_page_protect 9 .
 .It Va inheritance
 Contains flags which specify how this entry should be treated
 during fork processing.
@@ -328,7 +324,6 @@ is backed by a
 .Sh SEE ALSO
 .Xr pmap 9 ,
 .Xr vm_map_check_protection 9 ,
-.Xr vm_map_clean 9 ,
 .Xr vm_map_create 9 ,
 .Xr vm_map_delete 9 ,
 .Xr vm_map_entry_resize_free 9 ,
@@ -348,8 +343,8 @@ is backed by a
 .Xr vm_map_simplify_entry 9 ,
 .Xr vm_map_stack 9 ,
 .Xr vm_map_submap 9 ,
-.Xr vm_map_wire 9 ,
-.Xr vm_page_protect 9
+.Xr vm_map_sync 9 ,
+.Xr vm_map_wire 9
 .Sh AUTHORS
 This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff --git a/share/man/man9/vm_map_clean.9 b/share/man/man9/vm_map_sync.9
index eeea5bc..0ee1219 100644
--- a/share/man/man9/vm_map_clean.9
+++ b/share/man/man9/vm_map_sync.9
@@ -25,24 +25,24 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 19, 2003
-.Dt VM_MAP_CLEAN 9
+.Dd July 9, 2011
+.Dt VM_MAP_SYNC 9
 .Os
 .Sh NAME
-.Nm vm_map_clean
+.Nm vm_map_sync
 .Nd push dirty pages to their pager
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
 .In vm/vm_map.h
 .Ft int
-.Fo vm_map_clean
+.Fo vm_map_sync
 .Fa "vm_map_t map" "vm_offset_t start" "vm_offset_t end" "boolean_t syncio"
 .Fa "boolean_t invalidate"
 .Fc
 .Sh DESCRIPTION
 The
-.Fn vm_map_clean
+.Fn vm_map_sync
 function forces any dirty cached pages in the range
 .Fa start
 to
@@ -61,13 +61,9 @@ is TRUE, any cached pages are also freed.
 .Pp
 The range provided must be contiguous, it MUST NOT contain holes.
 The range provided MUST NOT contain any sub-map entries.
-.Sh IMPLEMENTATION NOTES
-This routine holds the
-.Va Giant
-lock to prevent multiple entry.
 .Sh RETURN VALUES
 The
-.Fn vm_map_clean
+.Fn vm_map_sync
 function returns
 .Dv KERN_SUCCESS
 if successful.
diff --git a/share/man/man9/vm_page_copy.9 b/share/man/man9/vm_page_copy.9
deleted file mode 100644
index 3cf7304..0000000
--- a/share/man/man9/vm_page_copy.9
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"
-.\" Copyright (C) 2001 Chad David <davidc@acns.ab.ca>. 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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), 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 COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-.\" DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd July 17, 2001
-.Dt VM_PAGE_COPY 9
-.Os
-.Sh NAME
-.Nm vm_page_copy
-.Nd "copy a page"
-.Sh SYNOPSIS
-.In sys/param.h
-.In vm/vm.h
-.In vm/vm_page.h
-.Ft void
-.Fn vm_page_copy "vm_page_t src_m" "vm_page_t dst_m"
-.Sh DESCRIPTION
-The
-.Fn vm_page_copy
-function copies the contents of
-.Fa src_m
-into
-.Fa dst_m .
-.Pp
-The entire contents of
-.Fa dst_m
-are marked as valid.
-.Pp
-The actual copy is performed by
-.Fn pmap_copy_page .
-.Sh AUTHORS
-This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_protect.9 b/share/man/man9/vm_page_protect.9
deleted file mode 100644
index 8b4911d..0000000
--- a/share/man/man9/vm_page_protect.9
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"
-.\" Copyright (C) 2001 Chad David <davidc@acns.ab.ca>. 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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), 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 COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-.\" DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd July 14, 2001
-.Dt VM_PAGE_PROTECT 9
-.Os
-.Sh NAME
-.Nm vm_page_protect
-.Nd "lower a page's protection"
-.Sh SYNOPSIS
-.In sys/param.h
-.In vm/vm.h
-.In vm/vm_page.h
-.Ft void
-.Fn vm_page_protect "vm_page_t mem" "int prot"
-.Sh DESCRIPTION
-The
-.Fn vm_page_protect
-function lowers a page's protection.
-The protection is never raised by this function; therefore, if the page is
-already at
-.Dv VM_PROT_NONE ,
-the function does nothing.
-.Pp
-Its arguments are:
-.Bl -tag -width ".Fa prot"
-.It Fa mem
-The page whose protection is lowered.
-.It Fa prot
-The protection the page should be reduced to.
-If
-.Dv VM_PROT_NONE
-is specified, then the
-.Dv PG_WRITABLE
-and
-.Dv PG_MAPPED
-flags are cleared and the pmap_page's protection is set to
-.Dv VM_PROT_NONE .
-If
-.Dv VM_PROT_READ
-is specified, then the
-.Dv PG_WRITABLE
-flag is cleared and the pmap_page's protection is set to
-.Dv VM_PROT_READ .
-.El
-.Pp
-Higher protection requests are ignored.
-.Sh AUTHORS
-This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_zero_fill.9 b/share/man/man9/vm_page_zero_fill.9
deleted file mode 100644
index 2adb301..0000000
--- a/share/man/man9/vm_page_zero_fill.9
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"
-.\" Copyright (C) 2001 Chad David <davidc@acns.ab.ca>. 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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), 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 COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-.\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-.\" DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd July 17, 2001
-.Dt VM_PAGE_ZERO_FILL 9
-.Os
-.Sh NAME
-.Nm vm_page_zero_fill
-.Nd "zero fill a page"
-.Sh SYNOPSIS
-.In sys/param.h
-.In vm/vm.h
-.In vm/vm_page.h
-.Ft boolean_t
-.Fn vm_page_zero_fill "vm_page_t m"
-.Sh DESCRIPTION
-The
-.Fn vm_page_zero_fill
-function zeros the given vm page by calling the machine dependent
-.Fn pmap_zero_page
-routine.
-.Pp
-.Fn vm_page_zero_fill
-always returns
-.Dv TRUE .
-.Sh AUTHORS
-This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .