Merge branch '3.3.x'

Closes gh-43552
spring-projects · Dec 18, 2024 · f5cf95d · f5cf95d
2 parents 79d9780 + 229137d
commit f5cf95d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...ot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/webserver.adoc b/...ot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/webserver.adoc
@@ -208,7 +208,15 @@ server:
     bundle: "example"
 ----
 
-NOTE: The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
+[NOTE]
+====
+The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
+
+The configprop:server.ssl.ciphers[], configprop:server.ssl.enabled-protocols[], configprop:server.ssl.protocol[] properties are also ignored when using a bundle.
+These properties should instead be defined using `spring.ssl.bundle.<type>.<name>.options` properties.
+====
+
+
 
 [[howto.webserver.configure-ssl.sni]]
 === Configure Server Name Indication