Merge branch 'docs-event-sphinx-plugins' into 'master'

Docs: add more events, add plugins to the doc

See merge request poezio/slixmpp!84

1 files changed, 6 insertions, 21 deletions

diff --git a/slixmpp/plugins/xep_0108/user_activity.py b/slixmpp/plugins/xep_0108/user_activity.py
index d66ed9c4..089269bd 100644
--- a/slixmpp/plugins/xep_0108/user_activity.py
+++ b/slixmpp/plugins/xep_0108/user_activity.py
@@ -39,19 +39,12 @@ class XEP_0108(BasePlugin):
         """
         Publish the user's current activity.
 
-        Arguments:
-            general  -- The required general category of the activity.
-            specific -- Optional specific activity being done as part
-                        of the general category.
-            text     -- Optional natural-language description or reason
-                        for the activity.
-            options  -- Optional form of publish options.
-            ifrom    -- Specify the sender's JID.
-            timeout  -- The length of time (in seconds) to wait for a response
-                        before exiting the send call if blocking is used.
-                        Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
-            callback -- Optional reference to a stream handler function. Will
-                        be executed when a reply stanza is received.
+        :param general: The required general category of the activity.
+        :param specific: Optional specific activity being done as part
+                         of the general category.
+        :param text: Optional natural-language description or reason
+                     for the activity.
+        :param options: Optional form of publish options.
         """
         activity = UserActivity()
         activity['value'] = (general, specific)
@@ -66,14 +59,6 @@ class XEP_0108(BasePlugin):
              timeout_callback=None):
         """
         Clear existing user activity information to stop notifications.
-
-        Arguments:
-            ifrom    -- Specify the sender's JID.
-            timeout  -- The length of time (in seconds) to wait for a response
-                        before exiting the send call if blocking is used.
-                        Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
-            callback -- Optional reference to a stream handler function. Will
-                        be executed when a reply stanza is received.
         """
         activity = UserActivity()
         self.xmpp['xep_0163'].publish(activity, node=UserActivity.namespace,