summaryrefslogtreecommitdiff
path: root/slixmpp/clientxmpp.py
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2016-09-30 13:49:04 -0500
committerSam Whited <sam@samwhited.com>2016-09-30 13:49:04 -0500
commit8217dc5239f7a649702c498b7b8a18263b813339 (patch)
treee2bedf7ff0ff66e618d004ce47e4b64e8f4defde /slixmpp/clientxmpp.py
parent2586abc0d36cbb8eae3540b5cb6d224c90b4b699 (diff)
downloadslixmpp-8217dc5239f7a649702c498b7b8a18263b813339.tar.gz
slixmpp-8217dc5239f7a649702c498b7b8a18263b813339.tar.bz2
slixmpp-8217dc5239f7a649702c498b7b8a18263b813339.tar.xz
slixmpp-8217dc5239f7a649702c498b7b8a18263b813339.zip
Minor documentation fixes
Diffstat (limited to 'slixmpp/clientxmpp.py')
-rw-r--r--slixmpp/clientxmpp.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/slixmpp/clientxmpp.py b/slixmpp/clientxmpp.py
index 0971e304..a4bb9a60 100644
--- a/slixmpp/clientxmpp.py
+++ b/slixmpp/clientxmpp.py
@@ -141,8 +141,11 @@ class ClientXMPP(BaseXMPP):
will be used.
:param address: A tuple containing the server's host and port.
- :param use_tls: Indicates if TLS should be used for the
- connection. Defaults to ``True``.
+ :param force_starttls: Indicates that negotiation should be aborted
+ if the server does not advertise support for
+ STARTTLS. Defaults to ``True``.
+ :param disable_starttls: Disables TLS for the connection.
+ Defaults to ``False``.
:param use_ssl: Indicates if the older SSL connection method
should be used. Defaults to ``False``.
"""