Merge branch '3.1.x' into 3.2.x

Closes gh-39641
2024-02-20 11:58:39 -06:00
parent 71e5e1252a c3af82ca62
commit 60d2b3ea43
1 changed files with 2 additions and 0 deletions
--- 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.