errata/article.xml:

- Prune stale entries from 11.1-RELEASE.
- Add an xml:id for diff reduction.

hardware/article.xml:
- Add an xml:id for diff reduction.

installation/article.xml:
- Add an xml:id for diff reduction.

readme/article.xml:
- Fix a malformed URL and mailing list reference.

readme/article.xml:
- Update the xml:id to match that used by readme/article.xml
  for consistency.

release.ent:
- Update versions, and switch from 'snapshot' to 'release'.

security.xml:
- Remove reference to 10.x.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation

6 files changed, 25 insertions, 79 deletions

diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 2a20c14..a9baa62 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -14,6 +14,7 @@
 
 <article xmlns="http://docbook.org/ns/docbook"
 	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xml:id="top"
 	version="5.0">
   <info>
     <title>&os; &release; Errata</title>
@@ -120,19 +121,6 @@ boot</screen>
       </listitem>
 
       <listitem>
-	<para>[2017-07-21] Due to a bug in earlier versions of
-	  &man.clang.1; that is difficult to work around in the
-	  upgrade process, to upgrade the system from sources via
-	  buildworld to -CURRENT or &release;, it is necessary to
-	  upgrade machines running 9.x to at least revision r286035,
-	  or machines running 10.x to revision r286033.  Source-based
-	  upgrades from 10.3-RELEASE are not affected.  This differs
-	  from the historical situation where one could generally
-	  upgrade from anywhere on earlier stable branches, so caution
-	  should be exercised.</para>
-      </listitem>
-
-      <listitem>
 	<para>[2017-07-25] &os;/&arch.arm64; currently lacks
 	  <acronym>EFI</acronym> real-time clock
 	  (<acronym>RTC</acronym>) support, which may cause the system
@@ -153,51 +141,6 @@ boot</screen>
       </listitem>
 
       <listitem>
-	<para>[2017-07-26] Note for those upgrading from 11.1-RC2 in
-	  <application>VirtualBox</application>:</para>
-
-	<para>If system panics were experienced when upgrading from
-	  11.1-RC1 to 11.1-RC2, and the <filename
-	    role="package">emulators/virtualbox-ose-additions{,-nox11}</filename>
-	  port was built locally as a resolution, the port will either
-	  need to be rebuilt when upgrading from 11.1-RC2 to
-	  11.1-RELEASE, or reinstall the package from the pkg(8)
-	  mirrors using either:</para>
-
-	<screen> &prompt.root; <userinput>pkg install -f virtualbox-ose-additions</userinput></screen>
-
-	<para>or</para>
-
-	<screen> &prompt.root; <userinput>pkg install -f virtualbox-ose-additions-nox11</userinput></screen>
-
-	<para>To ensure the system does not panic after rebooting into
-	  the updated kernel, it is recommended to disable the
-	  <literal>vboxguest</literal> service in &man.rc.conf.5;
-	  prior to rebooting the system if possible, or use
-	  &man.pkg.8; to forcefully reinstall the package.</para>
-
-	<para>Systems being upgraded from 11.1-RC1 and earlier and
-	  11.1-RC3 to 11.1-RELEASE should be unaffected.</para>
-      </listitem>
-
-      <listitem>
-	<para>[2017-07-27] The release notes erroneously state
-	  revision <literal>r315330</literal> was sponsored by Rubicon
-	  Communications, LLC (Netgate), when in fact this work was
-	  done by Hiroki Mori independently.</para>
-      </listitem>
-
-      <listitem>
-	<para>[2017-08-09] The release notes stated the
-	  &man.ruptime.1;, &man.rwho.1;, and &man.rwhod.8; utilities
-	  have been marked &quot;deprecated&quot;, however this change
-	  was reversed in 12.0-CURRENT.</para>
-
-	<para>The other utilities mentioned in the entry in the
-	  release notes, however, are unchanged.</para>
-      </listitem>
-
-      <listitem>
 	<para>[2017-11-06] An issue with &os; virtual machines with
 	  <application>vagrant</application> was discovered that
 	  affects the <application>VirtualBox</application> where the
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index 88abca4..11fad83 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -7,7 +7,9 @@
 %devauto;
 ]>
 <article xmlns="http://docbook.org/ns/docbook"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xml:id="top"
