From c3af9be463b18972eedf4ef16d64b6eb83345ec2 Mon Sep 17 00:00:00 2001
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 4 Apr 2016 00:57:27 +0000
Subject: [PATCH] - Announce 10.3-RELEASE. - Remove 10.3 from Upcoming
 Releases.

Approved by:	re (implicit)
---
 .../htdocs/releases/10.3R/Makefile            |  6 +++--
 .../htdocs/releases/10.3R/schedule.xml        |  4 ++--
 en_US.ISO8859-1/htdocs/releng/index.xml       |  6 -----
 share/xml/news.xml                            | 24 +++++++++++++++++++
 share/xml/release.ent                         | 12 +++++-----
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/releases/10.3R/Makefile b/en_US.ISO8859-1/htdocs/releases/10.3R/Makefile
index f5b2a346a8..5c0cf0691e 100644
--- a/en_US.ISO8859-1/htdocs/releases/10.3R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/10.3R/Makefile
@@ -12,12 +12,14 @@ _REVISION?=	10.3
 _BRANCH?=	RELEASE
 THISRELEASE?=	${_OS}-${_REVISION}-${_BRANCH}
 
-DOCS=	index.xml \
+DOCS=	announce.xml \
+	index.xml \
 	schedule.xml \
 	signatures.xml \
 	todo.xml
 
-DATA=	docbook.css \
+DATA=	announce.asc \
+	docbook.css \
 	hardware.html \
 	installation.html \
 	readme.html \
diff --git a/en_US.ISO8859-1/htdocs/releases/10.3R/schedule.xml b/en_US.ISO8859-1/htdocs/releases/10.3R/schedule.xml
index ca338a7a40..a0137cce4a 100644
--- a/en_US.ISO8859-1/htdocs/releases/10.3R/schedule.xml
+++ b/en_US.ISO8859-1/htdocs/releases/10.3R/schedule.xml
@@ -5,7 +5,7 @@
 <!ENTITY local.branch.stable "stable/10">
 <!ENTITY local.branch.releng "releng/10.3">
 <!ENTITY title "FreeBSD &local.rel; Release Process">
-<!ENTITY % beta.local.where "INCLUDE">
+<!ENTITY % beta.local.where "IGNORE">
 <!ENTITY % beta2.local.where "IGNORE">
 ]>
 
@@ -148,7 +148,7 @@
     <tr>
       <td>RELEASE announcement</td>
       <td>29&nbsp;March&nbsp;2016</td>
-      <td>-</td>
+      <td>4&nbsp;April&nbsp;2016</td>
       <td>&local.rel;-RELEASE press release.</td>
     </tr>
 
diff --git a/en_US.ISO8859-1/htdocs/releng/index.xml b/en_US.ISO8859-1/htdocs/releng/index.xml
index efcce4c9ec..acbcf6a422 100644
--- a/en_US.ISO8859-1/htdocs/releng/index.xml
+++ b/en_US.ISO8859-1/htdocs/releng/index.xml
@@ -49,12 +49,6 @@
       <th>Information</th>
     </tr>
 
-    <tr>
-      <td>March&nbsp;2016</td>
-      <td>&os;&nbsp;10.3</td>
-      <td><a href="&base;/releases/10.3R/schedule.html">Target Schedule</a></td>
-    </tr>
-
     <tr>
       <td>July&nbsp;2016</td>
       <td>&os;&nbsp;11.0</td>
diff --git a/share/xml/news.xml b/share/xml/news.xml
index 5a94e5e2ef..a2894f0d64 100644
--- a/share/xml/news.xml
+++ b/share/xml/news.xml
@@ -31,6 +31,30 @@
   <year>
     <name>2016</name>
 
+    <month>
+      <name>4</name>
+
+      <day>
+	<name>4</name>
+
+	<event>
+	  <title>&os;&nbsp;10.3-RELEASE Available</title>
+
+	  <p><a href="&enbase;/releases/10.3R/announce.html">FreeBSD
+	      10.3-RELEASE</a> is now available.  Please be sure to
+	    check the <a
+	      href="&enbase;/releases/10.3R/relnotes.html">Release
+	      Notes</a> and <a
+	      href="&enbase;/releases/10.3R/errata.html">Release
+	      Errata</a> before installation for any late-breaking
+	    news and/or issues with 10.3.  More information about
+	    FreeBSD releases can be found on the <a
+	      href="&enbase;/releases/index.html">Release
+	      Information</a> page.</p>
+	</event>
+      </day>
+    </month>
+
     <month>
       <name>3</name>
 
diff --git a/share/xml/release.ent b/share/xml/release.ent
index c8e03f166f..417967945c 100644
--- a/share/xml/release.ent
+++ b/share/xml/release.ent
@@ -34,12 +34,12 @@
       below to "IGNORE".  If we do, use "INCLUDE". -->
 
 <!-- Set to 'INCLUDE' when the schedule is available. -->
-<!ENTITY beta.upcoming "INCLUDE">
-<!ENTITY % beta.upcoming "INCLUDE">
+<!ENTITY beta.upcoming "IGNORE">
+<!ENTITY % beta.upcoming "IGNORE">
 
 <!-- Set to 'INCLUDE' when the installation images are available. -->
-<!ENTITY beta.testing "INCLUDE">
-<!ENTITY % beta.testing "INCLUDE">
+<!ENTITY beta.testing "IGNORE">
+<!ENTITY % beta.testing "IGNORE">
 <!ENTITY betarel.current '10.3'>
 <!ENTITY betarel.vers 'RC3'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
@@ -59,8 +59,8 @@
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current.major '10'>
-<!ENTITY rel.current '10.2'>
-<!ENTITY rel.current.date 'August 2015'>
+<!ENTITY rel.current '10.3'>
+<!ENTITY rel.current.date 'April 2016'>
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>