Index: stable/10/release/doc/share/xml/errata.xml
===================================================================
--- stable/10/release/doc/share/xml/errata.xml	(revision 285059)
+++ stable/10/release/doc/share/xml/errata.xml	(revision 285060)
@@ -1,90 +1,104 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <informaltable frame="none" pgwide="1">
   <tgroup cols="3">
     <colspec colwidth="40%"/>
     <colspec colwidth="30%"/>
     <colspec colwidth="30%"/>
     <thead>
       <row>
 	<entry>Errata</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-14:13.freebsd-update.asc">FreeBSD-EN-14:13.freebsd-update</link></entry>
 	<entry>23&nbsp;December&nbsp;2014</entry>
 	<entry><para>Fixed directory deletion issue in
 	    &man.freebsd-update.8;</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:01.vt.asc">FreeBSD-EN-15:01.vt</link></entry>
 	<entry>25&nbsp;February&nbsp;2015</entry>
 	<entry><para>&man.vt.4; crash with improper ioctl
 	    parameters</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:02.openssl.asc">FreeBSD-EN-15:02.openssl</link></entry>
 	<entry>25&nbsp;February&nbsp;2015</entry>
 	<entry><para>OpenSSL update</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:03.freebsd-update.asc">FreeBSD-EN-15:03.freebsd-update</link></entry>
 	<entry>25&nbsp;February&nbsp;2015</entry>
 	<entry><para>&man.freebsd-update.8; updates libraries in
 	    suboptimal order</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:04.freebsd-update.asc">FreeBSD-EN-15:04.freebsd-update</link></entry>
 	<entry>13&nbsp;May&nbsp;2015</entry>
 	<entry><para>&man.freebsd-update.8; does not ensure the
 	    previous upgrade has completed</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:05.ufs.asc">FreeBSD-EN-15:05.ufs</link></entry>
 	<entry>13&nbsp;May&nbsp;2015</entry>
 	<entry><para>Deadlock on reboot with UFS tuned with
 	    SU+J</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:06.file.asc">FreeBSD-EN-15:06.file</link></entry>
 	<entry>9&nbsp;June&nbsp;2015</entry>
 	<entry><para>Multiple denial of service issues</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:07.zfs.asc">FreeBSD-EN-15:07.zfs</link></entry>
 	<entry>9&nbsp;June&nbsp;2015</entry>
 	<entry><para>ZFS reliability improvements</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:08.sendmail.asc">FreeBSD-EN-15:08.sendmail</link></entry>
-	<entry>18&nbsp;June&nbsp;2015</entry>
+	<entry>30&nbsp;June&nbsp;2015 (revised)</entry>
 	<entry><para>Sendmail TLS/DH interoperability improvement</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-15:09.xlocale.asc">FreeBSD-EN-15:09.xlocale</link></entry>
+	<entry>30&nbsp;June&nbsp;2015</entry>
+	<entry><para>Fix inconsistency between locale and rune locale states</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-15:10.iconv.asc">FreeBSD-EN-15:10.iconv</link></entry>
+	<entry>30&nbsp;June&nbsp;2015</entry>
+	<entry><para>Improved &man.iconv.3; UTF-7 support</para></entry>
       </row>
     </tbody>
   </tgroup>
 </informaltable>
