Skip to content

Commit

Permalink
Polish
Browse files Browse the repository at this point in the history
  • Loading branch information
izeye authored and snicoll committed Mar 3, 2016
1 parent 7029ba5 commit a6c8378
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ something, or simply want to hack on the code this document should help you get

== Code of Conduct
This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of
conduct]. By participating, you are expected to uphold this code. Please report
conduct]. By participating, you are expected to uphold this code. Please report
unacceptable behavior to [email protected].


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public class ResourcePropertiesTests {

@Test
public void resourceChainNoCustomization() {
System.out.println(this.properties.getChain().getEnabled());
assertThat(this.properties.getChain().getEnabled()).isNull();
}

Expand Down
6 changes: 3 additions & 3 deletions spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ definitions by simply listing the properties classes directly in the

[NOTE]
====
When `@ConfigurationProperties` bean are registered that way, the bean will have a
When `@ConfigurationProperties` bean is registered that way, the bean will have a
conventional name: `<prefix>-<fqn>`, where `<prefix>` is the environment key prefix
specified in the `@ConfigurationProperties` annotation and <fqn> the fully qualified
name of the bean. If the annotation does not provide any prefix, only the fully qualified
Expand Down Expand Up @@ -2002,7 +2002,7 @@ password, printed at INFO level when the application starts up)
Using default security password: 78fa095d-3f4c-48b1-ad50-e24c31d5cf35
----

NOTE: If you fine tune your logging configuration, ensure that the
NOTE: If you fine-tune your logging configuration, ensure that the
`org.springframework.boot.autoconfigure.security` category is set to log `INFO` messages,
otherwise the default password will not be printed.

Expand Down Expand Up @@ -2372,7 +2372,7 @@ loadable.

See {sc-spring-boot-autoconfigure}/jdbc/DataSourceProperties.{sc-ext}[`DataSourceProperties`]
for more of the supported options. These are the standard options that work regardless of
the actual implementation. It is also possible to fine tune implementation-specific
the actual implementation. It is also possible to fine-tune implementation-specific
settings using their respective prefix (`+spring.datasource.tomcat*+`,
`+spring.datasource.hikari+`, `+spring.datasource.dbcp*+` and
`+spring.datasource.dbcp2*+`), refer to the documentation of the connection pool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public ExitCodeEvent(Object source, int exitCode) {

/**
* Return the exit code that will be used to exit the JVM.
* @return the the exit code
* @return the exit code
*/
public int getExitCode() {
return this.exitCode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class ContextIdApplicationContextInitializer implements
* <li>{@code server.port}</li>
* <li>{@code PORT}</li>
* </ul>
* This order allows favors a platform defined index over any user defined value.
* This order favors a platform defined index over any user defined value.
*/
private static final String INDEX_PATTERN = "${vcap.application.instance_index:${spring.application.index:${server.port:${PORT:null}}}}";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ protected FailureAnalysis analyze(Throwable rootFailure,
}
catch (NoSuchBeanDefinitionException ex) {
message.append(String.format(
"\t- %s: a programtically registered singleton", beanName));
"\t- %s: a programmatically registered singleton", beanName));
}

}
return new FailureAnalysis(message.toString(),
"Consider marking one of the beans as @Primary, updating the consumer to"
+ " accept multiple beans, or using @Qualifer to identify the"
+ " accept multiple beans, or using @Qualifier to identify the"
+ " bean that should be consumed",
cause);
}
Expand Down

0 comments on commit a6c8378

Please sign in to comment.