From 4ad8e2ac82d6dbc78dd39947d6b2914be169d0d9 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Fri, 1 Jun 2018 08:36:12 -0700
Subject: [PATCH] doc: update calendar, add news and link release notes for
 18.1.1

---
 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 34418e9bdc8..1e27b659768 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,12 @@
 
 <h1>News</h1>
 
+<h2>June 1, 2018</h2>
+<p>
+<a href="relnotes/18.1.1.html">Mesa 18.1.1</a> is released.
+This is a bug-fix release.
+</p>
+
 <h2>May 18, 2018</h2>
 <p>
 <a href="relnotes/18.1.0.html">Mesa 18.1.0</a> is released.  This is a
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index f9ff9acc2d9..ef4d703d303 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -46,13 +46,7 @@ if you'd like to nominate a patch in the next stable release.
 <td>Last planned 18.0.x release</td>
 </tr>
 <tr>
-<td rowspan="7">18.1</td>
-<td>2018-06-01</td>
-<td>18.1.1</td>
-<td>Dylan Baker</td>
-<td></td>
-</tr>
-<tr>
+<td rowspan="6">18.1</td>
 <td>2018-06-15</td>
 <td>18.1.2</td>
 <td>Dylan Baker</td>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 568615d9e4a..a4a3eb28404 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.1.html">18.1.1 release notes</a>
 <li><a href="relnotes/18.1.0.html">18.1.0 release notes</a>
 <li><a href="relnotes/18.0.4.html">18.0.4 release notes</a>
 <li><a href="relnotes/18.0.3.html">18.0.3 release notes</a>
-- 
2.30.2