Skip to content

Commit ddc2116

Browse files
committed
Merge pull request spring-projects#3608 from izeye/typo-20150728
* pr/3608: Fix typos
2 parents 32128a6 + ee6fc8d commit ddc2116

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public void setAddress(InetAddress address) {
206206
}
207207

208208
/**
209-
* Set the session timeout
209+
* Get the session timeout
210210
* @return the session timeout
211211
* @deprecated since 1.3.0 in favor of {@code session.timeout}.
212212
*/
@@ -217,7 +217,7 @@ public Integer getSessionTimeout() {
217217
}
218218

219219
/**
220-
* Get the session timeout
220+
* Set the session timeout
221221
* @param sessionTimeout the session timeout
222222
* @deprecated since 1.3.0 in favor of {@code session.timeout}.
223223
*/

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class HttpTunnelPayloadForwarderTests {
4141
public ExpectedException thrown = ExpectedException.none();
4242

4343
@Test
44-
public void targetChannelMustNoBeNull() throws Exception {
44+
public void targetChannelMustNotBeNull() throws Exception {
4545
this.thrown.expect(IllegalArgumentException.class);
4646
this.thrown.expectMessage("TargetChannel must not be null");
4747
new HttpTunnelPayloadForwarder(null);

spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ on the classpath. This provider supports these parameters:
499499

500500
The following types can be used:
501501

502-
* Any `java.lang.Enum` that list the possible values for the property (By all means, try to
502+
* Any `java.lang.Enum` that lists the possible values for the property (By all means, try to
503503
define the property with the `Enum` type instead as no further hint should be required for
504504
the IDE to auto-complete the values).
505505
* `java.nio.charset.Charset`: auto-completion of charset/encoding values (e.g. `UTF-8`)

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,7 @@ provider for more flexibility).
18801880

18811881
To limit the scope that the client asks for when it obtains an access token you can set
18821882
`security.oauth2.client.scope` (comma separated or an array in YAML). By default the scope
1883-
is empty and it is up to to Authorization Server to decide what the defaults should be,
1883+
is empty and it is up to Authorization Server to decide what the defaults should be,
18841884
usually depending on the settings in the client registration that it holds.
18851885

18861886
NOTE: There is also a setting for `security.oauth2.client.client-authentication-scheme`

spring-boot/src/main/java/org/springframework/boot/ApplicationArguments.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Set;
2121

2222
/**
23-
* Provides access to the arguments that were used run a {@link SpringApplication}.
23+
* Provides access to the arguments that were used to run a {@link SpringApplication}.
2424
*
2525
* @author Phillip Webb
2626
* @since 1.3.0
@@ -44,7 +44,7 @@ public interface ApplicationArguments {
4444
* Return whether the set of option arguments parsed from the arguments contains an
4545
* option with the given name.
4646
* @param name the name to check
47-
* @return {@code true} if the arguments contains an option with the given name
47+
* @return {@code true} if the arguments contain an option with the given name
4848
*/
4949
boolean containsOption(String name);
5050

spring-boot/src/main/java/org/springframework/boot/ApplicationRunner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
/**
2323
* Interface used to indicate that a bean should <em>run</em> when it is contained within
24-
* a {@link SpringApplication}. Multiple {@link ApplicationArguments} beans can be defined
24+
* a {@link SpringApplication}. Multiple {@link ApplicationRunner} beans can be defined
2525
* within the same application context and can be ordered using the {@link Ordered}
2626
* interface or {@link Order @Order} annotation.
2727
*

spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class DefaultApplicationArgumentsTests {
4242
public ExpectedException thrown = ExpectedException.none();
4343

4444
@Test
45-
public void argumentsMustNoBeNull() throws Exception {
45+
public void argumentsMustNotBeNull() throws Exception {
4646
this.thrown.expect(IllegalArgumentException.class);
4747
this.thrown.expectMessage("Args must not be null");
4848
new DefaultApplicationArguments(null);

0 commit comments

Comments
 (0)