Browse Source

Polish

See gh-23986
pull/23999/head
izeye 5 years ago committed by Stephane Nicoll
parent
commit
9c35cd41ad
  1. 2
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc
  2. 2
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
  3. 1
      spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java
  4. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocation.java

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc

@ -653,7 +653,7 @@ As of Undertow 1.4.0+, HTTP/2 is supported without any additional requirement on @@ -653,7 +653,7 @@ As of Undertow 1.4.0+, HTTP/2 is supported without any additional requirement on
[[howto-configure-http2-h2c]]
==== HTTP/2 Cleartext with supported servers
To enable HTTP/2 with cleartext support, you need to leave the `configprop:server.http2.enabled[]` property set to `false`,
To enable HTTP/2 with cleartext support, you need to leave the configprop:server.http2.enabled[] property set to `false`,
and instead apply a customizer specific to your choice of server:
For Tomcat, we need to add an upgrade protocol:

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

@ -1441,7 +1441,7 @@ NOTE: The `prefix` value for the annotation _must_ be in kebab case (lowercase a @@ -1441,7 +1441,7 @@ NOTE: The `prefix` value for the annotation _must_ be in kebab case (lowercase a
| Environment Variables
| Upper case format with underscore as the delimiter (see <<boot-features-external-config-relaxed-binding-from-environment-variables>>).
| Numeric values surrounded by underscores (see <<boot-features-external-config-relaxed-binding-from-environment-variables>>)`
| Numeric values surrounded by underscores (see <<boot-features-external-config-relaxed-binding-from-environment-variables>>)
| System properties
| Camel case, kebab case, or underscore notation

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java

@ -68,6 +68,7 @@ public class ConfigurationMetadata { @@ -68,6 +68,7 @@ public class ConfigurationMetadata {
/**
* Add item meta-data if it's not already present.
* @param itemMetadata the meta-data to add
* @since 2.4.0
*/
public void addIfMissing(ItemMetadata itemMetadata) {
add(this.items, itemMetadata.getName(), itemMetadata, true);

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocation.java

@ -121,7 +121,7 @@ public final class ConfigDataLocation implements OriginProvider { @@ -121,7 +121,7 @@ public final class ConfigDataLocation implements OriginProvider {
/**
* Create a new {@link ConfigDataLocation} with a specific {@link Origin}.
* @param origin the orgin to set
* @param origin the origin to set
* @return a new {@link ConfigDataLocation} instance.
*/
ConfigDataLocation withOrigin(Origin origin) {

Loading…
Cancel
Save