From 68bc9c193ca1f1ea7a697f3aa911d8d9a5b7bc86 Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <scolebourne@apache.org>
Date: Sun, 14 May 2006 20:20:39 +0000
Subject: [PATCH] Documentation for v3.2

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@406414 13f79535-47bb-0310-9956-ffa450edef68
---
 xdocs/building.xml       |  8 ++++----
 xdocs/history.xml        | 19 ++++++++++++-------
 xdocs/index.xml          | 10 +++++-----
 xdocs/issue-tracking.xml |  4 ++--
 xdocs/navigation.xml     |  2 +-
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/xdocs/building.xml b/xdocs/building.xml
index 990c54b6e..26fec892b 100644
--- a/xdocs/building.xml
+++ b/xdocs/building.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2005 The Apache Software Foundation.
+Copyright 2005-2006 The Apache Software Foundation.
  
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@ limitations under the License.
   primary build system, however <a href="http://maven.apache.org">Maven</a>
   is used for site generation.
 </p>
-<!--p>
-  You may also be interested in the <a href="upgradeto1_1.html">upgrade notes</a>.
-</p-->
+<p>
+  You may also be interested in the <a href="release_3_2.html">v3.2 release notes</a>.
+</p>
 </section>
 <!-- ================================================== -->
 <section name="Ant Goals">
diff --git a/xdocs/history.xml b/xdocs/history.xml
index 755082813..1164b9fb4 100644
--- a/xdocs/history.xml
+++ b/xdocs/history.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
  <!--
-   Copyright 2004 The Apache Software Foundation
+   Copyright 2004-2006 The Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -60,8 +60,8 @@ Thus there were now three packages, main, comparator and iterator.
 </p>
 
 <p>
-<b>Collections 3.0</b> represents a re-birth of collections after an 18 month absence.
-Many, many classes had been added to CVS but not released including primitive and
+<b>Collections 3.0</b> represented a re-birth of collections after an 18 month absence.
+Many, many classes were added to CVS but not released including primitive and
 event-generating classes. In order to control the size of the collections distribution,
 these became two new projects - primitives and events.
 </p>
@@ -77,21 +77,26 @@ As a result of this, and the general ongoing growth in the component, a full sub
 layout was chosen - one subpackage for each principal collections interface.
 </p>
 <p>
-Essentially the 3.0 release represents the result of changing from a 'dumping ground'
+Essentially the 3.0 release represented the result of changing from a 'dumping ground'
 of re-used collections to a component <b>designed</b> for the purpose.
 Of course, backwards compatibility has been retained during all transitions using deprecation.
 </p>
 
 <p>
-<b>Collections 2.1.1</b> is a patch release to v2.1.
+<b>Collections 2.1.1</b> was a patch release to v2.1.
 Unfortunately, v3.0 created a <a href="compatibility.html">binary incompatibility</a> in the IteratorUtils class.
 This patch was created as a work around, enabling v2.1.1 to be compatible with v3.1.
 </p>
 
 <p>
-<b>Collections 3.1</b> fixes some bugs in v3.0 and adds a few new enhancements.
+<b>Collections 3.1</b> fixed some bugs in v3.0 and adds a few new enhancements.
 The most notable change is a new list implementation, TreeList, that is well balanced for insertions and removals at any index.
-Other changes include more classes implementing Serializable and a ReferenceIdentityMap.
+Other changes included more classes implementing Serializable and a ReferenceIdentityMap.
+</p>
+
+<p>
+<b>Collections 3.2</b> combined bug fixes and some new features.
+Notably MultiValueMap is a new more flexible implementation of MultiHashMap.
 </p>
 
 </section>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 17e25095f..0b60869ea 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
  <!--
-   Copyright 2002-2005 The Apache Software Foundation
+   Copyright 2002-2006 The Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -59,8 +59,8 @@ as are various <a href="maven-reports.html">project reports</a>.
 The JavaDoc API documents are available online:
 </p>
 <ul>
