Sync docs from 1.3.x to gh-pages
This commit is contained in:
@@ -10,7 +10,8 @@ the box it is responsible for loading configuration properties from
|
||||
the external sources, and also decrypting properties in the local
|
||||
external configuration files. The two contexts share an <code class="literal">Environment</code>
|
||||
which is the source of external properties for any Spring
|
||||
application. Bootstrap properties are added with high precedence, so
|
||||
application. Bootstrap properties (not <code class="literal">bootstrap.properties</code> but properties
|
||||
that are loaded during the bootstrap phase) are added with high precedence, so
|
||||
they cannot be overridden by local configuration, by default.</p><p>The bootstrap context uses a different convention for locating
|
||||
external configuration than the main application context, so instead
|
||||
of <code class="literal">application.yml</code> (or <code class="literal">.properties</code>) you use <code class="literal">bootstrap.yml</code>,
|
||||
|
||||
@@ -10,7 +10,8 @@ the box it is responsible for loading configuration properties from
|
||||
the external sources, and also decrypting properties in the local
|
||||
external configuration files. The two contexts share an <code class="literal">Environment</code>
|
||||
which is the source of external properties for any Spring
|
||||
application. Bootstrap properties are added with high precedence, so
|
||||
application. Bootstrap properties (not <code class="literal">bootstrap.properties</code> but properties
|
||||
that are loaded during the bootstrap phase) are added with high precedence, so
|
||||
they cannot be overridden by local configuration, by default.</p><p>The bootstrap context uses a different convention for locating
|
||||
external configuration than the main application context, so instead
|
||||
of <code class="literal">application.yml</code> (or <code class="literal">.properties</code>) you use <code class="literal">bootstrap.yml</code>,
|
||||
|
||||
@@ -42,7 +42,8 @@ the box it is responsible for loading configuration properties from
|
||||
the external sources, and also decrypting properties in the local
|
||||
external configuration files. The two contexts share an <literal>Environment</literal>
|
||||
which is the source of external properties for any Spring
|
||||
application. Bootstrap properties are added with high precedence, so
|
||||
application. Bootstrap properties (not <literal>bootstrap.properties</literal> but properties
|
||||
that are loaded during the bootstrap phase) are added with high precedence, so
|
||||
they cannot be overridden by local configuration, by default.</simpara>
|
||||
<simpara>The bootstrap context uses a different convention for locating
|
||||
external configuration than the main application context, so instead
|
||||
|
||||
Reference in New Issue
Block a user