New release note:

	SA-04:05.openssl
	/etc/rc.d/mixer
	/etc/rc.d/gbde_swap (wording fix)

2 files changed, 42 insertions, 8 deletions

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index ae6e603..d953e8c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -155,6 +155,15 @@
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:04.tcp.asc">FreeBSD-SA-04:04</ulink>.
       &merged;</para>
 
+    <para>A bug in <application>OpenSSL</application>'s SSL/TLS
+      ChangeCipherSpec message processing could result in
+      a null pointer dereference, has been fixed.
+      This could allow a remote attacker to crash an
+      <application>OpenSSL</application>-using
+      application and cause a denial-of-service on the system.
+      More details can be found in security advisory <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:05.openssl.asc">FreeBSD-SA-04:05</ulink>.
+      &merged;</para>
   </sect2>
 
   <sect2 id="kernel">
@@ -402,16 +411,24 @@
 	if the server requires it; this may eventually become an
 	option to &man.mount.smbfs.8;.</para>
 
-      <para>A support for gbde-enabled swap devices has been added.
-	When <varname>gbde_swap_enable</varname> is specified
+      <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/foo.bde</filename> in &man.fstab.5;
+	<filename>/dev/<replaceable>foo.bde</replaceable></filename>
+	in &man.fstab.5;
 	is automatically attached at boot time with the device
-	<filename>/dev/foo</filename> and a random key, which
+	<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">
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 ae6e603..d953e8c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -155,6 +155,15 @@
       url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:04.tcp.asc">FreeBSD-SA-04:04</ulink>.
       &merged;</para>
 
+    <para>A bug in <application>OpenSSL</application>'s SSL/TLS
+      ChangeCipherSpec message processing could result in
+      a null pointer dereference, has been fixed.
+      This could allow a remote attacker to crash an
+      <application>OpenSSL</application>-using
+      application and cause a denial-of-service on the system.
+      More details can be found in security advisory <ulink
+      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:05.openssl.asc">FreeBSD-SA-04:05</ulink>.
+      &merged;</para>
   </sect2>
 
   <sect2 id="kernel">
@@ -402,16 +411,24 @@
 	if the server requires it; this may eventually become an
 	option to &man.mount.smbfs.8;.</para>
 
-      <para>A support for gbde-enabled swap devices has been added.
-	When <varname>gbde_swap_enable</varname> is specified
+      <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/foo.bde</filename> in &man.fstab.5;
+	<filename>/dev/<replaceable>foo.bde</replaceable></filename>
+	in &man.fstab.5;
 	is automatically attached at boot time with the device
-	<filename>/dev/foo</filename> and a random key, which
+	<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">