You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/03/25 21:01:43 UTC

svn commit: r758424 - in /archiva/site/src/site: apt/download.apt apt/known-issues.apt apt/versions.apt resources/.htaccess xdoc/index.xml

Author: oching
Date: Wed Mar 25 20:01:37 2009
New Revision: 758424

URL: http://svn.apache.org/viewvc?rev=758424&view=rev
Log:
o update site for latest release

Modified:
    archiva/site/src/site/apt/download.apt
    archiva/site/src/site/apt/known-issues.apt
    archiva/site/src/site/apt/versions.apt
    archiva/site/src/site/resources/.htaccess
    archiva/site/src/site/xdoc/index.xml

Modified: archiva/site/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/download.apt?rev=758424&r1=758423&r2=758424&view=diff
==============================================================================
--- archiva/site/src/site/apt/download.apt (original)
+++ archiva/site/src/site/apt/download.apt Wed Mar 25 20:01:37 2009
@@ -6,54 +6,44 @@
 
   Archiva is distributed under the {{{http://archiva.apache.org/license.html} Apache License, version 2.0}}.
 
-* Current Release: Archiva 1.1.3
+* Current Release: Archiva 1.2
 
   This is the currently recommended version of Archiva.
 
-    * {{{docs/1.2-M1/release-notes.html} Release Notes}}
+    * {{{docs/1.2/release-notes.html} Release Notes}}
 
     * {{{known-issues.html}Known Issues and Errata}}
 
   []
 
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3                 | Mirrors | Checksum | Signature |
+| Archiva 1.2                 | Mirrors | Checksum | Signature |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz.asc} asc}} |
+| Archiva 1.2 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-bin.tar.gz.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.asc} asc}} |
+|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-bin.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3 WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.asc} asc}} |
+| Archiva 1.2 WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2.war.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3 Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-docs.zip.asc} asc}} |
+| Archiva 1.2 Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-docs.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3 Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.1.3-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.1.3-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.1.3-src.zip.asc} asc}} |
+| Archiva 1.2 Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.2-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.2-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.2-src.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
 
-* Preview Release: Archiva 1.2-M1
-
-  This is a preview of the next version of Archiva for testing and feedback.
-
-    * {{{docs/1.2-M1/release-notes.html} Release Notes}}
-
-  []
+* Previous Versions
 
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.2-M1                 | Mirrors | Checksum | Signature |
-*-------------------------------+---------+----------+-----------+
-| Archiva 1.2-M1 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz.asc} asc}} |
+| Archiva 1.1.3                 | Mirrors | Checksum | Signature |
 *-------------------------------+---------+----------+-----------+
-|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.zip.asc} asc}} |
+| Archiva 1.1.3 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.2-M1 WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1.war.asc} asc}} |
+|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.2-M1 Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-docs.zip.asc} asc}} |
+| Archiva 1.1.3 WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.2-M1 Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.2-M1-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.2-M1-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.2-M1-src.zip.asc} asc}} |
+| Archiva 1.1.3 Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-docs.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-
-* Previous Versions
-
+| Archiva 1.1.3 Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.1.3-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.1.3-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.1.3-src.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
 | Archiva 1.1.2                   | Mirrors | Checksum | Signature |
 *-------------------------------+---------+----------+-----------+
@@ -104,6 +94,23 @@
 | Archiva 1.0.2 Sources           | {{{http://archive.apache.org/dist/maven/source/apache-archiva-1.0.2-src.zip} source zip}} | {{{http://archive.apache.org/dist/maven/source/apache-archiva-1.0.2-src.zip.md5} md5}} | {{{http://archive.apache.org/dist/maven/source/apache-archiva-1.0.2-src.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
 
+* Previous Preview Release Versions
+
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.2-M1                 | Mirrors | Checksum | Signature |
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.2-M1 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.2-M1 WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1.war.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.2-M1 Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-docs.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.2-M1 Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.2-M1-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.2-M1-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.2-M1-src.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+
+
 * System {Requirements}
 
 *----------------------+--------------------------------------------------------------------------------------------------------------------------------+

Modified: archiva/site/src/site/apt/known-issues.apt
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/known-issues.apt?rev=758424&r1=758423&r2=758424&view=diff
==============================================================================
--- archiva/site/src/site/apt/known-issues.apt (original)
+++ archiva/site/src/site/apt/known-issues.apt Wed Mar 25 20:01:37 2009
@@ -25,8 +25,18 @@
 
 Known Issues and Errata
 
-* Archiva 1.2-M1
+* Archiva 1.2
 
 ** Known Issues
 
-  * For a list of all issues reported against Archiva 1.2-M1, click  {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&&fixfor=14713&pid=10980&sorter/field=priority&sorter/order=DESC}here}}.
+~~ NOTE: This should link to a list of issues that has an Affects version of this release and are still Open
+
+  * For a list of all JIRA issues reported against Archiva 1.2, click  {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&&pid=10980&resolution=-1&version=14713&version=14288&sorter/field=priority&sorter/order=DESC}here}}.
+
+  * Migration of the users database from 1.1 to 1.2 is broken.
+  
+
+
+  
+
+