+  version="5.0">
 
   <info>
     <title>&os; &release.current; Hardware Notes</title>
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index 63f08f0..8e5d6c4 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -13,7 +13,9 @@
      End:
 -->
 <article xmlns="http://docbook.org/ns/docbook"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xml:id="top"
+  version="5.0">
 
   <info>
     <title>&os; &release.current; README</title>
@@ -229,7 +231,7 @@
 	please send mail to the &a.questions;.</para>
 
       <para>If you are tracking the &release.branch; development
-	efforts, you <emphasis>must</emphasis> join the &a.current;,
+	efforts, you <emphasis>must</emphasis> join the &a.stable;,
 	in order to keep abreast of recent developments and changes
 	that may affect the way you use and maintain the
 	system.</para>
@@ -363,9 +365,9 @@
 	  consulted as the <quote>current errata</quote> for this
 	  release.  These other copies of the errata are located at
 	  <uri
-	    xlink:href="&url.base;/releases/">&url.base;/releases/</uri>
-	  (as well as any sites which keep up-to-date mirrors of this
-	  location).</para>
+	    xlink:href="&url.base;/releases/">&os;&nbsp;&release.current;
+	    page</uri> (as well as any sites which keep up-to-date
+	  mirrors of this location).</para>
       </note>
     </sect2>
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 06577c3..a26c688 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -12,7 +12,7 @@
 ]>
 <article xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink"
-  xml:id="article"
+  xml:id="top"
   version="5.0">
 
   <info>
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index cf8a3db..66e90be 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -6,7 +6,7 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "11.1-STABLE">
+<!ENTITY release.current "11.2-RELEASE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
@@ -16,16 +16,16 @@
 <!-- The previous stable release, useful for pointing user's at the
      release they SHOULD be running if they don't want the bleeding
      edge. -->
-<!ENTITY release.prev.stable "10.3-RELEASE">
+<!ENTITY release.prev.stable "10.4-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "11.2-RELEASE">
+<!ENTITY release.next "11.3-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "11.1-STABLE">
+<!ENTITY release.branch "11.2-STABLE">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
-<!ENTITY release.url "https://www.FreeBSD.org/snapshots/">
+<!ENTITY release.url "https://www.FreeBSD.org/releases/">
 
 <!-- The URL for Security Advisories and Errata Notices. -->
 <!ENTITY security.url "https://www.FreeBSD.org/security/advisories">
@@ -37,10 +37,10 @@
      or "release" -->
 <!-- WARNING: Do not forget to also change the release type in
      doc.relnotes.mk when updating this -->
-<!ENTITY release.type "snapshot">
+<!ENTITY release.type "release">
 <!ENTITY % release.type.current  "IGNORE">
-<!ENTITY % release.type.snapshot "INCLUDE">
-<!ENTITY % release.type.release "IGNORE">
+<!ENTITY % release.type.snapshot "IGNORE">
+<!ENTITY % release.type.release "INCLUDE">
 
 <![%release.type.current;[
 <!ENTITY release '&release.current;'>
@@ -55,10 +55,10 @@
 
 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "https://www.FreeBSD.org/cgi/man.cgi">
-<!ENTITY release.manpath.xorg          "7.5.1">
+<!ENTITY release.manpath.xorg          "7.7">
 <!ENTITY release.manpath.netbsd        "5.1">
 <!ENTITY release.manpath.freebsd-ports "Ports">
-<!ENTITY release.manpath.freebsd       "11-current">
+<!ENTITY release.manpath.freebsd       "11.2-RELEASE">
 
 <!-- Text constants which probably don't need to be changed.-->
 
diff --git a/release/doc/share/xml/security.xml b/release/doc/share/xml/security.xml
index bc90a06..afc1cb0 100644
--- a/release/doc/share/xml/security.xml
+++ b/release/doc/share/xml/security.xml
@@ -84,10 +84,9 @@
 	  <para>Speculative Execution Vulnerabilities</para>
 	  <note>
 	    <para>This advisory addresses the most significant issues
-	      for &os;&nbsp;11.1 on &arch.amd64; CPUs.  We expect to
-	      update this advisory to include 10.x for &arch.amd64;
-	      CPUs.  Future &os; releases will address this issue on
-	      &arch.i386; and other CPUs.</para>
+	      for &os;&nbsp;11.x on &arch.amd64; CPUs.  We expect to
+	      update this advisory to &arch.i386; and other
+	      CPUs.</para>
 	  </note>
 	</entry>
       </row>