Browse Source

Merge pull request #5345 from izeye/polish-20160306

* pr/5345:
  Polish
pull/5345/merge
Stephane Nicoll 10 years ago
parent
commit
b8a315d8d0
  1. 2
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java
  2. 2
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java
  3. 8
      spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java

@ -31,7 +31,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @@ -31,7 +31,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
public class JolokiaProperties {
/**
* Jolokia settings. These are traditionally set using servlet parameters, refer to
* Jolokia settings. These are traditionally set using servlet parameters. Refer to
* the documentation of Jolokia for more details.
*/
private Map<String, String> config = new HashMap<String, String>();

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java

@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
/**
* Carries information of the application.
* <p>
* Each detail element can singular or a hierarchical object such as a pojo or a nested
* Each detail element can be singular or a hierarchical object such as a pojo or a nested
* Map.
*
* @author Meang Akira Tanaka

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

@ -2373,9 +2373,9 @@ loadable. @@ -2373,9 +2373,9 @@ 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
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
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
implementation you are using for more details.
For instance, if you are using the
@ -3747,7 +3747,7 @@ used to declare a corresponding queue on the RabbitMQ instance if necessary. @@ -3747,7 +3747,7 @@ used to declare a corresponding queue on the RabbitMQ instance if necessary.
When the Rabbit infrastructure is present, any bean can be annotated with
`@RabbitListener` to create a listener endpoint. If no `RabbitListenerContainerFactory`
has been defined, a default one is configured automatically. If a `MessageConverter`
beans is defined, is is associated automatically to the default factory.
beans is defined, it is associated automatically to the default factory.
The following component creates a listener endpoint on the `someQueue` queue:

Loading…
Cancel
Save