From 9600f352bf80649d3e68196dd34263a8afb03643 Mon Sep 17 00:00:00 2001
From: "Jonathan S. Katz" <jonathan.katz@excoventures.com>
Date: Thu, 10 May 2018 06:07:47 -0700
Subject: [PATCH] Cumulative 2018-05-10 release content updates.

---
 templates/base/base.html               |  2 +-
 templates/index.html                   | 18 ++++++++----------
 templates/pages/developer/roadmap.html |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/templates/base/base.html b/templates/base/base.html
index c78d000b..9baeb580 100644
--- a/templates/base/base.html
+++ b/templates/base/base.html
@@ -59,7 +59,7 @@
       </div>
       <div class="row justify-content-center pg-shout-box">
         <div class="col text-white text-center">
-          1st March 2018: <a href="/about/news/1834/">PostgreSQL 10.3 Released</a>!
+          10th May 2018: <a href="/about/news/1851/">PostgreSQL 10.4 Released</a>!
         </div>
       </div>
     </div>
diff --git a/templates/index.html b/templates/index.html
index b519c0a7..c1547f55 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -46,8 +46,8 @@
       <h2>Latest Releases</h2>
       <div class="text">
         <p>
-          <strong>2018-03-01 - PostgreSQL 10.3 Released!</strong>
-          The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 10.3, 9.6.8, 9.5.12, 9.4.17, and 9.3.22.
+          <strong>2018-05-10 - PostgreSQL 10.4 Released!</strong>
+          The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 10.4, 9.6.9, 9.5.13, 9.4.18, and 9.3.23.
         </p>
         <ul>
           {% for v in versions %}
@@ -129,23 +129,21 @@
       <h2 class="centered-lines">Latest News</h2>
       <!-- Featured Post -->
         <header>
-          <h3><a href="#">PostgreSQL 10.3 Released!</a></h3>
+          <h3><a href="#">PostgreSQL 10.4 Released!</a></h3>
           <ul class="meta">
-            <li><i class="far fa-clock"></i>&nbsp;2018-03-01</li>
+            <li><i class="far fa-clock"></i>&nbsp;2018-05-10</li>
             <!--<li><i class="far fa-comments"></i> 0</li>-->
           </ul>
         </header>
         <p>
-          The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 10.3, 9.6.8, 9.5.12, 9.4.17, and 9.3.22.
+          The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 10.4, 9.6.9, 9.5.13, 9.4.18, and 9.3.23.
         </p>
         <p>
-          This release centers around added documentation that describes <a href="https://wiki.postgresql.org/wiki/A_Guide_to_CVE-2018-1058:_Protect_Your_Search_Path" target="_blank">CVE-2018-1058</a> and how to take steps to mitigate the impact on PostgreSQL databases. There are also
-          several bug fixes included in the release. All users using the affected versions of PostgreSQL should update as soon as possible.
+          This release fixes one security issue as well as several bugs reported over the last three months.  Users should plan to update at the next convenient downtime. Please see the "Updating" section for post-installation steps for the security fix and the "incorrect volatility and parallel-safety markings" fix.
         </p>
         <ul class="bold">
-          <li><a href="/about/news/1834/">Release Announcement</a></li>
-          <li><a href="https://www.postgresql.org/docs/current/static/release-10-3.html">Release Notes</a></li>
-          <li><a href="https://wiki.postgresql.org/wiki/A_Guide_to_CVE-2018-1058:_Protect_Your_Search_Path">A Guide to CVE-2018-1058</a></li>
+          <li><a href="/about/news/1851/">Release Announcement</a></li>
+          <li><a href="https://www.postgresql.org/docs/current/static/release-10-4.html">Release Notes</a></li>
           <li><a href="https://www.postgresql.org/download/">Download</a></li>
         </ul>
         <a href="/about/newsarchive/" title="Archives"><button type="button" class="btn btn-primary">Browse Archives</button></a>
diff --git a/templates/pages/developer/roadmap.html b/templates/pages/developer/roadmap.html
index 345e2c96..ee73da70 100644
--- a/templates/pages/developer/roadmap.html
+++ b/templates/pages/developer/roadmap.html
@@ -25,10 +25,10 @@ Thursday of February, May, August, and November. The current schedule for upcomi
 releases is:
 </p>
 <ul>
-  <li>May 10th, 2018</li>
   <li>August 9th, 2018</li>
   <li>November 8th, 2018</li>
   <li>February 14th, 2019</li>
+  <li>May 9th, 2019</li>
 </ul>
 
 <h2>Next major release</h2>
-- 
2.39.5