IFC @ r222256

36 files changed, 489 insertions, 247 deletions

diff --git a/share/examples/diskless/README.TEMPLATING b/share/examples/diskless/README.TEMPLATING
index b094267..28edcae 100644
--- a/share/examples/diskless/README.TEMPLATING
+++ b/share/examples/diskless/README.TEMPLATING
@@ -136,7 +136,7 @@ be useful to set up clients and server for diskless boot.
 		should never be overwritten by the templating copy.
 
 
-		TYPICAL CUSTOMIZED CONFIGRATION SOFTLINKS
+		TYPICAL CUSTOMIZED CONFIGURATION SOFTLINKS
 
     The following files typically need to be turned into softlinks 
     to /conf/ME/<filename>:
@@ -261,9 +261,9 @@ be useful to set up clients and server for diskless boot.
 	identity.pub
 
     WHEN INITIALLY CONVERTING A TARGET MACHINE TO USE TEMPLATING, ALWAYS
-    MAKE A FULL BACKUP OF THE TARGET MACHINE FIRST!  You may accidently delete
-    files on the target during the conversion due to forgetting to enter
-    items into appropriate .cpignore files on the source.
+    MAKE A FULL BACKUP OF THE TARGET MACHINE FIRST!  You may accidentally
+    delete files on the target during the conversion due to forgetting to
+    enter items into appropriate .cpignore files on the source.
 
 	SECURITY CONSIDERATIONS WITH NFS ROOT EXPORT FROM TEMPLATE MACHINE
 	SECURITY CONSIDERATIONS WITH NFS USR EXPORT FROM TEMPLATE MACHINE
