From 103f86e125c41f8e8aa5a637b7cd1cdd70745564 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 21 Jun 2018 18:13:04 +0000
Subject: [PATCH] Final touches to 11.2-RELEASE release notes: - Remove an
 empty section that was left over from a previous commit   to prune empty
 sections. - Add a note about a late discovered issue with zfsd(8) (Bugzilla  
 228750).  Fix a sentence stop while here. - Document SA-18:07, which had been
 included in RC3. - Fix FreeBSD versions in the installation.html page.

Approved by:	re (implicit, relnotes)
Sponsored by:	The FreeBSD Foundation
---
 .../doc/en_US.ISO8859-1/errata/article.xml    | 19 ++++++++++++++++++-
 .../en_US.ISO8859-1/installation/article.xml  |  4 ++--
 .../doc/en_US.ISO8859-1/relnotes/article.xml  |  7 -------
 release/doc/share/xml/security.xml            |  8 ++++++++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index a9baa62b08c..516a4e746e9 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -57,7 +57,7 @@
     <title>Introduction</title>
 
     <para>This errata document contains <quote>late-breaking
-	news</quote> about &os; &release; Before installing this
+	news</quote> about &os; &release;.  Before installing this
       version, it is important to consult this document to learn about
       any post-release discoveries or problems that may already have
       been found and fixed.</para>
@@ -156,6 +156,23 @@ boot</screen>
 	  virtual machine to successfully boot, allowing access via
 	  <literal>vagrant ssh</literal>.</para>
       </listitem>
+
+      <listitem>
+	<para>[2018-06-21] An issue had been discovered late in the
+	  release cycle where removing <acronym>ZFS</acronym> vdevs
+	  from a pool under certain conditions would cause a system
+	  crash when &man.zfsd.8; is enabled in
+	  &man.rc.conf.5;.</para>
+
+	<para>At present, it is believed to be limited to removal of
+	  a <literal>mirror</literal> vdev from a pool consisting of
+	  multiple <literal>mirror</literal> vdevs.</para>
+
+	<para>See <acronym>PR</acronym> <link
+	    xlink:href="https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228750">228750</link>
+	  for more information and updates as the issue is
+	  investigated.</para>
+      </listitem>
     </itemizedlist>
   </sect1>
 
diff --git a/release/doc/en_US.ISO8859-1/installation/article.xml b/release/doc/en_US.ISO8859-1/installation/article.xml
index 88371e80050..ae038fc1a70 100644
--- a/release/doc/en_US.ISO8859-1/installation/article.xml
+++ b/release/doc/en_US.ISO8859-1/installation/article.xml
@@ -82,8 +82,8 @@
       <para>The &man.freebsd-update.8; utility supports binary
 	upgrades of &arch.i386; and &arch.amd64; systems running
 	earlier FreeBSD releases.  Systems running
-	<literal>10.3-RELEASE</literal>,
-	<literal>11.0-RELEASE</literal> can upgrade as follows:</para>
+	<literal>10.4-RELEASE</literal> or
+	<literal>11.1-RELEASE</literal> can upgrade as follows:</para>
 
       <screen>&prompt.root; freebsd-update fetch
 &prompt.root; freebsd-update install</screen>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 76cb4605edf..6ed8a170a7e 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -458,13 +458,6 @@
 	updated to default to <acronym>UEFI</acronym>-only
 	boot.</para>
     </sect2>
-
-    <sect2 xml:id="userland-rc">
-      <title><filename class="directory">/etc/rc.d</filename>
-	Scripts</title>
-
-      <para>&nbsp;</para>
-    </sect2>
   </sect1>
 
   <sect1 xml:id="kernel">
diff --git a/release/doc/share/xml/security.xml b/release/doc/share/xml/security.xml
index 74f3cc42980..26db9706603 100644
--- a/release/doc/share/xml/security.xml
+++ b/release/doc/share/xml/security.xml
@@ -113,6 +113,14 @@
 	<entry><para>Mishandling of x86 debug
 	    exceptions</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-18:07.lazyfpu.asc">FreeBSD-SA-18:07.lazyfpu</link></entry>
+	<entry>21&nbsp;June&nbsp;2018</entry>
+	<entry><para>Fix Lazy <acronym>FPU</acronym> information
+	    disclosure</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
-- 
2.45.0