Qpid-745

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@613126 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 8 insertions, 11 deletions

diff --git a/python/examples/fanout/declare_queues.py b/python/examples/fanout/declare_queues.py
index 3315f5bc14..8840ea38e1 100644
--- a/python/examples/fanout/declare_queues.py
+++ b/python/examples/fanout/declare_queues.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
- config_direct_exchange.py
+ declare_queues.py
 
  Creates and binds a queue on an AMQP direct exchange.
 
@@ -33,9 +33,6 @@ session.session_open()
 
 #----- Create a queue -------------------------------------
 
-# Create a queue named "listener" on channel 1, and bind it 
-# to the "amq.fanout" exchange.
-# 
 # queue_declare() creates an AMQP queue, which is held
 # on the broker. Published messages are sent to the AMQP queue, 
 # from which messages are delivered to consumers. 
diff --git a/python/examples/fanout/fanout_consumer.py b/python/examples/fanout/fanout_consumer.py
index e9a2291f4c..8d852ca753 100644
--- a/python/examples/fanout/fanout_consumer.py
+++ b/python/examples/fanout/fanout_consumer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
- direct_consumer.py
+ fanout_consumer.py
 
  This AMQP client reads messages from a message
  queue named "message_queue".
@@ -40,9 +40,9 @@ session.session_open()
 consumer_tag = "consumer1"
 queue = client.queue(consumer_tag)
 
-# Call message_consume() to tell the broker to deliver messages
+# Call message_subscribe() to tell the broker to deliver messages
 # from the AMQP queue to this local client queue. The broker will
-# start delivering messages as soon as message_consume() is called.
+# start delivering messages as soon as message_subscribe() is called.
 
 session.message_subscribe(queue="message_queue", destination=consumer_tag)
 session.message_flow(consumer_tag, 0, 0xFFFFFFFF)
diff --git a/python/examples/fanout/fanout_producer.py b/python/examples/fanout/fanout_producer.py
index 92ca7b7ec0..d9d8f454c8 100644
--- a/python/examples/fanout/fanout_producer.py
+++ b/python/examples/fanout/fanout_producer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
- direct_producer.py
+ fanout_producer.py
 
  Publishes messages to an AMQP direct exchange, using
  the routing key "routing_key"
diff --git a/python/examples/fanout/listener.py b/python/examples/fanout/listener.py
index 4779466fd9..09dd7ddb80 100644
--- a/python/examples/fanout/listener.py
+++ b/python/examples/fanout/listener.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
- direct_consumer.py
+ listener.py
 
  This AMQP client reads messages from a message
  queue named "message_queue".
@@ -63,9 +63,9 @@ session.session_open()
 consumer_tag = "consumer1"
 queue = client.queue(consumer_tag)
 
-# Call message_consume() to tell the broker to deliver messages
+# Call message_subscribe() to tell the broker to deliver messages
 # from the AMQP queue to this local client queue. The broker will
-# start delivering messages as soon as message_consume() is called.
+# start delivering messages as soon as message_subscribe() is called.
 
 session.message_subscribe(queue="message_queue", destination=consumer_tag)
 session.message_flow(consumer_tag, 0, 0xFFFFFFFF)  # Kill these?