Sync docs from 1.3.x to gh-pages

This commit is contained in:
buildmaster
2018-06-04 15:20:59 +00:00
parent e62b04e477
commit e988810fbf
3 changed files with 9 additions and 9 deletions

View File

@@ -556,7 +556,7 @@ handle all encryption as well as decryption.</p></td></tr></table></div></div><d
instead of doing it in the server. In that case you can still have
/encrypt and /decrypt endpoints (if you provide the <code class="literal">encrypt.*</code>
configuration to locate a key), but you need to explicitly switch off
the decryption of outgoing properties using
<code class="literal">spring.cloud.config.server.encrypt.enabled=false</code>. If you don&#8217;t care
about the endpoints, then it should work if you configure neither the
the decryption of outgoing properties by placing
<code class="literal">spring.cloud.config.server.encrypt.enabled=false</code> in <code class="literal">bootstrap.[yml|properties]</code>.
If you don&#8217;t care about the endpoints, then it should work if you configure neither the
key nor the enabled flag.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="multi__quick_start.html">Prev</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="multi__serving_alternative_formats.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">1.&nbsp;Quick Start&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;3.&nbsp;Serving Alternative Formats</td></tr></table></div></body></html>

View File

@@ -658,9 +658,9 @@ handle all encryption as well as decryption.</p></td></tr></table></div></div><d
instead of doing it in the server. In that case you can still have
/encrypt and /decrypt endpoints (if you provide the <code class="literal">encrypt.*</code>
configuration to locate a key), but you need to explicitly switch off
the decryption of outgoing properties using
<code class="literal">spring.cloud.config.server.encrypt.enabled=false</code>. If you don&#8217;t care
about the endpoints, then it should work if you configure neither the
the decryption of outgoing properties by placing
<code class="literal">spring.cloud.config.server.encrypt.enabled=false</code> in <code class="literal">bootstrap.[yml|properties]</code>.
If you don&#8217;t care about the endpoints, then it should work if you configure neither the
key nor the enabled flag.</p></div></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="_serving_alternative_formats" href="#_serving_alternative_formats"></a>3.&nbsp;Serving Alternative Formats</h1></div></div></div><p>The default JSON format from the environment endpoints is perfect for
consumption by Spring applications because it maps directly onto the
<code class="literal">Environment</code> abstraction. If you prefer you can consume the same data

View File

@@ -1072,9 +1072,9 @@ handle all encryption as well as decryption.</simpara>
instead of doing it in the server. In that case you can still have
/encrypt and /decrypt endpoints (if you provide the <literal>encrypt.*</literal>
configuration to locate a key), but you need to explicitly switch off
the decryption of outgoing properties using
<literal>spring.cloud.config.server.encrypt.enabled=false</literal>. If you don&#8217;t care
about the endpoints, then it should work if you configure neither the
the decryption of outgoing properties by placing
<literal>spring.cloud.config.server.encrypt.enabled=false</literal> in <literal>bootstrap.[yml|properties]</literal>.
If you don&#8217;t care about the endpoints, then it should work if you configure neither the
key nor the enabled flag.</simpara>
</section>
</chapter>