Index: stable/10/release/doc/share/xml/errata.xml
===================================================================
--- stable/10/release/doc/share/xml/errata.xml	(revision 320949)
+++ stable/10/release/doc/share/xml/errata.xml	(revision 320950)
@@ -1,139 +1,147 @@
 <?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-16:06.libc.asc">FreeBSD-EN-16:06.libc</link></entry>
 	<entry>4&nbsp;May&nbsp;2016</entry>
 	<entry><para>Performance regression in libc
 	    &man.hash.3;</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:07.ipi.asc">FreeBSD-EN-16:07.ipi</link></entry>
 	<entry>4&nbsp;May&nbsp;2016</entry>
 	<entry><para>Excessive latency in x86 IPI
 	    delivery</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:08.zfs.asc">FreeBSD-EN-16:08.zfs</link></entry>
 	<entry>4&nbsp;May&nbsp;2016</entry>
 	<entry><para>Memory leak in ZFS</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:09.freebsd-update.asc">FreeBSD-EN-16:09.freebsd-update</link></entry>
 	<entry>25&nbsp;July&nbsp;2016</entry>
 	<entry><para>Fix &man.freebsd-update.8; support of
 	    &os;&nbsp;11.0-RELEASE</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:10.dhclient.asc">FreeBSD-EN-16:10.dhclient</link></entry>
 	<entry>11&nbsp;August&nbsp;2016</entry>
 	<entry><para>Better handle unknown options received from
 	    aDHCP server</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:11.vmbus.asc">FreeBSD-EN-16:11.vmbus</link></entry>
 	<entry>11&nbsp;August&nbsp;2016</entry>
 	<entry><para>Avoid using spin locks for channel message
 	    locks</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:12.hv_storvsc.asc">FreeBSD-EN-16:12.hv_storvsc</link></entry>
 	<entry>11&nbsp;August&nbsp;2016</entry>
 	<entry><para>Enable INQUIRY result check only on
 	    Windows&nbsp;10 host systems</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:13.vmbus.asc">FreeBSD-EN-16:13.vmbus</link></entry>
 	<entry>11&nbsp;August&nbsp;2016</entry>
 	<entry><para>Register time counter early enough for TSC freq
 	    calibration</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:14.hv_storvsc.asc">FreeBSD-EN-16:14.hv_storvsc</link></entry>
 	<entry>11&nbsp;August&nbsp;2016</entry>
 	<entry><para>Disable incorrect callout in
 	    &man.hv.storvsc.4;</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:15.vmbus.asc">FreeBSD-EN-16:15.vmbus</link></entry>
 	<entry>11&nbsp;August&nbsp;2016</entry>
 	<entry><para>Better handle the GPADL setup failure in
 	    Hyper-V</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:16.hv_storvsc.asc">FreeBSD-EN-16:16.hv_storvsc</link></entry>
 	<entry>11&nbsp;August&nbsp;2016</entry>
 	<entry><para>Fix SCSI INQUIRY checks and error
 	    handling</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:17.vm.asc">FreeBSD-EN-16:17.vm</link></entry>
 	<entry>25&nbsp;October&nbsp;2016</entry>
 	<entry><para>Several virtual memory issues</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:19.tzcode.asc">FreeBSD-EN-16:19.tzcode</link></entry>
 	<entry>6&nbsp;December&nbsp;2016</entry>
 	<entry><para>Fix warnings about invalid timezone
 	    abbreviations</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-16:20.tzdata.asc">FreeBSD-EN-16:20.tzdata</link></entry>
 	<entry>6&nbsp;December&nbsp;2016</entry>
 	<entry><para>Update timezone database
 	    information</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-17:05.xen.asc">FreeBSD-EN-17:05.xen</link></entry>
 	<entry>23&nbsp;February&nbsp;2017</entry>
 	<entry><para>Xen migration enhancements</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-17:06.hyperv.asc">FreeBSD-EN-17:06.hyperv</link></entry>
