Merge remote-tracking branch 'origin/2.1.x'

README.adoc

@@ -1,8 +1,4 @@
-////
-DO NOT EDIT THIS FILE. IT WAS GENERATED.
-Manual changes to this file will be lost when it is generated again.
-Edit the files in the src/main/asciidoc/ directory instead.
-////
+// Do not edit this file (e.g. go instead to src/main/asciidoc)
 
 image::https://circleci.com/gh/spring-cloud/spring-cloud-commons.svg?style=svg[Build Status, link=https://circleci.com/gh/spring-cloud/spring-cloud-commons]
 

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

@@ -42,6 +42,8 @@ spring:
 ----
 
 If your application needs any application-specific configuration from the server, it is a good idea to set the `spring.application.name` (in `bootstrap.yml` or `application.yml`).
+In order for the property `spring.application.name` to be used as the application's context ID you
+must set it in `bootstrap.[properties | yml]`.
 
 You can disable the bootstrap process completely by setting `spring.cloud.bootstrap.enabled=false` (for example, in system properties).