Skip to content

Commit de69252

Browse files
committed
Merge pull request spring-projects#231 from carsonmcdonald/3.2.x
# By Carson McDonald # Via Carson McDonald * carson: Fix a few typos
2 parents 9320bf1 + 6f0b439 commit de69252

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -165,7 +165,7 @@ public PropertiesBeanDefinitionReader(BeanDefinitionRegistry registry) {
165165
* class can still override this.
166166
* <p>Strictly speaking, the rule that a default parent setting does
167167
* not apply to a bean definition that carries a class is there for
168-
* backwards compatiblity reasons. It still matches the typical use case.
168+
* backwards compatibility reasons. It still matches the typical use case.
169169
*/
170170
public void setDefaultParentBean(String defaultParentBean) {
171171
this.defaultParentBean = defaultParentBean;

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -50,14 +50,14 @@
5050
*
5151
* <p>Note that the second strategy also supports the use of submit buttons of
5252
* type 'image'. That is, an image submit button named 'reset' will normally be
53-
* submitted by the browser as two request paramters called 'reset.x', and
54-
* 'reset.y'. When checking for the existence of a paramter from the
53+
* submitted by the browser as two request parameters called 'reset.x', and
54+
* 'reset.y'. When checking for the existence of a parameter from the
5555
* {@code methodParamNames} list, to indicate that a specific method should
56-
* be called, the code will look for request parameter in the "reset" form
57-
* (exactly as spcified in the list), and in the "reset.x" form ('.x' appended to
58-
* the name in the list). In this way it can handle both normal and image submit
59-
* buttons. The actual method name resolved if there is a match will always be
60-
* the bare form without the ".x".
56+
* be called, the code will look for a request parameter in the "reset" form
57+
* (exactly as specified in the list), and in the "reset.x" form ('.x' appended
58+
* to the name in the list). In this way it can handle both normal and image
59+
* submit buttons. The actual method name resolved, if there is a match, will
60+
* always be the bare form without the ".x".
6161
*
6262
* <p><b>Note:</b> If both strategies are configured, i.e. both "paramName"
6363
* and "methodParamNames" are specified, then both will be checked for any given
@@ -69,7 +69,7 @@
6969
*
7070
* <p>For both resolution strategies, the method name is of course coming from
7171
* some sort of view code, (such as a JSP page). While this may be acceptable,
72-
* it is sometimes desireable to treat this only as a 'logical' method name,
72+
* it is sometimes desirable to treat this only as a 'logical' method name,
7373
* with a further mapping to a 'real' method name. As such, an optional
7474
* 'logical' mapping may be specified for this purpose.
7575
*

spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -160,7 +160,7 @@ protected ClassLoader getBundleClassLoader() {
160160
* <p>View definitions that define their own parent or carry their own
161161
* class can still override this. Strictly speaking, the rule that a
162162
* default parent setting does not apply to a bean definition that
163-
* carries a class is there for backwards compatiblity reasons.
163+
* carries a class is there for backwards compatibility reasons.
164164
* It still matches the typical use case.
165165
*/
166166
public void setDefaultParentView(String defaultParentView) {

0 commit comments

Comments
 (0)