From 9c35cd41adb3c081c366fc3fa9e53e934a722deb Mon Sep 17 00:00:00 2001 From: izeye Date: Sun, 1 Nov 2020 22:53:19 +0900 Subject: [PATCH] Polish See gh-23986 --- .../spring-boot-docs/src/docs/asciidoc/howto.adoc | 2 +- .../src/docs/asciidoc/spring-boot-features.adoc | 2 +- .../configurationprocessor/metadata/ConfigurationMetadata.java | 1 + .../springframework/boot/context/config/ConfigDataLocation.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc index 4699e34cc9..4a47093a7b 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc +++ b/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 [[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: diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index bdfd04ddbe..abcefccbe6 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/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 | Environment Variables | Upper case format with underscore as the delimiter (see <>). -| Numeric values surrounded by underscores (see <>)` +| Numeric values surrounded by underscores (see <>) | System properties | Camel case, kebab case, or underscore notation diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java index 4fb7481459..7d3c9ce278 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java +++ b/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 { /** * 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); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocation.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocation.java index 01075a3c2f..b8114f3d44 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocation.java +++ b/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 { /** * 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) {