Merge branch '1.4.x'

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

@@ -150,10 +150,10 @@ working copy as a cache.
 This repository implementation maps the `{label}` parameter of the
 HTTP resource to a git label (commit id, branch name or tag). If the
 git branch or tag name contains a slash ("/") then the label in the
-HTTP URL should be specified with the special string "(_)" instead (to
+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`.  The inclusion of the special string "(_)" can also be
+`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 '').
@@ -179,7 +179,7 @@ spring:
 or a "one repo per profile" policy using a similar pattern but with
 `{profile}`.
 
-Additionally, using the special string "(_)" within your
+Additionally, using the special string "($$_$$)" within your
 `{application}` parameters can enable support for multiple 
 organizations (for example):
 
@@ -194,7 +194,7 @@ spring:
 ----
 
 where `{application}` is provided at request time in the format 
-"organization(_)application".
+"organization($$_$$)application".
 
 ===== Pattern Matching and Multiple Repositories