New release note:

	isp(4) fix on sparc64,
	ipcs(1) -u option,
	rmdir(1) -v flag,
	rc.d/diskless split,
	rc.d/pf.

Update release note:
	MFC of umass(4) timeout/ATAPI MMC support,
	items related to the rc.d scripts moved into a separate section.

2 files changed, 80 insertions, 40 deletions

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index ba40b74..5dc5801 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -388,8 +388,12 @@
       <para>The &man.ips.4; driver now supports the recent
 	Adaptec ServeRAID series SCSI controller cards.</para>
 
+      <para arch="sparc64">A bug in the &man.isp.4; driver
+        which prevents the cards on SBus from working correctly,
+	has been fixed.</para>
+
       <para>The &man.umass.4; driver now supports the missing
-	ATAPI MMC commands and handles the timeout properly.</para>
+	ATAPI MMC commands and handles the timeout properly.  &merged;</para>
     </sect3>
 
     <sect3 id="fs">
@@ -422,25 +426,6 @@
 	significant performance penalty, this feature is only enabled
 	if the server requires it; this may eventually become an
 	option to &man.mount.smbfs.8;.</para>
-
-      <para>The <filename>gbde_swap</filename> script, which supports
-	gbde-enabled swap devices has been added into
-	<filename>/etc/rc.d</filename>.
-	When the <varname>gbde_swap_enable</varname> variable is specified
-	in &man.rc.conf.5;, a swap device named
-	<filename>/dev/<replaceable>foo.bde</replaceable></filename>
-	in &man.fstab.5;
-	is automatically attached at boot time with the device
-	<filename>/dev/<replaceable>foo</replaceable></filename>
-	and a random key, which
-	generated by computing the MD5 checksum of 512 bytes read
-	from <filename>/dev/random</filename>.
-	Note that this prevents recovery of kernel dumps.</para>
-
-      <para>The <filename>mixer</filename> script has been added into
-	<filename>/etc/rc.d</filename>.
-	It saves the current settings of all audio mixers present
-	in the system on shutdown and restores the settings on boot.</para>
     </sect3>
 
     <sect3 id="mm">
@@ -469,6 +454,10 @@
     <para>&man.ip6fw.8; now supports a <option>-n</option> flag to
       stop it from making any changes to the rules in the kernel</para>
 
+    <para>&man.ipcs.1; now supports a <option>-u</option> option to
+      display information about IPC mechanisms owned by the specified
+      user.</para>
+
     <para>&man.ipfw.8; now supports a <option>-b</option> flag to
       print only the action and comment for each rule, thus omitting
       the rule body.</para>
@@ -565,6 +554,9 @@
       role="package">devel/gnomevfs</filename>, and <filename
       role="package">devel/gnomevfs2</filename>.</para>
 
+    <para>&man.rmdir.1; now supports a <option>-v</option> flag,
+      which makes it verbose.</para>
+
     <para>&man.savecore.8; now works correctly for dump files larger
       than 2GB.</para>
 
@@ -582,6 +574,34 @@
       contributed utilities) now use the system version of
       &man.getopt.long.3;, rather than the GNU version.</para>
 
+    <sect3 id="rc-scripts">
+      <title><filename>/etc/rc.d</filename> Scripts</title>
+
+      <para>The <filename>diskless</filename> script has been
+	split out into <filename>hostname</filename>,
+        <filename>resolve</filename>, <filename>tmp</filename>, and
+        <filename>var</filename> scripts.</para>
+
+      <para>The <filename>gbde_swap</filename> script, which supports
+	gbde-enabled swap devices has been added.
+	When the <varname>gbde_swap_enable</varname> variable is specified
+	in &man.rc.conf.5;, a swap device named
+	<filename>/dev/<replaceable>foo.bde</replaceable></filename>
+	in &man.fstab.5;
+	is automatically attached at boot time with the device
+	<filename>/dev/<replaceable>foo</replaceable></filename>
+	and a random key, which
+	generated by computing the MD5 checksum of 512 bytes read
+	from <filename>/dev/random</filename>.
+	Note that this prevents recovery of kernel dumps.</para>
+
+      <para>The <filename>mixer</filename> script has been added.
+	It saves the current settings of all audio mixers present
+	in the system on shutdown and restores the settings on boot.</para>
+
+      <para>The <filename>pf</filename> script for &man.pf.4;
+        has been added.</para>
+    </sect3>
   </sect2>
 
   <sect2 id="contrib">
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 ba40b74..5dc5801 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -388,8 +388,12 @@
       <para>The &man.ips.4; driver now supports the recent
 	Adaptec ServeRAID series SCSI controller cards.</para>
 