+	<entry>12&nbsp;July&nbsp;2017</entry>
+	<entry><para>Boot compatibility improvements with
+	    Azure virtual machines</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
Index: stable/10/release/doc/share/xml/security.xml
===================================================================
--- stable/10/release/doc/share/xml/security.xml	(revision 320949)
+++ stable/10/release/doc/share/xml/security.xml	(revision 320950)
@@ -1,211 +1,219 @@
 <?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>Advisory</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:09.ntp.asc">FreeBSD-SA-16:09.ntp</link></entry>
 	<entry>29&nbsp;April&nbsp;2016</entry>
 	<entry><para>Multiple <application>ntp</application>
 	    vulnerabilities.</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:17.openssl.asc">FreeBSD-SA-16:17.openssl</link></entry>
 	<entry>29&nbsp;April&nbsp;2016</entry>
 	<entry><para>Multiple <application>OpenSSL</application>
 	    vulnerabilities.</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:18.atkbd.asc">FreeBSD-SA-16:18.atkbd</link></entry>
 	<entry>17&nbsp;May&nbsp;2016</entry>
 	<entry><para>Keyboard driver buffer overflow</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:19.sendmsg.asc">FreeBSD-SA-16:19.sendmsg</link></entry>
 	<entry>17&nbsp;May&nbsp;2016</entry>
 	<entry><para>Incorrect argument handling in
 	    &man.sendmsg.2;</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:20.linux.asc">FreeBSD-SA-16:20.linux</link></entry>
 	<entry>31&nbsp;May&nbsp;2016</entry>
 	<entry><para>Kernel stack disclosure in Linux compatibility
 	  layer</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:21.43bsd.asc">FreeBSD-SA-16:21.43bsd</link></entry>
 	<entry>31&nbsp;May&nbsp;2016</entry>
 	<entry><para>Kernel stack disclosure in 4.3BSD compatibility
 	  layer</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:22.libarchive.asc">FreeBSD-SA-16:22.libarchive</link></entry>
 	<entry>31&nbsp;May&nbsp;2016</entry>
 	<entry><para>Absolute path traversal
 	    vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:23.libarchive.asc">FreeBSD-SA-16:23.libarchive</link></entry>
 	<entry>31&nbsp;May&nbsp;2016</entry>
 	<entry><para>Absolute path traversal
 	    vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:24.ntp.asc">FreeBSD-SA-16:24.ntp</link></entry>
 	<entry>3&nbsp;June&nbsp;2016</entry>
 	<entry><para>Multiple <application>ntp</application>
 	    vulnerabilties</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:25.bspatch.asc">FreeBSD-SA-16:25.bspatch</link></entry>
 	<entry>25&nbsp;July&nbsp;2016</entry>
 	<entry><para>heap overflow vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:26.openssl.asc">FreeBSD-SA-16:26.openssl</link></entry>
 	<entry>23&nbsp;September&nbsp;2016</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:27.openssl.asc">FreeBSD-SA-16:27.openssl</link></entry>
 	<entry>26&nbsp;September&nbsp;2016</entry>
 	<entry><para>Regression in <application>OpenSSL</application>
 	    suite</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:29.bspatch.asc">FreeBSD-SA-16:29.bspatch</link></entry>
 	<entry>10&nbsp;October&nbsp;2016</entry>
 	<entry><para>Heap overflow vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:30.portsnap.asc">FreeBSD-SA-16:30.portsnap</link></entry>
 	<entry>10&nbsp;October&nbsp;2016</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:31.libarchive.asc">FreeBSD-SA-16:31.libarchive</link></entry>
 	<entry>10&nbsp;October&nbsp;2016</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:33.openssh.asc">FreeBSD-SA-16:33.openssh</link></entry>
 	<entry>2&nbsp;November&nbsp;2016</entry>
 	<entry><para>Remote Denial of Service
 	    vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:35.openssl.asc">FreeBSD-SA-16:35.openssl</link></entry>
 	<entry>2&nbsp;November&nbsp;2016</entry>
 	<entry><para>Remote Denial of Service
 	    vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:36.telnetd.asc">FreeBSD-SA-16:36.telnetd</link></entry>
 	<entry>6&nbsp;December&nbsp;2016</entry>
 	<entry><para>Possible &man.login.1; argument
 	    injection</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:37.libc.asc">FreeBSD-SA-16:37.libc</link></entry>
 	<entry>6&nbsp;December&nbsp;2016</entry>
 	<entry><para>&man.link.ntoa.3; buffer overflow</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:38.bhyve.asc">FreeBSD-SA-16:38.bhyve</link></entry>
 	<entry>6&nbsp;December&nbsp;2016</entry>
 	<entry><para>Possible escape from &man.bhyve.8; virtual
 	  machine</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:39.ntp.asc">FreeBSD-SA-16:39.ntp</link></entry>
 	<entry>22&nbsp;December&nbsp;2016</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:01.openssh.asc">FreeBSD-SA-17:01.openssh</link></entry>
 	<entry>10&nbsp;January&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:02.openssl.asc">FreeBSD-SA-17:02.openssl</link></entry>
 	<entry>23&nbsp;February&nbsp;2017</entry>
 	<entry><para>Fix OpenSSL RC4_MD5 cipher
 	    vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:03.ntp.asc">FreeBSD-SA-17:03.ntp</link></entry>
 	<entry>12&nbsp;April&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:04.ipfilter.asc">FreeBSD-SA-17:04.ipfilter</link></entry>
 	<entry>27&nbsp;April&nbsp;2017</entry>
 	<entry><para>Fix fragment handling panic</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-17:05.heimdal.asc">FreeBSD-SA-17:05.heimdal</link></entry>