Index: stable/8/release/doc/share/xml/errata.xml
===================================================================
--- stable/8/release/doc/share/xml/errata.xml	(revision 285059)
+++ stable/8/release/doc/share/xml/errata.xml	(revision 285060)
@@ -1,153 +1,153 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <informaltable frame="none" pgwide="1">
   <tgroup cols="3">
     <colspec colwidth="40%"/>
     <colspec colwidth="30%"/>
     <colspec colwidth="30%"/>
     <thead>
       <row>
 	<entry>Errata</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-13:01.fxp.asc">FreeBSD-EN-13:01.fxp</link></entry>
 	<entry>28&nbsp;June&nbsp;2013</entry>
 	<entry><para>Fixed a problem where &man.dhclient.8; would
 	    infinitely try to intialize &man.fxp.4;</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-13:02.vtnet.asc">FreeBSD-EN-13:02.vtnet</link></entry>
 	<entry>28&nbsp;June&nbsp;2013</entry>
 	<entry><para>Fixed a problem frames sent to additional MAC
 	    addresses are not forwarded to the &man.vtnet.4;
 	    interface</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-13:04.freebsd-update.asc">FreeBSD-EN-13:04.freebsd-update</link></entry>
 	<entry>26&nbsp;October&nbsp;2013</entry>
 	<entry><para>Multiple fixes</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-13:05.freebsd-update.asc">FreeBSD-EN-13:05.freebsd-update</link></entry>
 	<entry>28&nbsp;November&nbsp;2013</entry>
 	<entry><para>Fix INDEX generation</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:01.random.asc">FreeBSD-EN-14:01.random</link></entry>
 	<entry>14&nbsp;January&nbsp;2014</entry>
 	<entry><para>Disable hardware RNGs by default</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:02.mmap.asc">FreeBSD-EN-14:02.mmap</link></entry>
 	<entry>14&nbsp;January&nbsp;2014</entry>
 	<entry><para>Fix incorrect coalescing of stack
 	    entry</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:03.pkg.asc">FreeBSD-EN-14:03.pkg</link></entry>
 	<entry>15&nbsp;May&nbsp;2014</entry>
 	<entry><para>Add pkg bootstrapping, configuration and public
 	    keys</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:04.kldxref.asc">FreeBSD-EN-14:04.kldxref</link></entry>
 	<entry>15&nbsp;May&nbsp;2014</entry>
 	<entry><para>Improve build repeatability for
 	    &man.kldxref.8;</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:06.exec.asc">FreeBSD-EN-14:06.exec</link></entry>
 	<entry>3&nbsp;June&nbsp;2014</entry>
 	<entry><para>Fix triple-fault when executing from a threaded
 	    process</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:08.heimdal.asc">FreeBSD-EN-14:08.heimdal</link></entry>
 	<entry>24&nbsp;June&nbsp;2014</entry>
 	<entry><para>Fix <literal>gss_pseudo_random()</literal>
 	    interoperability issue</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:09.jail.asc">FreeBSD-EN-14:09.jail</link></entry>
 	<entry>8&nbsp;July&nbsp;2014</entry>
 	<entry><para>Fix jail fails to start if
 	    WITHOUT_INET/WITHOUT_INET6 is use</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:10.tzdata.asc">FreeBSD-EN-14:10.tzdata</link></entry>
 	<entry>21&nbsp;October&nbsp;2014</entry>
 	<entry><para>Time zone data file update</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:12.zfs.asc">FreeBSD-EN-14:12.zfs</link></entry>
 	<entry>4&nbsp;November&nbsp;2014</entry>
 	<entry><para>Fix NFSv4 and ZFS cache consistency
 	    issue</para></entry>
       </row>
 
       <row>
 	<entry><link xlink:href="&security.url;/FreeBSD-EN-14:13.freebsd-update.asc">FreeBSD-EN-14:13.freebsd-update</link></entry>
 	<entry>23&nbsp;December&nbsp;2014</entry>
 	<entry><para>Fix directory deletion issue</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:02.openssl.asc">FreeBSD-EN-15:02.openssl</link></entry>
 	<entry>25&nbsp;February&nbsp;2015</entry>
 	<entry><para>OpenSSL update</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:03.freebsd-update.asc">FreeBSD-EN-15:03.freebsd-update</link></entry>
 	<entry>25&nbsp;February&nbsp;2015</entry>
 	<entry><para>&man.freebsd-update.8; updates libraries in
 	    suboptimal order</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:04.freebsd-update.asc">FreeBSD-EN-15:04.freebsd-update</link></entry>
 	<entry>13&nbsp;May&nbsp;2015</entry>
 	<entry><para>&man.freebsd-update.8; does not ensure the
 	    previous upgrade has completed</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:06.file.asc">FreeBSD-EN-15:06.file</link></entry>
 	<entry>9&nbsp;June&nbsp;2015</entry>
 	<entry><para>Multiple denial of service issues</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:08.sendmail.asc">FreeBSD-EN-15:08.sendmail</link></entry>
