diff options
| author | mathieui <mathieui@mathieui.net> | 2016-09-30 20:53:36 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2016-09-30 20:53:36 +0200 |
| commit | e4696e0471bfad0dd0373ca635c026f07ba1ca3f (patch) | |
| tree | e2bedf7ff0ff66e618d004ce47e4b64e8f4defde /slixmpp/xmlstream/xmlstream.py | |
| parent | 2586abc0d36cbb8eae3540b5cb6d224c90b4b699 (diff) | |
| parent | 8217dc5239f7a649702c498b7b8a18263b813339 (diff) | |
| download | slixmpp-e4696e0471bfad0dd0373ca635c026f07ba1ca3f.tar.gz slixmpp-e4696e0471bfad0dd0373ca635c026f07ba1ca3f.tar.bz2 slixmpp-e4696e0471bfad0dd0373ca635c026f07ba1ca3f.tar.xz slixmpp-e4696e0471bfad0dd0373ca635c026f07ba1ca3f.zip | |
Merge branch 'doc_fixes' of https://github.com/SamWhited/slixmpp
Diffstat (limited to 'slixmpp/xmlstream/xmlstream.py')
| -rw-r--r-- | slixmpp/xmlstream/xmlstream.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py index bd6c4e6f..686dfde8 100644 --- a/slixmpp/xmlstream/xmlstream.py +++ b/slixmpp/xmlstream/xmlstream.py @@ -256,9 +256,9 @@ class XMLStream(asyncio.BaseProtocol): TODO fix the comment :param force_starttls: If True, the connection will be aborted if the server does not initiate a STARTTLS - negociation. If None, the connection will be + negotiation. If None, the connection will be upgraded to TLS only if the server initiate - the STARTTLS negociation, otherwise it will + the STARTTLS negotiation, otherwise it will connect in clear. If False it will never upgrade to TLS, even if the server provides it. Use this for example if you’re on |