prepare site for upcoming release

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/email/trunk@1803363 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/site/site.xml b/src/site/site.xml
index 89d2e33..89bd563 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,8 @@
             <item name="Download"                      href="http://commons.apache.org/email/download_email.cgi"/>
             <item name="User guide"                    href="/userguide.html"/>
             <item name="Latest API docs (development)" href="/apidocs/index.html"/>
-            <item name="Javadoc (1.4 release)"         href="/javadocs/api-release/index.html"/>
+            <item name="Javadoc (1.5 release)"         href="/javadocs/api-release/index.html"/>
+            <item name="Javadoc (1.4 release)"         href="/javadocs/api-1.4/index.html"/>
             <item name="Javadoc (1.3.3 release)"       href="/javadocs/api-1.3.3/index.html"/>
             <item name="Javadoc (1.2 release)"         href="/javadocs/api-1.2/index.html"/>
         </menu>
diff --git a/src/site/xdoc/download_email.xml b/src/site/xdoc/download_email.xml
index 98c72d2..6d9b808 100644
--- a/src/site/xdoc/download_email.xml
+++ b/src/site/xdoc/download_email.xml
@@ -31,10 +31,21 @@
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
  |    - commons.release.version (required)                              |
- |    - commons.binary.suffix (optional)                                |
+ |    - commons.release.name    (required)                              |
+ |    - commons.binary.suffix   (optional)                              |
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
+ |    - commons.release.desc    (optional)                              |
+ |    - commons.release.subdir  (optional)                              |
+ |                                                                      |
+ |    - commons.release.2/3.version       (conditional)                 |
+ |    - commons.release.2/3.name          (conditional)                 |
+ |    - commons.release.2/3.binary.suffix (optional)                    |
+ |    - commons.release.2/3.desc          (optional)                    |
+ |    - commons.release.2/3.subdir        (optional)                    |
  |                                                                      |
  | 3) Example Properties                                                |
+ |    (commons.release.name inherited by parent:                        |
+ |     ${project.artifactId}-${commons.release.version}                 |
  |                                                                      |
  |  <properties>                                                        |
  |    <commons.componentid>math</commons.componentid>                   |
@@ -46,17 +57,17 @@
 <document>
   <properties>
     <title>Download Apache Commons Email</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
     <section name="Download Apache Commons Email">
     <subsection name="Using a Mirror">
       <p>
         We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> verify the integrity of
+        builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
         the downloaded files using signatures downloaded from our main
         distribution directories. Recent releases (48 hours) may not yet
-        be available from the mirrors.
+        be available from all the mirrors.
       </p>
 
       <p>
@@ -88,39 +99,44 @@
       </form>
 
       <p>
-        The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
-        link links to the code signing keys used to sign the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
-        The <code>MD5</code> link downloads the checksum from the main site.
+        It is essential that you
+        <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
+        of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
+        failing that using the <code>MD5</code> hash (<code>*.md5</code> checksum files).
+      </p>
+      <p>
+        The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
+        file contains the public PGP keys used by Apache Commons developers
+        to sign releases.
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons Email 1.4 ">
+    <section name="Apache Commons Email 1.5 ">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/email/binaries/commons-email-1.4-bin.tar.gz">commons-email-1.4-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.4-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.4-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/binaries/commons-email-1.5-bin.tar.gz">commons-email-1.5-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/email/binaries/commons-email-1.5-bin.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/email/binaries/commons-email-1.5-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/email/binaries/commons-email-1.4-bin.zip">commons-email-1.4-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.4-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.4-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/binaries/commons-email-1.5-bin.zip">commons-email-1.5-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/email/binaries/commons-email-1.5-bin.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/email/binaries/commons-email-1.5-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/email/source/commons-email-1.4-src.tar.gz">commons-email-1.4-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.4-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.4-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/source/commons-email-1.5-src.tar.gz">commons-email-1.5-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/email/source/commons-email-1.5-src.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/email/source/commons-email-1.5-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/email/source/commons-email-1.4-src.zip">commons-email-1.4-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.4-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.4-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/source/commons-email-1.5-src.zip">commons-email-1.5-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/email/source/commons-email-1.5-src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/email/source/commons-email-1.5-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -131,7 +147,7 @@
         </p>
         <ul>
           <li class="download"><a href="[preferred]/commons/email/">browse download area</a></li>
-          <li><a href="http://archive.apache.org/dist/commons/email/">archives...</a></li>
+          <li><a href="https://archive.apache.org/dist/commons/email/">archives...</a></li>
         </ul>
     </section>
   </body>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 00901e6..b645541 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -77,7 +77,10 @@
             </p>
             <ul>
                 <li>The
-                    <a href="javadocs/api-release/index.html">current release 1.4</a>
+                    <a href="javadocs/api-release/index.html">current release 1.5</a>
+                </li>
+                <li>The
+                    <a href="javadocs/api-1.4/index.html">previous version 1.4</a>
                 </li>
                 <li>The
                     <a href="javadocs/api-1.3.3/index.html">previous version 1.3.3</a>
@@ -99,7 +102,7 @@
         <!-- ================================================== -->
         <section name="Releases">
             <p>
-                The latest version 1.4, requires Java 5 -
+                The latest version 1.5, requires Java 6 -
                 <a href="http://commons.apache.org/email/download_email.cgi">Download now!</a>
                 <br/>
                 The full