release.ent:

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

errata/article.xml:
- Prune stale entries from 11.0-RELEASE.
- Bump copyright date.

relnotes/article.xml:
- Remove several empty sections.

readme/article.xml:
- Fix a malformed URL.

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

4 files changed, 23 insertions, 153 deletions

diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 3a8c033..6db0a63 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -23,7 +23,7 @@
     <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
-      <year>2016</year>
+      <year>2017</year>
 
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation
 	Project</holder>
@@ -95,17 +95,6 @@
 
     <itemizedlist>
       <listitem>
-	<para>An issue was discovered with Amazon&reg; EC2&trade;
-	  images which would cause the virtual machine to hang during
-	  boot when upgrading from previous FreeBSD versions.  New
-	  EC2&trade; installations are not affected, but existing
-	  installations running earlier releases are advised to wait
-	  until the issue is resolved in an Errata Notice before
-	  upgrading.  An Errata Notice to address this is planned
-	  following the release.</para>
-      </listitem>
-
-      <listitem>
 	<para>&os;/&arch.i386; installed on ZFS may crash during boot
 	  when the ZFS pool mount is attempted while booting an
 	  unmodified <literal>GENERIC</literal> kernel.</para>
@@ -131,111 +120,10 @@ boot</screen>
       </listitem>
 
       <listitem>
-	<para>A bug was diagnosed in interaction of the
-	  <literal>pmap_activate()</literal> function and
-	  <acronym>TLB</acronym> shootdown <acronym>IPI</acronym>
-	  handler on amd64 systems which have <acronym>PCID</acronym>
-	  features but do not implement the <acronym>INVPCID</acronym>
-	  instruction.  On such machines, such as SandyBridge&trade;
-	  and IvyBridge&trade; microarchitectures, set the loader
-	  tunable <literal>vm.pmap.pcid_enabled=0</literal> during
-	  boot:</para>
-
-	<screen>set vm.pmap.pcid_enabled=0
-boot</screen>
-
-	<para>Add this line to
-	  <filename>/boot/loader.conf</filename> for the change to
-	  persist across reboots:</para>
-
-	<para>To check if the system is affected, check
-	  &man.dmesg.8; for <acronym>PCID</acronym> listed in the
-	  &quot;Features2&quot;, and absence of
-	  <acronym>INVPCID</acronym> in the &quot;Structured Extended
-	  Features&quot;.  If the <acronym>PCID</acronym> feature is
-	  not present, or <acronym>INVPCID</acronym> is present,
-	  system is not affected.</para>
-
-	<programlisting>vm.pmap.pcid_enabled=0</programlisting>
-      </listitem>
-
-      <listitem>
-	<para>The Release Notes erroneously states the
-	  <literal>WITH_SYSTEM_COMPILER</literal> &man.src.conf.5;
-	  option is enabled by default, however this was disabled
-	  prior to the final release build.</para>
-      </listitem>
-
-      <listitem>
-	<para>The release announcement stated &quot;Wireless support
-	  for 802.11n has been added.&quot;  This was intended to
-	  state &quot;Wireless support for 802.11n has been added for
-	  additional wireless network drivers.&quot;</para>
-      </listitem>
-
-      <listitem>
-	<para>Some release notes pertaining to the Cavium ThunderX
-	  platform (the &os;/&arch.arm64; reference platform) were
-	  omitted:</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para revision="289550" contrib="sponsor"
-	      sponsor="&cavium;">Support for the Cavium Virtualized
-	      NIC ethernet driver has been added.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para revision="286919" contrib="sponsor"
-	      sponsor="&cavium;">Support for the GICv3 and ITS device
-	      drivers has been added.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para revision="296308" contrib="sponsor"
-	      sponsor="&cavium;">Support for PCI Enhanced Allocation
-	      support has been added.</para>
-	  </listitem>
-	</itemizedlist>
-      </listitem>
-
-      <listitem>
-	<para revision="293860">[2016-10-20] Several recent Dell
-	  systems fail to find a bootable disk when the system boots
-	  in Legacy/BIOS/CSM mode, the boot disk is partitioned with
-	  <acronym>GPT</acronym>, and the Active flag in the
-	  Protective <acronym>MBR</acronym> is not set.  To work
-	  around this issue, either configure the system to boot in
-	  <acronym>UEFI</acronym> mode, or choose the &quot;GPT
-	  + Active&quot; scheme.</para>
-      </listitem>
-
-      <listitem>
-	<para>[2016-10-21] Support for <literal>sha512</literal> and
-	  <literal>skein</literal> checksumming has been added to the
-	  <acronym>ZFS</acronym> filesystem.  This was not mentioned
-	  in the release notes.</para>
-
-	<para>Systems being upgraded from earlier &os; releases with
-	  <acronym>ZFS</acronym> will see a message in <literal>zpool
-	    status</literal> output noting the pool is not at the
-	  latest version, and some features may not be enabled.
-	  Additional instructions on how to update
-	  <acronym>ZFS</acronym> pools to the latest version and
-	  update the boot blocks for all boot drives in the pool will
-	  also be provided in the output.</para>
-
-	<para>This information is also documented in
-	  <filename>/usr/src/UPDATING</filename>, which is included if
-	  the <literal>src</literal> component is selected during
-	  installation.</para>
-      </listitem>
-
-      <listitem>
-	<para>[2016-10-21] The size of the <acronym>GPT</acronym>
-	  enabled <acronym>ZFS</acronym> boot blocks
+	<para>The size of the <acronym>GPT</acronym> enabled
+	  <acronym>ZFS</acronym> boot blocks
 	  (<filename>/boot/gptzfsboot</filename>) has increased past
