Fully qualify Spring=>Spring Framework in ref docs

cbeams · cbeams · commit a4f882fbf0af · 2012-12-12T22:45:30.000+01:00
This is not a comprehensive update, only covering the "What's new"
sections for now.
diff --git a/src/reference/docbook/new-in-3.0.xml b/src/reference/docbook/new-in-3.0.xml
@@ -7,12 +7,12 @@
     xsi:schemaLocation="
         http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
         http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
-  <title>New Features and Enhancements in Spring 3.0</title>
+  <title>New Features and Enhancements in Spring Framework 3.0</title>
 
   <para>If you have been using the Spring Framework for some time, you will be
   aware that Spring has undergone two major revisions: Spring 2.0, released in
   October 2006, and Spring 2.5, released in November 2007. It is now time for
-  a third overhaul resulting in Spring 3.0.</para>
+  a third overhaul resulting in Spring Framework 3.0.</para>
 
   <sidebar xml:id="new-in-3.0-intro-java">
     <title>Java SE and Java EE Support</title>
@@ -52,8 +52,8 @@
     <title>Improved documentation</title>
 
     <para>The Spring reference documentation has also substantially been
-    updated to reflect all of the changes and new features for Spring 3.0.
-    While every effort has been made to ensure that there are no errors in
+    updated to reflect all of the changes and new features for Spring Framework
+    3.0. While every effort has been made to ensure that there are no errors in
     this documentation, some errors may nevertheless have crept in. If you do
     spot any typos or even more serious errors, and you can spare a few cycles
     during lunch, please do bring the error to the attention of the Spring
@@ -65,20 +65,23 @@
     <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 <link xl:href="http://www.springsource.org/documentation">Spring Documentation</link> page.
+        There are many excellent articles and tutorials that show how to get
+        started with Spring Framework 3 features. Read them at the
+        <link xl:href="http://www.springsource.org/documentation">Spring Documentation</link> page.
       </para>
       <para xml: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
+      The samples have been improved and updated to take advantage of the new features in Spring
+      Framework 3. Additionally, the samples have been moved out of the source tree into a dedicated SVN
       <link xl:href="https://anonsvn.springframework.org/svn/spring-samples/">repository</link> available at:</para>
 
     <para>
       <literal>https://anonsvn.springframework.org/svn/spring-samples/</literal>
       </para>
 
-      <para>As such, the samples are no longer distributed alongside Spring 3 and need to be downloaded separately from the repository mentioned above. However, this documentation
-      will continue to refer to some samples (in particular Petclinic) to illustrate various features.</para>
+      <para>As such, the samples are no longer distributed alongside Spring
+      Framework 3 and need to be downloaded separately from the repository
+      mentioned above. However, this documentation will continue to refer to
+      some samples (in particular Petclinic) to illustrate various features.</para>
 
       <note><para>For more information on Subversion (or in short SVN), see the project homepage at:
       <literal>http://subversion.apache.org/</literal></para>
@@ -190,7 +193,7 @@
   <section xml: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
+    <para>This is a list of new features for Spring Framework 3.0. We will cover these
     features in more detail later in this section.</para>
 
     <itemizedlist>
diff --git a/src/reference/docbook/new-in-3.1.xml b/src/reference/docbook/new-in-3.1.xml
@@ -7,17 +7,13 @@
     xsi:schemaLocation="
         http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
         http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
-  <title>New Features and Enhancements in Spring 3.1</title>
-
-  <para>Building on the support introduced in Spring 3.0, Spring 3.1 is
-  currently under development, and at the time of this writing Spring 3.1 RC1
-  is being prepared for release.</para>
+  <title>New Features and Enhancements in Spring Framework 3.1</title>
 
   <section xml:id="new-in-3.1-features-overview">
     <title>Overview of new features</title>
 
-    <para>This is a list of new features for Spring 3.1. Most features do not
-    yet have dedicated reference documentation but do have Javadoc. In such
+    <para>This is a list of new features for Spring Framework 3.1. A number of features
+    do not have dedicated reference documentation but do have complete Javadoc. In such
     cases, fully-qualified class names are given.</para>
 
     <section xml:id="new-in-3.1-cache-abstraction">
@@ -114,7 +110,7 @@
       form of <interfacename>@Enable</interfacename> annotations. These are
       designed for use in conjunction with Spring's
       <interfacename>@Configuration</interfacename> classes, which were
-      introduced in Spring 3.0.</para>
+      introduced in Spring Framework 3.0.</para>
 
       <itemizedlist>
         <listitem>
@@ -256,10 +252,10 @@
       <title>Support for injection against non-standard JavaBeans
       setters</title>
 
-      <para>Prior to Spring 3.1, in order to inject against a property method
-      it had to conform strictly to JavaBeans property signature rules, namely
-      that any 'setter' method must be void-returning. It is now possible in
-      Spring XML to specify setter methods that return any object type. This
+      <para>Prior to Spring Framework 3.1, in order to inject against a property
+      method it had to conform strictly to JavaBeans property signature rules,
+      namely that any 'setter' method must be void-returning. It is now possible
+      in Spring XML to specify setter methods that return any object type. This
       is useful when considering designing APIs for method-chaining, where
       setter methods return a reference to 'this'.</para>
     </section>
@@ -309,8 +305,8 @@
       which will in turn get searched for <literal>@Entity</literal> classes.
       In many cases, persistence.xml does not contain more than a unit name
       and relies on defaults and/or external setup for all other concerns
-      (such as the DataSource to use, etc). For that reason, Spring 3.1
-      provides an alternative:
+      (such as the DataSource to use, etc). For that reason, Spring Framework
+      3.1 provides an alternative:
       <classname>LocalContainerEntityManagerFactoryBean</classname> accepts a
       'packagesToScan' property, specifying base packages to scan for
       <literal>@Entity</literal> classes. This is analogous to
@@ -328,8 +324,8 @@
       <title>New HandlerMethod-based Support Classes For Annotated Controller
       Processing</title>
 
-      <para>Spring 3.1 introduces a new set of support classes for processing
-      requests with annotated controllers:</para>
+      <para>Spring Framework 3.1 introduces a new set of support classes for
+      processing requests with annotated controllers:</para>
 
       <itemizedlist>
         <listitem>
diff --git a/src/reference/docbook/new-in-3.2.xml b/src/reference/docbook/new-in-3.2.xml
@@ -7,7 +7,7 @@
          xmlns:xl="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xmlns:ns="http://docbook.org/ns/docbook">
-  <title>New Features and Enhancements in Spring 3.2</title>
+  <title>New Features and Enhancements in Spring Framework 3.2</title>
 
   <section xml:id="new-in-3.2-webmvc-async">
     <title>Support for Servlet 3 based asynchronous request processing</title>
