From da72ca9a201794b63af3359f83bb0ac7c46277fb Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 8 Jan 2015 17:27:46 +0200
Subject: [PATCH] AMQP-138: Add `What's New` about ContentTypeMC

JIRA: https://jira.spring.io/browse/AMQP-138

Polishing
---
 src/reference/docbook/amqp.xml       |  4 ++--
 src/reference/docbook/index.xml      |  2 +-
 src/reference/docbook/quick-tour.xml |  2 +-
 src/reference/docbook/whats-new.xml  | 16 +++++++++++++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/reference/docbook/amqp.xml b/src/reference/docbook/amqp.xml
index d15e9ce0..0921874a 100644
--- a/src/reference/docbook/amqp.xml
+++ b/src/reference/docbook/amqp.xml
@@ -1395,7 +1395,7 @@ public Message<OrderStatus> processOrder(Order order) {
     </section>
   </section>
 
-  <section>
+  <section id="message-converters">
     <title>Message Converters</title>
 
     <para>The <interfacename>AmqpTemplate</interfacename> also defines several
@@ -1650,7 +1650,7 @@ Object receiveAndConvert(String queueName) throws AmqpException;]]></programlist
     <section id="direct-reply-to">
         <title>RabbitMQ Direct reply-to</title>
         <important>
-        Starting the <emphasis>version 3.4.0</emphasis>, the RabbitMQ server now supports
+        Starting with <emphasis>version 3.4.0</emphasis>, the RabbitMQ server now supports
         <ulink url="http://www.rabbitmq.com/direct-reply-to.html">Direct reply-to</ulink>; this eliminates the main reason
         for a fixed reply queue (to avoid the need to create a temporary queue for each request).
         Starting with <emphasis>Spring AMQP version 1.4.1</emphasis> Direct reply-to will be used by default
diff --git a/src/reference/docbook/index.xml b/src/reference/docbook/index.xml
index f8560cd3..00a1ce68 100644
--- a/src/reference/docbook/index.xml
+++ b/src/reference/docbook/index.xml
@@ -53,7 +53,7 @@
 			</author>
         </authorgroup>
         <copyright>
-            <year>2010-2014</year>
+            <year>2010-2015</year>
             <holder>
                 GoPivotal, Inc. All Rights Reserved.
             </holder>
diff --git a/src/reference/docbook/quick-tour.xml b/src/reference/docbook/quick-tour.xml
index f4055cba..53be67b4 100644
--- a/src/reference/docbook/quick-tour.xml
+++ b/src/reference/docbook/quick-tour.xml
@@ -24,7 +24,7 @@
 	</para>
 	<programlisting>compile 'org.springframework.amqp:spring-rabbit:${version}'</programlisting>
 
-	<section>
+	<section id="compatibility">
 		<title>Compatibility</title>
 		<para>
 			While the default Spring Framework version dependency is 4.1.x, Spring AMQP is generally compatible
diff --git a/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml
index f1087d5b..5ec226a0 100644
--- a/src/reference/docbook/whats-new.xml
+++ b/src/reference/docbook/whats-new.xml
@@ -113,6 +113,7 @@
 			</para>
 		</section>
 		<section>
+			<title>Listeners and the Routing Connection Factory</title>
 			<para>
 				A <classname>SimpleMessageListenerContainer</classname> can be configured with a routing
 				connection factory to enable connection selection based on the queue names.
@@ -150,9 +151,18 @@ catch (MessageConversionException e) {
 		<section>
 			<title>RabbitMQ 3.4 Compatibility</title>
 			<para>
-				Now the Spring AMQP is compatible with the <emphasis>RabbitMQ 3.4</emphasis>.
-				However Spring AMQP still keeps the minimal RabbitMQ Client library in version
-				<emphasis>3.3.x</emphasis> to provide backward compatibility with legacy applications.
+				Spring AMQP is now compatible with the <emphasis>RabbitMQ 3.4</emphasis>,
+				including direct reply-to; see <xref linkend="compatibility" /> and
+				<xref linkend="direct-reply-to" /> for more information.
+			</para>
+		</section>
+		<section>
+			<title>ContentTypeDelegatingMessageConverter</title>
+			<para>
+				The <classname>ContentTypeDelegatingMessageConverter</classname> has been introduced to select
+				the <interfacename>MessageConverter</interfacename> to use, based on the <code>contentType</code>
+				property in the <classname>MessageProperties</classname>. See <xref linkend="message-converters"/>
+				for more information.
 			</para>
 		</section>
 	</section>