minor cleanup

spring-framework-reference/src/beans.xml

@@ -5815,7 +5815,7 @@ public @interface MovieQualifier {
       <emphasis>stereotype</emphasis> of a repository (a.k.a. Data Access
       Object or DAO). Among the possibilities for leveraging such a marker is
       the automatic translation of exceptions as described in <xref
-      linkend="orm-jpa-exceptions" />.</para>
+      linkend="orm-exception-translation" />.</para>
 
       <para>Spring 2.5 introduces further stereotype annotations:
       <interfacename>@Component</interfacename>,

spring-framework-reference/src/dynamic-languages.xml

@@ -224,7 +224,7 @@ http://www.springframework.org/schema/lang http://www.springframework.org/schema
         <para>
           The final step involves defining dynamic-language-backed bean definitions,
           one for each bean that you want to configure (this is no different to
-          normal Java bean configuration). However, instead of specifying the
+          normal JavaBean configuration). However, instead of specifying the
           fully qualified classname of the class that is to be instantiated and
           configured by the container, you use the <literal>&lt;lang:language/&gt;</literal>
           element to define the dynamic language-backed bean.

spring-framework-reference/src/metadata.xml

@@ -38,12 +38,12 @@ public class PetStoreImpl implements PetStoreFacade, OrderService {</programlist
     from program source code, some important enterprise settings - notably
     transaction characteristics - arguably belong in program source. </para>
 
-    <para>Spring uses custom Java 5 annotations thoughout the framework across
+    <para>Spring uses Java 5 annotations thoughout the framework across a wide
-    a wide range of features such as DI, MVC, and AOP and supports JEE
+    range of features such as DI, MVC, and AOP and supports JEE standard
-    standard annotations such as @PreDestroy and @PostConstruct defined by
+    annotations such as @PreDestroy and @PostConstruct defined by JSR-250.
-    JSR-250. This chapter describes the @Required attribute and provides links
+    This chapter describes the @Required attribute and provides links to other
-    to other parts the documentation where the various attributes are
+    parts the documentation where the various attributes are described in more
-    described in more detail.</para>
+    detail.</para>
   </section>
 
   <section id="metadata-annotations">

spring-framework-reference/src/orm.xml

@@ -118,21 +118,21 @@
     which ORM technology you use. The Hibernate section provides more details
     and also show these features/configurations in a concrete context.</para>
 
-    <para>The major goal is to allow for clear application layering, with any
+    <para>The major goal of Spring's ORM integration is to allow for clear
-    data access and transaction technology, and for loose coupling of
+    application layering, with any data access and transaction technology, and
-    application objects. No more business service dependencies on the data
+    for loose coupling of application objects. No more business service
-    access or transaction strategy, no more hard-coded resource lookups, no
+    dependencies on the data access or transaction strategy, no more
-    more hard-to-replace singletons, no more custom service registries. One
+    hard-coded resource lookups, no more hard-to-replace singletons, no more
-    simple and consistent approach to wiring up application objects, keeping
+    custom service registries. One simple and consistent approach to wiring up
-    them as reusable and free from container dependencies as possible. All the
+    application objects, keeping them as reusable and free from container
-    individual data access features are usable on their own but integrate
+    dependencies as possible. All the individual data access features are
-    nicely with Spring's application context concept, providing XML-based
+    usable on their own but integrate nicely with Spring's application context
-    configuration and cross-referencing of plain JavaBean instances that don't
+    concept, providing XML-based configuration and cross-referencing of plain
-    need to be Spring-aware. In a typical Spring application, many important
+    JavaBean instances that don't need to be Spring-aware. In a typical Spring
-    objects are JavaBeans: data access templates, data access objects,
+    application, many important objects are JavaBeans: data access templates,
-    transaction managers, business services (that use the data access objects
+    data access objects, transaction managers, business services (that use the
-    and transaction managers), web view resolvers, web controllers (that use
+    data access objects and transaction managers), web view resolvers, web
-    the business services),and so on.</para>
+    controllers (that use the business services),and so on.</para>
 
     <section id="orm-resource-mngmnt">
       <title>Resource and Transaction management</title>
@@ -386,12 +386,12 @@ public class ProductDaoImpl implements ProductDao {
       <title>Declarative transaction demarcation</title>
 
       <para>We recommended that you use Spring's declarative transaction
-      support, which essentially enables you to replace explicit transaction
+      support, which enables you to replace explicit transaction demarcation
-      demarcation API calls in your Java code with an AOP transaction
+      API calls in your Java code with an AOP transaction interceptor
-      interceptor configured in a Spring container. This allows you to keep
+      configured in a Spring container using Java annotations or XML. This
-      business services free of repetitive transaction demarcation code, and
+      allows you to keep business services free of repetitive transaction
-      allows you to focus on adding business logic which is where the real
+      demarcation code, and allows you to focus on adding business logic which
-      value of your application lies.</para>
+      is where the real value of your application lies.</para>
 
       <note>
         <para>You are <emphasis>strongly</emphasis> encouraged to read the
@@ -925,10 +925,10 @@ public class ProductDaoImpl implements ProductDao {
       up through direct instantiation of a
       <interfacename>PersistenceManagerFactory</interfacename> implementation
       class. A JDO <interfacename>PersistenceManagerFactory</interfacename>
-      implementation class is supposed to follow the JavaBeans pattern, just
+      implementation class follows the JavaBeans pattern, just like a JDBC
-      like a JDBC <interfacename>DataSource</interfacename> implementation
+      <interfacename>DataSource</interfacename> implementation class, which is
-      class, which is a natural fit for a Spring bean definition. This setup
+      a natural fit for configuration using Spring. This setup style usually
-      style usually supports a Spring-defined JDBC
+      supports a Spring-defined JDBC
       <interfacename>DataSource</interfacename>, passed into the
       "connectionFactory" property. For example, for the open source JDO
       implementation DataNucleus (formerly JPOX) (<ulink

spring-framework-reference/src/overview.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-
 <chapter id="introduction">
   <title>Introduction</title>
 
@@ -143,8 +142,8 @@
       <para>The <link linkend="beans-introduction"><emphasis>Core and
       Beans</emphasis></link> modules provide the most fundamental parts of
       the framework and provides the IoC and Dependency Injection features.
-      The basic concept here is the <classname>BeanFactory</classname>, which
+      The basic concept here is the <classname>BeanFactory</classname> which
-      provides a sophisticated implementation of the factory pattern which
+      provides a sophisticated implementation of the factory pattern. It
       removes the need for programmatic singletons and allows you to decouple
       the configuration and specification of dependencies from your actual
       program logic.</para>
@@ -160,7 +159,9 @@
       event-propagation, resource-loading, and the transparent creation of
       contexts by, for example, a servlet container. The Context module also
       contains support for some Java EE features like EJB, JMX and basic
-      remoting support.</para>
+      remoting support. The <classname>ApplicationContext</classname>
+      interface is the focal point of the Context module that provides these
+      features.</para>
 
       <para>The <emphasis>Expression Language</emphasis> module provides a
       powerful expression language for querying and manipulating an object
@@ -195,30 +196,32 @@
       offers, such as the simple declarative transaction management feature
       mentioned previously.</para>
 
-      <para>The <link linkend="oxm">OXM</link> module provides an abstraction layer for using a number of
+      <para>The <link linkend="oxm">OXM</link> module provides an abstraction
-      Object/XML mapping implementations. Supported technologies include JAXB,
+      layer for using a number of Object/XML mapping implementations.
-      Castor, XMLBeans, JiBX and XStream.</para>
+      Supported technologies include JAXB, Castor, XMLBeans, JiBX and
+      XStream.</para>
 
-      <para>The <link linkend="jms">JMS</link> module provides Spring's support for the Java Messaging Service. It 
+      <para>The <link linkend="jms">JMS</link> module provides Spring's
-      contains features for both producing and consuming messages. </para>
+      support for the Java Messaging Service. It contains features for both
+      producing and consuming messages.</para>
 
-      <para>The <link linkend="transaction">Transaction</link> module provides a way to do programmatic as well
+      <para>The <link linkend="transaction">Transaction</link> module provides
-      as declarative transaction management, not only for classes implementing
+      a way to do programmatic as well as declarative transaction management,
-      special interfaces, but for <emphasis>all your POJOs (plain old Java
+      not only for classes implementing special interfaces, but for
-      objects)</emphasis>.</para>
+      <emphasis>all your POJOs (plain old Java objects)</emphasis>.</para>
     </section>
 
     <section>
       <title>Web</title>
 
-      <para>The <emphasis>Web</emphasis> layer consists of the Web, Web-Servlet
+      <para>The <emphasis>Web</emphasis> layer consists of the Web,
-      and Web-Portlet modules.</para>
+      Web-Servlet and Web-Portlet modules.</para>
 
       <para>Spring's <emphasis>Web</emphasis> module provides basic
       web-oriented integration features, such as multipart file-upload
       functionality, the initialization of the IoC container using servlet
-      listeners and a web-oriented application context. It also contains the web
+      listeners and a web-oriented application context. It also contains the
-      related parts of Spring's remoting support.</para>
+      web related parts of Spring's remoting support.</para>
 
       <para>The <emphasis>Web-Servlet</emphasis> module provides Spring's
       Model-View-Controller (<link
@@ -275,11 +278,13 @@
 
     <para><mediaobject>
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/overview-full.png" format="PNG" />
+          <imagedata align="center" fileref="images/overview-full.png"
+                     format="PNG" />
         </imageobject>
 
         <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-full.png" format="PNG" />
+          <imagedata align="center" fileref="images/overview-full.png"
+                     format="PNG" />
         </imageobject>
 
         <caption><para>Typical full-fledged Spring web
@@ -304,13 +309,13 @@
 
     <para><mediaobject>
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/overview-thirdparty-web.png"
+          <imagedata align="center"
-                     format="PNG" />
+                     fileref="images/overview-thirdparty-web.png" format="PNG" />
         </imageobject>
 
         <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-thirdparty-web.png"
+          <imagedata align="center"
-                     format="PNG" />
+                     fileref="images/overview-thirdparty-web.png" format="PNG" />
         </imageobject>
 
         <caption><para>Spring middle-tier using a third-party web
@@ -330,11 +335,13 @@
 
     <para><mediaobject>
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/overview-remoting.png" format="PNG" />
+          <imagedata align="center" fileref="images/overview-remoting.png"
+                     format="PNG" />
         </imageobject>
 
         <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-remoting.png" format="PNG" />
+          <imagedata align="center" fileref="images/overview-remoting.png"
+                     format="PNG" />
         </imageobject>
 
         <caption><para>Remoting usage scenario</para></caption>
@@ -348,11 +355,13 @@
 
     <para><mediaobject>
         <imageobject role="fo">
-          <imagedata align="center" fileref="images/overview-ejb.png" format="PNG" />
+          <imagedata align="center" fileref="images/overview-ejb.png"
+                     format="PNG" />
         </imageobject>
 
         <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-ejb.png" format="PNG" />
+          <imagedata align="center" fileref="images/overview-ejb.png"
+                     format="PNG" />
         </imageobject>
 
         <caption><para>EJBs - Wrapping existing POJOs</para></caption>