4 files changed, 38 insertions, 27 deletions
diff --git a/archiva-docs/src/site/apt/adminguide/upgrade.apt b/archiva-docs/src/site/apt/adminguide/upgrade.apt
index 69348a8f3..a71b7c167 100644
--- a/archiva-docs/src/site/apt/adminguide/upgrade.apt
+++ b/archiva-docs/src/site/apt/adminguide/upgrade.apt
@@ -14,10 +14,10 @@ Upgrading Archiva
 
    The repository data is portable across versions, and multiple versions can be configured to look at the same repositories (though not run simultaneously).
 
-* Upgrading Archiva from 1.1 to 1.2
+* Upgrading Archiva from 1.1.x to 1.2.x
 
-   Because of the changes in the search implementation in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.x to
-   1.2. Since the format of the index has changed in 1.2, the old index directory (which is located at <<</path/to/repo/.index>>> by default) needs to
+   Because of the changes in the search implementation starting in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.1.x to
+   1.2.x. Since the format of the index has changed in 1.2.x, the old index directory (which is located at <<</path/to/repo/.index>>> by default) needs to
    be removed. And in order for the artifacts in the repository to be indexed again, the last modified date of the artifacts need to be updated.
    To do this, just execute <<find [REPOSITORY_DIRECTORY_NAME] | xargs touch>> at the base directory where the repository resides. Execute the repository
    scanning so that the new index will be generated.
diff --git a/archiva-docs/src/site/apt/release-notes.apt b/archiva-docs/src/site/apt/release-notes.apt
index db137741b..a9e51c852 100644
--- a/archiva-docs/src/site/apt/release-notes.apt
+++ b/archiva-docs/src/site/apt/release-notes.apt
@@ -1,10 +1,10 @@
  -----
- Release Notes for Archiva 1.2
+ Release Notes for Archiva 1.2.1
  -----
 
-Release Notes for Archiva 1.2
+Release Notes for Archiva 1.2.1
 
-  The Apache Archiva team would like to announce the release of Archiva 1.2.  Archiva is {{{http://archiva.apache.org/download.html}
+  The Apache Archiva team would like to announce the release of Archiva 1.2.1.  Archiva is {{{http://archiva.apache.org/download.html}
   available for download from the web site}}.
 
   Archiva is an application for managing one or more remote repositories, including administration, artifact handling, browsing and searching.
@@ -19,40 +19,50 @@ Release Notes for Archiva 1.2
 
   * The Audit log filename has been renamed to <<<archiva-audit.log>>> instead of <<<audit.log>>> so that the log directory can be shared with other applications.
 
-* New in Archiva 1.2
+* Major Fixes in Archiva 1.2.1
 
-** Struts 2
+** Indexing and Search
 
-   The Archiva web application has been migrated from Webwork to Struts 2.
+   The NPE problems in 1.2 have been fixed. See the Indexing section in {{{userguide/searching.html}Searching}} documentation for the
+   changes made.
 
-~~TODO add more info
+** Database upgrade problems
 
-** Repository Statistics
+   Database upgrade problems from 1.1.x to 1.2.x have been fixed.
 
-   Repository statistics are now available to help in monitoring the Archiva repositories. Statistics include the number of artifacts and size
-   of the repository, the number of plugins, jars, wars, etc. For more details about this feature, see {{{adminguide/reports.html}Reports}}.
+~~TODO
 
-** Search
+* Release Notes
 
-   An advanced or filter search feature is added for more specific searching of artifacts. More details are available in {{{userguide/searching.html}Searching}}.
-   Archiva is also now using the Nexus index format for it's index.
+  The Archiva 1.2.1 feature set can be seen in the {{{tour/index.html} feature tour}}.
 
-~~TODO
+* Changes in Archiva 1.2.1
 
-** Web Services
+  *24 May 2009*
 
-   A web service for administrative tasks has been provided. It uses the Atlassian XML-RPC Binder which leverages the Apache XML-RPC.
-   For instructions on how to use this feature, see {{{adminguide/web-services.html}Using Archiva Web Services}}.
+** Bug
 
-** Delete Artifact
+    * [MRM-1143] - Nexus indexer throws NPE on repository scan
 
-   Artifacts can now be deleted from the web application. More details on how to use this feature is available in {{{userguide/delete-artifact.html}Deleting an Artifact}}.
+    * [MRM-1157] - Update from 1.1.3 to 1.2 fails with create table error
 
-~~TODO
+    * [MRM-1160] - Nexus Indexer throws NPE intermittently on retrieval
 
-* Release Notes
+    * [MRM-1161] - indexing causes NullPointer when getting a SNAPSHOT that has been deployed with maven 2.1
+
+    * [MRM-1167] - Quicksearch from the xmlrpc api returns no results
+
+    * [MRM-1172] - Invalid version validation error when uploading a jar with a four-part version number
+
+    * [MRM-1176] - SQLSyntaxErrorException is thrown when browsing for artifacts after upgrading from 1.3.1 to 1.2
+
+    * [MRM-1179] - NPE retrieving artifacts via http/webdav that are proxied
+
+    * [MRM-1188] - Index cleanup consumer fails when there is a current indexing task being executed (e.g. during repo scan, during artifact deployment or during proxy)
+
+** Improvement
 
-  The Archiva 1.2 feature set can be seen in the {{{tour/index.html} feature tour}}.
+    * [MRM-1165] - Move out upgrade instructions from 'Installing Standalone' into it's own page
 
 * Changes in Archiva 1.2
 
diff --git a/archiva-docs/src/site/apt/userguide/searching.apt b/archiva-docs/src/site/apt/userguide/searching.apt
index 98b56b148..2622d28a4 100644
--- a/archiva-docs/src/site/apt/userguide/searching.apt
+++ b/archiva-docs/src/site/apt/userguide/searching.apt
@@ -48,7 +48,8 @@ Searching
   indexing task and queues it in an indexing task queue. This indexing task is in turn executed by a task executor and
   that's where the actual indexing happens. A similar indexing task is also created and queued as artifacts are deployed
   in the Archiva repository or proxied from a remote repository. The reason behind this is to avoid multiple or simultaneous
-  update of the index (a repository scan might be executing while artifacts are being deployed in the repository). 
+  update of the index (a repository scan might be executing while artifacts are being deployed in the repository). <Note:>
+  This behavior applies for versions starting 1.2.1.
 
 * What Can Be Searched?
 
diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index 12c149c43..d9acfc19f 100644
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -21,7 +21,7 @@
 <project>
   <body>
     <breadcrumbs>
-      <item name="1.2" href="/docs/1.2" />
+      <item name="1.2.1" href="/docs/1.2.1" />
     </breadcrumbs>
 
     <menu name="Introduction">