Merge branch 'develop' into develop-1.1

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
 

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()