-<li>The <a href="api-release/index.html">current release 3.1</a></li>
-<li>The <a href="api-2.1.1/index.html">previous version 2.1.1</a></li>
+<li>The <a href="api-release/index.html">current release 3.2</a></li>
+<li>The latest 2.x release - <a href="api-2.1.1/index.html">version 2.1.1</a></li>
 <li>The <a href="apidocs/index.html">latest SVN</a></li>
 </ul>
 <p>
@@ -71,9 +71,9 @@ The <a href="cvs-usage.html">subversion repository</a> can be
 <!-- ================================================== -->
 <section name="Releases">
 <p>
-The latest version is v3.1. - 
+The latest version is v3.2. - 
 <a href="http://jakarta.apache.org/site/downloads/downloads_commons-collections.cgi">Download now!</a><br />
-<!--The <a href="upgradeto3_2.html">upgrade notes</a> are also available.-->
+The <a href="release_3_2.html">release notes</a> are also available.
 </p>
 <p>
 For previous releases, see the <a href="http://archive.apache.org/dist/jakarta/commons/collections/">Apache Archive</a>
diff --git a/xdocs/issue-tracking.xml b/xdocs/issue-tracking.xml
index 1d5319585..0de244152 100644
--- a/xdocs/issue-tracking.xml
+++ b/xdocs/issue-tracking.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2005 The Apache Software Foundation.
+Copyright 2005-2006 The Apache Software Foundation.
  
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ limitations under the License.
   If you find your issue listed then please add a comment with your details.</li>
   <li><a href="http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/">Search the mailing list archive</a>.
   You may find your issue or idea has already been discussed.</li>
-  <li><a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Commons&amp;component=Collections&amp;version=3.1&amp;short_desc=%5Bcollections%5D%20%22Your%20subject%20heading%20here%22&amp;comment=Please%20provide%20details%20here.%20Its%20best%20to%20submit%20patches%20that%20alter%0D%0Aexisting%20file%20content%20in%20%22unified%20diff%22%20format.%20%0D%0A%0D%0ASubmissions%20that%20provide%20new%20files%20can%20be%20supplied%20as%20direct%20file%0D%0Aattachments%20or%20archives%20in%20zip%20or%20tar.gz%20format.%20please%20be%20kind%20%0D%0Aenough%20to%20identify%20the%20format%20of%20the%20attached%20archive%20as%20bugzilla%0D%0Atends%20to%20strip%20these%20characterstics%20by%20removing%20the%20files%20extension.">Submit a bug report or enhancement request</a>.
+  <li><a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Commons&amp;component=Collections&amp;version=3.2&amp;short_desc=%5Bcollections%5D%20%22Your%20subject%20heading%20here%22&amp;comment=Please%20provide%20details%20here.%20Its%20best%20to%20submit%20patches%20that%20alter%0D%0Aexisting%20file%20content%20in%20%22unified%20diff%22%20format.%20%0D%0A%0D%0ASubmissions%20that%20provide%20new%20files%20can%20be%20supplied%20as%20direct%20file%0D%0Aattachments%20or%20archives%20in%20zip%20or%20tar.gz%20format.%20please%20be%20kind%20%0D%0Aenough%20to%20identify%20the%20format%20of%20the%20attached%20archive%20as%20bugzilla%0D%0Atends%20to%20strip%20these%20characterstics%20by%20removing%20the%20files%20extension.">Submit a bug report or enhancement request</a>.
   Please prefix all new issues with [collections] in the summary line.
   </li>
   </ol>
diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml
index f00eeb4bf..c857700b4 100644
--- a/xdocs/navigation.xml
+++ b/xdocs/navigation.xml
@@ -29,7 +29,7 @@
       <item name="Download" href="http://jakarta.apache.org/site/downloads/downloads_commons-collections.cgi"/>
       <item name="User guide" href="/userguide.html"/>
       <item name="History" href="/history.html"/>
-      <item name="Javadoc (3.1 release)" href="api-release/index.html"/>
+      <item name="Javadoc (3.2 release)" href="api-release/index.html"/>
     </menu>
 
     <menu name="Development">