diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-12-31 01:29:12 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-12-31 01:29:12 -0500 |
| commit | e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c (patch) | |
| tree | 6a5fe2cee8a3a4bb77d7b99d2d80d9fc7be2511d /sleekxmpp | |
| parent | d817d64c65c62976481690c0bfc3882621ac0455 (diff) | |
| parent | 03bc38f7e34f6f8f6d79b58477d56df8e488578c (diff) | |
| download | slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.gz slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.bz2 slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.tar.xz slixmpp-e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c.zip | |
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/stanza/message.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/stanzabase.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/stanza/message.py b/sleekxmpp/stanza/message.py index 3518fc7a..19d4d9e2 100644 --- a/sleekxmpp/stanza/message.py +++ b/sleekxmpp/stanza/message.py @@ -79,7 +79,7 @@ class Message(RootStanza): return self def normal(self): - """Set the message type to 'chat'.""" + """Set the message type to 'normal'.""" self['type'] = 'normal' return self diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py index 8678ca14..d1409706 100644 --- a/sleekxmpp/xmlstream/stanzabase.py +++ b/sleekxmpp/xmlstream/stanzabase.py @@ -167,7 +167,7 @@ class ElementBase(object): #: For :class:`ElementBase` subclasses which are intended to be used #: as plugins, the ``plugin_attrib`` value defines the plugin name. #: Plugins may be accessed by using the ``plugin_attrib`` value as - #: the interface. An example using ``plugin_attrib = 'foo'``: + #: the interface. An example using ``plugin_attrib = 'foo'``:: #: #: register_stanza_plugin(Message, FooPlugin) #: msg = Message() |