Update download page for 2.1.18 and 2.2.10 releases


git-svn-id: http://svn.apache.org/repos/asf/cassandra/site@1799999 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/publish/download/index.html b/publish/download/index.html
index 1942ca8..1242d34 100644
--- a/publish/download/index.html
+++ b/publish/download/index.html
@@ -107,9 +107,9 @@
 
 <ul>
   <li>Apache Cassandra 3.0 is supported until <strong>6 months after 4.0 release (date TBD)</strong>. The latest release is <a href="http://www.apache.org/dyn/closer.lua/cassandra/3.0.14/apache-cassandra-3.0.14-bin.tar.gz">3.0.14</a> (<a href="http://www.apache.org/dist/cassandra/3.0.14/apache-cassandra-3.0.14-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/3.0.14/apache-cassandra-3.0.14-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/3.0.14/apache-cassandra-3.0.14-bin.tar.gz.sha1">sha1</a>), released on 2017-06-23.</li>
-  <li>Apache Cassandra 2.2 is supported until <strong>4.0 release (date TBD)</strong>. The latest release is <a href="http://www.apache.org/dyn/closer.lua/cassandra/2.2.9/apache-cassandra-2.2.9-bin.tar.gz">2.2.9</a> (<a href="http://www.apache.org/dist/cassandra/2.2.9/apache-cassandra-2.2.9-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/2.2.9/apache-cassandra-2.2.9-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/2.2.9/apache-cassandra-2.2.9-bin.tar.gz.sha1">sha1</a>), released on 2017-02-21.</li>
+  <li>Apache Cassandra 2.2 is supported until <strong>4.0 release (date TBD)</strong>. The latest release is <a href="http://www.apache.org/dyn/closer.lua/cassandra/2.2.10/apache-cassandra-2.2.10-bin.tar.gz">2.2.10</a> (<a href="http://www.apache.org/dist/cassandra/2.2.10/apache-cassandra-2.2.10-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/2.2.10/apache-cassandra-2.2.10-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/2.2.10/apache-cassandra-2.2.10-bin.tar.gz.sha1">sha1</a>), released on 2017-06-26.</li>
   <li>Apache Cassandra 2.1 is supported until <strong>4.0 release (date TBD)</strong> with <strong>critical fixes only</strong>. The latest release is
-<a href="http://www.apache.org/dyn/closer.lua/cassandra/2.1.17/apache-cassandra-2.1.17-bin.tar.gz">2.1.17</a> (<a href="http://www.apache.org/dist/cassandra/2.1.17/apache-cassandra-2.1.17-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/2.1.17/apache-cassandra-2.1.17-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/2.1.17/apache-cassandra-2.1.17-bin.tar.gz.sha1">sha1</a>), released on 2017-02-21.</li>
+<a href="http://www.apache.org/dyn/closer.lua/cassandra/2.1.18/apache-cassandra-2.1.18-bin.tar.gz">2.1.18</a> (<a href="http://www.apache.org/dist/cassandra/2.1.18/apache-cassandra-2.1.18-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/2.1.18/apache-cassandra-2.1.18-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/2.1.18/apache-cassandra-2.1.18-bin.tar.gz.sha1">sha1</a>), released on 2017-06-26.</li>
 </ul>
 
 <p>Older (unsupported) versions of Cassandra are <a href="http://archive.apache.org/dist/cassandra/">archived here</a>.</p>
@@ -146,7 +146,7 @@
   <li>If you encounter this error:</li>
 </ul>
 
-<pre><code>GPG error: http://www.apache.org 310x InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY A278B781FE4B2BDA
+<pre><code>GPG error: http://www.apache.org 311x InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY A278B781FE4B2BDA
 </code></pre>
 <p>Then add the public key A278B781FE4B2BDA as follows:</p>
 
@@ -174,11 +174,10 @@
 
 <h3 id="installation-from-rpm-packages">Installation from RPM packages</h3>
 
-<p>Cassandra can be installed using RPM packages for the following <code>&lt;release series&gt;</code>, similar to Debian packages above:</p>
-
 <ul>
