From 4593ca8d70de75415b8493de229c431f8b163257 Mon Sep 17 00:00:00 2001 From: Larry West Date: Tue, 31 Aug 2021 13:33:44 -0700 Subject: [PATCH] Clarify what is doing the overriding of remote settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If I am reading this correctly, the existing two lines flip the perspective of what is doing the overriding from “subject/actor is remote (e.g., config-service) overriding local settings” (in the property names) to “subject/actor is local settings overriding remote ones” (in the text) within each line: Existing: ``` * `spring.cloud.config.overrideNone=true`: Override from any local property source. * `spring.cloud.config.overrideSystemProperties=false`: Only system properties, command line arguments, and environment variables (but not the local config files) should override the remote settings. ``` My change aims to clarify by not re-using the verb "override", which is in the property names. It also removes "should", which I find puzzling. --- docs/src/main/asciidoc/spring-cloud-commons.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-commons.adoc b/docs/src/main/asciidoc/spring-cloud-commons.adoc index af8cefd19..afb594569 100644 --- a/docs/src/main/asciidoc/spring-cloud-commons.adoc +++ b/docs/src/main/asciidoc/spring-cloud-commons.adoc @@ -92,8 +92,8 @@ By default, they cannot be overridden locally. If you want to let your applications override the remote properties with their own system properties or config files, the remote property source has to grant it permission by setting `spring.cloud.config.allowOverride=true` (it does not work to set this locally). Once that flag is set, two finer-grained settings control the location of the remote properties in relation to system properties and the application's local configuration: -* `spring.cloud.config.overrideNone=true`: Override from any local property source. -* `spring.cloud.config.overrideSystemProperties=false`: Only system properties, command line arguments, and environment variables (but not the local config files) should override the remote settings. +* `spring.cloud.config.overrideNone=true`: Local property sources will always have higher precedence than remote settings. +* `spring.cloud.config.overrideSystemProperties=false`: Only system properties, command line arguments, and environment variables (but not the local config files) will have higher precedence than the remote settings. === Customizing the Bootstrap Configuration