+	<entry>12&nbsp;July&nbsp;2017</entry>
+	<entry><para>Fix KDC-REP service name validation
+	    vulnerability</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
Index: stable/11/release/doc/share/xml/security.xml
===================================================================
--- stable/11/release/doc/share/xml/security.xml	(revision 320949)
+++ stable/11/release/doc/share/xml/security.xml	(revision 320950)
@@ -1,95 +1,103 @@
 <?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>Advisory</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:32.bhyve.asc">FreeBSD-SA-16:32.bhyve</link></entry>
 	<entry>25&nbsp;October&nbsp;2016</entry>
 	<entry><para>Privilege escalation vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:33.openssh.asc">FreeBSD-SA-16:33.openssh</link></entry>
 	<entry>2&nbsp;November&nbsp;2016</entry>
 	<entry><para>Remote Denial of Service
 	    vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:36.telnetd.asc">FreeBSD-SA-16:36.telnetd</link></entry>
 	<entry>6&nbsp;December&nbsp;2016</entry>
 	<entry><para>Possible &man.login.1; argument
 	    injection</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:37.libc.asc">FreeBSD-SA-16:37.libc</link></entry>
 	<entry>6&nbsp;December&nbsp;2016</entry>
 	<entry><para>&man.link.ntoa.3; buffer overflow</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:38.bhyve.asc">FreeBSD-SA-16:38.bhyve</link></entry>
 	<entry>6&nbsp;December&nbsp;2016</entry>
 	<entry><para>Possible escape from &man.bhyve.8; virtual
 	  machine</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-16:39.ntp.asc">FreeBSD-SA-16:39.ntp</link></entry>
 	<entry>22&nbsp;December&nbsp;2016</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:01.openssh.asc">FreeBSD-SA-17:01.openssh</link></entry>
 	<entry>10&nbsp;January&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:02.openssl.asc">FreeBSD-SA-17:02.openssl</link></entry>
 	<entry>23&nbsp;February&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:03.ntp.asc">FreeBSD-SA-17:03.ntp</link></entry>
 	<entry>12&nbsp;April&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:04.ipfilter.asc">FreeBSD-SA-17:04.ipfilter</link></entry>
 	<entry>27&nbsp;April&nbsp;2017</entry>
 	<entry><para>Fix fragment handling panic</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-17:05.heimdal.asc">FreeBSD-SA-17:05.heimdal</link></entry>
+	<entry>12&nbsp;July&nbsp;2017</entry>
+	<entry><para>Fix KDC-REP service name validation
+	    vulnerability</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>