Modified: archiva/site/src/site/apt/versions.apt
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/versions.apt?rev=758424&r1=758423&r2=758424&view=diff
==============================================================================
--- archiva/site/src/site/apt/versions.apt (original)
+++ archiva/site/src/site/apt/versions.apt Wed Mar 25 20:01:37 2009
@@ -8,31 +8,23 @@
 
 Archiva Documentation
 
-* Current Release: Archiva 1.1.3
+* Current Release: Archiva 1.2
 
-  The current stable release of Archiva is <1.1.3>.
+  The current stable release of Archiva is <1.2>.
 
-    * {{{docs/1.1.3/release-notes.html} Release Notes}}
+    * {{{docs/1.2/release-notes.html} Release Notes}}
 
-    * {{{docs/1.1.3/index.html} Documentation}}
+    * {{{docs/1.2/index.html} Documentation}}
 
-    * {{{ref/1.1.3/index.html} Developer Reference}}
-
-* Preview Release: Archiva 1.2-M1
-
-  The latest preview release of Archiva is <1.2-M1>.
-
-    * {{{docs/1.2-M1/release-notes.html} Release Notes}}
-
-    * {{{docs/1.2-M1/index.html} Documentation}}
-
-    * {{{ref/1.2-M1/index.html} Developer Reference}}
+    * {{{ref/1.2/index.html} Developer Reference}}
 
 ~~ TODO: have more specific links than Documentation, and find a better link for developer reference
 
-* Previous Releases
+* Previous Stable Releases
 
 *------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
+| 1.1.3 | {{{docs/1.1.3/release-notes.html} Release Notes}} | {{{docs/1.1.3/learn.html} Documentation}} | {{{ref/1.1.3/index.html} Developer Reference}} |
+*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
 | 1.1.2 | {{{docs/1.1.2/release-notes.html} Release Notes}} | {{{docs/1.1.2/learn.html} Documentation}} | {{{ref/1.1.2/index.html} Developer Reference}} |
 *------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
 | 1.1.1 | {{{docs/1.1.1/release-notes.html} Release Notes}} | {{{docs/1.1.1/learn.html} Documentation}} | {{{ref/1.1.1/index.html} Developer Reference}} |
@@ -46,3 +38,8 @@
 | 1.0 | {{{docs/1.0/release-notes.html} Release Notes}} | {{{docs/1.0/learn.html} Documentation}} | {{{ref/1.0/index.html} Developer Reference}} |
 *------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
 
+* Previous Preview Releases
+
+*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
+| 1.2-M1 | {{{docs/1.2-M1/release-notes.html} Release Notes}} | {{{docs/1.2-M1/learn.html} Documentation}} | {{{ref/1.2-M1/index.html} Developer Reference}} |
+*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+

Modified: archiva/site/src/site/resources/.htaccess
URL: http://svn.apache.org/viewvc/archiva/site/src/site/resources/.htaccess?rev=758424&r1=758423&r2=758424&view=diff
==============================================================================
--- archiva/site/src/site/resources/.htaccess (original)
+++ archiva/site/src/site/resources/.htaccess Wed Mar 25 20:01:37 2009
@@ -1,2 +1,2 @@
-Redirect Permanent /reports http://archiva.apache.org/ref/1.2-M1
-Redirect Permanent /docs/current http://archiva.apache.org/docs/1.2-M1
+Redirect Permanent /reports http://archiva.apache.org/ref/1.2
+Redirect Permanent /docs/current http://archiva.apache.org/docs/1.2

Modified: archiva/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/archiva/site/src/site/xdoc/index.xml?rev=758424&r1=758423&r2=758424&view=diff
==============================================================================
--- archiva/site/src/site/xdoc/index.xml (original)
+++ archiva/site/src/site/xdoc/index.xml Wed Mar 25 20:01:37 2009
@@ -29,61 +29,61 @@
     <div id="rhs">
       <h4>Features</h4>
       <p>
-        <a href="docs/1.1.3/tour/project.html">
+        <a href="docs/1.2/tour/project.html">
           <img src="images/screenshots/project.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Project Information
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/search.html">
+        <a href="docs/1.2/tour/search.html">
           <img src="images/screenshots/search.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Artifact Search
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/proxy.html">
+        <a href="docs/1.2/tour/proxy.html">
           <img src="images/screenshots/proxy.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Remote Proxying Cache
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/upload.html">
+        <a href="docs/1.2/tour/upload.html">
           <img src="images/screenshots/upload.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Artifact Upload
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/admin.html">
+        <a href="docs/1.2/tour/admin.html">
           <img src="images/screenshots/admin.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Graphical Administration
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/virtual-repos.html">
+        <a href="docs/1.2/tour/virtual-repos.html">
           <img src="images/screenshots/virtual-repos.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Repository Groups
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/rss.html">
+        <a href="docs/1.2/tour/rss.html">
           <img src="images/screenshots/rss.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           RSS Feeds
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/security.html">
+        <a href="docs/1.2/tour/security.html">
           <img src="images/screenshots/security.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Role-based Security
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/reports.html">
+        <a href="docs/1.2/tour/reports.html">
           <img src="images/screenshots/reports.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Integrity Reports
         </a>
       </p>
       <p>
