From 5ec4d4c51339fd5487686ffac7f9f0306d7250fc Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 18 Mar 2016 12:00:56 +0000
Subject: [PATCH] Sync docs from 1.0.x to gh-pages

---
 1.0.x/spring-cloud-config.html | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/1.0.x/spring-cloud-config.html b/1.0.x/spring-cloud-config.html
index 1d63f1e4..bae7ad3d 100644
--- a/1.0.x/spring-cloud-config.html
+++ b/1.0.x/spring-cloud-config.html
@@ -429,9 +429,10 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_key_management">Key Management</a></li>
 <li><a href="#_creating_a_key_store_for_testing">Creating a Key Store for Testing</a></li>
 <li><a href="#_using_multiple_keys_and_key_rotation">Using Multiple Keys and Key Rotation</a></li>
-<li><a href="#_embedding_the_config_server">Embedding the Config Server</a></li>
+<li><a href="#_serving_encrypted_properties">Serving Encrypted Properties</a></li>
 </ul>
 </li>
+<li><a href="#_embedding_the_config_server">Embedding the Config Server</a></li>
 <li><a href="#_spring_cloud_config_client">Spring Cloud Config Client</a>
 <ul class="sectlevel2">
 <li><a href="#config-first-bootstrap">Config First Bootstrap</a></li>
@@ -451,9 +452,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="paragraph">
 <p>Spring Cloud Config provides server and client-side support for externalized configuration in a distributed system. With the Config Server you have a central place to manage external properties for applications across all environments. The concepts on both client and server map identically to the Spring <code>Environment</code> and <code>PropertySource</code> abstractions, so they fit very well with Spring applications, but can be used with any application running in any language. As an application moves through the deployment pipeline from dev to test and into production you can manage the configuration between those environments and be certain that applications have everything they need to run when they migrate. The default implementation of the server storage backend uses git so it easily supports labelled versions of configuration environments, as well as being accessible to a wide range of tooling for managing the content.  It is easy to add alternative implementations and plug them in with Spring configuration.</p>
 </div>
-<div class="paragraph">
-<p><a href="https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc" class="bare">https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc</a></p>
-</div>
 </div>
 </div>
 <div class="sect1">
@@ -1217,7 +1215,23 @@ handle all encryption as well as decryption.
 </div>
 </div>
 <div class="sect2">
-<h3 id="_embedding_the_config_server">Embedding the Config Server</h3>
+<h3 id="_serving_encrypted_properties">Serving Encrypted Properties</h3>
+<div class="paragraph">
+<p>Sometimes you want the clients to decrypt the configuration locally,
+instead of doing it in the server. In that case you can still have
+/encrypt and /decrypt endpoints (if you provide the <code>encrypt.*</code>
+configuration to locate a key), but you need to explicitly switch off
+the decryption of outgoing properties using
+<code>spring.cloud.config.server.encrypt.enabled=false</code>. If you don&#8217;t care
+about the endpoints, then it should work if you configure neither the
+key nor the enabled flag.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_embedding_the_config_server">Embedding the Config Server</h2>
+<div class="sectionbody">
 <div class="paragraph">
 <p>The Config Server runs best as a standalone application, but if you
 need to you can embed it in another application. Just use the
@@ -1235,7 +1249,6 @@ initialize the same way as any other application.</p>
 </div>
 </div>
 </div>
-</div>
 <div class="sect1">
 <h2 id="_spring_cloud_config_client">Spring Cloud Config Client</h2>
 <div class="sectionbody">
@@ -1411,7 +1424,7 @@ grabbing it in the bootstrap context and injecting one).</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-02-16 10:42:51 UTC
+Last updated 2016-03-18 11:59:37 UTC
 </div>
 </div>
 </body>