-  <li><code>311x</code> and <code>30x</code></li>
-  <li>Modify the <code>&lt;release series&gt;</code> desired in the <code>baseurl</code> below.</li>
+  <li>For the <code>&lt;release series&gt;</code> specify the major version number, without dot, and with an appended <code>x</code>.</li>
+  <li>The latest <code>&lt;release series&gt;</code> is <code>311x</code>.</li>
+  <li>For older releases, the <code>&lt;release series&gt;</code> can one of <code>30x</code>, <code>22x</code>, or <code>21x</code>.</li>
   <li>
     <p>(Not all versions of Apache Cassandra are available, since building RPMs is a recent addition to the project.)</p>
   </li>
@@ -186,12 +185,12 @@
 </ul>
 
 <div><div class="CodeRay">
-  <div class="code"><pre><span class="line-numbers"><a href="#n1" name="n1">1</a></span>[cassandra]
-<span class="line-numbers"><a href="#n2" name="n2">2</a></span>name=Apache Cassandra
-<span class="line-numbers"><a href="#n3" name="n3">3</a></span>baseurl=https://www.apache.org/dist/cassandra/redhat/311x/
-<span class="line-numbers"><a href="#n4" name="n4">4</a></span>gpgcheck=1
-<span class="line-numbers"><a href="#n5" name="n5">5</a></span>repo_gpgcheck=1
-<span class="line-numbers"><a href="#n6" name="n6">6</a></span>gpgkey=https://www.apache.org/dist/cassandra/KEYS
+  <div class="code"><pre><span class="line-numbers"><a href="#n1" name="n1"></a></span>[cassandra]
+<span class="line-numbers"><a href="#n2" name="n2"></a></span>name=Apache Cassandra
+<span class="line-numbers"><a href="#n3" name="n3"></a></span>baseurl=https://www.apache.org/dist/cassandra/redhat/311x/
+<span class="line-numbers"><a href="#n4" name="n4"></a></span>gpgcheck=1
+<span class="line-numbers"><a href="#n5" name="n5"></a></span>repo_gpgcheck=1
+<span class="line-numbers"><a href="#n6" name="n6"></a></span>gpgkey=https://www.apache.org/dist/cassandra/KEYS
 </pre></div>
 </div>
 </div>
diff --git a/src/_data/releases.yaml b/src/_data/releases.yaml
index dfcf2b2..7e6a770 100644
--- a/src/_data/releases.yaml
+++ b/src/_data/releases.yaml
@@ -7,9 +7,9 @@
   date: 2017-06-23
 
 "2.2":
-  name: "2.2.9"
-  date: 2017-02-21
+  name: "2.2.10"
+  date: 2017-06-26
 
 "2.1":
-  name: "2.1.17"
-  date: 2017-02-21
+  name: "2.1.18"
+  date: 2017-06-26
diff --git a/src/download.md b/src/download.md
index db2589c..ad64566 100644
--- a/src/download.md
+++ b/src/download.md
@@ -51,7 +51,7 @@
 * If you encounter this error:
 
 ```
-GPG error: http://www.apache.org 310x InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY A278B781FE4B2BDA
+GPG error: http://www.apache.org 311x InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY A278B781FE4B2BDA
 ```
 Then add the public key A278B781FE4B2BDA as follows:
 
@@ -77,10 +77,9 @@
 
 ### Installation from RPM packages
 
-Cassandra can be installed using RPM packages for the following `<release series>`, similar to Debian packages above:
-
-* `311x` and `30x`
-* Modify the `<release series>` desired in the `baseurl` below.
+* For the `<release series>` specify the major version number, without dot, and with an appended `x`.
+* The latest `<release series>` is `311x`.
+* For older releases, the `<release series>` can one of `30x`, `22x`, or `21x`.
 * (Not all versions of Apache Cassandra are available, since building RPMs is a recent addition to the project.)
 
 * Add the Apache repository of Cassandra to `/etc/yum.repos.d/cassandra.repo`, for example for the latest 3.11 version:
@@ -111,7 +110,6 @@
 Please note that official RPMs for Apache Cassandra only have been available recently and are not tested thoroughly on all platforms yet. We appreciate your feedback and support and ask you to post details on any issues in the [corresponding Jira ticket](https://issues.apache.org/jira/browse/CASSANDRA-13433).
 
 
-
 ### Source
 
 Development is done in the Apache Git repository. To check out a copy: