diff --git a/src/docbkx/amqp.xml b/src/docbkx/amqp.xml
index ea989577..5989d0ad 100644
--- a/src/docbkx/amqp.xml
+++ b/src/docbkx/amqp.xml
@@ -1109,7 +1109,7 @@ public class ExampleExternalTransactionAmqpConfiguration {
       declare exchanges, queues and bindings on startup.  It does this
       lazily, through a <classname>ConnectionListener</classname>, so
       if the broker is not present on startup it doesn't matter.  The
-      first time a <classname>Connection</classname> is useed (e.g. by
+      first time a <classname>Connection</classname> is used (e.g. by
       sending a message) the listener will fire and the admin features
       will be applied.  A further benefit of doing the auto
       declarations in a listener is that if the connection is dropped
diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml
index 098b513a..8e26dc54 100644
--- a/src/docbkx/index.xml
+++ b/src/docbkx/index.xml
@@ -45,7 +45,7 @@
             <para>
                 This first part of the reference documentation is a
                 high-level overview of Spring AMQP and the underlying
-                concepts and some code snippets that qill get you up
+                concepts and some code snippets that will get you up
                 and running as quickly as possible.
             </para>
         </partintro>
diff --git a/src/docbkx/si-amqp.xml b/src/docbkx/si-amqp.xml
index 816114cc..beb9c04a 100644
--- a/src/docbkx/si-amqp.xml
+++ b/src/docbkx/si-amqp.xml
@@ -25,8 +25,8 @@
 
     <para>To receive AMQP Messages from a Queue, configure an &lt;inbound-channel-adapter&gt;</para>
 
-    <programlisting language="xml"><![CDATA[<amqp:inbound-channel-adapter queue-name="some.queue"
-                              channel="fromAMQP"
+    <programlisting language="xml"><![CDATA[<amqp:inbound-channel-adapter channel="fromAMQP"
+                              queue-names="some.queue"
                               connection-factory="rabbitConnectionFactory"/>]]></programlisting>
   </section>
 
@@ -45,17 +45,13 @@
   <section>
     <title>Inbound Gateway</title>
 
-    <para>To receive an AMQP Message from a Queue, and respond to an
-    Exchange, configure an &lt;inbound-gateway&gt;.  A
-    'routing-key' may optionally be provided in addition to the
-    exchange name.</para>
+    <para>To receive an AMQP Message from a Queue, and respond to its
+    reply-to address, configure an &lt;inbound-gateway&gt;.</para>
 
-    <programlisting language="xml"><![CDATA[<amqp:inbound-gateway input-channel="fromAMQP"
-                               output-channel="toAMQP"
-                               exchange-name="some.exchange"
-                               routing-key="foo"
-                               queue-name="some.queue"
-                               amqp-template="rabbitTemplate"/>]]></programlisting>
+    <programlisting language="xml"><![CDATA[<amqp:inbound-gateway request-channel="fromAMQP"
+                               reply-channel="toAMQP"
+                               queue-names="some.queue"
+                               connection-factory="rabbitConnectionFactory"/>]]></programlisting>
 
   </section>
 
@@ -67,8 +63,8 @@
     &lt;outbound-gateway&gt;.  A 'routing-key' may optionally be
     provided in addition to the exchange name.</para>
 
-    <programlisting language="xml"><![CDATA[<amqp:outbound-gateway input-channel="toAMQP"
-                               output-channel="fromAMQP"
+    <programlisting language="xml"><![CDATA[<amqp:outbound-gateway request-channel="toAMQP"
+                               reply-channel="fromAMQP"
                                exchange-name="some.exchange"
                                routing-key="foo"
                                amqp-template="rabbitTemplate"/>]]></programlisting>