diff --git a/share/examples/drivers/make_device_driver.sh b/share/examples/drivers/make_device_driver.sh
index 2acea33..d7b9259 100755
--- a/share/examples/drivers/make_device_driver.sh
+++ b/share/examples/drivers/make_device_driver.sh
@@ -485,7 +485,7 @@ ${1}_isa_probe (device_t device)
 				/*rid*/0, membase, memsize);
 			/*
 			 * We found one, return non-positive numbers..
-			 * Return -N if we cant handle it, but not well.
+			 * Return -N if we can't handle it, but not well.
 			 * Return -2 if we would LIKE the device.
 			 * Return -1 if we want it a lot.
 			 * Return 0 if we MUST get the device.
diff --git a/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c
index 781f6a1..c2edfbc 100644
--- a/share/examples/libvgl/demo.c
+++ b/share/examples/libvgl/demo.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1991-1997 Søren Schmidt
+ * Copyright (c) 1991-1997 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,15 +42,15 @@ main(int argc, char **argv)
 
   // set graphics mode, here 320x240 256 colors
   // supported modes are (from <sys/consio.h>):
-  // SW_VGA_CG320:	std VGA 320x200 256 colors
-  // SW_VGA_MODEX:	Modex VGA 320x240 256 colors
-  // SW_VGA_VG640:	std VGA 640x480 16 colors
+  // SW_VGA_CG320:      std VGA 320x200 256 colors
+  // SW_VGA_MODEX:      Modex VGA 320x240 256 colors
+  // SW_VGA_VG640:      std VGA 640x480 16 colors
   VGLInit(SW_VGA_MODEX);
 
   // initialize mouse and show pointer
   VGLMouseInit(VGL_MOUSESHOW);
 
-  // VGLDisplay is a ptr to a struct Bitmap defined and initialized by 
+  // VGLDisplay is a ptr to a struct Bitmap defined and initialized by
   // libvgl. The Bitmap points directly to screen memory etc.
   xsize=VGLDisplay->Xsize;
   ysize=VGLDisplay->Ysize;
@@ -61,7 +61,7 @@ main(int argc, char **argv)
   VGLClear(tmp, 0);
 
   // fill the screen with colored lines
-  for (y=0; y<ysize; y++) 
+  for (y=0; y<ysize; y++)
     VGLLine(VGLDisplay, 0, y, xsize-1, y, y/2 % 256);
 
   // draw some lines and circles just to show off
@@ -72,7 +72,7 @@ main(int argc, char **argv)
   VGLEllipse(VGLDisplay, 256, 0, 256, 256, 63);
   VGLEllipse(VGLDisplay, 0, 256, 256, 256, 0);
 
-  // some text is also usefull
+  // some text is also useful
   VGLBitmapString(VGLDisplay, 100,100,
     "This is text", 63, 0, 0, VGL_DIR_RIGHT);
   sleep(2);
@@ -86,7 +86,7 @@ main(int argc, char **argv)
     "This is text", 63, 0, 0, VGL_DIR_DOWN);
   sleep(2);
 
-  // now show some simple bitblit 
+  // now show some simple bitblit
   for (i=0; i<256; i++)
     for (j=0; j<256; j++)
       tmp->Bitmap[i+256*j] = i%16;
@@ -106,12 +106,12 @@ main(int argc, char **argv)
   // loop around drawing and copying
   while (++i) {
     VGLBitmapCopy(VGLDisplay, rand()%xsize, rand()%ysize,
-  		  VGLDisplay, rand()%xsize, rand()%ysize,
-  		  rand()%xsize, rand()%ysize);
+                  VGLDisplay, rand()%xsize, rand()%ysize,
+                  rand()%xsize, rand()%ysize);
     VGLLine(VGLDisplay,  rand()%xsize, rand()%ysize, 
             rand()%xsize, rand()%ysize, rand()%256);
     VGLEllipse(VGLDisplay, rand()%xsize, rand()%ysize,
-   	       rand()%xsize/2, rand()%ysize/2, rand()%256);
+               rand()%xsize/2, rand()%ysize/2, rand()%256);
     rand();
     if (i > 1000) break;
   }
@@ -120,4 +120,3 @@ main(int argc, char **argv)
   VGLEnd();
   return 0;
 }
-
diff --git a/share/examples/netgraph/ether.bridge b/share/examples/netgraph/ether.bridge
index 754e760..1e405f2 100644
--- a/share/examples/netgraph/ether.bridge
+++ b/share/examples/netgraph/ether.bridge
@@ -40,7 +40,7 @@ BRIDGE_NAME="bnet0"
 # machine as well then set ${LOCAL_IFACES} as well (they may also be
 # listed in ${BRIDGE_IFACES}). Of course, any ${LOCAL_IFACE} must
 # be ifconfig(8)ured separately. If you don't want a ${LOCAL_IFACE}
-# then assign it the emtpy string.
+# then assign it the empty string.
 
 BRIDGE_IFACES="de0 fxp0 fxp1"
 LOCAL_IFACES="fxp0 fxp1"
diff --git a/share/examples/netgraph/frame_relay b/share/examples/netgraph/frame_relay
index 0becb47..53f643f 100644
--- a/share/examples/netgraph/frame_relay
+++ b/share/examples/netgraph/frame_relay
@@ -13,13 +13,13 @@ ngctl mkpeer ${CARD}: frame_relay rawdata downstream
 # Link management protocol node.
 ngctl mkpeer ${CARD}:rawdata lmi dlci0 auto0
 
-# Also attach dlci 1023, as it needs both to try autoconfiguring.
+# Also attach dlci 1023, as it needs both to try auto-configuring.
 # The Link management protocol is now alive and probing..
 ngctl connect ${CARD}:rawdata ${CARD}:rawdata.dlci0 dlci1023 auto1023
 
 # Attach the DLCI(channel) the Telco has assigned you to
-# a node to hadle whatever protocol encapsulation your peer
-# is using. In this case rfc1490 encapsulation.
+# a node to handle whatever protocol encapsulation your peer
+# is using. In this case RFC1490 encapsulation.
 ngctl mkpeer ${CARD}:rawdata rfc1490 dlci${DLCI} downstream
 
 
@@ -34,8 +34,8 @@ ngctl mkpeer ${CARD}:rawdata.dlci${DLCI} iface inet inet
 # Then use ifconfig on interface ng0 as usual
 
 # A variant on this whole set might use the 'name' command to make it more
-# readable. but it doesn't work if you have multiple lines or dlcis 
-# e.g. 
+# readable. But it doesn't work if you have multiple lines or dlcis
+# e.g.
 # ngctl mkpeer ${CARD}: frame_relay rawdata downstream
 # ngctl name ${CARD}:rawdata mux
 # ngctl mkpeer mux: lmi dlci0 auto0
diff --git a/share/examples/netgraph/ngctl b/share/examples/netgraph/ngctl
index 80a7f22..e7b7cd8 100644
--- a/share/examples/netgraph/ngctl
+++ b/share/examples/netgraph/ngctl
@@ -46,7 +46,7 @@
 
 # Note that we used ngctl's ``name'' command to do this.  However,
 # the following manually constructed netgraph message would have
-# acomplished the exact same thing:
+# accomplished the exact same thing:
 
     + msg foo name { name="fred" }
 
@@ -85,7 +85,7 @@
 
 # As soon as we sent the message, we got back a response.  Here
 # ngctl is telling us that it received a control message with the
-# NGF_RESP (response) flag set, the reponse was to a prior ``getname''
+# NGF_RESP (response) flag set, the response was to a prior ``getname''
 # control message, that the originator was the node addressable
 # as ``fred:''.  The message arguments field is then displayed to
 # us in its ASCII form.  In this case, what we get back is a struct
diff --git a/share/examples/netgraph/raw b/share/examples/netgraph/raw
index e0970f3..6dc39ca 100644
--- a/share/examples/netgraph/raw
+++ b/share/examples/netgraph/raw
@@ -6,7 +6,7 @@
 CARD=sr0
 
 # create an interface "ng0" and attach it to the sync port.
-# The packets had jolly well better be ip because we are not discriminating.
+# The packets had jolly well better be IP because we are not discriminating.
 ngctl mkpeer ${CARD}: iface rawdata inet
 
 # if ng0 already exists, use a CONNECT command instead of a mkpeer. e.g.
diff --git a/share/examples/netgraph/virtual.chain b/share/examples/netgraph/virtual.chain
index 73a12d6..bc6b854 100644
--- a/share/examples/netgraph/virtual.chain
+++ b/share/examples/netgraph/virtual.chain
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2010, Yavuz Gokirmak 
+# Copyright (c) 2010, Yavuz Gokirmak
 #
 # All rights reserved.
 #
@@ -14,7 +14,6 @@
 #
 # $FreeBSD$
 #
-#
 # This script creates and connects n router like nodes. Complex wide
 # area topologies can be created with the help of script.
 #
@@ -25,9 +24,9 @@
 #
 # 0. Make your own copy of this example script.
 #
-# 1. Edit the definition of ${TARGET_TOPOLOGY} to define your virtual 
+# 1. Edit the definition of ${TARGET_TOPOLOGY} to define your virtual
 #    nodes. Virtual topology definition includes node names and their
-#    IP address. Target top. sytax: ( name|ip<->name|ip ... )
+#    IP address. Target top. syntax: ( name|ip<->name|ip ... )
 #    Example 1: ( n1|10.0.2.1/30<->n2|10.0.2.2/30 ...)
 #    Example 2: ( n1|2001:b90::14a/125<->n1|2001:b90::14b/125 ...)
 #
@@ -35,21 +34,21 @@
 #
 # 3. Add necessary static route commands for each virtual node. For
 #    example assume you have three virtual nodes connected each other
-#    llike a chain ( n1 is connected to n2, n2 is connecte to n3 ). 
-#    In order to estabklish connectivity among these virtual nodes,
+#    like a chain (n1 is connected to n2, n2 is connected to n3).
+#    In order to establish connectivity among these virtual nodes,
 #    you have to add default routes to node n1 and node n3. Example
 #    static route command is:
-#      STATIC_ROUTE0="jexec n1 route add -inet default 10.0.2.2" 
-#      STATIC_ROUTE1="jexec n3 route add -inet default 10.0.2.5" 
-#    After defining default routes with above format you have to set 
+#      STATIC_ROUTE0="jexec n1 route add -inet default 10.0.2.2"
+#      STATIC_ROUTE1="jexec n3 route add -inet default 10.0.2.5"
+#    After defining default routes with above format you have to set
 #    the total number of static route commands as:
 #      STATIC_ROUTE_CNT=2
 #
 # 4. Stop bridging by running this script with "stop" as the
 #    command line argument.
-# 
-# 5. This cript uses a template file in order to carry information 
-#    between start and stop calls. 
+#
+# 5. This script uses a template file in order to carry information
+#    between start and stop calls.
 #      In the start call, the netgraph interfaces and jails are created.
 #      At the stop phase, all created objects should be removed.
 #    DO NOT delete the temporary file between the start and stop phases.
@@ -84,8 +83,8 @@
 #
 #
 
-# List the names of virtual nodes and their IP addresses. Use ':' 
-# character to seperate node name from node IP address and netmask.
+# List the names of virtual nodes and their IP addresses. Use ':'
+# character to separate node name from node IP address and netmask.
 
 TARGET_TOPOLOGY="n1|10.0.2.1/30<->n2|10.0.2.2/30 n2|10.0.2.5/30<->n3|10.0.2.6/30 n2|10.0.2.9/30<->n4|10.0.2.10/30"
 STATIC_ROUTE0="jexec n1 route add -inet default 10.0.2.2"
@@ -93,10 +92,10 @@ STATIC_ROUTE1="jexec n3 route add -inet default 10.0.2.5"
 STATIC_ROUTE2="jexec n4 route add -inet default 10.0.2.9"
 STATIC_ROUTE_CNT=3
 
-# MAC manifacturer prefix. This can be modified according to needs.
-MAC_PREFIX="00:1d:92" 
+# MAC manufacturer prefix. This can be modified according to needs.
+MAC_PREFIX="00:1d:92"
 
-# Temporary file is important for proper execution of script. 
+# Temporary file is important for proper execution of script.
 TEMP_FILE="/var/tmp/.virtual.chain.tmp"
 
 # Set root directory for jails to be created.
@@ -112,7 +111,7 @@ JAIL_PATH="/usr/jails/router"
 virtual_chain_start() {
 
 	# Load netgraph KLD's as necessary.
-	
+
 	for KLD in ng_ether ng_bridge ng_eiface; do
 		if ! kldstat -v | grep -qw ${KLD}; then
 			echo -n "Loading ${KLD}.ko... "
@@ -122,21 +121,21 @@ virtual_chain_start() {
 	done
 
 	# Reset all interfaces and jails. If temporary file can not be found
-	# script assumes that there is no previous configuration. 
-	
+	# script assumes that there is no previous configuration.
+
 	if [ ! -e ${TEMP_FILE} ]; then
 		echo "No previous configuration(${TEMP_FILE}) found to clean-up."
 	else
 		echo -n "Cleaning previous configuration..."
 		virtual_chain_stop
 		echo "done"
-	fi	
+	fi
 
-	# Create temporary file for usage. This file includes generated 
+	# Create temporary file for usage. This file includes generated
 	# interface names and jail names. All bridges, interfaces and jails
-	# are written to file while created. In clean-up process written 
-	# objects are cleaned (i.e removed) from system.
-	
+	# are written to file while created. In clean-up process written
+	# objects are cleaned (i.e. removed) from system.
+
 	if [ -e ${TEMP_FILE} ]; then
 		touch ${TEMP_FILE}
 	fi
@@ -144,40 +143,40 @@ virtual_chain_start() {
 
 	# Attach other interfaces as well.
 	for CONNECTION in ${TARGET_TOPOLOGY}; do
-		
+
 		# Virtual connections are defined in TARGET_TOPOLOGY variable.
 		# They have the form of 'nodeName|IPaddr'. Below two lines split
-	
+
 		PEER1=`echo ${CONNECTION} | awk -F"<->" '{print $1}'`
 		PEER1_NAME=`echo ${PEER1} | awk -F"|" '{print $1}'`
 		PEER1_IP=`echo ${PEER1} | awk -F"|" '{print $2}'`
-		
+
 		PEER2=`echo ${CONNECTION} | awk -F"<->" '{print $2}'`
 		PEER2_NAME=`echo ${PEER2} | awk -F"|" '{print $1}'`
 		PEER2_IP=`echo ${PEER2} | awk -F"|" '{print $2}'`
 
 		# !!! if not created already..
-		# Create virtual node (jail) with given name and using 
+		# Create virtual node (jail) with given name and using
 		# JAIL_PATH as root directory for jail.
 
 		virtual_chain_create_peer_if_necessary ${PEER1_NAME}
 		virtual_chain_create_peer_if_necessary ${PEER2_NAME}
 
 		# create an interface for peer with the given peer IP. Get interface
-		# for future use; you will connect this interface to the other 
+		# for future use; you will connect this interface to the other
 		# peers' (PEER2) interface.
 		virtual_chain_create_interface_with_ip ${PEER1_NAME} ${PEER1_IP}
 		PEER1_INTERFACE=${RET_INTERFACE}
-		
+
 		# create an interface for peer with the given peer IP. Get interface
-		# for future use; you will connect this interface to the other 
+		# for future use; you will connect this interface to the other
 		# peers' (PEER2) interface.
 		virtual_chain_create_interface_with_ip ${PEER2_NAME} ${PEER2_IP}
 		PEER2_INTERFACE=${RET_INTERFACE}
 
 		# Connect virtual interface to other interface. Syntax is :
 		# ngctl connect INTERFACE1: INTERFACE2: ether ether.
-		
+
 		echo -n "Connecting ${PEER1_INTERFACE}:ether to ${PEER2_INTERFACE}:ether..."
 		ngctl connect ${PEER1_INTERFACE}: ${PEER2_INTERFACE}: ether ether \
 			|| exit 1
@@ -193,7 +192,7 @@ virtual_chain_start() {
 		i=`expr $i + 1`
 	done
 
-	echo "Virtual WAN established succesfully!"
+	echo "Virtual WAN established successfully!"
 }
 
 virtual_chain_create_interface_with_ip() {
@@ -201,35 +200,35 @@ virtual_chain_create_interface_with_ip() {
 	NODE_NAME=$1
 	NODE_IP=$2
 
-	# Create a ng_eiface object for virtual node. ng_eiface 
+	# Create a ng_eiface object for virtual node. ng_eiface
 	# object has a hook that can be connected to one of bridge
-	# links. After creating interface get its automatically 
-	# generated name for further usage. 
+	# links. After creating interface get its automatically
+	# generated name for further usage.
 
 	echo "Creating eiface interface for virtual node ${NODE_NAME}."
 	ngctl mkpeer eiface ether ether
 	EIFACE=`ngctl l | grep ngeth | tail -n 1| awk '{print $2}'`
-	echo "Interface ${EIFACE} is created." 
-	
+	echo "Interface ${EIFACE} is created."
+
 	# Write name of the interface to temp file. Clean-up procedure
 	# will use this name to shutdown interface.
-	
+
 	echo "interface ${EIFACE}" >> ${TEMP_FILE}
 
-	# Move virtual interface to virtual node. Note that Interface 
+	# Move virtual interface to virtual node. Note that Interface
 	# name will not be changed at the end of this movement. Moved
 	# interface can be seen at the output of ifconfig command in
 	# jail: 'jexec jailname ifconfig'
 
-	echo "Moving ${EIFACE} to ${NODE_NAME}" 
+	echo "Moving ${EIFACE} to ${NODE_NAME}"
 	ifconfig ${EIFACE} vnet ${NODE_NAME}
-	
+
 	# Make lo0 interface localhost.
 	jexec ${NODE_NAME} ifconfig lo0 localhost
 
 	# Generate a random mac address for virtual interface. First
 	# three octets can be changed by user. Last three octets are
-	# generated randomly. 
+	# generated randomly.
 	M4=`od -An -N2 -i /dev/random | sed -e 's/ //g' | \
 			awk '{ print $1 % 256 }'`
 	M5=`od -An -N2 -i /dev/random | sed -e 's/ //g' | \
@@ -244,16 +243,16 @@ virtual_chain_create_interface_with_ip() {
 	echo "Setting MAC address of ${EIFACE} to '${MAC}'"
 	jexec ${NODE_NAME} ifconfig ${EIFACE} link $MAC
 
-	# Either IPv4 or IPv6 can be used in this script. Ifconfig 
+	# Either IPv4 or IPv6 can be used in this script. Ifconfig
 	# IP setting syntax differs slightly for two IP versions.
 	# For version 4 'inet' keyword is used whereas for version 6
 	# 'inet6' is used. Below line tries to decide which IP version
-	# is given and sets IPVER to 'inet' or 'inet6'. 
+	# is given and sets IPVER to 'inet' or 'inet6'.
 
 	IPVER=`echo ${NODE_IP} | awk -F"." '{ split($4,last,"/"); \
 		if( NF==4 && $1>0 && $1<256 && $2<256 && $3<256 && \
 		last[1]<256) print "inet"; else print "inet6"}'`
-	
+
 	# Set IP address of virtual interface in virtual node.
 	echo "Setting IP address of ${EIFACE} to '${NODE_IP}'"
 	jexec ${NODE_NAME} ifconfig ${EIFACE} ${IPVER} ${NODE_IP}
@@ -264,23 +263,22 @@ virtual_chain_create_interface_with_ip() {
 virtual_chain_create_peer_if_necessary() {
 
 	if ! grep -q $1 ${TEMP_FILE} ; then
-		
-		echo -n "Creating virtual node (jail) ${1}..." 
+
+		echo -n "Creating virtual node (jail) ${1}..."
 		jail -c vnet name=${1} host.hostname=${1} \
-			path=${JAIL_PATH} persist 
+			path=${JAIL_PATH} persist
 		jexec ${1} sysctl -w net.inet.ip.forwarding=1
 		jexec ${1} sysctl -w net.inet6.ip6.forwarding=1
 		echo "done"
-			
-		# Write name of the jail to temp file. Clean-up 
+
+		# Write name of the jail to temp file. Clean-up
 		# procedure will use this name to remove jail.
-	
+
 		echo "node ${1}" >> ${TEMP_FILE}
 	fi
 
 }
 
-
 # Stop routine.
 virtual_chain_stop() {
 
@@ -288,31 +286,31 @@ virtual_chain_stop() {
 		echo "Nothing to stop! ${TEMP_FILE}: temp file not found"
 	else
 
-		echo -n "Shutdown bridge interface.."	
+		echo -n "Shutdown bridge interface.."
 		OBJECTS=`cat ${TEMP_FILE} | grep bridge | awk '{print $2}'`
 		for BRIDGE in ${OBJECTS}; do
 			ngctl shutdown ${BRIDGE}: >/dev/null 2>&1
 		done
 		echo "done"
-	
-		echo -n "Shutdown all eiface interfaces..."	
+
+		echo -n "Shutdown all eiface interfaces..."
 		OBJECTS=`cat ${TEMP_FILE} | grep interface | awk '{print $2}'`
 		for INTERFACE in ${OBJECTS}; do
 			ngctl shutdown ${INTERFACE}: >/dev/null 2>&1
 		done
 		echo "done"
-	
-		echo -n "Removing all jails..."	
+
+		echo -n "Removing all jails..."
 		OBJECTS=`cat ${TEMP_FILE} | grep node | awk '{print $2}'`
 		for NODE in ${OBJECTS}; do
 			jail -r ${NODE}
 		done
 		echo "done"
-	
-		echo "Removing tempfile ${TEMP_FILE}"	
+
+		echo "Removing tempfile ${TEMP_FILE}"
 		rm ${TEMP_FILE}
 	fi
-	echo "Virtual LAN objects removed succesfully!"
+	echo "Virtual LAN objects removed successfully!"
 
 }
 
@@ -324,7 +322,6 @@ virtual_chain_usage() {
 
 # Main entry point.
 
-
 case $# in
 	1)
 		case $1 in
@@ -340,7 +337,7 @@ case $# in
 					echo " temp file not found"
 				else
 					virtual_chain_stop
-				fi	
+				fi
                                 ;;
                         help)
                                 virtual_chain_usage
diff --git a/share/examples/netgraph/virtual.lan b/share/examples/netgraph/virtual.lan
index bce33e1..5e6e3ac 100644
--- a/share/examples/netgraph/virtual.lan
+++ b/share/examples/netgraph/virtual.lan
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2010, Yavuz Gokirmak 
+# Copyright (c) 2010, Yavuz Gokirmak
 #
 # All rights reserved.
 #
@@ -13,13 +13,12 @@
 # its use.
 #
 # $FreeBSD$
-
 #
-# This script adds virtual nodes to one of the physical interfaces 
+# This script adds virtual nodes to one of the physical interfaces
 # visible on your local area network (LAN). Virtual nodes seems real
-# to external observers. 
+# to external observers.
 # If traceroute is executed to one of virtual nodes, the IP
-# address of the physical interface will not be seen in the output. 
+# address of the physical interface will not be seen in the output.
 # Virtual nodes are generated via jails and network connections are
 # established using ng_bridge(4) and ng_eiface(4) node types.
 #
@@ -29,11 +28,11 @@
 #
 # 1. Edit the definition of ${ETHER_INTF} as described below
 #    to define your real interface connected to the LAN. Virtual nodes
-#    will placed on the same physical network as this interface. 
+#    will placed on the same physical network as this interface.
 #
-# 2. Edit the definition of ${TARGET_TOPOLOGY} to define your virtual 
+# 2. Edit the definition of ${TARGET_TOPOLOGY} to define your virtual
 #    nodes. Virtual topology definition includes node names and their
-#    IP address. Target top. sytax: ( node1|ip1/24 node2|ip2/24 ... )
+#    IP address. Target top. syntax: ( node1|ip1/24 node2|ip2/24 ... )
 #    Example 1: ( n1|122.122.122.12/24, n2|122.122.122.13/24 ...)
 #    Example 2: ( n1|2001:b90::14a/125, n1|2001:b90::14b/125 ...)
 #
@@ -41,9 +40,9 @@
 #
 # 4. Stop bridging by running this script with "stop" as the
 #    command line argument.
-# 
-# 5. This cript uses a template file in order to carry information 
-#    between start and stop calls. 
+#
+# 5. This script uses a template file in order to carry information
+#    between start and stop calls.
 #      In the start call, the netgraph interfaces and jails are created.
 #      At the stop phase, all created objects should be removed.
 #    DO NOT delete the temporary file between the start and stop phases.
@@ -80,19 +79,19 @@
 #
 
 # Give the name of ethernet interface. Virtual nodes will be seen as
-# local neighbours of this interface. 
+# local neighbours of this interface.
 
 ETHER_INTF="em0"
 
-# List the names of virtual nodes and their IP addresses. Use ':' 
-# character to seperate node name from node IP address and netmask.
+# List the names of virtual nodes and their IP addresses. Use ':'
+# character to separate node name from node IP address and netmask.
 
 TARGET_TOPOLOGY="c1|10.0.2.20/24 c2|10.0.2.21/24 c3|10.0.2.22/24"
 
-# MAC manifacturer prefix. This can be modified according to needs.
-MAC_PREFIX="00:1d:92" 
+# MAC manufacturer prefix. This can be modified according to needs.
+MAC_PREFIX="00:1d:92"
 
-# Temporary file is important for proper execution of script. 
+# Temporary file is important for proper execution of script.
 TEMP_FILE="/var/tmp/.virtual.lan.tmp"
 
 # Set root directory for jails to be created.
@@ -108,7 +107,7 @@ JAIL_PATH="/usr/jails/node"
 virtual_lan_start() {
 
 	# Load netgraph KLD's as necessary.
-	
+
 	for KLD in ng_ether ng_bridge ng_eiface; do
 		if ! kldstat -v | grep -qw ${KLD}; then
 			echo -n "Loading ${KLD}.ko... "
@@ -118,21 +117,21 @@ virtual_lan_start() {
 	done
 
 	# Reset all interfaces and jails. If temporary file can not be found
-	# script assumes that there is no previous configuration. 
-	
+	# script assumes that there is no previous configuration.
+
 	if [ ! -e ${TEMP_FILE} ]; then
 		echo "No previous configuration(${TEMP_FILE}) found to clean-up."
 	else
 		echo -n "Cleaning previous configuration..."
 		virtual_lan_stop
 		echo "done"
-	fi	
+	fi
 
-	# Create temporary file for usage. This file includes generated 
+	# Create temporary file for usage. This file includes generated
 	# interface names and jail names. All bridges, interfaces and jails
-	# are written to file while created. In clean-up process written 
-	# objects are cleaned (i.e removed) from system.
-	
+	# are written to file while created. In clean-up process written
+	# objects are cleaned (i.e. removed) from system.
+
 	if [ -e ${TEMP_FILE} ]; then
 		touch ${TEMP_FILE}
 	fi
@@ -150,20 +149,20 @@ virtual_lan_start() {
 	# is used to create a name for new bridge.
 	BRIDGE_COUNT=`ngctl l | grep bridge | wc -l | sed -e "s/ //g"`
 	BRIDGE_NAME="bridge${BRIDGE_COUNT}"
-	
+
 	# Create new ng_bridge(4) node and attach it to the ethernet interface.
 	# Connect ng_ether:lower hook to bridge:link0 when creating bridge and
 	# connect ng_ether:upper hook to bridge:link1 after bridge name is set.
-	
+
 	echo "Creating bridge interface: ${BRIDGE_NAME}..."
 	ngctl mkpeer ${ETHER_INTF}: bridge lower link0 || exit 1
 	ngctl name ${ETHER_INTF}:lower ${BRIDGE_NAME} || exit 1
 	ngctl connect ${ETHER_INTF}: ${BRIDGE_NAME}: upper link1 || exit 1
 	echo "Bridge ${BRIDGE_NAME} is created and ${ETHER_INTF} is connected."
-	
+
 	# In the above code block two hooks are connected to bridge interface,
-	# therefore LINKNUM is set to 2 indicating total number of connected 
-	# hooks on the bridge interface. 
+	# therefore LINKNUM is set to 2 indicating total number of connected
+	# hooks on the bridge interface.
 	LINKNUM=2
 
 	# Write name of the bridge to temp file. Clean-up procedure will use
@@ -173,7 +172,7 @@ virtual_lan_start() {
 
 	# Attach other interfaces as well.
 	for NODE in ${TARGET_TOPOLOGY}; do
-		
+
 		# Virtual nodes are defined in TARGET_TOPOLOGY variable. They
 		# have the form of 'nodeName|IPaddr'. Below two lines split
 		# node definition to get node name and node IP.
@@ -181,48 +180,48 @@ virtual_lan_start() {
 		NODE_NAME=`echo ${NODE} | awk -F"|" '{print $1}'`
 		NODE_IP=`echo ${NODE} | awk -F"|" '{print $2}'`
 
-		# Create virtual node (jail) with given name and using 
+		# Create virtual node (jail) with given name and using
 		# JAIL_PATH as root directory for jail.
 
-		echo -n "Creating virtual node (jail) ${NODE_NAME}..." 
+		echo -n "Creating virtual node (jail) ${NODE_NAME}..."
 		jail -c vnet name=${NODE_NAME} host.hostname=${NODE_NAME} \
-			path=${JAIL_PATH} persist 
+			path=${JAIL_PATH} persist
 		echo "done"
-	
-		# Write name of the jail to temp file. Clean-up procedure will 
+
+		# Write name of the jail to temp file. Clean-up procedure will
 		# use this name to remove jail.
-	
+
 		echo "node ${NODE_NAME}" >> ${TEMP_FILE}
 
-		# Create a ng_eiface object for virtual node. ng_eiface 
+		# Create a ng_eiface object for virtual node. ng_eiface
 		# object has a hook that can be connected to one of bridge
-		# links. After creating interface get its automatically 
-		# generated name for further usage. 
+		# links. After creating interface get its automatically
+		# generated name for further usage.
 
 		echo "Creating eiface interface for virtual node ${NODE_NAME}."
 		ngctl mkpeer eiface ether ether
 		EIFACE=`ngctl l | grep ngeth | tail -n 1| awk '{print $2}'`
-		echo "Interface ${EIFACE} is created." 
-		
+		echo "Interface ${EIFACE} is created."
+
 		# Write name of the interface to temp file. Clean-up procedure
 		# will use this name to shutdown interface.
-		
+
 		echo "interface ${EIFACE}" >> ${TEMP_FILE}
-	
-		# Move virtual interface to virtual node. Note that Interface 
+
+		# Move virtual interface to virtual node. Note that Interface
 		# name will not be changed at the end of this movement. Moved
 		# interface can be seen at the output of ifconfig command in
 		# jail: 'jexec jailname ifconfig'
 
-		echo "Moving ${EIFACE} to ${NODE_NAME}" 
+		echo "Moving ${EIFACE} to ${NODE_NAME}"
 		ifconfig ${EIFACE} vnet ${NODE_NAME}
-		
+
 		# Make lo0 interface localhost.
 		jexec ${NODE_NAME} ifconfig lo0 localhost
 
 		# Generate a random mac address for virtual interface. First
 		# three octets can be changed by user. Last three octets are
-		# generated randomly. 
+		# generated randomly.
 		M4=`od -An -N2 -i /dev/random | sed -e 's/ //g' | \
 				awk '{ print $1 % 256 }'`
 		M5=`od -An -N2 -i /dev/random | sed -e 's/ //g' | \
@@ -237,35 +236,35 @@ virtual_lan_start() {
 		echo "Setting MAC address of ${EIFACE} to '${MAC}'"
 		jexec ${NODE_NAME} ifconfig ${EIFACE} link $MAC
 
-		# Either IPv4 or IPv6 can be used in this script. Ifconfig 
+		# Either IPv4 or IPv6 can be used in this script. Ifconfig
 		# IP setting syntax differs slightly for two IP versions.
 		# For version 4 'inet' keyword is used whereas for version 6
 		# 'inet6' is used. Below line tries to decide which IP version
-		# is given and sets IPVER to 'inet' or 'inet6'. 
+		# is given and sets IPVER to 'inet' or 'inet6'.
 
 		IPVER=`echo ${NODE_IP} | awk -F"." '{ split($4,last,"/"); \
 			if( NF==4 && $1>0 && $1<256 && $2<256 && $3<256 && \
 			last[1]<256) print "inet"; else print "inet6"}'`
-		
+
 		# Set IP address of virtual interface in virtual node.
 		echo "Setting IP address of ${EIFACE} to '${NODE_IP}'"
 		jexec ${NODE_NAME} ifconfig ${EIFACE} ${IPVER} ${NODE_IP}
-	
+
 		# Connect virtual interface to bridge interface. Syntax is :
 		# ngctl connect INTERFACE: BRIDGE: INTERFACE_HOOK EMPTY_LINK.
 		# Interface has one hook named 'ether' and below line connects
-		# ether hook to bridge's first unconnected link. 
-		
+		# ether hook to bridge's first unconnected link.
+
 		echo -n "Connecting ${EIFACE}:ether to ${BRIDGE_NAME}:link${LINKNUM}..."
 		ngctl connect ${EIFACE}: ${BRIDGE_NAME}: ether link${LINKNUM} \
 			|| exit 1
 		echo "done"
 
 		# Now, bridge has one more connected link thus link count is
-		# incremented. 
+		# incremented.
 		LINKNUM=`expr ${LINKNUM} + 1`
 	done
-	echo "Virtual LAN established succesfully!"
+	echo "Virtual LAN established successfully!"
 
 }
 
@@ -276,31 +275,31 @@ virtual_lan_stop() {
 		echo "Nothing to stop! ${TEMP_FILE}: temp file not found"
 	else
 
-		echo -n "Shutdown bridge interface.."	
+		echo -n "Shutdown bridge interface.."
 		OBJECTS=`cat ${TEMP_FILE} | grep bridge | awk '{print $2}'`
 		for BRIDGE in ${OBJECTS}; do
 			ngctl shutdown ${BRIDGE}: >/dev/null 2>&1
 		done
 		echo "done"
-	
-		echo -n "Shutdown all eiface interfaces..."	
+
+		echo -n "Shutdown all eiface interfaces..."
 		OBJECTS=`cat ${TEMP_FILE} | grep interface | awk '{print $2}'`
 		for INTERFACE in ${OBJECTS}; do
 			ngctl shutdown ${INTERFACE}: >/dev/null 2>&1
 		done
 		echo "done"
-	
-		echo -n "Removing all jails..."	
+
+		echo -n "Removing all jails..."
 		OBJECTS=`cat ${TEMP_FILE} | grep node | awk '{print $2}'`
 		for NODE in ${OBJECTS}; do
 			jail -r ${NODE}
 		done
 		echo "done"
-	
-		echo "Removing tempfile ${TEMP_FILE}"	
+
+		echo "Removing tempfile ${TEMP_FILE}"
 		rm ${TEMP_FILE}
 	fi
-	echo "Virtual LAN objects removed succesfully!"
+	echo "Virtual LAN objects removed successfully!"
 
 }
 
@@ -327,7 +326,7 @@ case $# in
 					echo " temp file not found"
 				else
 					virtual_lan_stop
-				fi	
+				fi
                                 ;;
                         help)
                                 virtual_lan_usage
diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4
index 144d64b..68aea35 100644
--- a/share/man/man4/ahci.4
+++ b/share/man/man4/ahci.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 28, 2010
+.Dd May 17, 2011
 .Dt AHCI 4
 .Os
 .Sh NAME
@@ -121,6 +121,15 @@ hardware command queues (up to 32 commands per port),
 Native Command Queuing, SATA interface Power Management, device hot-plug
 and Message Signaled Interrupts.
 .Pp
+Driver supports "LED" enclosure management messages, defined by the AHCI.
+When supported by hardware, it allows to control per-port activity, locate
+and fault LEDs via the
+.Xr led 4
+API for localization and status reporting purposes.
+Supporting AHCI controllers may transmit that information to the backplane
+controllers via SGPIO interface. Backplane controllers interpret received
+statuses in some way (IBPI standard) to report them using present indicators.
+.Pp
 AHCI hardware is also supported by ataahci driver from
 .Xr ata 4
 subsystem.
@@ -135,6 +144,15 @@ subclass 6 (SATA) and programming interface 1 (AHCI).
 Also, in cooperation with atamarvell and atajmicron drivers of ata(4),
 it supports AHCI part of legacy-PATA + AHCI-SATA combined controllers,
 such as JMicron JMB36x and Marvell 88SX61xx.
+.Sh FILES
+.Bl -tag -width /dev/led/ahcich*.locate
+.It Pa /dev/led/ahcich*.act
+activity LED device nodes
+.It Pa /dev/led/ahcich*.fault
+fault LED device nodes
+.It Pa /dev/led/ahcich*.locate
+locate LED device nodes
+.El
 .Sh SEE ALSO
 .Xr ada 4 ,
 .Xr ata 4 ,
diff --git a/share/man/man4/aio.4 b/share/man/man4/aio.4
index 3ea71b0..8e773d9 100644
--- a/share/man/man4/aio.4
+++ b/share/man/man4/aio.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2002 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2002 Dag-Erling Coïdan Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index 44973f1..05e03d6 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Søren Schmidt <sos@FreeBSD.org>
+.\" Copyright (c) 2003 Søren Schmidt <sos@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index 73831c2..0c486e2 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 29, 2008
+.Dd May 20, 2011
 .Dt ATKBD 4
 .Os
 .Sh NAME
@@ -176,6 +176,11 @@ When this option is given, the
 .Nm
 driver will not test the keyboard port during the probe routine.
 Some machines hang during boot when this test is performed.
+.It bit 4 (PROBE_TYPEMATIC)
+When this option is given, the
+.Nm
+driver will try to probe the keyboard typematic rate on boot.
+Some machines hang during boot when this test is performed.
 .El
 .\".Sh FILES
 .Sh EXAMPLES
diff --git a/share/man/man4/cc_hd.4 b/share/man/man4/cc_hd.4
index d761539..5c4c2de 100644
--- a/share/man/man4/cc_hd.4
+++ b/share/man/man4/cc_hd.4
@@ -98,7 +98,7 @@ Community Foundation Silicon Valley.
 .Sh FUTURE WORK
 The Hamilton Institute have recently made some improvements to the algorithm
 implemented by this module and have called it Coexistent-TCP (C-TCP).
-The improvments should be evaluated and potentially incorporated into this
+The improvements should be evaluated and potentially incorporated into this
 module.
 .Sh HISTORY
 The
diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4
index ce4eb36..efae020 100644
--- a/share/man/man4/coretemp.4
+++ b/share/man/man4/coretemp.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/geom_map.4 b/share/man/man4/geom_map.4
index 3d65dcd..6af91be 100644
--- a/share/man/man4/geom_map.4
+++ b/share/man/man4/geom_map.4
@@ -25,12 +25,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 5, 2011
+.Dd May 17, 2011
 .Dt GEOM_MAP 4
 .Os
 .Sh NAME
 .Nm geom_map
-.Nd "GEOM module that map difined items as separate partitions"
+.Nd "GEOM module that maps defined items as separate partitions"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following line in your
@@ -41,16 +41,16 @@ kernel configuration file:
 .Sh DESCRIPTION
 The
 .Nm
-framework provides support for mapping defined parts of the media. Basicaly it
-is helpful in the embedded devices where in the one continous flash are loader,
-kernel and rootfs parts. The
+framework provides support for mapping defined parts of the media.
+Basically it is helpful for embedded devices where in the one continuous
+flash are loader, kernel and rootfs parts.
 .Nm
-allows making them available as separate parts and protect loader from
-overwriting.
+allows making them available as separate parts and protects the loader from
+being overwritten.
 .Pp
 At boot time
 .Nm
-partitions listed (only with bootverbose) as:
+partitions are listed (only with bootverbose) as:
 .Bd -literal -offset indent
 MAP: 0x30000, data=0x30000 "/dev/map/bootloader"
 MAP: 30000x10000, data=0x10000 "/dev/map/factory"
@@ -62,13 +62,19 @@ MAP: 150000x690000, data=0x690000 "/dev/map/rootfs"
 MAP: 7e0000x20000, data=0x20000 "/dev/map/config"
 .Ed
 .Pp
-Also
+The current
 .Nm
-current configuration can be accessible with sysctl's kern.geom.conftxt,
-kern.geom.confxml, kern.geom.confdot or geom map list.
+configuration can be accessed with the following
+.Xr sysctl 8
+nodes:
+.Va kern.geom.conftxt , kern.geom.confxml ,
+and
+.Va kern.geom.confdot
+or by using
+.Dq Li "geom map list" .
 .Bd -literal -offset indent
-# sysctl kern.geom.conftxt
-kern.geom.conftxt: 0 MD md0 10485760 512 u 0 s 512 f 0 fs 0 l 10485760 t malloc
+# sysctl -n kern.geom.conftxt
+0 MD md0 10485760 512 u 0 s 512 f 0 fs 0 l 10485760 t malloc
 0 DISK cfid0 8388608 4 hd 0 sc 0
 1 MAP map/config 131072 4 i 5 o 8257536 entry 0 dsize 131072
 1 MAP map/rootfs 6881280 4 i 4 o 1376256 entry 0 dsize 6881280
@@ -79,49 +85,55 @@ kern.geom.conftxt: 0 MD md0 10485760 512 u 0 s 512 f 0 fs 0 l 10485760 t malloc
 1 MAP map/bootloader 196608 4 i 0 o 0 entry 0 dsize 196608
 .Ed
 .Pp
-Driver configuration can be done in device hints file. List of used parameters:
+Driver configuration can be done in
+.Xr device.hints 5 .
+List of used parameters:
 .Bl -tag -width indent
-.It Fa at
+.It Va at
 select media to attach
-.It Fa name
-name of partiton (will create device /dev/map/that_name)
-.It Fa start
+.It Va name
+name of partition (will create device
+.Pa /dev/map/ Ns Ar that_name )
+.It Va start
 offset from the beginning of the parent media to start of the mapped partition.
-This field can also have special value 
-"search:searchstart:searchstep:searchkey", where:
+This field can also have a special value
+.Qq Li search: Ns Ar searchstart Ns Li : Ns Ar searchstep Ns Li : Ns Ar searchkey ,
+where:
 .Bl -tag -width indent
-.It Fa searchstart
+.It Ar searchstart
 offset from the beginning of the parent media where search will be started
-.It Fa searchstep
+.It Ar searchstep
 value of the increment used while searching for the partition boundary markers
-.It Fa searchkey
-key which will be used to find partition boundary markers. Wildcard "." char 
-can be used to match any char on that position
+.It Ar searchkey
+key which will be used to find partition boundary markers.
+The wildcard
+.Ql .\&
+can be used to match any character on that position
 .El
-.It Fa end
-offset from the beginning of the parent media to end of the mapped partition.
-This field can also have special value 
-"search:searchstart:searchstep:searchkey", look "start" for details.
-.It Fa offset
-offset where the data of mapped partition begins
+.It Va end
+offset from the beginning of the parent media to the end of the mapped partition.
+This field can also have the special value
+.Qq Li search: Ns Ar searchstart Ns Li : Ns Ar searchstep Ns Li : Ns Ar searchkey ,
+as described above.
+.It Va offset
+offset where the data of the mapped partition begins
 .El
 .Pp
-Each record contains start address(bytes) from the media begin, size(bytes),
-offset where the data of mapped partition begins, and the name of new device.
+Each record contains the start address (in bytes) from the media begin, size
+(in bytes), offset where the data of mapped partition begins, and the name of
+new device.
 .Bd -literal -offset indent
 MAP: 150000x690000, data=0x690000 "/dev/map/rootfs"
 .Ed
 .Bd -literal
-00150000 - begin address
+00150000 - start address
 00690000 - size
 00000000 - data begin from zero offset
 00690000 - data size
 "map/rootfs" - new media will be accessible via /dev/map/rootfs dev.
 .Ed
 .Sh EXAMPLES
-.Pp
-.Bl -bullet -compact
-If we need to implement layout shown above, we need to define the folowing
+If we need to implement layout shown above, we need to define the following
 hints:
 .Bd -literal -offset indent
 hint.map.0.at="cfid0"
@@ -129,10 +141,17 @@ hint.map.0.start=0x00000000
 hint.map.0.end=0x00030000
 hint.map.0.name="bootloader"
 hint.map.0.readonly=1
-
 .Ed
-define "/dev/map/bootloader" at disk "cfid0" starting at 0x00000000 and end
-0x00030000, also marked as readonly.
+.Pp
+This defines
+.Pa /dev/map/bootloader
+at disk
+.Pa cfid0
+starting at
+.Li 0x00000000
+and ending at
+.Li 0x00030000 ,
+it is also marked as readonly.
 .Bd -literal -offset indent
 hint.map.1.at="cfid0"
 hint.map.1.start=0x00030000
@@ -148,13 +167,28 @@ hint.map.3.at="cfid0"
 hint.map.3.name="kernel"
 hint.map.3.start=0x00040000
 hint.map.3.end="search:0x00100000:0x10000:.!/bin/sh"
-
 .Ed
-define "/dev/map/kernel" at disk "cfid0" starting at 0x00040000, but end
-position must be searched by the key ".!/bin/sh", from offset 0x00100000 to end
-of media with step 0x10000. Real marker in that case is "#!/bin/sh", but "#"
-terminates the line when hints file is parsed, so we need to use wildcard "." 
-instead of "#".
+.Pp
+This defines
+.Pa /dev/map/kernel
+at disk
+.Pa cfid0
+starting at
+.Li 0x00040000 ,
+but the end position must be searched by finding the key
+.Dq Li ".!/bin/sh" ,
+from offset
+.Li 0x00100000
+to the end of media with step
+.Li 0x10000 .
+The real marker in this case is
+.Dq Li "#!/bin/sh" ,
+but
+.Ql #
+terminates the line when the hints file is parsed, so we need to use wildcard
+.Ql .\&
+instead of
+.Ql # .
 .Bd -literal -offset indent
 hint.map.4.at="cfid0"
 hint.map.4.name="rootfs"
@@ -166,13 +200,11 @@ hint.map.5.start=0x007e0000
 hint.map.5.end=0x00800000
 hint.map.5.name="config"
 .Ed
-.El
 .Sh SEE ALSO
-.Xr GEOM 4 ,
+.Xr geom 4 ,
 .Xr geom 8 ,
 .Xr sysctl 8
 .Sh AUTHORS
-.An -nosplit
 The
 .Nm
 driver was written by
diff --git a/share/man/man4/hpet.4 b/share/man/man4/hpet.4
index f787895..f501e0b 100644
--- a/share/man/man4/hpet.4
+++ b/share/man/man4/hpet.4
@@ -69,14 +69,14 @@ This driver uses High Precision Event Timer hardware (part of the chipset,
 usually enumerated via ACPI) to supply kernel with one time counter and
 several (usually from 3 to 8) event timers.
 This hardware includes single main counter with known increment frequency
-(10MHz or more), and several programable comparators (optionally with
+(10MHz or more), and several programmable comparators (optionally with
 automatic reload feature).
 When value of the main counter matches current value of any comparator,
 interrupt can be generated.
 Depending on hardware capabilities and configuration, interrupt can be
 delivered as regular I/O APIC interrupt (ISA or PCI) in range from 0 to 31,
 or as Front Side Bus interrupt, alike to PCI MSI interrupts, or in so called
-"LegacyReplacement Route" HPET can speal IRQ0 of i8254 and IRQ8 of the RTC.
+"LegacyReplacement Route" HPET can steal IRQ0 of i8254 and IRQ8 of the RTC.
 Interrupt can be either edge- or level-triggered. In last case they could be
 safely shared with PCI IRQs.
 Driver prefers to use FSB interrupts, if supported, to avoid sharing.
diff --git a/share/man/man4/ichwd.4 b/share/man/man4/ichwd.4
index 497712c..25b6dbb 100644
--- a/share/man/man4/ichwd.4
+++ b/share/man/man4/ichwd.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 0134d57..974eec0 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -12,6 +12,7 @@ MAN=	aic.4 \
 	ep.4 \
 	ex.4 \
 	fe.4 \
+	glxiic.4 \
 	glxsb.4 \
 	ie.4 \
 	longrun.4 \
diff --git a/share/man/man4/man4.i386/glxiic.4 b/share/man/man4/man4.i386/glxiic.4
new file mode 100644
index 0000000..30d3ffe
--- /dev/null
+++ b/share/man/man4/man4.i386/glxiic.4
@@ -0,0 +1,106 @@
+.\" Copyright (c) 2011 Henrik Brix Andersen <brix@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 ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd May 15, 2011
+.Dt GLXIIC 4 i386
+.Os
+.Sh NAME
+.Nm glxiic
+.Nd Geode LX CS5536 I2C controller driver
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device pci"
+.Cd "device isa"
+.Cd "device glxiic"
+.Cd "device iicbus"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+glxiic_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the System Management Bus controller of the Geode LX
+series CS5536 Companion Device.  The Geode LX is a member of the AMD
+Geode family of integrated x86 system chips.
+.Pp
+Although AMD refers to this device as a System Management Bus (SMBus)
+controller, it is really an I2C controller (it lacks SMBus ALERT# and
+Alert Response support).
+.Pp
+The
+.Nm
+driver supports both I2C master and slave mode.
+.Sh SYSCTL VARIABLE
+The
+.Nm
+driver supports the following variable as both
+.Xr sysctl 8
+and
+.Xr loader 8
+tunable:
+.Bl -tag -width indent
+.It Va dev.glxiic.0.timeout
+This variable controls the I2C bus timeout in milliseconds.  The
+default timeout is 35 milliseconds.  A value of zero disables the
+timeout.
+.El
+.Sh CAVEAT
+The
+.Nm
+driver uses the interrupt line number configured by the board firmware
+by default.  If no interrupt line number has been configured by the
+board firmware (or to override the interrupt line number configured by
+board firmware), place the following line in
+.Xr device.hints 5 :
+.Bd -ragged -offset indent
+hint.glxiic.0.irq="10"
+.Ed
+.Pp
+The interrupt line number must be between 1 and 15.
+.Sh SEE ALSO
+.Xr iicbus 4 ,
+.Xr device.hints 5 ,
+.Xr loader.conf 5 ,
+.Xr loader 8 ,
+.Xr sysctl 8
+.Sh HISTORY
+The
+.Nm
+device driver and manual page first appeared in
+.Fx 9.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+device driver and manual page were written by
+.An Henrik Brix Andersen Aq brix@FreeBSD.org .
diff --git a/share/man/man4/msk.4 b/share/man/man4/msk.4
index fe32a68..200c6f7 100644
--- a/share/man/man4/msk.4
+++ b/share/man/man4/msk.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 23, 2010
+.Dd May 23, 2011
 .Dt MSK 4
 .Os
 .Sh NAME
@@ -195,6 +195,8 @@ Marvell Yukon 88E8071 Gigabit Ethernet
 .It
 Marvell Yukon 88E8072 Gigabit Ethernet
 .It
+Marvell Yukon 88E8075 Gigabit Ethernet
+.It
 SysKonnect SK-9Sxx Gigabit Ethernet
 .It
 SysKonnect SK-9Exx Gigabit Ethernet
diff --git a/share/man/man4/pst.4 b/share/man/man4/pst.4
index f207e2d..3ce95d8 100644
--- a/share/man/man4/pst.4
+++ b/share/man/man4/pst.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2001,2002 Søren Schmidt
+.\" Copyright (c) 2001,2002 Søren Schmidt
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/ucycom.4 b/share/man/man4/ucycom.4
index 9276462..6d76564 100644
--- a/share/man/man4/ucycom.4
+++ b/share/man/man4/ucycom.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man4/xhci.4 b/share/man/man4/xhci.4
index 670d395..09f3185 100644
--- a/share/man/man4/xhci.4
+++ b/share/man/man4/xhci.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 24, 2011
+.Dd May 17, 2011
 .Dt XHCI 4
 .Os
 .Sh NAME
@@ -49,6 +49,13 @@ The
 controller supports
 .Tn USB
 connection speeds up to 5.0Gbps when using a USB 3.0 compliant device.
+.Sh HARDWARE
+The
+.Nm
+driver supports
+.Tn XHCI
+compatible controllers having PCI class 12 (serial bus),
+subclass 3 (USB) and programming interface 48 (XHCI).
 .Sh SEE ALSO
 .Xr ehci 4 ,
 .Xr ohci 4 ,
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 16f247b..cf062c5 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -3772,7 +3772,7 @@ Set to
 .Dq Li -l -U root
 by default.
 These are flags to pass to
-.Xr jail .
+.Xr jail 8 .
 .It Va jail_ Ns Ao Ar jname Ac Ns Va _interface
 .Pq Vt str
 Unset by default.
diff --git a/share/man/man5/reiserfs.5 b/share/man/man5/reiserfs.5
index eda7028..dd7757c 100644
--- a/share/man/man5/reiserfs.5
+++ b/share/man/man5/reiserfs.5
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2005 Jean-Sébastien Pédron
+.\" Copyright (c) 2005 Jean-Sébastien Pédron
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 134e4f3..f0b9905 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 10, 2011
+.Dd May 22, 2011
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -206,6 +206,14 @@ and
 .\" 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 222090 2011-05-19 05:13:25Z imp
+Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib,
+ld, nm, objcopy, objdump, readelf, size and strip)
+.Bf -symbolic
+The option does not generally work for build targets, unless some alternative
+toolchain is enabled.
+.Ef
 .It Va WITHOUT_BLUETOOTH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru
 Set to not build Bluetooth related kernel modules, programs and libraries.
@@ -364,6 +372,13 @@ Set to not build
 .It Va WITHOUT_GAMES
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GAMES 156932 2006-03-21 07:50:50Z ru
 Set to not build games.
+.It Va WITHOUT_GCC
+.\" from FreeBSD: head/tools/build/options/WITHOUT_GCC 222090 2011-05-19 05:13:25Z imp
+Set to not install gcc and g++.
+.Bf -symbolic
+The option does not generally work for build targets, unless some alternative
+toolchain is enabled.
+.Ef
 .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
@@ -512,6 +527,12 @@ Set to build some programs without Kerberos support, like
 .Xr sshd 8 ,
 and
 .Xr telnetd 8 .
+.It Va WITHOUT_KERNEL_SYMBOLS
+.\" from FreeBSD: head/tools/build/options/WITHOUT_KERNEL_SYMBOLS 222189 2011-05-22 18:23:17Z imp
+Set to not install kernel symbol files.
+.Bf -symbolic
+This option is recommended for those people who have small root partitions.
+.Ef
 .It Va WITHOUT_KVM
 .\" from FreeBSD: head/tools/build/options/WITHOUT_KVM 174550 2007-12-12 16:43:17Z ru
 Set to not build the
@@ -712,6 +733,11 @@ will not be built either if this option is set.
 Set to not build
 .Xr ntpd 8
 and related programs.
+.It Va WITH_OFED
+.\" from FreeBSD: head/tools/build/options/WITH_OFED 222016 2011-05-17 11:06:41Z ru
+Set to build the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack.
 .It Va WITHOUT_OPENSSH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_OPENSSH 156932 2006-03-21 07:50:50Z ru
 Set to not build OpenSSH.
@@ -879,8 +905,12 @@ When set, it also enforces the following options:
 .Pp
 .Bl -item -compact
 .It
+.Va WITHOUT_BINUTILS
+.It
 .Va WITHOUT_CLANG
 .It
+.Va WITHOUT_GCC
+.It
 .Va WITHOUT_GDB
 .El
 .It Va WITHOUT_USB
diff --git a/share/man/man9/LOCK_PROFILING.9 b/share/man/man9/LOCK_PROFILING.9
index cdb78b3..94b2246 100644
--- a/share/man/man9/LOCK_PROFILING.9
+++ b/share/man/man9/LOCK_PROFILING.9
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav
 .\" Copyright (c) 2005 Robert N. M. Watson
 .\" Copyright (c) 2006 Kip Macy
 .\" All rights reserved.
diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9
index b0b22ff..5d39496 100644
--- a/share/man/man9/pseudofs.9
+++ b/share/man/man9/pseudofs.9
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index 4b93df5..d17b34c 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@
 .Nm sbuf_len ,
 .Nm sbuf_done ,
 .Nm sbuf_delete
-.Nd safe string formatting
+.Nd safe string composition
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/sbuf.h
@@ -106,14 +106,20 @@
 .Sh DESCRIPTION
 The
 .Nm
-family of functions allows one to safely allocate, construct and
-release bounded NUL-terminated strings in kernel space.
+family of functions allows one to safely allocate, compose and
+release strings in kernel or user space.
+.Pp
 Instead of arrays of characters, these functions operate on structures
 called
 .Fa sbufs ,
 defined in
 .In sys/sbuf.h .
 .Pp
+Any errors encountered during the allocation or composition of the
+string will be latched in the data structure,
+making a single error test at the end of the composition 
+sufficient to determine success or failure of the entire process.
+.Pp
 The
 .Fn sbuf_new
 function initializes the
@@ -468,14 +474,35 @@ The
 function
 returns \-1 if copying string from userland failed, and number of bytes
 copied otherwise.
+.Pp
 The
-.Fn sbuf_finish
-function returns ENOMEM if the sbuf overflowed before being finished,
+.Fn sbuf_finish 9
+function (the kernel version) returns ENOMEM if the sbuf overflowed before
+being finished,
 or returns the error code from the drain if one is attached.
-When used as
-.Xr sbuf_finish 3 ,
-.Fn sbuf_finish
-will return \-1 and set errno on error instead.
+.Pp
+The
+.Fn sbuf_finish 3 
+function (the userland version)
+will return zero for success and \-1 and set errno on error.
+.Sh EXAMPLES
+.Bd -literal -compact
+#include <sys/sbuf.h>
+
+struct sbuf *sb;
+
+sb = sbuf_new_auto();
+sbuf_cat(sb, "Customers found:\en");
+TAILQ_FOREACH(foo, &foolist, list) {
+	sbuf_printf(sb, "   %4d %s\en", foo->index, foo->name);
+	sbuf_printf(sb, "      Address: %s\en", foo->address);
+	sbuf_printf(sb, "      Zip: %s\en", foo->zipcode);
+}
+if (sbuf_finish(sb)) /* Check for any and all errors */
+	err(1,"Could not generate message");
+transmit_msg(sbuf_data(sb), sbuf_len(sb));
+sbuf_delete(sb);
+.Ed
 .Sh SEE ALSO
 .Xr printf 3 ,
 .Xr strcat 3 ,
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index a2132b5..32531bb 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 1d20448..1f4ec11 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -562,7 +562,7 @@ Australian Computer Society, Hobart, August 1993.
 Peter H. Salus. Unix at 25. Byte Magazine, October 1994.
 URL: http://www.byte.com/art/9410/sec8/art3.htm
 
