Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-32777
This commit is contained in:
Phillip Webb
2022-10-18 17:14:48 -07:00
parent 8dec296dfd a182cc6f7c
commit fcaac2b343
4 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/external-config.adoc
View File

@@ -495,7 +495,7 @@ For example, the following file has two logical documents:
on-cloud-platform: "kubernetes"
----
For `application.properties` files a special `#---` comment is used to mark the document splits:
For `application.properties` files a special `#---` or `!---` comment is used to mark the document splits:
[source,properties,indent=0,subs="verbatim"]
----
@@ -506,7 +506,7 @@ For `application.properties` files a special `#---` comment is used to mark the
----
NOTE: Property file separators must not have any leading whitespace and must have exactly three hyphen characters.
The lines immediately before and after the separator must not be comments.
The lines immediately before and after the separator must not be same comment prefix.
TIP: Multi-document property files are often used in conjunction with activation properties such as `spring.config.activate.on-profile`.
See the <<features#features.external-config.files.activation-properties, next section>> for details.