include the release notes

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@597543 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-docs/src/site/apt/release-notes.apt b/archiva-docs/src/site/apt/release-notes.apt
index 9749a8bd08895e01055846da50204df20d08e962..962495e78ae157d568c3d35b67aecec3831aa659 100644 (file)
--- a/archiva-docs/src/site/apt/release-notes.apt
+++ b/archiva-docs/src/site/apt/release-notes.apt
@@ -1,8 +1,6 @@
  -----
  Release Notes for Archiva 1.0
  -----
- -----
- -----
 
 Release Notes for Archiva 1.0
 
@@ -20,8 +18,20 @@ Release Notes for Archiva 1.0
 
 * Release Notes
 
-  The full list of changes can be found {{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=12113&styleName=Text&projectId=10980} in JIRA}} and is reproduced below:
+  Archiva 1.0 is the culmination of many months of development and several beta-testing releases. Past issues can be seen in the JIRA instance and the implemented feature set in the {{{tour/index.html} feature tour}}.
+
+  The following describes the changes since the beta-4 release. The full list of changes can be found {{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=12113&styleName=Text&projectId=10980} in JIRA}}.
 
-~~TODO: paste
+-----
+** Bug
+    * [MRM-545] - Documentation for configuring for Tomcat is invalid
+    * [MRM-586] - entire proxy request fails if a queried remote repository throws a proxyexception
+    * [MRM-595] - regression : server-side relocation fails
+    * [MRM-596] - regression : cannot get java-sources anymore from maven1
+    * [MRM-598] - Validation error on new repository creation
 
+** Task
+    * [MRM-583] - Finalise and publish updated web site
+    * [MRM-587] - further changes to logging needed
+-----