-	  64K.  Systems upgraded from older releases may experience
+	  82K.  Systems upgraded from older releases may experience
 	  a problem where the size of the existing
 	  &quot;freebsd-boot&quot; partition is too small to hold the
 	  new <filename>gptzfsboot</filename>.</para>
@@ -249,16 +137,15 @@ boot</screen>
       </listitem>
 
       <listitem>
-	<para>[2016-10-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>
+	<para>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
+	  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>
     </itemizedlist>
   </sect1>
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index f98b801..e7d4d11 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -362,8 +362,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
+	    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 6332038..78931df 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -795,12 +795,6 @@
     <para>This section covers changes and additions to file systems
       and other storage subsystems, both local and networked.</para>
 
-    <sect2 xml:id="storage-general">
-      <title>General Storage</title>
-
-      <para>&nbsp;</para>
-    </sect2>
-
     <sect2 xml:id="storage-net">
       <title>Networked Storage</title>
 
@@ -828,12 +822,6 @@
 	&man.loader.conf.5;, whereas
 	<literal>vfs.zfs.debug_flags</literal> could not.</para>
     </sect2>
-
-    <sect2 xml:id="storage-geom">
-      <title><literal>geom(4)</literal></title>
-
-      <para>&nbsp;</para>
-    </sect2>
   </sect1>
 
   <sect1 xml:id="boot">
@@ -854,12 +842,6 @@
 	<acronym>TFTPFS</acronym>, providing netboot support without
 	requiring an <acronym>NFS</acronym> server.</para>
     </sect2>
-
-    <sect2 xml:id="boot-menu">
-      <title>Boot Menu Changes</title>
-
-      <para>&nbsp;</para>
-    </sect2>
   </sect1>
 
   <sect1 xml:id="network">
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index 4c5ab8f..827e3ba 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.0-STABLE">
+<!ENTITY release.current "11.1-RELEASE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
@@ -19,13 +19,13 @@
 <!ENTITY release.prev.stable "10.3-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "11.1-RELEASE">
+<!ENTITY release.next "11.2-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "11.0-STABLE">
+<!ENTITY release.branch "11.1-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;'>