Sync docs from master to gh-pages

spring-cloud.html

@@ -1145,8 +1145,9 @@ your <code>application.yml</code> for the Config Server:</p>
 <pre>encrypt:
   keyStore:
     location: classpath:/server.jks
+    password: letmein
     alias: mytestkey
-    password: letmein</pre>
+    secret: changeme</pre>
 </div>
 </div>
 </div>
@@ -1160,7 +1161,12 @@ need to you can embed it in another application. Just use the
 to serve the resources under a prefix. The prefix should start but not
 end with a "/". It is applied to the <code>@RequestMappings</code> in the Config
 Server (i.e. underneath the Spring Boot prefixes <code>server.servletPath</code>
-and <code>server.contextPath</code>).</p>
+and <code>server.contextPath</code>). Another optional property that can be
+useful in this case is <code>spring.cloud.config.server.bootstrap</code> which is
+a flag to indicate that the server should configure itself from its
+own remote repository. The flag is off by default because it can delay
+startup, but when embedded in another application it makes sense to
+initialize the same way as any other application.</p>
 </div>
 </div>
 </div>
@@ -3486,7 +3492,7 @@ ProxyAuthenticationProperties</a> for full details.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-03-09 17:54:51 UTC
+Last updated 2015-03-11 10:37:03 UTC
 </div>
 </div>
 </body>