From 665fc9cf55d820dedfbfc6e2d1ab31e6ba4a2c20 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Fri, 27 Jul 2018 07:08:59 -0700
Subject: [PATCH] docs: Update release calendar, add news item, and add release
 notes for 18.1.5

---
 docs/index.html            | 6 ++++++
 docs/release-calendar.html | 8 +-------
 docs/relnotes.html         | 1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 2414a703085..f0a153a9121 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,12 @@
 
 <h1>News</h1>
 
+<h2>July 27, 2018</h2>
+<p>
+<a href="relnotes/18.1.5.html">Mesa 18.1.5</a> is released.
+This is a bug-fix release.
+</p>
+
 <h2>July 13, 2018</h2>
 <p>
 <a href="relnotes/18.1.4.html">Mesa 18.1.4</a> is released.
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index 8e23b7f9e05..c086b90f681 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -39,13 +39,7 @@ if you'd like to nominate a patch in the next stable release.
 <th>Notes</th>
 </tr>
 <tr>
-<td rowspan="4">18.1</td>
-<td>2018-07-27</td>
-<td>18.1.5</td>
-<td>Dylan Baker</td>
-<td></td>
-</tr>
-<tr>
+<td rowspan="3">18.1</td>
 <td>2018-08-10</td>
 <td>18.1.6</td>
 <td>Dylan Baker</td>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index eecb5a843fe..9d4a262b96e 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <ul>
+<li><a href="relnotes/18.1.5.html">18.1.5 release notes</a>
 <li><a href="relnotes/18.1.4.html">18.1.4 release notes</a>
 <li><a href="relnotes/18.1.3.html">18.1.3 release notes</a>
 <li><a href="relnotes/18.1.2.html">18.1.2 release notes</a>
-- 
2.30.2