Permalink
Browse files

Merge branch 'develop' of github.com:boto/boto into develop

  • Loading branch information...
2 parents 4086e97 + 3e1b2a7 commit cd6152f5c69cfe1251d14b558b2ca581549531e9 @garnaat garnaat committed Dec 4, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 boto/sns/connection.py
@@ -255,7 +255,7 @@ def subscribe(self, topic, protocol, endpoint):
Subscribe to a Topic.
:type topic: string
- :param topic: The name of the new topic.
+ :param topic: The ARN of the new topic.
:type protocol: string
:param protocol: The protocol used to communicate with
@@ -302,7 +302,7 @@ def subscribe_sqs_queue(self, topic, queue):
that policy. If no policy exists, a new policy will be created.
:type topic: string
- :param topic: The name of the new topic.
+ :param topic: The ARN of the new topic.
:type queue: A boto Queue object
:param queue: The queue you wish to subscribe to the SNS Topic.

0 comments on commit cd6152f

Please sign in to comment.