-        <a href="docs/1.1.3/tour/maintenance.html">
+        <a href="docs/1.2/tour/maintenance.html">
           <img src="images/screenshots/maintenance.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Maintenance
         </a>
@@ -116,7 +116,7 @@
 
           <p>
             <!-- TODO: use velocity and property throughout - note that we don't include beta in here -->
-            <a href="docs/1.1.3/tour/index.html">Take a look around <img src="images/arrow.png" width="16" height="16" alt="" /></a>
+            <a href="docs/1.2/tour/index.html">Take a look around <img src="images/arrow.png" width="16" height="16" alt="" /></a>
           </p>
           <p>
             <!-- Commenting out while we still don't have a live demo  
@@ -137,13 +137,13 @@
           <p>
             <span class="expand">
               <img src="images/collapsed.gif" width="7" height="7" alt="" />
-              <strong>Stable release</strong>: <a href="#">Archiva 1.1.3</a> - October 9, 2008 
+              <strong>Stable 1.1.x release</strong>: <a href="#">Archiva 1.1.3</a> - October 9, 2008 
             </span>
             <br/>
             <span class="expand">
               <!-- TODO: use velocity and property throughout -->
               <img src="images/collapsed.gif" width="7" height="7" alt="" />
-              <strong>Preview release</strong>: <a href="#">Archiva 1.2-M1</a> - November 14, 2008
+              <strong>Stable latest release</strong>: <a href="#">Archiva 1.2</a> - March 26, 2008
             </span>
             <br/>
             <span class="expand">
@@ -157,7 +157,7 @@
         <span class="jqmClose">[x]</span>
         <h2>Archiva 1.1.3</h2>
         <p>
-          This is the recommended release of Archiva.
+          This is the recommended 1.1.x release of Archiva.
         </p>
         <div class="linkBox">
           <table>
@@ -185,9 +185,9 @@
       </div>
       <div id="dialogPrerelease" class="jqmWindow">
         <span class="jqmClose">[x]</span>
-        <h2>Archiva 1.2-M1</h2>
+        <h2>Archiva 1.2</h2>
         <p>
-          This is a preview release of the next version of Archiva.
+          This is the recommended latest release of Archiva.
         </p>
         <div class="linkBox">
           <table>
@@ -198,34 +198,34 @@
               <th>Signature</th>
             </tr>
             <tr>
-              <td>Archiva 1.2-M1 Standalone</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-bin.zip">zip</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.zip.asc">asc</a></td>
+              <td>Archiva 1.2 Standalone</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-bin.zip">zip</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-bin.zip.asc">asc</a></td>
             </tr>
             <tr>
-              <td>Archiva 1.2-M1 WAR</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1.war">war</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1.war.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1.war.asc">asc</a></td>
+              <td>Archiva 1.2 WAR</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2.war">war</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2.war.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2.war.asc">asc</a></td>
             </tr>
           </table> 
         </div>
-        <p><a href="docs/1.2-M1/release-notes.html">Release Notes</a> | <a href="download.html">More downloads</a></p>
+        <p><a href="docs/1.2/release-notes.html">Release Notes</a> | <a href="download.html">More downloads</a></p>
       </div>
       <div class="mainBox">
         <div>
           <span class="bignumber">3</span>
 
           <p>
-            <a href="docs/1.1.3/index.html">Documentation <img src="images/arrow.png" width="16" height="16" alt="" /></a>
+            <a href="docs/1.2/index.html">Documentation <img src="images/arrow.png" width="16" height="16" alt="" /></a>
           </p>
           <p>
             <img src="images/collapsed.gif" width="7" height="7" alt="" />
-            Simple out of the box configuration and <a href="docs/1.1.3/quick-start.html">quick start guide</a>
+            Simple out of the box configuration and <a href="docs/1.2/quick-start.html">quick start guide</a>
             <br/>
             <img src="images/collapsed.gif" width="7" height="7" alt="" />
-            Read the <a href="docs/1.1.3/userguide/index.html">users guide</a> and <a href="docs/1.1.3/adminguide/index.html">administration documentation</a>
+            Read the <a href="docs/1.2/userguide/index.html">users guide</a> and <a href="docs/1.2/adminguide/index.html">administration documentation</a>
             <br/>
             <img src="images/collapsed.gif" width="7" height="7" alt="" />
             Documentation is also available for <a href="versions.html">previous versions</a>