Sync docs from master to gh-pages

This commit is contained in:
Dave Syer
2016-04-22 09:45:54 +00:00
parent 289ec3ba83
commit 92249bdd35

View File

@@ -479,7 +479,7 @@ $ mvn spring-boot:run</pre>
<div class="paragraph">
<p>The server is a Spring Boot application so you can run it from your
IDE instead if you prefer (the main class is
<code>ConfigServerApplication</code>). Then try it out a client:</p>
<code>ConfigServerApplication</code>). Then try out a client:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -826,9 +826,9 @@ be set as environment variables or command line arguments).</p>
<code>Environment</code> from <code>application.yml</code> (shared between all clients), and
<code>foo.yml</code> (with <code>foo.yml</code> taking precedence). If the YAML files have
documents inside them that point to Spring profiles, those are applied
with higher precendence (in order of the profiles listed), and if
with higher precedence (in order of the profiles listed), and if
there are profile-specific YAML (or properties) files these are also
applied with higher precedence than the defaults. Higher precendence
applied with higher precedence than the defaults. Higher precedence
translates to a <code>PropertySource</code> listed earlier in the
<code>Environment</code>. (These are the same rules as apply in a standalone
Spring Boot application.)</p>
@@ -1983,7 +1983,7 @@ grabbing it in the bootstrap context and injecting one).</p>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2016-04-19 12:50:35 UTC
Last updated 2016-04-22 09:44:29 UTC
</div>
</div>
</body>