From 684fe4bf4ecf720e82bbcf06a80dec0bd47164b8 Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Thu, 26 Jan 2017 16:45:50 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 spring-cloud-netflix.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-netflix.html b/spring-cloud-netflix.html
index e4961982c..d4378eb9a 100644
--- a/spring-cloud-netflix.html
+++ b/spring-cloud-netflix.html
@@ -1662,14 +1662,14 @@ public interface StoreClient {
 <div class="paragraph">
 <p>In this case the client is composed from the components already in <code>FeignClientsConfiguration</code> together with any in <code>FooConfiguration</code> (where the latter will override the former).</p>
 </div>
-<div class="admonitionblock warning">
+<div class="admonitionblock note">
 <table>
 <tr>
 <td class="icon">
-<div class="title">Warning</div>
+<div class="title">Note</div>
 </td>
 <td class="content">
-The <code>FooConfiguration</code> has to be <code>@Configuration</code> but take care that it is not in a <code>@ComponentScan</code> for the main application context, otherwise it will be used for every <code>@FeignClient</code>. If you use <code>@ComponentScan</code> (or <code>@SpringBootApplication</code>) you need to take steps to avoid it being included (for instance put it in a separate, non-overlapping package, or specify the packages to scan explicitly in the <code>@ComponentScan</code>).
+<code>FooConfiguration</code> does not need to be annotated with <code>@Configuration</code>. However, if it is, then take care to exclude it from any <code>@ComponentScan</code> that would otherwise include this configuration as it will become the default source for <code>feign.Decoder</code>, <code>feign.Encoder</code>, <code>feign.Contract</code>, etc., when specified. This can be avoided by putting it in a separate, non-overlapping package from any <code>@ComponentScan</code> or <code>@SpringBootApplication</code>, or it can be explicitly excluded in <code>@ComponentScan</code>.
 </td>
 </tr>
 </table>