From 3af4cdb0f1eb698ba0f816ff7bc0fd4d31df423f Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Sat, 4 Jun 2011 12:45:58 +0000
Subject: [PATCH] Rename ref docs section new-in-3 => new-in-3.0

---
 spring-framework-reference/src/aop.xml         |  2 +-
 spring-framework-reference/src/mvc.xml         |  2 +-
 .../src/{new-in-3.xml => new-in-3.0.xml}       | 18 +++++++++---------
 .../src/spring-framework-reference.xml         |  6 +++---
 spring-framework-reference/src/testing.xml     |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)
 rename spring-framework-reference/src/{new-in-3.xml => new-in-3.0.xml} (98%)

diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml
index 765d4fb9927..d1844d4cf73 100644
--- a/spring-framework-reference/src/aop.xml
+++ b/spring-framework-reference/src/aop.xml
@@ -3185,7 +3185,7 @@ public class Account {
       <para>Now that the sales pitch is over, let us first walk through a
       quick example of AspectJ LTW using Spring, followed by detailed
       specifics about elements introduced in the following example. For a
-      complete example, please see the Petclinic <link linkend="new-in-3-samples">sample</link> application.</para>
+      complete example, please see the Petclinic <link linkend="new-in-3.0-samples">sample</link> application.</para>
 
       <section id="aop-aj-ltw-first-example">
         <title>A first example</title>
diff --git a/spring-framework-reference/src/mvc.xml b/spring-framework-reference/src/mvc.xml
index 55a5f5de9d7..058be3827e2 100644
--- a/spring-framework-reference/src/mvc.xml
+++ b/spring-framework-reference/src/mvc.xml
@@ -589,7 +589,7 @@
     configure access to Servlet or Portlet facilities.</para>
 
     <tip>
-      <para>Available in the <link linkend="new-in-3-samples">samples repository</link>, 
+      <para>Available in the <link linkend="new-in-3.0-samples">samples repository</link>,
       a number of web applications leverage the annotation support described in this section 
       including <emphasis>MvcShowcase</emphasis>, <emphasis>MvcAjax</emphasis>,
       <emphasis>MvcBasic</emphasis>, <emphasis>PetClinic</emphasis>, 
diff --git a/spring-framework-reference/src/new-in-3.xml b/spring-framework-reference/src/new-in-3.0.xml
similarity index 98%
rename from spring-framework-reference/src/new-in-3.xml
rename to spring-framework-reference/src/new-in-3.0.xml
index c53a2d4383d..555cba6ac40 100644
--- a/spring-framework-reference/src/new-in-3.xml
+++ b/spring-framework-reference/src/new-in-3.0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="new-in-3">
+<chapter id="new-in-3.0">
   <title>New Features and Enhancements in Spring 3.0</title>
 
   <para>If you have been using the Spring Framework for some time, you will be
@@ -9,7 +9,7 @@
   October 2006, and Spring 2.5, released in November 2007. It is now time for
   a third overhaul resulting in Spring 3.0.</para>
 
-  <sidebar id="new-in-3-intro-java">
+  <sidebar id="new-in-3.0-intro-java">
     <title>Java SE and Java EE Support</title>
 
     <para>The Spring Framework is now based on Java 5, and Java 6 is fully
@@ -19,7 +19,7 @@
     at the same time introducing some early support for Java EE 6.</para>
   </sidebar>
 
-  <section id="new-in-3-intro">
+  <section id="new-in-3.0-intro">
     <title>Java 5</title>
 
     <para>The entire framework code has been revised to take advantage of Java
@@ -43,7 +43,7 @@
     @Asynchronous annotation).</para>
   </section>
 
-  <section id="new-in-3-improved-docs">
+  <section id="new-in-3.0-improved-docs">
     <title>Improved documentation</title>
 
     <para>The Spring reference documentation has also substantially been
@@ -56,14 +56,14 @@
     issue</ulink>.</para>
   </section>
 
-  <section id="new-in-3-new-tutorial">
+  <section id="new-in-3.0-new-tutorial">
     <title>New articles and tutorials</title>
 
     <para>
 		There are many excellent articles and tutorials that show how to get started with Spring 3 features.
 		Read them at the <ulink url="http://www.springsource.org/documentation">Spring Documentation</ulink> page.
 	  </para>
-	  <para id="new-in-3-samples">
+	  <para id="new-in-3.0-samples">
 	  The samples have been improved and updated to take advantage of the new features in Spring 3.
 	  Additionally, the samples have been moved out of the source tree into a dedicated SVN 
 	  <ulink url="https://anonsvn.springframework.org/svn/spring-samples/">repository</ulink> available at:</para>
@@ -81,7 +81,7 @@
 
   </section>
 
-  <section id="new-in-3-modules-build">
+  <section id="new-in-3.0-modules-build">
     <title>New module organization and build system</title>
 
     <para>The framework modules have been revised and are now managed
@@ -153,7 +153,7 @@
       </listitem>
     </itemizedlist>
 
-    <sidebar id="new-in-3-intro-spring-jar">
+    <sidebar id="new-in-3.0-intro-spring-jar">
       <title>Note:</title>
 
       <para>The spring.jar artifact that contained almost the entire framework
@@ -182,7 +182,7 @@
     </itemizedlist>
   </section>
 
-  <section id="new-in-3-features-overview">
+  <section id="new-in-3.0-features-overview">
     <title>Overview of new features</title>
 
     <para>This is a list of new features for Spring 3.0. We will cover these
diff --git a/spring-framework-reference/src/spring-framework-reference.xml b/spring-framework-reference/src/spring-framework-reference.xml
index 286bf04998e..9e4dbdabe77 100644
--- a/spring-framework-reference/src/spring-framework-reference.xml
+++ b/spring-framework-reference/src/spring-framework-reference.xml
@@ -7,7 +7,7 @@
 
     <productname>Spring Framework</productname>
 
-    <releaseinfo>3.0</releaseinfo>
+    <releaseinfo>3.1</releaseinfo>
 
     <mediaobject>
       <imageobject role="fo">
@@ -238,9 +238,9 @@
   </part>
 
   <part id="spring-whats-new">
-    <title>What's New in Spring 3.0</title>
+    <title>What's New in Spring 3</title>
 
-    <xi:include href="new-in-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="new-in-3.0.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   </part>
 
   <part id="spring-core">
diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml
index 23d599a09d4..ee4e09293ee 100644
--- a/spring-framework-reference/src/testing.xml
+++ b/spring-framework-reference/src/testing.xml
@@ -1699,7 +1699,7 @@ public class SimpleTest {
       <title>PetClinic example</title>
 
       <para>The PetClinic application, available from the
-      <link linkend="new-in-3-samples">samples repository</link>,
+      <link linkend="new-in-3.0-samples">samples repository</link>,
       illustrates several features of the <emphasis>Spring
       TestContext Framework</emphasis> in a JUnit 4.5+ environment. Most test
       functionality is included in the