svn commit: r323618 - in releng/10.4/release/doc: en_US.ISO8859-1 en_US.ISO8859-1/readme share/xml

[Glen Barber]

Author: gjb
Date: Fri Sep 15 19:17:30 2017
New Revision: 323618
URL: https://svnweb.freebsd.org/changeset/base/323618

Log:
  - Disconnect the errata document from the build.
  - Connect the installation page to the build.
  - Fix a malformed URL.
  - Update versions, and switch from 'snapshot' to 'release.'
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/10.4/release/doc/en_US.ISO8859-1/Makefile
  releng/10.4/release/doc/en_US.ISO8859-1/readme/article.xml
  releng/10.4/release/doc/share/xml/release.ent

Modified: releng/10.4/release/doc/en_US.ISO8859-1/Makefile
==============================================================================
--- releng/10.4/release/doc/en_US.ISO8859-1/Makefile	Fri Sep 15 19:16:32 2017	(r323617)
+++ releng/10.4/release/doc/en_US.ISO8859-1/Makefile	Fri Sep 15 19:17:30 2017	(r323618)
@@ -4,8 +4,8 @@ RELN_ROOT?= ${.CURDIR}/..
 
 SUBDIR = relnotes
 SUBDIR+= hardware
+SUBDIR+= installation
 SUBDIR+= readme
-SUBDIR+= errata
 
 COMPAT_SYMLINK = en
 

Modified: releng/10.4/release/doc/en_US.ISO8859-1/readme/article.xml
==============================================================================
--- releng/10.4/release/doc/en_US.ISO8859-1/readme/article.xml	Fri Sep 15 19:16:32 2017	(r323617)
+++ releng/10.4/release/doc/en_US.ISO8859-1/readme/article.xml	Fri Sep 15 19:17:30 2017	(r323618)
@@ -352,8 +352,9 @@
 	  other copies are kept updated on the Internet and should be
 	  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>
+	  the <uri
+	    xlink:href="&url.base;/releases/">&os; &release.current;
+	    page</uri>
 	  (as well as any sites which keep up-to-date mirrors of this
 	  location).</para>
       </note>

Modified: releng/10.4/release/doc/share/xml/release.ent
==============================================================================
--- releng/10.4/release/doc/share/xml/release.ent	Fri Sep 15 19:16:32 2017	(r323617)
+++ releng/10.4/release/doc/share/xml/release.ent	Fri Sep 15 19:17:30 2017	(r323618)
@@ -6,7 +6,7 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "10.3-STABLE">
+<!ENTITY release.current "10.4-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.2-RELEASE">
+<!ENTITY release.prev.stable "10.3-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "10.3-RELEASE">
+<!ENTITY release.next "10.4-STABLE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "10.3-STABLE">
+<!ENTITY release.branch "10.4-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">
@@ -38,9 +38,9 @@
 <!-- WARNING: Do not forget to also change the release type in
      doc.relnotes.mk when updating this -->
 <!ENTITY release.type "snapshot">
-<!ENTITY % release.type.current  "INCLUDE">
+<!ENTITY % release.type.current  "IGNORE">
 <!ENTITY % release.type.snapshot "IGNORE">
-<!ENTITY % release.type.release "IGNORE">
+<!ENTITY % release.type.release "INCLUDE">
 
 <![%release.type.current;[
 <!ENTITY release '&release.current;'>