diff --git a/spring-framework-reference/src/new-in-3.xml b/spring-framework-reference/src/new-in-3.xml
index f3a4ae9deb4..fd1018109b5 100644
--- a/spring-framework-reference/src/new-in-3.xml
+++ b/spring-framework-reference/src/new-in-3.xml
@@ -390,7 +390,7 @@ public class AppConfig {
A general purpose type conversion
system has been introduced. The system is currently used by SpEL
- for type coersion, and may also be used by a Spring Container when
+ for type conversion, and may also be used by a Spring Container when
binding bean property values.In addition, a ui.format system
@@ -428,14 +428,14 @@ public class AppConfig {
JmsTemplate. Both server and client side REST
functionality make use of
HttpConverters to facilitate the
- conversion between objects and their representation in HTTP request
- and replies.
+ conversion between objects and their representation in HTTP requests
+ and responses.
The MarshallingHttpMessageConverter uses
the Object to XML mapping functionality mentioned
earlier.
- Refer to the section on MVC and Refer to the sections on MVC and the RestTemplate for more
information.
diff --git a/spring-framework-reference/src/overview.xml b/spring-framework-reference/src/overview.xml
index 22022884480..a72b90e4b54 100644
--- a/spring-framework-reference/src/overview.xml
+++ b/spring-framework-reference/src/overview.xml
@@ -46,7 +46,7 @@
The question is, what aspect of control are
[they] inverting? Martin Fowler posed this question
- about Inversion of Control on his site in 2004. Fowler suggested
+ about Inversion of Control (IoC) on his site in 2004. Fowler suggested
renaming the principle to make it more self-explanatory and came up with
Dependency Injection.
@@ -73,7 +73,8 @@
Patterns are formalized best practices that you must implement
yourself in your application.
- The Spring Framework IoC component addresses this concern by
+ The Spring Framework Inversion of Control (IoC)
+ component addresses this concern by
providing a formalized means of composing disparate components into a
fully working application ready for use. The
Spring Framework codifies formalized design patterns as first-class
@@ -140,11 +141,11 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu
a powerful expression language for querying and manipulating an object
graph at runtime. It is an extension of the unified expression language
(unified EL) as specified in the JSP 2.1 specification. The language
- supports setting and getting of property values, property assignment,
+ supports setting and getting property values, property assignment,
method invocation, accessing the context of arrays, collections and
indexers, logical and arithmetic operators, named variables, and
retrieval of objects by name from Spring's IoC container. It also
- supports list projection and selection, as well as common list
+ supports list projection and selection as well as common list
aggregations.
@@ -165,15 +166,15 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu
linkend="orm-jdo">JDO, Hibernate, and iBatis. Using the ORM package you can use
- all those O/R-mappers in combination with all the other features Spring
- offers, such as the simple declarative transaction management feature
- mentioned previously.
+ all of these O/R-mapping frameworks in combination with all of the other
+ features Spring offers, such as the simple declarative transaction
+ management feature mentioned previously.
The OXM module provides an abstraction
layer that supports Object/XML mapping implementations for JAXB, Castor,
XMLBeans, JiBX and XStream.
- The Java Messaging Service (JMS )module
+ The Java Messaging Service (JMS) module
contains features for producing and consuming messages.The Transaction module supports
@@ -198,7 +199,7 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu
model-view-controller (MVC)
implementation for web applications. Spring's MVC framework provides a
- clean separation between domain model code and web
+ clean separation between domain model code and web
forms, and integrates with all the other features of the Spring
Framework.
@@ -266,7 +267,7 @@ TR: OK. Added to diagram.-->Spring's declarative
transaction management features make the web application fully
- transactional, just as it would be if you use EJB container-managed
+ transactional, just as it would be if you used EJB container-managed
transactions. All your custom business logic can be implemented with
simple POJOs and managed by Spring's IoC container. Additional services
include support for sending email and validation that is independent of
@@ -339,9 +340,9 @@ TR: OK. Added to diagram.-->
EJBs - Wrapping existing POJOs
- The Spring Framework also provides an access-
- and abstraction- layer for Enterprise JavaBeans, enabling you to
- reuse your existing POJOs and wrap them in stateless session beans, for
+ The Spring Framework also provides an access
+ and abstraction layer for Enterprise JavaBeans, enabling you to
+ reuse your existing POJOs and wrap them in stateless session beans for
use in scalable, fail-safe web applications that might need declarative
security.
diff --git a/spring-framework-reference/src/spring-framework-reference.xml b/spring-framework-reference/src/spring-framework-reference.xml
index 4d81e36448e..bfdf0f16dfe 100644
--- a/spring-framework-reference/src/spring-framework-reference.xml
+++ b/spring-framework-reference/src/spring-framework-reference.xml
@@ -197,7 +197,7 @@
use of IoC certainly does make both unit and integration
testing easier (in that the presence of setter methods and
appropriate constructors on classes makes them
- easier to wire together on a test without having to set up
+ easier to wire together in a test without having to set up
service locator registries and suchlike)... the chapter
dedicated solely to testing will hopefully convince you of
this as well.