-Andreas Klemm, Lars Köller. If you're going to San Francisco ...
+Andreas Klemm, Lars Köller. If you're going to San Francisco ...
 Die freien BSD-Varianten von Unix. c't April 1997, page 368ff.
 
 BSD Release Announcements collection.
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 2199590..d450c8a 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -100,6 +100,7 @@ antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2008/02/03"]
 ariff [label="Ariff Abdullah\nariff@FreeBSD.org\n2005/11/14"]
 art [label="Artem Belevich\nart@FreeBSD.org\n2011/03/29"]
 avg [label="Andriy Gapon\navg@FreeBSD.org\n2009/02/18"]
+benl [label="Ben Laurie\nbenl@FreeBSD.org\n2011/05/18"]
 benno [label="Benno Rice\nbenno@FreeBSD.org\n2000/11/02"]
 bms [label="Bruce M Simpson\nbms@FreeBSD.org\n2003/08/06"]
 brian [label="Brian Somers\nbrian@FreeBSD.org\n1996/12/16"]
@@ -486,6 +487,7 @@ peter -> asmodai
 peter -> jayanth
 peter -> ps
 
+philip -> benl
 philip -> ed
 philip -> jls
 philip -> matteo
@@ -546,6 +548,8 @@ sheldonh -> iedowse
 
 shin -> ume
 
