Skip to content

Fix Asciidoc build step #24326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix Asciidoc build step #24326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down