From eb6bc071d443b0618e46cab105bf2338b5609a06 Mon Sep 17 00:00:00 2001
From: "Weston M. Price" <wprice@apache.org>
Date: Thu, 3 May 2012 19:03:37 +0000
Subject: Merge branch 'QPID-3957' into trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1333584 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/jca/README.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'qpid/java/jca')

diff --git a/qpid/java/jca/README.txt b/qpid/java/jca/README.txt
index 5a7c467685..57b97a3fef 100644
--- a/qpid/java/jca/README.txt
+++ b/qpid/java/jca/README.txt
@@ -169,7 +169,7 @@ PrefetchLow
 PrefetchHigh
     Qpid specific -- TODO more explanation
 
-SetupA
+Setup
 Administered Objects
 ======================
 The JCA specification provides for administered objects. Ass per the specification, administered objects are
@@ -188,6 +188,9 @@ DestinationAddress
 Example:
    DestinationAddress=hello.Queue;{create:always, node:{type:queue, x-declare:{auto-delete:true}}}
    DestinationAddress=amq.topic/hello.Topic
+    The QpidQueue/QpidTopic AdminObjects allow a developer, deployer or adminstrator to create destinations
+    (queues or topic) and bind these destinations into JNDI. Only one property is required:
+
 
 QpidConnectionFactoryProxy
 ==========================
-- 
cgit v1.2.1