Sync docs from master to gh-pages

multi/multi__serving_plain_text.html

@@ -33,8 +33,8 @@ nginx.conf</pre><p>where <code class="literal">nginx.conf</code> looks like this
 }</pre><p>and <code class="literal">/foo/development/master/nginx.conf</code> like this:</p><pre class="screen">server {
     listen              80;
     server_name         develop.com;
-}</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="images/note.png"></td><th align="left">Note</th></tr><tr><td align="left" valign="top"><p>just like the source files for environment configuration, the
+}</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="images/note.png"></td><th align="left">Note</th></tr><tr><td align="left" valign="top"><p>Just like the source files for environment configuration, the
 "profile" is used to resolve the file name, so if you want a
 profile-specific file then <code class="literal">/*/development/*/logback.xml</code> will be
 resolved by a file called <code class="literal">logback-development.xml</code> (in preference
-to <code class="literal">logback.xml</code>).</p></td></tr></table></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="multi__serving_alternative_formats.html">Prev</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="multi__embedding_the_config_server.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">3.&nbsp;Serving Alternative Formats&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="multi_spring-cloud-config.html">Home</a></td><td width="40%" align="right" valign="top">&nbsp;5.&nbsp;Embedding the Config Server</td></tr></table></div></body></html>
+to <code class="literal">logback.xml</code>).</p></td></tr></table></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="images/note.png"></td><th align="left">Note</th></tr><tr><td align="left" valign="top"><p>If you do not want to supply the <code class="literal">label</code> and let the server use the default label, you can supply a <code class="literal">useDefaultLabel</code> request parameter. So, the above example for the <code class="literal">default</code> profile could look like <code class="literal">/foo/default/nginx.conf?useDefaultLabel</code>.</p></td></tr></table></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="multi__serving_alternative_formats.html">Prev</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="multi__embedding_the_config_server.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">3.&nbsp;Serving Alternative Formats&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="multi_spring-cloud-config.html">Home</a></td><td width="40%" align="right" valign="top">&nbsp;5.&nbsp;Embedding the Config Server</td></tr></table></div></body></html>

single/spring-cloud-config.html

@@ -730,11 +730,11 @@ nginx.conf</pre><p>where <code class="literal">nginx.conf</code> looks like this
 }</pre><p>and <code class="literal">/foo/development/master/nginx.conf</code> like this:</p><pre class="screen">server {
     listen              80;
     server_name         develop.com;
-}</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="images/note.png"></td><th align="left">Note</th></tr><tr><td align="left" valign="top"><p>just like the source files for environment configuration, the
+}</pre><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="images/note.png"></td><th align="left">Note</th></tr><tr><td align="left" valign="top"><p>Just like the source files for environment configuration, the
 "profile" is used to resolve the file name, so if you want a
 profile-specific file then <code class="literal">/*/development/*/logback.xml</code> will be
 resolved by a file called <code class="literal">logback-development.xml</code> (in preference
-to <code class="literal">logback.xml</code>).</p></td></tr></table></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="_embedding_the_config_server" href="#_embedding_the_config_server"></a>5.&nbsp;Embedding the Config Server</h1></div></div></div><p>The Config Server runs best as a standalone application, but if you
+to <code class="literal">logback.xml</code>).</p></td></tr></table></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="images/note.png"></td><th align="left">Note</th></tr><tr><td align="left" valign="top"><p>If you do not want to supply the <code class="literal">label</code> and let the server use the default label, you can supply a <code class="literal">useDefaultLabel</code> request parameter. So, the above example for the <code class="literal">default</code> profile could look like <code class="literal">/foo/default/nginx.conf?useDefaultLabel</code>.</p></td></tr></table></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="_embedding_the_config_server" href="#_embedding_the_config_server"></a>5.&nbsp;Embedding the Config Server</h1></div></div></div><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
 <code class="literal">@EnableConfigServer</code> annotation. An optional property that can be
 useful in this case is <code class="literal">spring.cloud.config.server.bootstrap</code> which is

spring-cloud-config.xml

@@ -1182,12 +1182,15 @@ nginx:
     server_name         develop.com;
 }</screen>
 <note>
-<simpara>just like the source files for environment configuration, the
+<simpara>Just like the source files for environment configuration, the
 "profile" is used to resolve the file name, so if you want a
 profile-specific file then <literal>/*/development/*/logback.xml</literal> will be
 resolved by a file called <literal>logback-development.xml</literal> (in preference
 to <literal>logback.xml</literal>).</simpara>
 </note>
+<note>
+<simpara>If you do not want to supply the <literal>label</literal> and let the server use the default label, you can supply a <literal>useDefaultLabel</literal> request parameter. So, the above example for the <literal>default</literal> profile could look like <literal>/foo/default/nginx.conf?useDefaultLabel</literal>.</simpara>
+</note>
 </chapter>
 <chapter xml:id="_embedding_the_config_server">
 <title>Embedding the Config Server</title>