Sync docs from master to gh-pages

spring-cloud-config.html

@@ -1162,7 +1162,8 @@ hooks. To declare overrides just add a map of name-value pairs to
   cloud:
     config:
       server:
-        foo: bar</code></pre>
+        overrides:
+          foo: bar</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1919,7 +1920,7 @@ grabbing it in the bootstrap context and injecting one).</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-01-25 11:45:14 UTC
+Last updated 2016-01-26 10:00:55 UTC
 </div>
 </div>
 </body>