diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/ssl.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/ssl.adoc index 3b48f470811..938d5be755b 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/ssl.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/ssl.adoc @@ -45,8 +45,8 @@ When used to secure a client-side connection, a `truststore` is typically config [TIP] ==== -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. -If you chose this options, the value should start with `base64:`. +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. +If you chose this option, the value of the property should start with `base64:`. ==== 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 [TIP] ==== -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. -If you chose this options, the value should start with `base64:`. +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. +If you chose this option, the value of the property should start with `base64:`. -PEM content can be used directly for both the `certificate` and `private-key` properties. +PEM content can also be used directly for both the `certificate` and `private-key` properties. If the property values contain `BEGIN` and `END` markers then they will be treated as PEM content rather than a resource location. The following example shows how a truststore certificate can be defined: