Sync docs from master to gh-pages

This commit is contained in:
Dave Syer
2015-07-24 08:48:00 +00:00
parent 923eafc9e4
commit 2d2acad8c2

View File

@@ -753,8 +753,8 @@ things with their parent.</p>
<div class="sect2">
<h3 id="customizing-bootstrap-properties">Changing the Location of Bootstrap Properties</h3>
<div class="paragraph">
<p>The <code>bootstrap.yml</code> (or <code>.properties) location can be specified using
`spring.cloud.bootstrap.name</code> (default "bootstrap") or
<p>The <code>bootstrap.yml</code> (or <code>.properties</code>) location can be specified using
<code>spring.cloud.bootstrap.name</code> (default "bootstrap") or
<code>spring.cloud.bootstrap.location</code> (default empty), e.g. in System
properties. Those properties behave like the <code>spring.config.*</code>
variants with the same name, in fact they are used to set up the
@@ -3501,7 +3501,7 @@ AQAjPgt3eFZQXwt8tsHAVv/QHiY5sI2dRcR+...</pre>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2015-07-24 08:45:24 UTC
Last updated 2015-07-24 08:47:07 UTC
</div>
</div>
</body>