+simon -> benl
+
 sos -> marcel
 
 thompsa -> weongyo
diff --git a/share/misc/iso3166 b/share/misc/iso3166
index 70ca84f..d8d5972 100644
--- a/share/misc/iso3166
+++ b/share/misc/iso3166
@@ -46,6 +46,7 @@ BJ	BEN	204	Benin
 BM	BMU	060	Bermuda
 BT	BTN	064	Bhutan
 BO	BOL	068	Bolivia, Plurinational State of
+BQ	BES	535	Bonaire, Saint Eustatius and Saba
 BA	BIH	070	Bosnia and Herzegovina
 BW	BWA	072	Botswana
 BV	BVT	074	Bouvet Island
@@ -75,6 +76,7 @@ CR	CRI	188	Costa Rica
 CI	CIV	384	Cote d'Ivoire
 HR	HRV	191	Croatia
 CU	CUB	192	Cuba
+CW	CUW	531	Curacao
 CY	CYP	196	Cyprus
 CZ	CZE	203	Czech Republic
 DK	DNK	208	Denmark
@@ -205,7 +207,7 @@ RW	RWA	646	Rwanda
 BL	BLM	652	Saint Barthelemy
 KN	KNA	659	Saint Kitts and Nevis
 LC	LCA	662	Saint Lucia
