From 85a602fa1c12c5ce0e006b9b13f3dc0f11697940 Mon Sep 17 00:00:00 2001
From: Artem Bilan <clericsmail@gmail.com>
Date: Mon, 28 Nov 2011 18:17:35 +0200
Subject: [PATCH 1/2] INT-2273: Manual 3.2

---
 docs/src/reference/docbook/channel-adapter.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/src/reference/docbook/channel-adapter.xml b/docs/src/reference/docbook/channel-adapter.xml
index efec45d05b..f3619f2f5b 100644
--- a/docs/src/reference/docbook/channel-adapter.xml
+++ b/docs/src/reference/docbook/channel-adapter.xml
@@ -118,9 +118,15 @@
     <para>
       Any Channel Adapter can be created without a "channel" reference in which case it will implicitly create an
       instance of <classname>DirectChannel</classname>. The created channel's name will match the "id" attribute
-      of the &lt;inbound-channel-adapter/&gt; or &lt;outbound-channel-adapter&gt; element. Therefore, if the "channel"
+      of the <code>&lt;inbound-channel-adapter&gt;</code> or <code>&lt;outbound-channel-adapter&gt;</code> element. Therefore, if the "channel"
       is not provided, the "id" is required.
     </para>
+    <para>
+      As many other Spring Integration components <code>&lt;inbound-channel-adapter&gt;</code> and <code>&lt;outbound-channel-adapter&gt;</code>
+      also provide support for SpEL expression via 'expression' attribute in contrast to method-invocation via 'bean reference/method', while following the same contract where:
+      <emphasis>expression</emphasis> for <code>&lt;inbound-channel-adapter&gt;</code> must always return <emphasis>non-null</emphasis> value,
+      while the one for <code>&lt;outbound-channel-adapter&gt;</code> must be equivalent of <emphasis>void</emphasis> return type.
+    </para>
   </section>
 
 </section>

From dec71f27c86f400077de39d9ee6006919608941d Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 2 Dec 2011 14:13:25 -0500
Subject: [PATCH 2/2] polishing

---
 docs/src/reference/docbook/channel-adapter.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/src/reference/docbook/channel-adapter.xml b/docs/src/reference/docbook/channel-adapter.xml
index f3619f2f5b..efc27b46dd 100644
--- a/docs/src/reference/docbook/channel-adapter.xml
+++ b/docs/src/reference/docbook/channel-adapter.xml
@@ -122,10 +122,13 @@
       is not provided, the "id" is required.
     </para>
     <para>
-      As many other Spring Integration components <code>&lt;inbound-channel-adapter&gt;</code> and <code>&lt;outbound-channel-adapter&gt;</code>
-      also provide support for SpEL expression via 'expression' attribute in contrast to method-invocation via 'bean reference/method', while following the same contract where:
-      <emphasis>expression</emphasis> for <code>&lt;inbound-channel-adapter&gt;</code> must always return <emphasis>non-null</emphasis> value,
-      while the one for <code>&lt;outbound-channel-adapter&gt;</code> must be equivalent of <emphasis>void</emphasis> return type.
+      Like many other Spring Integration components, the <code>&lt;inbound-channel-adapter&gt;</code> and
+      <code>&lt;outbound-channel-adapter&gt;</code> also provide support for SpEL expression evaluation. To use SpEL, provide the
+      expression string via the 'expression' attribute instead of providing the 'ref' and 'method' attributes that are used for
+      method-invocation on a bean. When an Expression is evaluated, it follows the same contract as method-invocation where:
+      the <emphasis>expression</emphasis> for an <code>&lt;inbound-channel-adapter&gt;</code> will generate a message anytime the
+      evaluation result is a <emphasis>non-null</emphasis> value, while the <emphasis>expression</emphasis> for an
+      <code>&lt;outbound-channel-adapter&gt;</code> must be the equivalent of a <emphasis>void</emphasis> returning method invocation.
     </para>
   </section>