From 92249bdd3502a3406106bca46b797ee7a0fa0a9c Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 22 Apr 2016 09:45:54 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- spring-cloud-config.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-config.html b/spring-cloud-config.html index 3be75377..7e0b39c1 100644 --- a/spring-cloud-config.html +++ b/spring-cloud-config.html @@ -479,7 +479,7 @@ $ mvn spring-boot:run

The server is a Spring Boot application so you can run it from your IDE instead if you prefer (the main class is -ConfigServerApplication). Then try it out a client:

+ConfigServerApplication). Then try out a client:

@@ -826,9 +826,9 @@ be set as environment variables or command line arguments).

Environment from application.yml (shared between all clients), and foo.yml (with foo.yml taking precedence). If the YAML files have documents inside them that point to Spring profiles, those are applied -with higher precendence (in order of the profiles listed), and if +with higher precedence (in order of the profiles listed), and if there are profile-specific YAML (or properties) files these are also -applied with higher precedence than the defaults. Higher precendence +applied with higher precedence than the defaults. Higher precedence translates to a PropertySource listed earlier in the Environment. (These are the same rules as apply in a standalone Spring Boot application.)

@@ -1983,7 +1983,7 @@ grabbing it in the bootstrap context and injecting one).