diff --git a/spring-framework-reference/src/beans.xml b/spring-framework-reference/src/beans.xml
index 652f1a4a996..083cf6f04b0 100644
--- a/spring-framework-reference/src/beans.xml
+++ b/spring-framework-reference/src/beans.xml
@@ -3406,7 +3406,7 @@ beanFactory.registerScope("thread", threadScope
once, as explained in the preceding section.
- Multiple lifestyle mechanisms configured for the same bean, with
+ Multiple lifecycle mechanisms configured for the same bean, with
different initialization methods, are called as follows:
@@ -4217,7 +4217,7 @@ dataSource.url=jdbc:mysql:mydb
url="http://static.springframework.org/spring/docs/3.0.x/javadoc-api/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.html">RequiredAnnotationBeanPostProcessor.)
- Note that <context:annotation-config/>
+ <context:annotation-config/>
only looks for annotations on beans in the same application context in
which it is defined. This means that, if you put
<context:annotation-config/> in a
@@ -4270,9 +4270,9 @@ dataSource.url=jdbc:mysql:mydb
@Autowired in the examples below.
@Inject does not have a required
property unlike Spring's @Autowire
- annotation which as a required property to indicate if the value being
+ annotation which has a required property to indicate if the value being
injected is optional. This behavior is enabled automatically if you
- have the JSR 330 jar on the classpath.
+ have the JSR 330 JAR on the classpath.
public class SimpleMovieLister {
@@ -4443,11 +4443,11 @@ dataSource.url=jdbc:mysql:mydb
simplest case, this can be a plain descriptive value:
- Note that the JSR 330 @Qualifier
+ JSR 330's @Qualifier
annotation can only be applied as a meta-annotation unlike Spring's
@Qualifier which takes a string property to discriminate among
- multiple injection candidates and can be placed on annotation as well
- as types, fields, methods, contstructors and parameters.
+ multiple injection candidates and can be placed on annotations as well
+ as types, fields, methods, constructors, and parameters.
public class MovieRecommender {
@@ -4968,8 +4968,8 @@ public @interface MovieQualifier {
project are part of the core Spring Framework. This allows you
to define beans using Java rather than using the traditional XML files.
Take a look at the @Configuration,
- @Bean, @Import, and
- @DependsOn annotations for how to use
+ @Bean, @Import, and
+ @DependsOn annotations for examples of how to use
these new features.
@@ -5088,9 +5088,9 @@ public class JpaMovieFinder implements MovieFinder {
stereotpye annotations and they will be automatically detected during
component-scanning. The value of the
@Named property will be used as the
- Bean Name. At this time Spring default for bean scope will be applied
+ Bean Name. At this time Spring defaults for bean scope will be applied
when using @Named. This behavior as well as mapping of JSR 330 and
- JSR299 scopes is planned for Spring 3.0 GA assuming the JSRs are
+ JSR 299 scopes is planned for Spring 3.0 GA assuming the JSRs are
stable at that time.
@@ -5315,9 +5315,9 @@ public class FactoryMethodComponent {
corresponding bean definition.
- JSR 330's @Named annotation can be used as a mean to both detect
+ JSR 330's @Named annotation can be used as a means to both detect
components and to provide them with a name. This behavior is enabled
- automatically if you have the JSR 330 jar on the classpath.
+ automatically if you have the JSR 330 JAR on the classpath.
If such an annotation contains no name value or
@@ -6045,7 +6045,8 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.
implements the MessageSourceAware interface is
injected with the application context's
MessageSource when the bean is created and
- configured.
+ configured.
+
As an alternative to
ResourceBundleMessageSource, Spring provides
a ReloadableResourceBundleMessageSource
@@ -6058,7 +6059,7 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.
(while efficiently caching them in between). Check out the
ReloadableResourceBundleMessageSource javadoc
for details.
-
+
@@ -6403,7 +6404,7 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.
"META-INF/applicationContext.xml"), and drop the resulting RAR file into
your application server's deployment directory.
-
+
Such RAR deployment units are usually self-contained; they do
not expose components to the outside world, not even to other
modules of the same application. Interaction with a RAR-based
@@ -6414,7 +6415,7 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.
the outside, it could for example export RMI endpoints, which of
course may be used by other application modules on the same
machine.
-
+