-	<entry>18&nbsp;June&nbsp;2015</entry>
+	<entry>30&nbsp;June&nbsp;2015 (revised)</entry>
 	<entry><para>Sendmail TLS/DH interoperability improvement</para></entry>
       </row>
     </tbody>
   </tgroup>
 </informaltable>
Index: stable/9/release/doc/share/xml/errata.xml
===================================================================
--- stable/9/release/doc/share/xml/errata.xml	(revision 285059)
+++ stable/9/release/doc/share/xml/errata.xml	(revision 285060)
@@ -1,98 +1,105 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <informaltable frame="none" pgwide="1">
   <tgroup cols="3">
     <colspec colwidth="40%"/>
     <colspec colwidth="30%"/>
     <colspec colwidth="30%"/>
     <thead>
       <row>
 	<entry>Errata</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-14:10.tzdata.asc">FreeBSD-EN-14:10.tzdata</link></entry>
 	<entry>21&nbsp;October&nbsp;2014</entry>
 	<entry><para>Time zone data file update</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-14:11.crypt.asc">FreeBSD-EN-14:11.crypt</link></entry>
 	<entry>21&nbsp;October&nbsp;2014</entry>
 	<entry><para>Change &man.crypt.3; default hashing algorithm
 	    back to DES</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-14:12.zfs.asc">FreeBSD-EN-14:12.zfs</link></entry>
 	<entry>11&nbsp;November&nbsp;2014</entry>
 	<entry><para>Fix NFSv4 and ZFS cache consistency
 	    issue</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-14:13.freebsd-update.asc">FreeBSD-EN-14:13.freebsd-update</link></entry>
 	<entry>23&nbsp;December&nbsp;2014</entry>
 	<entry><para>Fixed directory deletion issue in
 	    &man.freebsd-update.8;</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:01.vt.asc">FreeBSD-EN-15:01.vt</link></entry>
 	<entry>25&nbsp;February&nbsp;2015</entry>
 	<entry><para>&man.vt.4; crash with improper ioctl
 	    parameters</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:02.openssl.asc">FreeBSD-EN-15:02.openssl</link></entry>
 	<entry>25&nbsp;February&nbsp;2015</entry>
 	<entry><para>OpenSSL update</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:03.freebsd-update.asc">FreeBSD-EN-15:03.freebsd-update</link></entry>
 	<entry>25&nbsp;February&nbsp;2015</entry>
 	<entry><para>&man.freebsd-update.8; updates libraries in
 	    suboptimal order</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:04.freebsd-update.asc">FreeBSD-EN-15:04.freebsd-update</link></entry>
 	<entry>13&nbsp;May&nbsp;2015</entry>
 	<entry><para>&man.freebsd-update.8; does not ensure the
 	    previous upgrade has completed</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:06.file.asc">FreeBSD-EN-15:06.file</link></entry>
 	<entry>9&nbsp;June&nbsp;2015</entry>
 	<entry><para>Multiple denial of service issues</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-15:08.sendmail.asc">FreeBSD-EN-15:08.sendmail</link></entry>
-	<entry>18&nbsp;June&nbsp;2015</entry>
+	<entry>30&nbsp;June&nbsp;2015 (revised)</entry>
 	<entry><para>Sendmail TLS/DH interoperability improvement</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-15:09.xlocale.asc">FreeBSD-EN-15:09.xlocale</link></entry>
+	<entry>30&nbsp;June&nbsp;2015</entry>
+	<entry><para>Fix inconsistency between locale and rune locale states</para></entry>
       </row>
     </tbody>
   </tgroup>
 </informaltable>