Add texts about quarterly releases

diff --git a/templates/index.html b/templates/index.html
index 9c797a0dcb10b67739f9a88f1aa2169e9c0f6c59..23f611be895786e785e6b77cbd576c32651e3488 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -56,7 +56,7 @@
              <br />
              {%endfor%}
             </div>
-           <div id="pgFrontLatestReleasesNote"><b><a href="/download">Download</a></b> | <a href="/versions.rss" title="Versions RSS Feed"><img class="pgRSSImage" src="/media/img/misc/ico_rss.png" width="28" height="13" alt="Versions RSS Feed" /></a><br /><a href="/support/versioning">Why should I upgrade?</a></div>
+           <div id="pgFrontLatestReleasesNote"><b><a href="/download">Download</a></b> | <a href="/versions.rss" title="Versions RSS Feed"><img class="pgRSSImage" src="/media/img/misc/ico_rss.png" width="28" height="13" alt="Versions RSS Feed" /></a><br /><a href="/support/versioning">Why should I upgrade?</a><br/><a href="/developer/roadmap/">Upcoming releases</a></div>
           </div> <!-- pgFrontLatestreleases -->
           <div id="pgFrontShortcuts">
             <h2><img src="/media/img/hdr/hdr_shortcuts.png" width="85" height="10" alt="Shortcuts" /></h2>

diff --git a/templates/pages/developer/roadmap.html b/templates/pages/developer/roadmap.html
index 549ecb2f07c37813796a84e0bce702aa2b8bc724..273771675f0c984c1ee5f2683002440d8ff32279 100644 (file)
--- a/templates/pages/developer/roadmap.html
+++ b/templates/pages/developer/roadmap.html
@@ -9,9 +9,31 @@ such there is no formal list of feature requirements required for development.
 We really do follow the mantra of letting developers scratch their own itches.
 </p>
 
-<p>The next release of PostgreSQL is planned to be the 9.6 release. A
+
+<h2>Upcoming minor releases</h2>
+<p>
+The PostgreSQL project aims to make <i>at least</i> one minor release every quarter,
+on a predefined schedule. If it becomes necessary due to an important bugfix or
+security issue, more releases will be made between these dates, so this list should
+be considered a minimum. At each of these dates, a new minor release will be made
+for each <a href="/support/versioning/">supported version</a>.
+</p>
+<p>
+The target date for these releases are, unless otherwise stated, the second
+Thursday of February, May, August, and November. The current schedule for upcoming
+releases is:
+</p>
+<ul>
+  <li>May 12th, 2016</li>
+  <li>August 11th, 2016</li>
+  <li>November 7th, 2016</li>
+</ul>
+
+<h2>Next major release</h2>
+
+<p>The next major release of PostgreSQL is planned to be the 9.6 release. A
 tentative schedule for this version has a release in the 
-fourth quarter of 2016.</p>
+third quarter of 2016.</p>
 
 <p>While there are no formal requirements for each PostgreSQL release, there 
 are several places you can look to find out more information on upcoming

diff --git a/templates/support/versioning.html b/templates/support/versioning.html
index 71aec1cd8a1323a02865b5d1d715e681cc3f58ac..4c40dea3805c6c87278e135f7d1211a42c63dd43 100644 (file)
--- a/templates/support/versioning.html
+++ b/templates/support/versioning.html
@@ -20,6 +20,11 @@ Major releases usually change the internal format of system tables and data file
 Minor releases are numbered by increasing the third part of the version number, e.g. 9.2.3 to 9.2.4. The PostgreSQL team only adds bug fixes to minor releases. All users should upgrade to the most recent minor release as soon as possible. While upgrades always have some risk, PostgreSQL minor releases fix only frequently-encountered, <a href="/support/security">security</a>, and data corruption bugs to reduce the risk of upgrading. <i>The community considers not upgrading to be riskier than upgrading</i>.
 </p>
 
+<p>
+A tentative schedule for upcoming minor releases can be found in the
+<a href="/developer/roadmap/">roadmap</a>.
+</p>
+
 <p>
 Upgrading to a minor release does not require a dump and restore; merely stop the database server, install the updated binaries, and restart the server.  For some releases, manual changes may be required to complete the upgrade, so always read the release notes before upgrading.
 </p>