From ecfe41e6902237e53459e0d6b06b2cd91fb34025 Mon Sep 17 00:00:00 2001
From: Andres Gomez <agomez@igalia.com>
Date: Sat, 8 Sep 2018 00:40:43 +0300
Subject: [PATCH] docs: update calendar, add news item and link release notes
 for 18.2.0

Signed-off-by: Andres Gomez <agomez@igalia.com>
---
 docs/index.html            |  8 ++++++--
 docs/release-calendar.html | 32 ++++++++++++++++++++++++++++----
 docs/relnotes.html         |  1 +
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index cda64f0bd8b..e157c57f6a0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -17,8 +17,12 @@
 <h1>News</h1>
 <h2>September 7, 2018</h2>
 <p>
-<a href="relnotes/18.1.8.html">Mesa 18.1.8</a> is released.
-This is a bug-fix release.
+<a href="relnotes/18.1.8.html">Mesa 18.1.8</a> and
+<a href="relnotes/18.2.0.html">Mesa 18.2.0</a> are released.
+
+These are, respectively, a bug-fix release from the 18.1 branch and a
+new development release.  See the release notes for more information
+about the releases.
 </p>
 
 <h2>August 24, 2018</h2>
diff --git a/docs/release-calendar.html b/docs/release-calendar.html
index b9a2ceb023b..b9e32d89e6c 100644
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -46,11 +46,35 @@ if you'd like to nominate a patch in the next stable release.
 <td>Last planned 18.1.x release</td>
 </tr>
 <tr>
-<td rowspan="1">18.2</td>
-<td>2018-09-05</td>
-<td>18.2.0-rc6</td>
+<td rowspan="5">18.2</td>
+<td>2018-09-19</td>
+<td>18.2.1</td>
 <td>Andres Gomez</td>
-<td>Last planned RC/Final release</td>
+<td></td>
+</tr>
+<tr>
+<td>2018-10-03</td>
+<td>18.2.2</td>
+<td>Andres Gomez</td>
+<td></td>
+</tr>
+<tr>
+<td>2018-10-17</td>
+<td>18.2.3</td>
+<td>Andres Gomez</td>
+<td></td>
+</tr>
+<tr>
+<td>2018-10-31</td>
+<td>18.2.4</td>
+<td>Andres Gomez</td>
+<td></td>
+</tr>
+<tr>
+<td>2018-11-14</td>
+<td>18.2.5</td>
+<td>Andres Gomez</td>
+<td>Last planned 18.2.x release</td>
 </tr>
 </table>
 
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 553eb9ab050..e41daee6679 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.2.0.html">18.2.0 release notes</a>
 <li><a href="relnotes/18.1.8.html">18.1.8 release notes</a>
 <li><a href="relnotes/18.1.7.html">18.1.7 release notes</a>
 <li><a href="relnotes/18.1.6.html">18.1.6 release notes</a>
-- 
2.30.2