summaryrefslogtreecommitdiff
path: root/qpid/python
diff options
context:
space:
mode:
authorJustin Ross <jross@apache.org>2013-09-23 12:33:21 +0000
committerJustin Ross <jross@apache.org>2013-09-23 12:33:21 +0000
commitb07719f653b27c348774fae87020ab142fb10b42 (patch)
tree2ad8c91b86fa203a1a3d35959a6512c46d471839 /qpid/python
parent14d65b904febc8f22f734acb07465801adb9cdc8 (diff)
downloadqpid-python-b07719f653b27c348774fae87020ab142fb10b42.tar.gz
QPID-5154: Further corrections to the Connection API doc; a patch from Ernie Allen
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525570 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
-rw-r--r--qpid/python/qpid/messaging/endpoints.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/qpid/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py
index 3453971a77..6f0e9432dc 100644
--- a/qpid/python/qpid/messaging/endpoints.py
+++ b/qpid/python/qpid/messaging/endpoints.py
@@ -70,8 +70,8 @@ class Connection(Endpoint):
def __init__(self, url=None, **options):
"""
- Creates a connection. A newly created connection must be connected
- with the Connection.connect() method before it can be used.
+ Creates a connection. A newly created connection must be opened
+ with the Connection.open() method before it can be used.
@type url: str
@param url: [ <username> [ / <password> ] @ ] <host> [ : <port> ]
@@ -88,11 +88,6 @@ class Connection(Endpoint):
@param username: the username for authentication (overriden by url)
@type password: str
@param password: the password for authentication (overriden by url)
-
- * - sasl_min_ssf: the minimum acceptable security strength factor
- * - sasl_max_ssf: the minimum acceptable security strength factor
- * - sasl_service: the service name if needed by the SASL mechanism in use
-
@type sasl_mechanisms: str
@param sasl_mechanisms: space separated list of permitted sasl mechanisms
@type sasl_service: str
@@ -100,7 +95,7 @@ class Connection(Endpoint):
@type sasl_min_ssf: int
@param sasl_min_ssf: the minimum acceptable security strength factor
@type sasl_max_ssf: int
- @param sasl_max_ssf: the minimum acceptable security strength factor
+ @param sasl_max_ssf: the maximum acceptable security strength factor
@type reconnect: bool
@param reconnect: enable/disable automatic reconnect