Skip to content

Commit 1785891

Browse files
committed
Corrected grammar and spelling mistakes in reference manual.
1 parent db486e1 commit 1785891

File tree

3 files changed

+37
-31
lines changed

3 files changed

+37
-31
lines changed

spring-framework-reference/src/getting-started.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
<chapter id="getting-started">
66
<title>Getting started with Spring</title>
77

8-
<para>This chapter will give you a quick introduction and a guide for how to get started
9-
in using the Spring Framework for your Java development. We can of course only cover a tiny
10-
subset of the available features in this chapter. You will have to turn to the rest of this
8+
<para>
9+
This chapter will give you a quick introduction and serve as a guide for how to get started
10+
using the Spring Framework for your Java development. We can of course only cover a tiny
11+
subset of the available features in this chapter. You will have to turn to the rest of this
1112
reference document for more detailed coverage of all features.</para>
1213

1314
<section id="start-app-context">

spring-framework-reference/src/new-in-3.xml

+32-27
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<sidebar id="new-in-3-intro-java">
1313
<title>Java SE and Java EE Support</title>
1414

15-
<para>The Spring Framework is now based on Java 5 and Java 6 is fully
15+
<para>The Spring Framework is now based on Java 5, and Java 6 is fully
1616
supported.</para>
1717

1818
<para>Furthermore, Spring is compatible with J2EE 1.4 and Java EE 5, while
@@ -201,27 +201,29 @@
201201
<section id="new-feature-java5">
202202
<title>Core APIs updated for Java 5</title>
203203

204-
<para>BeanFactoryinterface returns typed bean instancesas far as
205-
possible <itemizedlist>
206-
<listitem>
207-
<para>T getBean(Stringname, Class&lt;T&gt; requiredType)</para>
208-
</listitem>
209-
210-
<listitem>
211-
<para>Map&lt;String, T&gt; getBeansOfType(Class&lt;T&gt;
212-
type)</para>
213-
</listitem>
214-
</itemizedlist></para>
215-
216-
<para>Spring's TaskExecutorinterface extends
217-
<classname>java.util.concurrent.Executor</classname> now <itemizedlist>
204+
<para>BeanFactory interface returns typed bean instances as far as possible:
205+
<itemizedlist>
206+
<listitem>
207+
<para>T getBean(Stringname, Class&lt;T&gt; requiredType)</para>
208+
</listitem>
209+
210+
<listitem>
211+
<para>Map&lt;String, T&gt; getBeansOfType(Class&lt;T&gt; type)</para>
212+
</listitem>
213+
</itemizedlist>
214+
</para>
215+
216+
<para>Spring's TaskExecutor interface now extends
217+
<classname>java.util.concurrent.Executor</classname>:
218+
<itemizedlist>
218219
<listitem>
219220
<para>extended AsyncTaskExecutor supports standard Callables with
220221
Futures</para>
221222
</listitem>
222223
</itemizedlist></para>
223224

224-
<para>New Java 5 based converter API and SPI <itemizedlist>
225+
<para>New Java 5 based converter API and SPI:
226+
<itemizedlist>
225227
<listitem>
226228
<para>stateless ConversionService and Converters</para>
227229
</listitem>
@@ -246,11 +248,11 @@
246248
linkend="expressions">Spring Expression Language (SpEL).</link></para>
247249

248250
<para>The Spring Expression Language was created to provide the Spring
249-
community with a single well supported expression language that can used
251+
community a single, well supported expression language that can be used
250252
across all the products in the Spring portfolio. Its language features
251253
are driven by the requirements of the projects in the Spring portfolio,
252254
including tooling requirements for code completion support within the
253-
eclipse based SpringSource Tool Suite.</para>
255+
Eclipse based SpringSource Tool Suite.</para>
254256

255257
<para>The following is an example of how the Expression Language can be
256258
used to configure some properties of a database setup <programlisting
@@ -281,11 +283,13 @@ public class RewardsTestDatabase {
281283
<section id="new-java-configuration">
282284
<title>Java based bean metadata</title>
283285

284-
<para>Some core features from the <ulink
285-
url="http://www.springsource.org/javaconfig"><link
286-
linkend="???">JavaConfig</link></ulink> project have been added to the
287-
Spring Framework now. This means that the following annotations are
288-
now directly supported: <itemizedlist>
286+
<para>
287+
Some core features from the
288+
<ulink url="http://www.springsource.org/javaconfig">JavaConfig</ulink>
289+
project have been added to the Spring Framework now. This means
290+
that the following annotations are now directly supported:
291+
292+
<itemizedlist>
289293
<listitem>
290294
<para>@Configuration</para>
291295
</listitem>
@@ -309,7 +313,8 @@ public class RewardsTestDatabase {
309313
<listitem>
310314
<para>@Value</para>
311315
</listitem>
312-
</itemizedlist></para>
316+
</itemizedlist>
317+
</para>
313318

314319
<para>Here is an example of a Java class providing basic configuration
315320
using the new JavaConfig features: <programlisting language="java">@Configuration
@@ -362,10 +367,10 @@ public class AppConfig{
362367
<title>The Data Tier</title>
363368

364369
<para>Object to XML mapping functionality (OXM) from the Spring Web
365-
Services project have been moved to the core Spring Framework now. The
370+
Services project has been moved to the core Spring Framework now. The
366371
functionality is found in the <literal>org.springframework.oxm</literal>
367-
package. More information on the use of the <literal>OXM</literal> can
368-
be found in the <link linkend="oxm">Marshalling XML using O/X
372+
package. More information on the use of the <literal>OXM</literal> module
373+
can be found in the <link linkend="oxm">Marshalling XML using O/X
369374
Mappers</link> chapter.</para>
370375
</section>
371376

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<year>2004-2009</year>
109109
<holder>Rod Johnson, Juergen Hoeller, Alef Arendsen, Colin Sampaleanu, Rob Harrop, Thomas Risberg, Darren Davison,
110110
Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis,
111-
Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma, Chris Beams, Tareq Abbed Rabbo
111+
Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma, Chris Beams, Tareq Abed Rabbo
112112
</holder>
113113
</copyright>
114114
<legalnotice>

0 commit comments

Comments
 (0)