- Mark MFC'd items.

- Add some missing items:
	snd_ich(4) and snd_es137x(4) MPSAFE,
	bge(4) polling mode support,
	lge(4) MPSAFE,
	glabel NTFS support,
	/var/audit and audit group added,
	snapinfo(8) added, and
	groff 1.19.2 imported.

2 files changed, 278 insertions, 180 deletions

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 34afa77..46f0a901 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -171,18 +171,22 @@
       this displays various information about the lock and calls a
       new function pointer in lock_class (lc_ddb_show) to dump class-specific
       information about the lock as well (such as the owner of a mutex or
-      xlock'ed sx lock).</para>
+      xlock'ed sx lock).  &merged;</para>
 
     <para>The &man.ddb.4; debugger now provides the <literal>show sleepq</literal>
       command.  This takes a wait channel as an argument and looks
       for a sleep queue associated with that wait channel.</para>
 
-    <para>A bug in file descriptor handling such that a simple
+    <para><filename>DEFAULTS</filename> kernel configuration files
+      for each platform have been added.  &merged;</para>
+
+    <para>A bug in file descriptor handling such that simple
       <literal>close(0); dup(fd)</literal> sequence does not return
       descriptor <literal>0</literal> in some cases, has been fixed.</para>
 
     <para>The &man.firmware.9; subsystem has been added.  This allows
-      to load binary data into the kernel via a specially crafted module.</para>
+      to load binary data into the kernel via a specially crafted module.
+      &merged;</para>
 
     <para>The &man.gdb.1; remote debugging interface now supports
       copying console messages to a remote debugger instance.
@@ -199,7 +203,8 @@
       &man.pmcstat.8; can now log over a network socket
       to a remote host.</para>
 
-    <para>The &man.random.4; entropy device driver is now MPSAFE.</para>
+    <para>The &man.random.4; entropy device driver is now MPSAFE.
+      &merged;</para>
 
     <para>The <literal>SIGCHLD</literal> signal queuing has been
       added.  For each child process whose status has been changed,
@@ -249,7 +254,8 @@
       <literal>biba/equal(equal-equal)</literal>, has been added.
       This is useful where programs such as &man.dhclient.8; and &man.ppp.8;.
       which initialize network interfaces do not have any labeling support.
-      This variable is set as <literal>0</literal>(disabled) by default.</para>
+      This variable is set as <literal>0</literal>(disabled) by default.
+      &merged;</para>
 
     <para>A new sysctl variable <varname>vm.zone_stats</varname>
       has been added.  This allows to export &man.uma.9; allocator
@@ -281,9 +287,6 @@
       has been added.  For details of the latest development,
       see <ulink url="http://xbox-bsd.nl"></ulink>.</para>
 
-    <para><filename>DEFAULTS</filename> kernel configuration files
-      for each platform have been added.</para>
-
     <sect3 id="boot">
       <title>Boot Loader Changes</title>
 
@@ -300,7 +303,7 @@
 	then the default speed is determined from the current serial port
 	speed, and otherwise it is set to 9600 or the value of
 	the kernel option <literal>BOOT_COMCONSOLE_SPEED</literal>
-	at compile time.</para>
+	at compile time.  &merged;</para>
 
       <!-- Above this line, order boot loader changes by keyword-->
 
@@ -315,8 +318,9 @@
       <para>The &man.cardbus.4; driver now supports
 	<filename>/dev/cardbus<replaceable>%d</replaceable>.cis</filename>.</para>
 
-      <para>The &man.ce.4; driver, which supports Cronyx Tau-PCI/32 adapters,
-	has been added. &merged;</para>
+      <para arch="i386,pc98">The &man.ce.4; driver,
+	which supports Cronyx Tau-PCI/32 adapters, has been added.
+	&merged;</para>
 
       <para>Support for the PadLock Security Co-processor in VIA C3
 	processors has been added to the &man.crypto.9; subsystem.
@@ -338,13 +342,14 @@
 	Switch to &man.kbdmux.4; can be done at boot time by loading
 	<literal>kbdmux</literal> kernel module via &man.loader.8;,
 	or at runtime via &man.kldload.8; and releasing the active
-	keyboard.</para>
+	keyboard.  &merged;</para>
 
       <para arch="amd64,i386">The &man.kbdmux.4; has been included in the
 	<filename>GENERIC</filename> kernel by default.
 	Also, the <quote>Boot FreeBSD with USB keyboard</quote>
 	menu item in the boot loader menu has been removed
-	since this fixes USB keyboard probing problems.</para>
+	since this fixes USB keyboard probing problems.
+	&merged;</para>
 
       <para arch="ia64">The loader tunable <varname>debug.mpsafevfs</varname>
 	is set to <literal>1</literal> by default.</para>
@@ -378,29 +383,34 @@
       <sect4 id="mm">
 	<title>Multimedia Support</title>
 
-	<para>The &man.agp.4; driver now supports ATI IGP chipsets.</para>
+	<para>The &man.agp.4; driver now supports ATI IGP chipsets.
+	  &merged;</para>
 
 	<para>The &man.sound.4; driver now supports
 	  wider range sampling rate, multiple precisions choice,
-	  and 24/32 bit PCM format conversion.</para>
+	  and 24/32 bit PCM format conversion.  &merged;</para>
 
-	<para>The &man.snd.als4000.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.als4000.4; driver is now MPSAFE.  &merged;</para>
 
 	<para>The &man.snd.atiixp.4; driver has been added.
-	  This supports ATI IXP 200/300/400 series audio controllers.</para>
+	  This supports ATI IXP 200/300/400 series audio controllers.  &merged;</para>
 
 	<para>The &man.snd.atiixp.4; driver now supports
 	  suspend and resume features.</para>
 
 	<para>The &man.snd.cmi.4; driver is now MPSAFE.</para>
 
-	<para>The &man.snd.solo.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.es137x.4; driver is now MPSAFE.  &merged;</para>
+
+	<para>The &man.snd.ich.4; driver is now MPSAFE.  &merged;</para>
+
+	<para>The &man.snd.solo.4; driver is now MPSAFE.  &merged;</para>
 
-	<para>The &man.snd.via8233.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.via8233.4; driver is now MPSAFE.  &merged;</para>
 
-	<para>The &man.snd.via82c686.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.via82c686.4; driver is now MPSAFE.  &merged;</para>
 
-	<para arch="amd64">The &man.speaker.4; driver now supports &os;/amd64.</para>
+	<para arch="amd64">The &man.speaker.4; driver now supports &os;/amd64.  &merged;</para>
 
 	<para>The &man.uaudio.4; driver now supports 24/32 bit audio
 	  formats and conversion.</para>
@@ -410,7 +420,7 @@
 	<title>Network Interface Support</title>
 
 	<para>The &man.ath.4; driver has been updated to
-	  version 0.9.16.16.</para>
+	  version 0.9.16.16.  &merged;</para>
 
 	<para arch="i386,amd64">The &man.bce.4; driver, which supports Broadcom
 	  NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet controllers,
@@ -421,6 +431,9 @@
 	<para>The &man.bge.4; driver now supports big-endian
 	  architectures such as sparc64.</para>
 
+	<para>The &man.bge.4; driver now supports &man.polling.4; mode.
+	  &merged;</para>
+
 	<para>The &man.dc.4; driver is now MPSAFE. &merged;</para>
 
 	<para>The &man.de.4; driver has been converted to the &man.bus.dma.9;
@@ -431,7 +444,7 @@
 	<para>The &man.el.4; driver has been removed.</para>
 
 	<para>The &man.em.4; driver now supports big-endian
-	  architectures such as sparc64.</para>
+	  architectures such as sparc64.  &merged;</para>
 
 	<para>The &man.em.4; driver has been updated to
 	  version 3.2.18 from Intel, and now supports
@@ -454,7 +467,9 @@
 	  has been added.  While the &man.lnc.4; driver also support these
 	  NICs, this driver has several advantages over it such as
 	  MPSAFE, ALTQ, VLAN_MTU, ifmedia, and 32-bit DMA for PCI
-	  variants.</para>
+	  variants.  &merged;</para>
+
+	<para>The &man.lge.4; driver is now MPSAFE. &merged;</para>
 
 	<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
 
@@ -502,12 +517,12 @@
 	suppression, while there is demand for such ARP entry.
 	Due to this change, a sysctl variable
 	<varname>net.link.ether.inet.host_down_time</varname>
-	has been removed.</para>
+	has been removed.  &merged;</para>
 
       <para>The &man.arp.8; now supports a sysctl variable
 	<varname>net.link.ether.inet.log_arp_permanent_modify</varname>
 	to suppress logging of attempts to modify
-	permanent ARP entries.</para>
+	permanent ARP entries.  &merged;</para>
 
       <para>The &man.arp.8; utility now allows <option>-i</option>
 	option with <option>-d</option> and <option>-a</option> options
@@ -525,24 +540,25 @@
       <para>The &man.if.bridge.4; bridge driver now supports
 	creating span ports, which transmit a copy of every frame
 	received by the bridge.  This feature can be enabled
-	by using &man.ifconfig.8;.</para>
+	by using &man.ifconfig.8;.  &merged;</para>
 
       <para>The &man.if.bridge.4; bridge driver now supports
 	RFC 3378 EtherIP.  This change makes it possible to
 	add &man.gif.4; interfaces to bridges, which will then
 	send and receive IP protocol 97 packets.
-	Packets are Ethernet frames with an EtherIP header prepended.</para>
+	Packets are Ethernet frames with an EtherIP header prepended.
+        &merged;</para>
 
       <para>The path MTU discovery for multicast packets in the &os;
 	&man.ip6.4; stack has been disabled by default because
 	notifying path MTU by a lot of routers in multicast
 	can be a kind of distributed Denial-of-Service attack to a router.
 	This feature can be enabled by using a new sysctl variable
-	<varname>net.inet6.ip6.mcast_pmtu</varname>.</para>
+	<varname>net.inet6.ip6.mcast_pmtu</varname>.  &merged;</para>
 
       <para>The &man.ipfw.4;, IP packet filter now supports IPv6.
 	The &man.ip6fw.8; is deprecated and will be removed
-	in the future releases.</para>
+	in the future releases.  &merged;</para>
 
       <para>The &man.ipfw.4; now supports substitution of the action
 	argument with the value obtained from table lookup,
@@ -552,7 +568,7 @@
 	<literal>divert</literal>,
 	<literal>tee</literal>,
 	<literal>netgraph</literal>,
-	and <literal>ngtee</literal> rules.
+	and <literal>ngtee</literal> rules.  &merged;
 	For example, the following rules will throw different
 	packets to different pipes:</para>
 
@@ -569,9 +585,12 @@ pipe tablearg ip from table(1) to any</programlisting>
 	to <varname>net.bpf_jitter.enable</varname> and this controls
 	both &man.bpf.4; and &man.ng.bpf.4; now.</para>
 
+      <para>The &man.ng.iface.4; Netgraph node now supports &man.altq.4;.
+	&merged;</para>
+
       <para>A bug where a connection of NFS over TCP would not reconnect
 	when the server sent FIN.  This problem had occurred
-	with Solaris NFS servers.</para>
+	with Solaris NFS servers.  &merged;</para>
 
       <para>The sysctl variable <varname>net.inet.ip.portrange.reservedhigh</varname>
 	and <varname>net.inet.ip.portrange.reservedlow</varname>
@@ -625,7 +644,7 @@ pipe tablearg ip from table(1) to any</programlisting>
 	tick granularity.  A new sysctl variable
 	<varname>net.inet.tcp.inflight.rttthresh</varname> specifies
 	the threshold in milliseconds below which this feature
-	will disengage.  It defaults to 10ms.</para>
+	will disengage.  It defaults to 10ms.  &merged;</para>
     </sect3>
 
     <sect3 id="disks">
@@ -638,23 +657,28 @@ pipe tablearg ip from table(1) to any</programlisting>
 	and now supports full 64-bit DMA.  While this feature is
 	enabled by default, this can be forced off by setting the
 	<varname>hw.amr.force_sg32</varname> loader tunable for
-	debugging purpose.</para>
+	debugging purpose.
+	&merged;</para>
 
       <para>The &man.amr.4; driver now supports &man.ioctl.2; requests
 	necessary for Linux LSI MegaRaid tools on &os;'s Linux emulation
-	environment.</para>
+	environment.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports a workaround
 	for some controllers whose DMA does not work properly
 	in 48bit mode.  For the suspicious controllers
-	the PIO mode will be used for access to over 137GB areas.</para>
+	the PIO mode will be used for access to over 137GB areas.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports the ITE IT8211F IDE controller,
 	and Promise PDC40718 and PDC40719 chip found in Promise
-	Fasttrak TX4300.</para>
+	Fasttrak TX4300.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports DMA for kernel crash dump
-	and crash dumping to &man.ataraid.4; device.</para>
+	and crash dumping to &man.ataraid.4; device.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports USB mass storage class
 	devices.  To enable it, a line <literal>device atausb</literal>
@@ -664,10 +688,14 @@ pipe tablearg ip from table(1) to any</programlisting>
 	each other.</para>
 
       <para>The &man.ataraid.4; driver now supports
-	JMicron ATA RAID metadata.</para>
+	JMicron ATA RAID metadata.  &merged;</para>
+
+      <para>The <literal>GEOM_LABEL</literal> class now supports
+	Ext2FS, NTFS, and ReiserFS.  &merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> class now supports
-	kernel crash dump to the GEOM providers.</para>
+	kernel crash dump to the GEOM providers.
+	&merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> and <literal>GEOM_RAID3</literal>
 	classes now support sysctl variables
@@ -683,7 +711,8 @@ pipe tablearg ip from table(1) to any</programlisting>
 	different places, so actually all data is available.
 	The broken components will be visible in <command>gmirror list</command>
 	or <command>graid3 list</command> output with flag
-	<literal>BROKEN</literal>.</para>
+	<literal>BROKEN</literal>.
+	&merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> and <literal>GEOM_RAID3</literal>
 	classes now use parallel I/O request for synchronization
@@ -696,17 +725,16 @@ pipe tablearg ip from table(1) to any</programlisting>
 	<varname>kern.geom.mirror.syncs_per_sec</varname>,
 	<varname>kern.geom.raid3.reqs_per_sync</varname>, and
 	<varname>kern.geom.raid3.syncs_per_sec</varname>
-	are deprecated and have been removed.</para>
+	are deprecated and have been removed.
+	&merged;</para>
 
       <para>A new GEOM class <literal>GEOM_ZERO</literal> has been added.
 	It creates very huge provider (41PB) <filename>/dev/gzero</filename>
 	and mainly for performance testing.
 	On <literal>BIO_READ</literal> request it zero-fills
 	<varname>bio_data</varname> and on <literal>BIO_WRITE</literal>
-	it does nothing.</para>
-
-      <para>The <literal>GEOM_LABEL</literal> class now supports
-	Ext2FS and ReiserFS.</para>
+	it does nothing.
+	&merged;</para>
 
       <para>The GEOM class kernel module <filename>g_md.ko</filename>
 	has been renamed to <filename>geom_md.ko</filename>
@@ -716,7 +744,8 @@ pipe tablearg ip from table(1) to any</programlisting>
 	amd64 as well as PAE.</para>
 
       <para>The &man.mfi.4; driver, which supports
-	LSI MegaRAID SAS controller family has been added.</para>
+	LSI MegaRAID SAS controller family has been added.
+	&merged;</para>
 
       <para>The &man.mpt.4; driver has been updated to support
 	various new features such as RAID volume and RAID member
@@ -728,8 +757,8 @@ pipe tablearg ip from table(1) to any</programlisting>
       <para>The &man.mpt.4; driver now supports SAS HBA (partially),
 	64-bit PCI, and large data transfer.</para>
 
-      <para>The &man.twa.4; has been updated to the 9.3.0.1
-	release on the 3ware website.</para>
+      <para>The &man.twa.4; driver has been updated to the 9.3.0.1
+	release on the 3ware website.  &merged;</para>
 
       <para>A new GEOM-based disk encryption facility, GEOM_ELI, has been
 	added.  It uses the &man.crypto.9; framework for hardware acceleration
@@ -737,7 +766,8 @@ pipe tablearg ip from table(1) to any</programlisting>
 	more information. &merged;</para>
 
       <para>The &man.geli.8; now supports loading keyfiles before root
-	file system is mounted.  For example, the following entries
+	file system is mounted.  &merged;
+	For example, the following entries
 	can be used in <filename>/boot/loader.conf</filename> to enable
 	it:</para>
 
@@ -781,7 +811,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	has been updated to 20051021.</para>
 
       <para><application>DRM</application> has
-	been updated to a snapshot from DRI CVS as of 20051202.</para>
+	been updated to a snapshot from DRI CVS as of 20051202.  &merged;</para>
 
       <para>TrustedBSD <application>OpenBSM</application> distribution,
 	version 1.0 alpha 5, an implementation of the documented Sun Basic
@@ -816,22 +846,23 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       applying binary patches.</para>
 
     <para>The &man.bsnmpd.1; utility now supports the Host Resources
-      MIB described in RFC 2790.</para>
+      MIB described in RFC 2790.  &merged;</para>
 
     <para>The &man.cmp.1; utility now supports an <option>-h</option>
       flag to compare the symbolic link itself rather than the
       file that the link points to.</para>
 
     <para>The &man.config.8; utility now supports <literal>nocpu</literal>
-      directive.</para>
+      directive.  &merged;</para>
 
     <para>The &man.config.8; utility now reads <filename>DEFAULTS</filename>
       kernel configuration file if it exists in the current directory
-      before the specified configuration file.</para>
+      before the specified configuration file.  &merged;</para>
 
     <para>The &man.csh.1; utility now supports NLS catalog.
       Note that this requires installing
-      <filename role="package">shells/tcsh_nls</filename>.</para>
+      <filename role="package">shells/tcsh_nls</filename>.
+      &merged;</para>
 
     <para>The csup(1) utility has been imported.
       This is an implementation of CVSup-compatible client written
@@ -839,11 +870,11 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       only.</para>
 
     <para>The &man.devd.8; utility now supports a <option>-f</option> option
-      to specify a configuration file.</para>
+      to specify a configuration file.  &merged;</para>
 
     <para>The &man.ftpd.8; utility now creates a PID file
       <filename>/var/run/ftpd.pid</filename> even when
-      no <option>-p</option> option is specified.</para>
+      no <option>-p</option> option is specified.  &merged;</para>
 
     <para>The &man.gbde.8; utility now supports
       <option>-k</option> and <option>-K</option> options
@@ -851,13 +882,14 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.getfacl.1; utility now supports
       a <option>-q</option> flag to suppress the per-file header
-      comment listing the file name, owner, and group.</para>
+      comment listing the file name, owner, and group.
+      &merged;</para>
 
     <para>The &man.gpt.8; utility now supports setting GPT partition labels.</para>
 
     <para>The &man.gvinum.8; utility now supports commands
       to rename objects and to move a subdisk from
-      one drive to another.</para>
+      one drive to another.  &merged;</para>
 
     <para>The &man.gvinum.8; utility now supports
       <command>resetconfig</command> sub-command.</para>
@@ -887,14 +919,14 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	<replaceable>jid_file</replaceable></option> option to
       write out a JidFile, similar to a PidFile, containing
       the jailid, path, hostname, IP and the command used to start
-      the jail.</para>
+      the jail.  &merged;</para>
 
     <para>The &man.kdump.1; now supports a <option>-H</option>
       flag, which causes kdump to print an additional field holding
-      the threadid.</para>
+      the threadid.  &merged;</para>
 
     <para>The &man.kdump.1; now supports a <option>-s</option>
-      flag to suppress the display of I/O data.</para>
+      flag to suppress the display of I/O data.  &merged;</para>
 
     <para>The &man.kenv.1; utility now supports a <option>-q</option>
       flag to suppress warnings.</para>
@@ -927,15 +959,17 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.ln.1; utility now supports
       an <option>-F</option> flag which allows to delete existing
-      empty directories, when creating symbolic links.</para>
+      empty directories, when creating symbolic links.
+      &merged;</para>
 
     <para>The &man.locate.1; utility now supports
       a <option>-0</option> flag to make this utility
-      interoperable with &man.xargs.1;'s <option>-0</option> flag.</para>
+      interoperable with &man.xargs.1;'s <option>-0</option> flag.
+      &merged;</para>
 
     <para>The &man.ls.1; utility now supports
       an <option>-I</option> flag to disable the automatic
-      <option>-A</option> flag for the superuser.</para>
+      <option>-A</option> flag for the superuser.  &merged;</para>
 
     <para>The &man.ls.1; utility now supports
       an <option>-U</option> flag to use the file creation
@@ -965,7 +999,8 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.mergemaster.8; utility now supports
       an <option>-A</option> option to explicitly specify
-      an architecture to pass through to the underlying makefiles.</para>
+      an architecture to pass through to the underlying makefiles.
+      &merged;</para>
 
     <para>The &man.mount.8; <literal>nodev</literal> option has
       been removed.</para>
@@ -974,7 +1009,8 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.moused.8; now supports an <option>-H</option> flag
       to enable horizontal virtual scrolling similar to a
-      <option>-V</option> flag for vertical virtual scrolling.</para>
+      <option>-V</option> flag for vertical virtual scrolling.
+      &merged;</para>
 
     <para>The &man.netstat.1; utility now supports an
       <option>-h</option> flag for interface stats mode,
@@ -986,16 +1022,16 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       rather than the KAME IPSEC stack.
       Note that the output of <command>netstat -s -p ipsec</command>
       differs depending on which stack is compiled into
-      the kernel since they each keep different stats.</para>
+      the kernel since they each keep different stats.  &merged;</para>
 
     <para>The &man.periodic.8; daily script now supports
       to show the status of &man.gmirror.8;, &man.graid3.8;,
       &man.gstripe.8;, and &man.gconcat.8; devices.
-      Note that these are disabled by default.</para>
+      Note that these are disabled by default.  &merged;</para>
 
     <para>A new functions, &man.pidfile.3;, which allow reliable
       pidfiles handling have been implemented in
-      <filename>libutil</filename>.</para>
+      <filename>libutil</filename>.  &merged;</para>
 
     <para>The &man.ping.8; utility now supports <quote>a sweeping
 	ping</quote> in which &man.icmp.4; payload of
@@ -1025,7 +1061,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
     <para>The &man.rfcomm.sppd.1; now supports service name
       in addition to <option>-c</option> option with channel number.
       The supported names are: DUN (Dial-Up Networking), FAX (Fax),
-      LAN (LAN Access Using PPP), and SP (Serial Port).</para>
+      LAN (LAN Access Using PPP), and SP (Serial Port).  &merged;</para>
 
     <para>The &man.rpcgen.1; utility now generates headers and stub files
       which can be used with ANSI C compilers by default.</para>
@@ -1041,9 +1077,12 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
     <para>The &man.sh.1; utility now supports <literal>times</literal>
       built-in command.</para>
 
+    <para>The &man.snapinfo.8; utility which shows snapshot location
+      on UFS filesystems has been added.  &merged;</para>
+
     <para>The &man.strtonum.3; library function has been implemented
       based on OpenBSD's implementation.  This is an improved version of
-      &man.strtoll.3;.</para>
+      &man.strtoll.3;.  &merged;</para>
 
     <para>The &man.sysctl.8; utility now supports a <option>-q</option>
       flag to suppress a limited set of warnings and errors.</para>
@@ -1060,7 +1099,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.xargs.1; utility now supports a <option>-r</option>
       flag which makes the command execution when the standard input
-      does not contain any non-whitespace-characters.</para>
+      does not contain any non-whitespace-characters.  &merged;</para>
 
     <para>The shared library version number of all libraries have
       been updated due to some possible ABI changes.  The libraries
@@ -1094,7 +1133,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	<filename>/etc/bluetooth/<replaceable>$device</replaceable>.conf</filename>
 	(where <replaceable>$device</replaceable> is <devicename>ubt0</devicename>,
 	<devicename>btcc0</devicename>, and so on.)
-	For more details, see &man.bluetooth.conf.5;.</para>
+	For more details, see &man.bluetooth.conf.5;.  &merged;</para>
 
       <para>The <filename>ftpd</filename> script for
 	stand-alone &man.ftpd.8; has been added.</para>
@@ -1119,15 +1158,16 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	are attached to the system, but both daemons depend on
 	Bluetooth socket layer and thus disabled by default.
 	Bluetooth sockets layer must be either loaded
-	as a module or compiled into kernel before the daemons can run.</para>
+	as a module or compiled into kernel before the daemons can run.
+	&merged;</para>
 
       <para>The <filename>hostapd</filename> script for
-	&man.hostapd.8; has been added.</para>
+	&man.hostapd.8; has been added.  &merged;</para>
 
       <para>The <filename>netif</filename> script now supports
 	<varname>ipv4_addrs_<replaceable>ifn</replaceable></varname>,
 	which adds one or more IPv4 address from a ranged list in
-	CIRD notation.  For example:</para>
+	CIRD notation.  &merged;  For example:</para>
 
       <programlisting>ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28"</programlisting>
 
@@ -1144,7 +1184,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	since OLDCARD is deprecated.</para>
 
       <para>The <filename>ppp-user</filename> script has been renamed to
-	<filename>ppp</filename>.</para>
+	<filename>ppp</filename>.  &merged;</para>
 
       <para>The <varname>removable_interfaces</varname> variable
 	has been removed.</para>
@@ -1171,6 +1211,10 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
     <para><application>GNU Readline library</application>
       has been updated from 5.0 to 5.1.</para>
 
+    <para><application>GNU Troff</application>
+      has been updated from version 1.19 to version 1.19.2.
+      &merged;</para>
+
     <para><application>IPFilter</application> has been updated from
       4.1.8 to 4.1.10.</para>
 
@@ -1178,7 +1222,8 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       4.2p1 to 4.3p1.</para>
 
     <para><application>hostapd</application>
-      has been updated from version 0.3.9 to version 0.4.8.</para>
+      has been updated from version 0.3.9 to version 0.4.8.
+      &merged;</para>
 
     <para><application>sendmail</application> has been updated from
       8.13.4 to 8.13.6. &merged;</para>
@@ -1188,7 +1233,8 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       <application>tzdata2005r</application> release. &merged;</para>
 
     <para><application>WPA Supplicant</application>
-      has been updated from version 0.3.9 to version 0.4.8.</para>
+      has been updated from version 0.3.9 to version 0.4.8.
+      &merged;</para>
 
     <para><application>zlib</application>
       has been updated from version 1.2.2 to version 1.2.3.</para>
@@ -1204,33 +1250,35 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
     <para>The &man.pkg.add.1; now supports an <option>-P</option>
       flag, which is the same as the <option>-p</option> flag
       except that the given prefix is also used recursively for the
-      dependency packages if any.</para>
+      dependency packages if any.  &merged;</para>
 
     <para>The &man.pkg.add.1; and &man.pkg.create.1; now supports
       a <option>-K</option> flag to save packages to the current directory
-      (or <varname>PKGDIR</varname> if defined) by default.</para>
+      (or <varname>PKGDIR</varname> if defined) by default.
+      &merged;</para>
 
     <para>The &man.pkg.create.1; now supports an <option>-x</option>
       flag to support basic regular expressions for package name,
       an <option>-E</option> flag for extended regular
-      expressions, and a <option>-G</option> for exact matching.</para>
+      expressions, and a <option>-G</option> for exact matching.  &merged;</para>
 
     <para>The &man.pkg.version.1; now supports an <option>-o</option>
       flag to show the origin recorded on package generation
       instead of the package name, and an <option>-O</option> flag
-      to list packages whose registered origin is origin only.</para>
+      to list packages whose registered origin is origin only.
+      &merged;</para>
 
     <para>The &man.portsnap.8; utility (<filename>sysutils/portsnap</filename>)
       has been added into the &os; base system.  This is a secure,
       easy to use, fast, lightweight, and generally good way for
-      users to keep their ports trees up to date.</para>
+      users to keep their ports trees up to date.  &merged;</para>
 
     <para>A incorrect handling of <varname>HTTP_PROXY_AUTH</varname>
-      in the &man.portsnap.8; utility has been fixed.</para>
+      in the &man.portsnap.8; utility has been fixed.  &merged;</para>
 
     <para>The startup scripts from the <varname>local_startup</varname>
       directory now evaluated by using &man.rcorder.8; with scripts
-      in the base system.</para>
+      in the base system.  &merged;</para>
 
     <para>The suffix of startup scripts from the Ports Collection
       has been removed.  This means <filename>foo.sh</filename>
@@ -1239,19 +1287,20 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       <filename>foo.ORG</filename> will also be invoked.
       You are recommended to reinstall packages which install
       such scripts and remove extra files in the
-      <varname>local_startup</varname> directory.</para>
+      <varname>local_startup</varname> directory.  &merged;</para>
 
     <para>New <filename>rc.conf</filename> variables,
       <varname>ldconfig_local_dirs</varname> and
       <varname>ldconfig_local32_dirs</varname> have been added.
-      These hold lists of local &man.ldconfig.8; directories.</para>
+      These hold lists of local &man.ldconfig.8; directories.
+      &merged;</para>
 
     <para>The <command>@cwd</command> command in
       <filename>pkg-plist</filename> now allows
       no directory argument.  If no
       directory argument is given, it will set current
       working directory to the first prefix given by the
-      <command>@cwd</command> command.</para>
+      <command>@cwd</command> command.  &merged;</para>
   </sect2>
 
   <sect2 id="releng">
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index 34afa77..46f0a901 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -171,18 +171,22 @@
       this displays various information about the lock and calls a
       new function pointer in lock_class (lc_ddb_show) to dump class-specific
       information about the lock as well (such as the owner of a mutex or
-      xlock'ed sx lock).</para>
+      xlock'ed sx lock).  &merged;</para>
 
     <para>The &man.ddb.4; debugger now provides the <literal>show sleepq</literal>
       command.  This takes a wait channel as an argument and looks
       for a sleep queue associated with that wait channel.</para>
 
-    <para>A bug in file descriptor handling such that a simple
+    <para><filename>DEFAULTS</filename> kernel configuration files
+      for each platform have been added.  &merged;</para>
+
+    <para>A bug in file descriptor handling such that simple
       <literal>close(0); dup(fd)</literal> sequence does not return
       descriptor <literal>0</literal> in some cases, has been fixed.</para>
 
     <para>The &man.firmware.9; subsystem has been added.  This allows
-      to load binary data into the kernel via a specially crafted module.</para>
+      to load binary data into the kernel via a specially crafted module.
+      &merged;</para>
 
     <para>The &man.gdb.1; remote debugging interface now supports
       copying console messages to a remote debugger instance.
@@ -199,7 +203,8 @@
       &man.pmcstat.8; can now log over a network socket
       to a remote host.</para>
 
-    <para>The &man.random.4; entropy device driver is now MPSAFE.</para>
+    <para>The &man.random.4; entropy device driver is now MPSAFE.
+      &merged;</para>
 
     <para>The <literal>SIGCHLD</literal> signal queuing has been
       added.  For each child process whose status has been changed,
@@ -249,7 +254,8 @@
       <literal>biba/equal(equal-equal)</literal>, has been added.
       This is useful where programs such as &man.dhclient.8; and &man.ppp.8;.
       which initialize network interfaces do not have any labeling support.
-      This variable is set as <literal>0</literal>(disabled) by default.</para>
+      This variable is set as <literal>0</literal>(disabled) by default.
+      &merged;</para>
 
     <para>A new sysctl variable <varname>vm.zone_stats</varname>
       has been added.  This allows to export &man.uma.9; allocator
@@ -281,9 +287,6 @@
       has been added.  For details of the latest development,
       see <ulink url="http://xbox-bsd.nl"></ulink>.</para>
 
-    <para><filename>DEFAULTS</filename> kernel configuration files
-      for each platform have been added.</para>
-
     <sect3 id="boot">
       <title>Boot Loader Changes</title>
 
@@ -300,7 +303,7 @@
 	then the default speed is determined from the current serial port
 	speed, and otherwise it is set to 9600 or the value of
 	the kernel option <literal>BOOT_COMCONSOLE_SPEED</literal>
-	at compile time.</para>
+	at compile time.  &merged;</para>
 
       <!-- Above this line, order boot loader changes by keyword-->
 
@@ -315,8 +318,9 @@
       <para>The &man.cardbus.4; driver now supports
 	<filename>/dev/cardbus<replaceable>%d</replaceable>.cis</filename>.</para>
 
-      <para>The &man.ce.4; driver, which supports Cronyx Tau-PCI/32 adapters,
-	has been added. &merged;</para>
+      <para arch="i386,pc98">The &man.ce.4; driver,
+	which supports Cronyx Tau-PCI/32 adapters, has been added.
+	&merged;</para>
 
       <para>Support for the PadLock Security Co-processor in VIA C3
 	processors has been added to the &man.crypto.9; subsystem.
@@ -338,13 +342,14 @@
 	Switch to &man.kbdmux.4; can be done at boot time by loading
 	<literal>kbdmux</literal> kernel module via &man.loader.8;,
 	or at runtime via &man.kldload.8; and releasing the active
-	keyboard.</para>
+	keyboard.  &merged;</para>
 
       <para arch="amd64,i386">The &man.kbdmux.4; has been included in the
 	<filename>GENERIC</filename> kernel by default.
 	Also, the <quote>Boot FreeBSD with USB keyboard</quote>
 	menu item in the boot loader menu has been removed
-	since this fixes USB keyboard probing problems.</para>
+	since this fixes USB keyboard probing problems.
+	&merged;</para>
 
       <para arch="ia64">The loader tunable <varname>debug.mpsafevfs</varname>
 	is set to <literal>1</literal> by default.</para>
@@ -378,29 +383,34 @@
       <sect4 id="mm">
 	<title>Multimedia Support</title>
 
-	<para>The &man.agp.4; driver now supports ATI IGP chipsets.</para>
+	<para>The &man.agp.4; driver now supports ATI IGP chipsets.
+	  &merged;</para>
 
 	<para>The &man.sound.4; driver now supports
 	  wider range sampling rate, multiple precisions choice,
-	  and 24/32 bit PCM format conversion.</para>
+	  and 24/32 bit PCM format conversion.  &merged;</para>
 
-	<para>The &man.snd.als4000.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.als4000.4; driver is now MPSAFE.  &merged;</para>
 
 	<para>The &man.snd.atiixp.4; driver has been added.
-	  This supports ATI IXP 200/300/400 series audio controllers.</para>
+	  This supports ATI IXP 200/300/400 series audio controllers.  &merged;</para>
 
 	<para>The &man.snd.atiixp.4; driver now supports
 	  suspend and resume features.</para>
 
 	<para>The &man.snd.cmi.4; driver is now MPSAFE.</para>
 
-	<para>The &man.snd.solo.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.es137x.4; driver is now MPSAFE.  &merged;</para>
+
+	<para>The &man.snd.ich.4; driver is now MPSAFE.  &merged;</para>
+
+	<para>The &man.snd.solo.4; driver is now MPSAFE.  &merged;</para>
 
-	<para>The &man.snd.via8233.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.via8233.4; driver is now MPSAFE.  &merged;</para>
 
-	<para>The &man.snd.via82c686.4; driver is now MPSAFE.</para>
+	<para>The &man.snd.via82c686.4; driver is now MPSAFE.  &merged;</para>
 
-	<para arch="amd64">The &man.speaker.4; driver now supports &os;/amd64.</para>
+	<para arch="amd64">The &man.speaker.4; driver now supports &os;/amd64.  &merged;</para>
 
 	<para>The &man.uaudio.4; driver now supports 24/32 bit audio
 	  formats and conversion.</para>
@@ -410,7 +420,7 @@
 	<title>Network Interface Support</title>
 
 	<para>The &man.ath.4; driver has been updated to
-	  version 0.9.16.16.</para>
+	  version 0.9.16.16.  &merged;</para>
 
 	<para arch="i386,amd64">The &man.bce.4; driver, which supports Broadcom
 	  NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet controllers,
@@ -421,6 +431,9 @@
 	<para>The &man.bge.4; driver now supports big-endian
 	  architectures such as sparc64.</para>
 
+	<para>The &man.bge.4; driver now supports &man.polling.4; mode.
+	  &merged;</para>
+
 	<para>The &man.dc.4; driver is now MPSAFE. &merged;</para>
 
 	<para>The &man.de.4; driver has been converted to the &man.bus.dma.9;
@@ -431,7 +444,7 @@
 	<para>The &man.el.4; driver has been removed.</para>
 
 	<para>The &man.em.4; driver now supports big-endian
-	  architectures such as sparc64.</para>
+	  architectures such as sparc64.  &merged;</para>
 
 	<para>The &man.em.4; driver has been updated to
 	  version 3.2.18 from Intel, and now supports
@@ -454,7 +467,9 @@
 	  has been added.  While the &man.lnc.4; driver also support these
 	  NICs, this driver has several advantages over it such as
 	  MPSAFE, ALTQ, VLAN_MTU, ifmedia, and 32-bit DMA for PCI
-	  variants.</para>
+	  variants.  &merged;</para>
+
+	<para>The &man.lge.4; driver is now MPSAFE. &merged;</para>
 
 	<para>The &man.my.4; driver is now MPSAFE. &merged;</para>
 
@@ -502,12 +517,12 @@
 	suppression, while there is demand for such ARP entry.
 	Due to this change, a sysctl variable
 	<varname>net.link.ether.inet.host_down_time</varname>
-	has been removed.</para>
+	has been removed.  &merged;</para>
 
       <para>The &man.arp.8; now supports a sysctl variable
 	<varname>net.link.ether.inet.log_arp_permanent_modify</varname>
 	to suppress logging of attempts to modify
-	permanent ARP entries.</para>
+	permanent ARP entries.  &merged;</para>
 
       <para>The &man.arp.8; utility now allows <option>-i</option>
 	option with <option>-d</option> and <option>-a</option> options
@@ -525,24 +540,25 @@
       <para>The &man.if.bridge.4; bridge driver now supports
 	creating span ports, which transmit a copy of every frame
 	received by the bridge.  This feature can be enabled
-	by using &man.ifconfig.8;.</para>
+	by using &man.ifconfig.8;.  &merged;</para>
 
       <para>The &man.if.bridge.4; bridge driver now supports
 	RFC 3378 EtherIP.  This change makes it possible to
 	add &man.gif.4; interfaces to bridges, which will then
 	send and receive IP protocol 97 packets.
-	Packets are Ethernet frames with an EtherIP header prepended.</para>
+	Packets are Ethernet frames with an EtherIP header prepended.
+        &merged;</para>
 
       <para>The path MTU discovery for multicast packets in the &os;
 	&man.ip6.4; stack has been disabled by default because
 	notifying path MTU by a lot of routers in multicast
 	can be a kind of distributed Denial-of-Service attack to a router.
 	This feature can be enabled by using a new sysctl variable
-	<varname>net.inet6.ip6.mcast_pmtu</varname>.</para>
+	<varname>net.inet6.ip6.mcast_pmtu</varname>.  &merged;</para>
 
       <para>The &man.ipfw.4;, IP packet filter now supports IPv6.
 	The &man.ip6fw.8; is deprecated and will be removed
-	in the future releases.</para>
+	in the future releases.  &merged;</para>
 
       <para>The &man.ipfw.4; now supports substitution of the action
 	argument with the value obtained from table lookup,
@@ -552,7 +568,7 @@
 	<literal>divert</literal>,
 	<literal>tee</literal>,
 	<literal>netgraph</literal>,
-	and <literal>ngtee</literal> rules.
+	and <literal>ngtee</literal> rules.  &merged;
 	For example, the following rules will throw different
 	packets to different pipes:</para>
 
@@ -569,9 +585,12 @@ pipe tablearg ip from table(1) to any</programlisting>
 	to <varname>net.bpf_jitter.enable</varname> and this controls
 	both &man.bpf.4; and &man.ng.bpf.4; now.</para>
 
+      <para>The &man.ng.iface.4; Netgraph node now supports &man.altq.4;.
+	&merged;</para>
+
       <para>A bug where a connection of NFS over TCP would not reconnect
 	when the server sent FIN.  This problem had occurred
-	with Solaris NFS servers.</para>
+	with Solaris NFS servers.  &merged;</para>
 
       <para>The sysctl variable <varname>net.inet.ip.portrange.reservedhigh</varname>
 	and <varname>net.inet.ip.portrange.reservedlow</varname>
@@ -625,7 +644,7 @@ pipe tablearg ip from table(1) to any</programlisting>
 	tick granularity.  A new sysctl variable
 	<varname>net.inet.tcp.inflight.rttthresh</varname> specifies
 	the threshold in milliseconds below which this feature
-	will disengage.  It defaults to 10ms.</para>
+	will disengage.  It defaults to 10ms.  &merged;</para>
     </sect3>
 
     <sect3 id="disks">
@@ -638,23 +657,28 @@ pipe tablearg ip from table(1) to any</programlisting>
 	and now supports full 64-bit DMA.  While this feature is
 	enabled by default, this can be forced off by setting the
 	<varname>hw.amr.force_sg32</varname> loader tunable for
-	debugging purpose.</para>
+	debugging purpose.
+	&merged;</para>
 
       <para>The &man.amr.4; driver now supports &man.ioctl.2; requests
 	necessary for Linux LSI MegaRaid tools on &os;'s Linux emulation
-	environment.</para>
+	environment.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports a workaround
 	for some controllers whose DMA does not work properly
 	in 48bit mode.  For the suspicious controllers
-	the PIO mode will be used for access to over 137GB areas.</para>
+	the PIO mode will be used for access to over 137GB areas.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports the ITE IT8211F IDE controller,
 	and Promise PDC40718 and PDC40719 chip found in Promise
-	Fasttrak TX4300.</para>
+	Fasttrak TX4300.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports DMA for kernel crash dump
-	and crash dumping to &man.ataraid.4; device.</para>
+	and crash dumping to &man.ataraid.4; device.
+	&merged;</para>
 
       <para>The &man.ata.4; driver now supports USB mass storage class
 	devices.  To enable it, a line <literal>device atausb</literal>
@@ -664,10 +688,14 @@ pipe tablearg ip from table(1) to any</programlisting>
 	each other.</para>
 
       <para>The &man.ataraid.4; driver now supports
-	JMicron ATA RAID metadata.</para>
+	JMicron ATA RAID metadata.  &merged;</para>
+
+      <para>The <literal>GEOM_LABEL</literal> class now supports
+	Ext2FS, NTFS, and ReiserFS.  &merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> class now supports
-	kernel crash dump to the GEOM providers.</para>
+	kernel crash dump to the GEOM providers.
+	&merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> and <literal>GEOM_RAID3</literal>
 	classes now support sysctl variables
@@ -683,7 +711,8 @@ pipe tablearg ip from table(1) to any</programlisting>
 	different places, so actually all data is available.
 	The broken components will be visible in <command>gmirror list</command>
 	or <command>graid3 list</command> output with flag
-	<literal>BROKEN</literal>.</para>
+	<literal>BROKEN</literal>.
+	&merged;</para>
 
       <para>The <literal>GEOM_MIRROR</literal> and <literal>GEOM_RAID3</literal>
 	classes now use parallel I/O request for synchronization
@@ -696,17 +725,16 @@ pipe tablearg ip from table(1) to any</programlisting>
 	<varname>kern.geom.mirror.syncs_per_sec</varname>,
 	<varname>kern.geom.raid3.reqs_per_sync</varname>, and
 	<varname>kern.geom.raid3.syncs_per_sec</varname>
-	are deprecated and have been removed.</para>
+	are deprecated and have been removed.
+	&merged;</para>
 
       <para>A new GEOM class <literal>GEOM_ZERO</literal> has been added.
 	It creates very huge provider (41PB) <filename>/dev/gzero</filename>
 	and mainly for performance testing.
 	On <literal>BIO_READ</literal> request it zero-fills
 	<varname>bio_data</varname> and on <literal>BIO_WRITE</literal>
-	it does nothing.</para>
-
-      <para>The <literal>GEOM_LABEL</literal> class now supports
-	Ext2FS and ReiserFS.</para>
+	it does nothing.
+	&merged;</para>
 
       <para>The GEOM class kernel module <filename>g_md.ko</filename>
 	has been renamed to <filename>geom_md.ko</filename>
@@ -716,7 +744,8 @@ pipe tablearg ip from table(1) to any</programlisting>
 	amd64 as well as PAE.</para>
 
       <para>The &man.mfi.4; driver, which supports
-	LSI MegaRAID SAS controller family has been added.</para>
+	LSI MegaRAID SAS controller family has been added.
+	&merged;</para>
 
       <para>The &man.mpt.4; driver has been updated to support
 	various new features such as RAID volume and RAID member
@@ -728,8 +757,8 @@ pipe tablearg ip from table(1) to any</programlisting>
       <para>The &man.mpt.4; driver now supports SAS HBA (partially),
 	64-bit PCI, and large data transfer.</para>
 
-      <para>The &man.twa.4; has been updated to the 9.3.0.1
-	release on the 3ware website.</para>
+      <para>The &man.twa.4; driver has been updated to the 9.3.0.1
+	release on the 3ware website.  &merged;</para>
 
       <para>A new GEOM-based disk encryption facility, GEOM_ELI, has been
 	added.  It uses the &man.crypto.9; framework for hardware acceleration
@@ -737,7 +766,8 @@ pipe tablearg ip from table(1) to any</programlisting>
 	more information. &merged;</para>
 
       <para>The &man.geli.8; now supports loading keyfiles before root
-	file system is mounted.  For example, the following entries
+	file system is mounted.  &merged;
+	For example, the following entries
 	can be used in <filename>/boot/loader.conf</filename> to enable
 	it:</para>
 
@@ -781,7 +811,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	has been updated to 20051021.</para>
 
       <para><application>DRM</application> has
-	been updated to a snapshot from DRI CVS as of 20051202.</para>
+	been updated to a snapshot from DRI CVS as of 20051202.  &merged;</para>
 
       <para>TrustedBSD <application>OpenBSM</application> distribution,
 	version 1.0 alpha 5, an implementation of the documented Sun Basic
@@ -816,22 +846,23 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       applying binary patches.</para>
 
     <para>The &man.bsnmpd.1; utility now supports the Host Resources
-      MIB described in RFC 2790.</para>
+      MIB described in RFC 2790.  &merged;</para>
 
     <para>The &man.cmp.1; utility now supports an <option>-h</option>
       flag to compare the symbolic link itself rather than the
       file that the link points to.</para>
 
     <para>The &man.config.8; utility now supports <literal>nocpu</literal>
-      directive.</para>
+      directive.  &merged;</para>
 
     <para>The &man.config.8; utility now reads <filename>DEFAULTS</filename>
       kernel configuration file if it exists in the current directory
-      before the specified configuration file.</para>
+      before the specified configuration file.  &merged;</para>
 
     <para>The &man.csh.1; utility now supports NLS catalog.
       Note that this requires installing
-      <filename role="package">shells/tcsh_nls</filename>.</para>
+      <filename role="package">shells/tcsh_nls</filename>.
+      &merged;</para>
 
     <para>The csup(1) utility has been imported.
       This is an implementation of CVSup-compatible client written
@@ -839,11 +870,11 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       only.</para>
 
     <para>The &man.devd.8; utility now supports a <option>-f</option> option
-      to specify a configuration file.</para>
+      to specify a configuration file.  &merged;</para>
 
     <para>The &man.ftpd.8; utility now creates a PID file
       <filename>/var/run/ftpd.pid</filename> even when
-      no <option>-p</option> option is specified.</para>
+      no <option>-p</option> option is specified.  &merged;</para>
 
     <para>The &man.gbde.8; utility now supports
       <option>-k</option> and <option>-K</option> options
@@ -851,13 +882,14 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.getfacl.1; utility now supports
       a <option>-q</option> flag to suppress the per-file header
-      comment listing the file name, owner, and group.</para>
+      comment listing the file name, owner, and group.
+      &merged;</para>
 
     <para>The &man.gpt.8; utility now supports setting GPT partition labels.</para>
 
     <para>The &man.gvinum.8; utility now supports commands
       to rename objects and to move a subdisk from
-      one drive to another.</para>
+      one drive to another.  &merged;</para>
 
     <para>The &man.gvinum.8; utility now supports
       <command>resetconfig</command> sub-command.</para>
@@ -887,14 +919,14 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	<replaceable>jid_file</replaceable></option> option to
       write out a JidFile, similar to a PidFile, containing
       the jailid, path, hostname, IP and the command used to start
-      the jail.</para>
+      the jail.  &merged;</para>
 
     <para>The &man.kdump.1; now supports a <option>-H</option>
       flag, which causes kdump to print an additional field holding
-      the threadid.</para>
+      the threadid.  &merged;</para>
 
     <para>The &man.kdump.1; now supports a <option>-s</option>
-      flag to suppress the display of I/O data.</para>
+      flag to suppress the display of I/O data.  &merged;</para>
 
     <para>The &man.kenv.1; utility now supports a <option>-q</option>
       flag to suppress warnings.</para>
@@ -927,15 +959,17 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.ln.1; utility now supports
       an <option>-F</option> flag which allows to delete existing
-      empty directories, when creating symbolic links.</para>
+      empty directories, when creating symbolic links.
+      &merged;</para>
 
     <para>The &man.locate.1; utility now supports
       a <option>-0</option> flag to make this utility
-      interoperable with &man.xargs.1;'s <option>-0</option> flag.</para>
+      interoperable with &man.xargs.1;'s <option>-0</option> flag.
+      &merged;</para>
 
     <para>The &man.ls.1; utility now supports
       an <option>-I</option> flag to disable the automatic
-      <option>-A</option> flag for the superuser.</para>
+      <option>-A</option> flag for the superuser.  &merged;</para>
 
     <para>The &man.ls.1; utility now supports
       an <option>-U</option> flag to use the file creation
@@ -965,7 +999,8 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.mergemaster.8; utility now supports
       an <option>-A</option> option to explicitly specify
-      an architecture to pass through to the underlying makefiles.</para>
+      an architecture to pass through to the underlying makefiles.
+      &merged;</para>
 
     <para>The &man.mount.8; <literal>nodev</literal> option has
       been removed.</para>
@@ -974,7 +1009,8 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.moused.8; now supports an <option>-H</option> flag
       to enable horizontal virtual scrolling similar to a
-      <option>-V</option> flag for vertical virtual scrolling.</para>
+      <option>-V</option> flag for vertical virtual scrolling.
+      &merged;</para>
 
     <para>The &man.netstat.1; utility now supports an
       <option>-h</option> flag for interface stats mode,
@@ -986,16 +1022,16 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       rather than the KAME IPSEC stack.
       Note that the output of <command>netstat -s -p ipsec</command>
       differs depending on which stack is compiled into
-      the kernel since they each keep different stats.</para>
+      the kernel since they each keep different stats.  &merged;</para>
 
     <para>The &man.periodic.8; daily script now supports
       to show the status of &man.gmirror.8;, &man.graid3.8;,
       &man.gstripe.8;, and &man.gconcat.8; devices.
-      Note that these are disabled by default.</para>
+      Note that these are disabled by default.  &merged;</para>
 
     <para>A new functions, &man.pidfile.3;, which allow reliable
       pidfiles handling have been implemented in
-      <filename>libutil</filename>.</para>
+      <filename>libutil</filename>.  &merged;</para>
 
     <para>The &man.ping.8; utility now supports <quote>a sweeping
 	ping</quote> in which &man.icmp.4; payload of
@@ -1025,7 +1061,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
     <para>The &man.rfcomm.sppd.1; now supports service name
       in addition to <option>-c</option> option with channel number.
       The supported names are: DUN (Dial-Up Networking), FAX (Fax),
-      LAN (LAN Access Using PPP), and SP (Serial Port).</para>
+      LAN (LAN Access Using PPP), and SP (Serial Port).  &merged;</para>
 
     <para>The &man.rpcgen.1; utility now generates headers and stub files
       which can be used with ANSI C compilers by default.</para>
@@ -1041,9 +1077,12 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
     <para>The &man.sh.1; utility now supports <literal>times</literal>
       built-in command.</para>
 
+    <para>The &man.snapinfo.8; utility which shows snapshot location
+      on UFS filesystems has been added.  &merged;</para>
+
     <para>The &man.strtonum.3; library function has been implemented
       based on OpenBSD's implementation.  This is an improved version of
-      &man.strtoll.3;.</para>
+      &man.strtoll.3;.  &merged;</para>
 
     <para>The &man.sysctl.8; utility now supports a <option>-q</option>
       flag to suppress a limited set of warnings and errors.</para>
@@ -1060,7 +1099,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 
     <para>The &man.xargs.1; utility now supports a <option>-r</option>
       flag which makes the command execution when the standard input
-      does not contain any non-whitespace-characters.</para>
+      does not contain any non-whitespace-characters.  &merged;</para>
 
     <para>The shared library version number of all libraries have
       been updated due to some possible ABI changes.  The libraries
@@ -1094,7 +1133,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	<filename>/etc/bluetooth/<replaceable>$device</replaceable>.conf</filename>
 	(where <replaceable>$device</replaceable> is <devicename>ubt0</devicename>,
 	<devicename>btcc0</devicename>, and so on.)
-	For more details, see &man.bluetooth.conf.5;.</para>
+	For more details, see &man.bluetooth.conf.5;.  &merged;</para>
 
       <para>The <filename>ftpd</filename> script for
 	stand-alone &man.ftpd.8; has been added.</para>
@@ -1119,15 +1158,16 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	are attached to the system, but both daemons depend on
 	Bluetooth socket layer and thus disabled by default.
 	Bluetooth sockets layer must be either loaded
-	as a module or compiled into kernel before the daemons can run.</para>
+	as a module or compiled into kernel before the daemons can run.
+	&merged;</para>
 
       <para>The <filename>hostapd</filename> script for
-	&man.hostapd.8; has been added.</para>
+	&man.hostapd.8; has been added.  &merged;</para>
 
       <para>The <filename>netif</filename> script now supports
 	<varname>ipv4_addrs_<replaceable>ifn</replaceable></varname>,
 	which adds one or more IPv4 address from a ranged list in
-	CIRD notation.  For example:</para>
+	CIRD notation.  &merged;  For example:</para>
 
       <programlisting>ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28"</programlisting>
 
@@ -1144,7 +1184,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
 	since OLDCARD is deprecated.</para>
 
       <para>The <filename>ppp-user</filename> script has been renamed to
-	<filename>ppp</filename>.</para>
+	<filename>ppp</filename>.  &merged;</para>
 
       <para>The <varname>removable_interfaces</varname> variable
 	has been removed.</para>
@@ -1171,6 +1211,10 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
     <para><application>GNU Readline library</application>
       has been updated from 5.0 to 5.1.</para>
 
+    <para><application>GNU Troff</application>
+      has been updated from version 1.19 to version 1.19.2.
+      &merged;</para>
+
     <para><application>IPFilter</application> has been updated from
       4.1.8 to 4.1.10.</para>
 
@@ -1178,7 +1222,8 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       4.2p1 to 4.3p1.</para>
 
     <para><application>hostapd</application>
-      has been updated from version 0.3.9 to version 0.4.8.</para>
+      has been updated from version 0.3.9 to version 0.4.8.
+      &merged;</para>
 
     <para><application>sendmail</application> has been updated from
       8.13.4 to 8.13.6. &merged;</para>
@@ -1188,7 +1233,8 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       <application>tzdata2005r</application> release. &merged;</para>
 
     <para><application>WPA Supplicant</application>
-      has been updated from version 0.3.9 to version 0.4.8.</para>
+      has been updated from version 0.3.9 to version 0.4.8.
+      &merged;</para>
 
     <para><application>zlib</application>
       has been updated from version 1.2.2 to version 1.2.3.</para>
@@ -1204,33 +1250,35 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
     <para>The &man.pkg.add.1; now supports an <option>-P</option>
       flag, which is the same as the <option>-p</option> flag
       except that the given prefix is also used recursively for the
-      dependency packages if any.</para>
+      dependency packages if any.  &merged;</para>
 
     <para>The &man.pkg.add.1; and &man.pkg.create.1; now supports
       a <option>-K</option> flag to save packages to the current directory
-      (or <varname>PKGDIR</varname> if defined) by default.</para>
+      (or <varname>PKGDIR</varname> if defined) by default.
+      &merged;</para>
 
     <para>The &man.pkg.create.1; now supports an <option>-x</option>
       flag to support basic regular expressions for package name,
       an <option>-E</option> flag for extended regular
-      expressions, and a <option>-G</option> for exact matching.</para>
+      expressions, and a <option>-G</option> for exact matching.  &merged;</para>
 
     <para>The &man.pkg.version.1; now supports an <option>-o</option>
       flag to show the origin recorded on package generation
       instead of the package name, and an <option>-O</option> flag
-      to list packages whose registered origin is origin only.</para>
+      to list packages whose registered origin is origin only.
+      &merged;</para>
 
     <para>The &man.portsnap.8; utility (<filename>sysutils/portsnap</filename>)
       has been added into the &os; base system.  This is a secure,
       easy to use, fast, lightweight, and generally good way for
-      users to keep their ports trees up to date.</para>
+      users to keep their ports trees up to date.  &merged;</para>
 
     <para>A incorrect handling of <varname>HTTP_PROXY_AUTH</varname>
-      in the &man.portsnap.8; utility has been fixed.</para>
+      in the &man.portsnap.8; utility has been fixed.  &merged;</para>
 
     <para>The startup scripts from the <varname>local_startup</varname>
       directory now evaluated by using &man.rcorder.8; with scripts
-      in the base system.</para>
+      in the base system.  &merged;</para>
 
     <para>The suffix of startup scripts from the Ports Collection
       has been removed.  This means <filename>foo.sh</filename>
@@ -1239,19 +1287,20 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting>
       <filename>foo.ORG</filename> will also be invoked.
       You are recommended to reinstall packages which install
       such scripts and remove extra files in the
-      <varname>local_startup</varname> directory.</para>
+      <varname>local_startup</varname> directory.  &merged;</para>
 
     <para>New <filename>rc.conf</filename> variables,
       <varname>ldconfig_local_dirs</varname> and
       <varname>ldconfig_local32_dirs</varname> have been added.
-      These hold lists of local &man.ldconfig.8; directories.</para>
+      These hold lists of local &man.ldconfig.8; directories.
+      &merged;</para>
 
     <para>The <command>@cwd</command> command in
       <filename>pkg-plist</filename> now allows
       no directory argument.  If no
       directory argument is given, it will set current
       working directory to the first prefix given by the
-      <command>@cwd</command> command.</para>
+      <command>@cwd</command> command.  &merged;</para>
   </sect2>
 
   <sect2 id="releng">