Merge branch 'master' into 2.0.x

docs/src/main/asciidoc/spring-cloud-config.adoc

@@ -153,9 +153,10 @@ git branch or tag name contains a slash ("/") then the label in the
 HTTP URL should be specified with the special string "(\_)" instead (to
 avoid ambiguity with other URL paths).  For example, if the label is
 `foo/bar`, replacing the slash would result in a label that looks like
-`foo(_)bar`.  Be careful with the brackets in
-the URL if you are using a command line client like curl (e.g. escape
-them from the shell with quotes '').
+`foo(_)bar`.  The inclusion of the special string "(\_)" can also be 
+applied to the `{application}` parameter. Be careful with the brackets 
+in the URL if you are using a command line client like curl (e.g.
+escape them from the shell with quotes '').
 
 ===== Placeholders in Git URI
 
@@ -178,6 +179,23 @@ spring:
 or a "one repo per profile" policy using a similar pattern but with
 `{profile}`.
 
+Additionally, using the special string "(\_)" within your 
+`{application}` parameters can enable support for multiple 
+organizations (for example):
+
+[source,yaml]
+----
+spring:
+  cloud:
+    config:
+      server:
+        git:
+          uri: https://github.com/{application}
+----
+
+where `{application}` is provided at request time in the format 
+"organization(\_)application".
+
 ===== Pattern Matching and Multiple Repositories
 
 There is also support for more complex requirements with pattern
@@ -969,7 +987,7 @@ The key argument is mandatory (despite having a `--` prefix).
 The Config Server can use a symmetric (shared) key or an asymmetric
 one (RSA key pair). The asymmetric choice is superior in terms of
 security, but it is often more convenient to use a symmetric key since
-it is just a single property value to configure.
+it is just a single property value to configure in the `bootstrap.properties`.
 
 To configure a symmetric key you just need to set `encrypt.key` to a
 secret String (or use an enviroment variable `ENCRYPT_KEY` to keep it
@@ -1006,7 +1024,7 @@ $ keytool -genkeypair -alias mytestkey -keyalg RSA \
 ----
 
 Put the `server.jks` file in the classpath (for instance) and then in
-your `application.yml` for the Config Server:
+your `bootstrap.yml` for the Config Server:
 
 [source,yaml]
 ----