-MF	MAF	663	Saint Martin
+MF	MAF	663	Saint Martin (French Part)
 VC	VCT	670	Saint Vincent and the Grenadines
 WS	WSM	882	Samoa
 SM	SMR	674	San Marino
@@ -216,6 +218,7 @@ RS	SRB	688	Serbia
 SC	SYC	690	Seychelles
 SL	SLE	694	Sierra Leone
 SG	SGP	702	Singapore
+SX	SXM	534	Sint Maarten (Dutch part)
 SK	SVK	703	Slovakia
 SI	SVN	705	Slovenia
 SB	SLB	090	Solomon Islands
@@ -224,7 +227,7 @@ ZA	ZAF	710	South Africa
 GS	SGS	239	South Georgia and the South Sandwich Islands
 ES	ESP	724	Spain
 LK	LKA	144	Sri Lanka
-SH	SHN	654	Saint Helena
+SH	SHN	654	Saint Helena, Ascension and Tristan da Cunha
 PM	SPM	666	Saint Pierre and Miquelon
 SD	SDN	736	Sudan
 SR	SUR	740	Suriname
@@ -395,7 +398,7 @@ ZW	ZWE	716	Zimbabwe
 # Newsletter III-41 1993-07-28
 #   MAURITIUS, changes outside this document
 #
