Merge branch '3.2.x'

Closes gh-39642
spring-projects · Feb 20, 2024 · 5e844db · 5e844db
2 parents bb384f2 + 60d2b3e
commit 5e844db
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
@@ -194,6 +194,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.