Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
Closes gh-14271
This commit is contained in:
Johnny Lim
2018-09-01 00:01:46 +09:00
committed by Stephane Nicoll
parent 7dff13b632
commit d510bc71b1
8 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@@ -549,7 +549,7 @@ content into your application. Rather, pick only the properties that you need.
spring.flyway.baseline-description= #
spring.flyway.baseline-on-migrate= #
spring.flyway.baseline-version=1 # Version to start migration
spring.flyway.batch = #
spring.flyway.batch= #
spring.flyway.check-location=true # Whether to check that migration scripts location exists.
spring.flyway.clean-disabled= #
spring.flyway.clean-on-validation-error= #
@@ -1106,9 +1106,9 @@ content into your application. Rather, pick only the properties that you need.
spring.kafka.ssl.trust-store-location= # Location of the trust store file.
spring.kafka.ssl.trust-store-password= # Store password for the trust store file.
spring.kafka.ssl.trust-store-type= # Type of the trust store.
spring.kafka.streams.application-id = # Kafka streams application.id property; default spring.application.name.
spring.kafka.streams.application-id= # Kafka streams application.id property; default spring.application.name.
spring.kafka.streams.auto-startup=true # Whether or not to auto-start the streams factory bean.
spring.kafka.streams.bootstrap-servers= # Comma-delimited list of host:port pairs to use for establishing the initial connection to the Kafka cluster. Overrides the global property, for streams.
spring.kafka.streams.bootstrap-servers= # Comma-delimited list of host:port pairs to use for establishing the initial connections to the Kafka cluster. Overrides the global property, for streams.
spring.kafka.streams.cache-max-bytes-buffering= # Maximum number of memory bytes to be used for buffering across all threads.
spring.kafka.streams.client-id= # ID to pass to the server when making requests. Used for server-side logging.
spring.kafka.streams.properties.*= # Additional Kafka properties used to configure the streams.

4
spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@@ -1326,7 +1326,7 @@ source for more details.
[[howto-switch-off-the-spring-mvc-dispatcherservlet]]
=== Switch Off the Spring MVC DispatcherServlet
By default, All content is served from the root of your application (`/`) down. If you
By default, all content is served from the root of your application (`/`). If you
would rather map to a different path, you can configure one as follows:
[source,properties,indent=0,subs="verbatim"]
@@ -1334,7 +1334,7 @@ would rather map to a different path, you can configure one as follows:
spring.mvc.servlet.path=/acme
----
If you have additional servlets you can declare a `@Bean` of type `Servlet` or
If you have additional servlets you can declare a `@Bean` of type `Servlet` or
`ServletRegistrationBean` for each and Spring Boot will register them transparently to the
container. Because servlets are registered that way, they can be mapped to a sub-context
of the `DispatcherServlet` without invoking it.

6
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -5701,12 +5701,12 @@ reference the auto-configured `KafkaTransactionManager` bean.
==== Kafka Streams
Spring for Apache Kafka provides a factory bean to create a `StreamsBuilder` object and
manage the lifecycle of its streams. Spring Boot auto-configures the required
`KafkaStreamsConfiguration` bean as long as `kafka-streams` in on the classpath and kafka
streams is enabled via the `@EnableKafkaStreams` annotation.
`KafkaStreamsConfiguration` bean as long as `kafka-streams` is on the classpath and Kafka
Streams is enabled via the `@EnableKafkaStreams` annotation.
Enabling Kafka Streams means that the application id and bootstrap servers must be set.
The former can be configured using `spring.kafka.streams.application-id`, defaulting to
`spring.application.name` if not set. The later can be set globally or
`spring.application.name` if not set. The latter can be set globally or
specifically overridden just for streams.
Several additional properties are available using dedicated properties; other arbitrary