Skip to content

Commit 5e844db

Browse files
Merge branch '3.2.x'
Closes gh-39642
2 parents bb384f2 + 60d2b3e commit 5e844db

File tree

1 file changed

+2
-0
lines changed
  • spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto

1 file changed

+2
-0
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ Alternatively, the SSL trust material can be configured in an <<features#feature
194194
bundle: "example"
195195
----
196196

197+
NOTE: The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
198+
197199
See {spring-boot-module-code}/web/server/Ssl.java[`Ssl`] for details of all of the supported properties.
198200

199201

0 commit comments

Comments
 (0)