From 11a0d5563f49b84f27b2707d77a8553da52d73ba Mon Sep 17 00:00:00 2001
From: "Juan A. Suarez Romero" <jasuarez@igalia.com>
Date: Thu, 17 May 2018 18:45:26 +0000
Subject: [PATCH] docs: update calendar, add news and link release notes to
 18.0.4

Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
---
 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 de65588743d..5644ead731a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,12 @@
 
 <h1>News</h1>
 
+<h2>May 17, 2018</h2>
+<p>
+<a href="relnotes/18.0.4.html">Mesa 18.0.4</a> is released.
+This is a bug-fix release.
+</p>
+
 <h2>May 7, 2018</h2>
 <p>
 <a href="relnotes/18.0.3.html">Mesa 18.0.3</a> is released.
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index 49f4300d381..ba297532dc3 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="2">18.0</td>
-<td>2018-05-18</td>
-<td>18.0.4</td>
-<td>Juan A. Suarez Romero</td>
-<td></td>
-</tr>
-<tr>
+<td rowspan="1">18.0</td>
 <td>2018-06-01</td>
 <td>18.0.5</td>
 <td>Juan A. Suarez Romero</td>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 78af393a515..6f90021610e 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.0.4.html">18.0.4 release notes</a>
 <li><a href="relnotes/18.0.3.html">18.0.3 release notes</a>
 <li><a href="relnotes/18.0.2.html">18.0.2 release notes</a>
 <li><a href="relnotes/18.0.1.html">18.0.1 release notes</a>
-- 
2.30.2