+      <para arch="sparc64">A bug in the &man.isp.4; driver
+        which prevents the cards on SBus from working correctly,
+	has been fixed.</para>
+
       <para>The &man.umass.4; driver now supports the missing
-	ATAPI MMC commands and handles the timeout properly.</para>
+	ATAPI MMC commands and handles the timeout properly.  &merged;</para>
     </sect3>
 
     <sect3 id="fs">
@@ -422,25 +426,6 @@
 	significant performance penalty, this feature is only enabled
 	if the server requires it; this may eventually become an
 	option to &man.mount.smbfs.8;.</para>
-
-      <para>The <filename>gbde_swap</filename> script, which supports
-	gbde-enabled swap devices has been added into
-	<filename>/etc/rc.d</filename>.
-	When the <varname>gbde_swap_enable</varname> variable is specified
-	in &man.rc.conf.5;, a swap device named
-	<filename>/dev/<replaceable>foo.bde</replaceable></filename>
-	in &man.fstab.5;
-	is automatically attached at boot time with the device
-	<filename>/dev/<replaceable>foo</replaceable></filename>
-	and a random key, which
-	generated by computing the MD5 checksum of 512 bytes read
-	from <filename>/dev/random</filename>.
-	Note that this prevents recovery of kernel dumps.</para>
-
-      <para>The <filename>mixer</filename> script has been added into
-	<filename>/etc/rc.d</filename>.
-	It saves the current settings of all audio mixers present
-	in the system on shutdown and restores the settings on boot.</para>
     </sect3>
 
     <sect3 id="mm">
@@ -469,6 +454,10 @@
     <para>&man.ip6fw.8; now supports a <option>-n</option> flag to
       stop it from making any changes to the rules in the kernel</para>
 
+    <para>&man.ipcs.1; now supports a <option>-u</option> option to
+      display information about IPC mechanisms owned by the specified
+      user.</para>
+
     <para>&man.ipfw.8; now supports a <option>-b</option> flag to
       print only the action and comment for each rule, thus omitting
       the rule body.</para>
@@ -565,6 +554,9 @@
       role="package">devel/gnomevfs</filename>, and <filename
       role="package">devel/gnomevfs2</filename>.</para>
 
+    <para>&man.rmdir.1; now supports a <option>-v</option> flag,
+      which makes it verbose.</para>
+
     <para>&man.savecore.8; now works correctly for dump files larger
       than 2GB.</para>
 
@@ -582,6 +574,34 @@
       contributed utilities) now use the system version of
       &man.getopt.long.3;, rather than the GNU version.</para>
 
+    <sect3 id="rc-scripts">
+      <title><filename>/etc/rc.d</filename> Scripts</title>
+
+      <para>The <filename>diskless</filename> script has been
+	split out into <filename>hostname</filename>,
+        <filename>resolve</filename>, <filename>tmp</filename>, and
+        <filename>var</filename> scripts.</para>
+
+      <para>The <filename>gbde_swap</filename> script, which supports
+	gbde-enabled swap devices has been added.
+	When the <varname>gbde_swap_enable</varname> variable is specified
+	in &man.rc.conf.5;, a swap device named
+	<filename>/dev/<replaceable>foo.bde</replaceable></filename>
+	in &man.fstab.5;
+	is automatically attached at boot time with the device
+	<filename>/dev/<replaceable>foo</replaceable></filename>
+	and a random key, which
+	generated by computing the MD5 checksum of 512 bytes read
+	from <filename>/dev/random</filename>.
+	Note that this prevents recovery of kernel dumps.</para>
+
+      <para>The <filename>mixer</filename> script has been added.
+	It saves the current settings of all audio mixers present
+	in the system on shutdown and restores the settings on boot.</para>
+
+      <para>The <filename>pf</filename> script for &man.pf.4;
+        has been added.</para>
+    </sect3>
   </sect2>
 
   <sect2 id="contrib">