Skip to content

Commit 4685fde

Browse files
committed
Merge branch '3.4.x'
2 parents 1cd93cf + 55cb112 commit 4685fde

File tree

1 file changed

+5
-5
lines changed
  • spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features

1 file changed

+5
-5
lines changed

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/ssl.adoc

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ When used to secure a client-side connection, a `truststore` is typically config
4545

4646
[TIP]
4747
====
48-
Rather than the location to a file, the xref:features/external-config.adoc#features.external-config.typesafe-configuration-properties.conversion.base64[Base64 encoded content] of the file can be provided.
49-
If you chose this options, the value should start with `base64:`.
48+
Rather than the location to a file, its xref:features/external-config.adoc#features.external-config.typesafe-configuration-properties.conversion.base64[Base64 encoded content] can be provided.
49+
If you chose this option, the value of the property should start with `base64:`.
5050
====
5151

5252
See javadoc:org.springframework.boot.autoconfigure.ssl.JksSslBundleProperties[] for the full set of supported properties.
@@ -90,10 +90,10 @@ When used to secure a client-side connection, a `truststore` is typically config
9090

9191
[TIP]
9292
====
93-
Rather than the location to a file, the xref:features/external-config.adoc#features.external-config.typesafe-configuration-properties.conversion.base64[Base64 encoded content] of the file can be provided.
94-
If you chose this options, the value should start with `base64:`.
93+
Rather than the location to a file, its xref:features/external-config.adoc#features.external-config.typesafe-configuration-properties.conversion.base64[Base64 encoded content] can be provided.
94+
If you chose this option, the value of the property should start with `base64:`.
9595
96-
PEM content can be used directly for both the `certificate` and `private-key` properties.
96+
PEM content can also be used directly for both the `certificate` and `private-key` properties.
9797
If the property values contain `BEGIN` and `END` markers then they will be treated as PEM content rather than a resource location.
9898
9999
The following example shows how a truststore certificate can be defined:

0 commit comments

Comments
 (0)