From 76370e2ee648b024aa9cb0f61e738225ba56ed97 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Sun, 26 Oct 2014 15:49:44 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 spring-cloud-config.html | 44 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-config.html b/spring-cloud-config.html
index f6382f6a..a85f2bf1 100644
--- a/spring-cloud-config.html
+++ b/spring-cloud-config.html
@@ -430,6 +430,8 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </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>
+<li><a href="#_eureka_first_bootstrap">Eureka First Bootstrap</a></li>
 <li><a href="#_environment_changes">Environment Changes</a></li>
 <li><a href="#_refresh_scope">Refresh Scope</a></li>
 <li><a href="#_encryption_and_decryption_2">Encryption and Decryption</a></li>
@@ -816,10 +818,42 @@ your <code>application.yml</code> for the Config Server:</p>
 <p>A Spring Boot application can take immediate advantage of the Spring
 Config Server (or other external property sources provided by the
 application developer), and it will also pick up some additional
-useful features related to <code>Environment</code> change events. When a config
-client starts up it binds to the Config Server (via the bootstrap
-configuration property <code>spring.cloud.config.uri</code>) and initializes
-Spring <code>Environment</code> with remote property sources</p>
+useful features related to <code>Environment</code> change events.</p>
+</div>
+<div class="sect2">
+<h3 id="_config_first_bootstrap">Config First Bootstrap</h3>
+<div class="paragraph">
+<p>This is the default behaviour for any application wich has the Spring
+Cloud Config Client on the classpath. When a config client starts up
+it binds to the Config Server (via the bootstrap configuration
+property <code>spring.cloud.config.uri</code>) and initializes Spring
+<code>Environment</code> with remote property sources.</p>
+</div>
+<div class="paragraph">
+<p>The net result of this is that all client apps that want to consume
+the Config Server need a <code>bootstrap.yml</code> (or an environment variable)
+with the server address in <code>spring.cloud.config.uri</code> (defaults to
+"http://localhost:8888").</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_eureka_first_bootstrap">Eureka First Bootstrap</h3>
+<div class="paragraph">
+<p>If you are using Spring Cloud Netflix and Eureka Service Discovery,
+then you can have the Config Server register with Eureka if you want
+to, but in the default "Config First" mode, clients won&#8217;t be able to
+take advantage of the registration.</p>
+</div>
+<div class="paragraph">
+<p>If you prefer to use Eureka to locate the Config Server, you can do
+that by setting <code>spring.cloud.config.discovery.enabled=true</code> (default
+"false"). The net result of that is that client apps all need a
+<code>bootstrap.yml</code> (or an environment variable) with the Eureka server
+address, e.g. in <code>eureka.client.serviceUrl.defaultZone</code>.  The price
+for using this option is an extra network round trip on start up to
+locate the service registration. The benefit is that the Config Server
+can change its co-ordinates, as long as Eureka is a fixed point.</p>
+</div>
 </div>
 <div class="sect2">
 <h3 id="_environment_changes">Environment Changes</h3>
@@ -1077,7 +1111,7 @@ grabbing it in the bootstrap context and injecting one).</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-10-26 15:37:52 UTC
+Last updated 2014-10-26 15:48:31 UTC
 </div>
 </div>
 </body>