diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index a1cf4ecb47..f49cf7f95e 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -40,3 +40,4 @@
 ** xref:server/aot-and-native-image-support.adoc[]
 * xref:client.adoc[]
 * xref:observability.adoc[]
+* xref:configprops.adoc[]
diff --git a/docs/modules/ROOT/pages/_configprops.adoc b/docs/modules/ROOT/pages/_configprops.adoc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docs/modules/ROOT/partials/_configprops.adoc b/docs/modules/ROOT/partials/_configprops.adoc
index ccf8305294..8d72569c9f 100644
--- a/docs/modules/ROOT/partials/_configprops.adoc
+++ b/docs/modules/ROOT/partials/_configprops.adoc
@@ -1,7 +1,7 @@
 |===
 |Name | Default | Description
 
-|spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true.
+|spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that `PropertySourceBootstrapProperties#isOverrideSystemProperties()` can be used. Set to false to prevent users from changing the default accidentally. Default true.
 |spring.cloud.config.charset | `+++UTF-8+++` | The charset to read the resource from the config server.
 |spring.cloud.config.discovery.enabled | `+++false+++` | Flag to indicate that config server discovery is enabled (config server URL will be looked up via discovery).
 |spring.cloud.config.discovery.service-id | `+++configserver+++` | Service id to locate config server.
@@ -11,9 +11,9 @@
 |spring.cloud.config.initialize-on-context-refresh | `+++false+++` | Flag to initialize bootstrap configuration on context refresh event. Default false.
 |spring.cloud.config.label |  | The label name to use to pull remote configuration properties. The default is set on the server (generally "main" for a git based server).
 |spring.cloud.config.media-type |  | The Accept header media type to send to config server.
-|spring.cloud.config.multiple-uri-strategy | `+++always+++` | The strategy to use when call to server fails and there are multiple URLs configured on the uri property (default {@link MultipleUriStrategy#ALWAYS}).
+|spring.cloud.config.multiple-uri-strategy | `+++always+++` | The strategy to use when call to server fails and there are multiple URLs configured on the uri property (default `MultipleUriStrategy#ALWAYS`).
 |spring.cloud.config.name |  | Name of application used to fetch remote properties.
-|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. This will only have an effect when using config first bootstrap.
+|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when `PropertySourceBootstrapProperties#setAllowOverride(boolean)` is true, external properties should take the lowest priority and should not override any existing property sources (including local config files). Default false. This will only have an effect when using config first bootstrap.
 |spring.cloud.config.override-system-properties | `+++true+++` | Flag to indicate that the external properties should override system properties. Default true.
 |spring.cloud.config.password |  | The password to use (HTTP Basic) when contacting the remote server.
 |spring.cloud.config.profile | `+++default+++` | The default profile to use when fetching remote configuration (comma-separated). Default is "default".
diff --git a/spring-cloud-config-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-config-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 0000000000..b1970a5b0b
--- /dev/null
+++ b/spring-cloud-config-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,10 @@
+{
+	"properties": [
+		{
+			"defaultValue": "always",
+			"name": "spring.cloud.config.multiple-uri-strategy",
+			"description": "The strategy to use when call to server fails and there are multiple URLs configured on the uri property (default `MultipleUriStrategy#ALWAYS`).",
+			"type": "org.springframework.cloud.config.client.ConfigClientProperties$MultipleUriStrategy"
+		}
+	]
+}
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/vault/VaultEnvironmentEncryptor.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/vault/VaultEnvironmentEncryptor.java
index 555d74415d..2f74c62825 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/vault/VaultEnvironmentEncryptor.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/encryption/vault/VaultEnvironmentEncryptor.java
@@ -32,8 +32,8 @@
 import org.springframework.vault.support.VaultResponse;
 
 /**
- * VaultEnvironmentEncryptor that can decrypt property values prefixed with {@code {vault}}
- * marker.
+ * VaultEnvironmentEncryptor that can decrypt property values prefixed with
+ * {@code {vault}} marker.
  *
  * @author Alexey Zhokhov
  */
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java
index 713cfb444b..42f28de636 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java
@@ -151,9 +151,9 @@ private String getFilePath(ServletWebRequest request, String name, String profil
 	}
 
 	/**
-	 * This method is synchronized because the underlying {@link EnvironmentRepository} may not
-	 * be threadsafe (JGit for example). Calling this method could result in an update to
-	 * the files on disk.
+	 * This method is synchronized because the underlying {@link EnvironmentRepository}
+	 * may not be threadsafe (JGit for example). Calling this method could result in an
+	 * update to the files on disk.
 	 */
 	synchronized String retrieve(ServletWebRequest request, String name, String profile, String label, String path,
 			boolean resolvePlaceholders, String acceptedCharset) throws IOException {