From 6df1ea3544e29a46be2def2dcd49760e070c11b0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 22 Apr 2018 09:19:08 +0200 Subject: [PATCH 1/2] Fix use of deprecated property in docs Closes gh-12940 --- .../spring-boot-docs/src/main/asciidoc/howto.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc index 32bfcb7edc..7bfbbd2a93 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -276,12 +276,12 @@ configuration by setting properties in `+spring.main.*+`. For example, in [source,properties,indent=0,subs="verbatim,quotes,attributes"] ---- - spring.main.web-environment=false + spring.main.web-application-type=none spring.main.banner-mode=off ---- -Then the Spring Boot banner is not printed on startup, and the application is -not a web application. +Then the Spring Boot banner is not printed on startup, and the application is not starting +an embedded web server. NOTE: The preceding example also demonstrates how flexible binding allows the use of underscores (`_`) as well as dashes (`-`) in property names. From 469ce57016cae1912f965d73f6e6b1bd050d1d73 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 22 Apr 2018 09:20:19 +0200 Subject: [PATCH 2/2] Remove outdated note As we've updated the complete ref doc to use a canonical format for configuration keys, this not is outdated and this commit removes it. --- .../spring-boot-docs/src/main/asciidoc/howto.adoc | 3 --- 1 file changed, 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc index 7bfbbd2a93..7e43d55146 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -283,9 +283,6 @@ configuration by setting properties in `+spring.main.*+`. For example, in Then the Spring Boot banner is not printed on startup, and the application is not starting an embedded web server. -NOTE: The preceding example also demonstrates how flexible binding allows the use of -underscores (`_`) as well as dashes (`-`) in property names. - Properties defined in external configuration override the values specified with the Java API, with the notable exception of the sources used to create the `ApplicationContext`. Consider the following application: