From 0890cb534e7597dfd93304c32caefb3c5534edf1 Mon Sep 17 00:00:00 2001
From: Phil Harvey <philharveyonline@apache.org>
Date: Wed, 8 May 2013 09:38:40 +0000
Subject: QPID-4817: add message grouping documentation to Java Broker book,
 and modify Programming in Apache Qpid book to mention that this feature is no
 longer solely in the C++ broker.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1480196 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/doc/book/src/programming/Message-Groups-Guide.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'qpid/doc/book/src/programming')

diff --git a/qpid/doc/book/src/programming/Message-Groups-Guide.xml b/qpid/doc/book/src/programming/Message-Groups-Guide.xml
index 3e5c549ff9..0ec6982bac 100644
--- a/qpid/doc/book/src/programming/Message-Groups-Guide.xml
+++ b/qpid/doc/book/src/programming/Message-Groups-Guide.xml
@@ -24,12 +24,12 @@
   <title>Using Message Groups</title>
   <para>
     This section describes how messaging applications can use the Message Group feature
-    provided by the C++ Broker.
+    provided by the Broker.
   </para>
   <note>
     The content of this section assumes the reader is familiar with the Message Group
-    feature as described in the AMQP Messaging Broker (C++) user's guide.  Please read the
-    section <emphasis>Using Message Groups</emphasis> in the user's guide before using the
+    feature as described in the AMQP Messaging Broker user's guide.  Please read the
+    message grouping section in the Broker user's guide before using the
     examples given in this section.
   </note>
   <section role="h2" id="messagegroups-setup">
@@ -73,17 +73,17 @@ MessageProducer sender = s.createProducer(d);
     </example>
     <para>
       The example code uses the x-declare map to specify the message group configuration
-      that should be used for the queue.  See the AMQP Messaging Broker (C++) user's guide
+      that should be used for the queue.  See the AMQP Messaging Broker user's guide
       for a detailed description of these arguments.  Note that the
-      qpid.group_header_key's value MUST be a string type.
+      qpid.group_header_key's value MUST be a string type if using the C++ broker.
     </para>
   </section>
   <section role="h2" id="messagegroups-sending">
     <title>Sending Grouped Messages</title>
     <para>
       When sending grouped messages, the client must add a message property containing the
-      group identifier to the outgoing message.  The group identifier must be a string
-      type.  The key used for the property must exactly match the value passed in the
+      group identifier to the outgoing message.  If using the C++ broker, the group identifier
+      must be a string type.  The key used for the property must exactly match the value passed in the
       'qpid.group_header_key' configuration argument.
     </para>
     <example>
@@ -157,8 +157,7 @@ sender.send(tmsg3);
       Since the broker enforces group policy when delivering messages, no special actions
       are necessary for receiving grouped messages from the broker.  However, applications
       must adhere to the rules for message group consumption as described in the AMQP
-      Messaging Broker (C++) user's guide.  Refer to the section <emphasis>Well Behaved
-      Consumers</emphasis> for details.
+      Messaging Broker user's guide.
     </para>
   </section>
 </section>
-- 
cgit v1.2.1