Merge pull request #39616 from wanger26

* pr/39616: Polish "Add note regarding mixing of bundle-based and direct SSL configuration" Add note regarding mixing of bundle-based and direct SSL configuration Closes gh-39616
spring-projects · Feb 20, 2024 · c3af82c · c3af82c
2 parents e6d9fcd + eb4d6e7
commit c3af82c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc
@@ -211,6 +211,8 @@ Alternatively, the SSL trust material can be configured in an <<features#feature
 	    bundle: "example"
 ----
 
+NOTE: The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
+
 See {spring-boot-module-code}/web/server/Ssl.java[`Ssl`] for details of all of the supported properties.