Browse Source

Merge pull request #24326 from dreis2211

* pr/24326:
  Fix Asciidoc build step

Closes gh-24326
pull/24336/head
Madhura Bhave 5 years ago
parent
commit
258f1d6c78
  1. 14
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

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

@ -733,14 +733,20 @@ For instance, the two examples below produce the same result: @@ -733,14 +733,20 @@ For instance, the two examples below produce the same result:
[source,yaml,indent=0,configblocks]
----
spring.config.import=my.properties
my.property=value
spring:
config:
import: my.properties
my:
property: value
----
[source,yaml,indent=0,configblocks]
----
my.property=value
spring.config.import=my.properties
my:
property: value
spring:
config:
import: my.properties
----
In both of the above examples, the values from the `my.properties` file will take precedence over the file that triggered its import.

Loading…
Cancel
Save