-# Newletter III-42 1993-07-12
+# Newsletter III-42 1993-07-12
 #   SAINT VINCENT AND THE GRENADINES, changes outside this document
 #
 # Newsletter III-43 1993-07-12
@@ -426,15 +429,15 @@ ZW	ZWE	716	Zimbabwe
 #   Czechoslovakia officially deleted
 #
 # Newsletter III-52, 1993-07-02
-#   Angola, changing information not included in this file. Offical name
+#   Angola, changing information not included in this file. Official name
 #   change to Republic of Angola
 #
 # Newsletter III-53, 1993-07-12
-#   Madagascar, changing information not included in this file. Official 
+#   Madagascar, changing information not included in this file. Official
 #   name change to Republic of Madagascar
 #
 # Newsletter III-54, 1993-07-23
-#   South Georgia and the South Sandwich Islands, previously covered by 
+#   South Georgia and the South Sandwich Islands, previously covered by
 #   Falkland Islands
 #
 # Newsletter III-55, 1993-07-16
@@ -450,23 +453,23 @@ ZW	ZWE	716	Zimbabwe
 #
 # Newsletter III-58, 1993-07-16
 #   Afghanistan, changing information not included in this file
-#   Official name change to Islamic State of Afghanistan  
+#   Official name change to Islamic State of Afghanistan
 #
-# Newsletter III-32, 1993-07-25 ammendment
-#   Kyrgyzstan, changing information not included in this file. Offical name
+# Newsletter III-32, 1993-07-25 amendment
+#   Kyrgyzstan, changing information not included in this file. Official name
 #   change to Kyrgyz Republic
 #
 # Newsletter III-59, 1994-01-26
-#   Andorra, changing information not included in this file. Offical name
+#   Andorra, changing information not included in this file. Official name
 #   change to Pricipality of Andorra
 #
 # Newsletter III-60, 1994-01-26
-#   Cambodia, changing information not included in this file. Offical name
+#   Cambodia, changing information not included in this file. Official name
 #   change to Kingdom of Cambodia
 #
 # Thu Feb 10 1994
 # At this point the fourth edition of ISO 3166 appears. It can *now* be
-# ordered from national standards institutions. The RIPE NCC will continue 
+# ordered from national standards institutions. The RIPE NCC will continue
 # tracking changes.
 #
 # [deletia]
@@ -537,3 +540,11 @@ ZW	ZWE	716	Zimbabwe
 #
 # Newsletter VI-6 2009-05-08
 #  Name change for Plurinational State of Bolivia.
+#
+# Newsletter VI-7 2010-02-22
+#  Name change for Saint Helena, Ascension and Tristan da Cunha
+#
+# Newsletter VI-8 2010-12-15
+#  BONAIRE, SAINT EUSTATIUS AND SABA (BQ), CURACAO (CW) and
+#  SINT MAARTEN (DUTCH PART) (SX) added as new entries.
+#  NETHERLANDS ANTILLES (AN) removed.
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index f338893..a5d3030 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -129,7 +129,6 @@ MINUSLPAM+=	-lypclnt
 
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
-LIBPKG?=	${DESTDIR}${LIBDIR}/libpkg.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index cbbe7c9..f7ab5f8 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -297,6 +297,7 @@ __DEFAULT_YES_OPTIONS = \
     BIND_MTREE \
     BIND_NAMED \
     BIND_UTILS \
+    BINUTILS \
     BLUETOOTH \
     BOOT \
     BSD_CPIO \
@@ -317,6 +318,7 @@ __DEFAULT_YES_OPTIONS = \
     FP_LIBC \
     FREEBSD_UPDATE \
     GAMES \
+    GCC \
     GCOV \
     GDB \
     GNU \
@@ -333,6 +335,7 @@ __DEFAULT_YES_OPTIONS = \
     IPX \
     JAIL \
     KERBEROS \
+    KERNEL_SYMBOLS \
     KVM \
     LEGACY_CONSOLE \
     LIB32 \
@@ -529,7 +532,9 @@ MK_GROFF:=	no
 .endif
 
 .if ${MK_TOOLCHAIN} == "no"
+MK_BINUTILS:=	no
 MK_CLANG:=	no
+MK_GCC:=	no
 MK_GDB:=	no
 .endif