# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1395410631 -3600
# Node ID fab49a1d5ea24d03dc85d99c6f2e7496af145328
# Parent  2ef523f0b5c3ea5c696bd9b558d8f0644f74663c
core: minor docstring fixes

diff -r 2ef523f0b5c3 -r fab49a1d5ea2 src/core/sat_main.py
--- a/src/core/sat_main.py	Tue Mar 18 13:52:12 2014 +0100
+++ b/src/core/sat_main.py	Fri Mar 21 15:03:51 2014 +0100
@@ -541,9 +541,8 @@
         return treatments
 
     def sendAndStoreMessage(self, mess_data, skip_send=False, profile=None):
-        """Actually send and store the message to history, after all the treatments
-        have been done. This has been moved outside the main sendMessage method
-        because it is used by XEP-0033 to complete a server-side feature not yet
+        """Actually send and store the message to history, after all the treatments have been done.
+        This has been moved outside the main sendMessage method because it is used by XEP-0033 to complete a server-side feature not yet
         implemented by the prosody plugin.
         @param mess_data: message data dictionary
         @param skip_send: set to True to skip sending the message to only store it
@@ -646,10 +645,10 @@
         """Discover if a server or its items offer a given feature
         @param feature: the feature to check
         @param jid_: the jid of the server, local server if None
-        @param cache_only: expect the result to be in cache and don't actually
-        make any request. This can be used anytime for requesting a feature on
-        the local server because the data are cached for sure.
+        @param cache_only: expect the result to be in cache and don't actually make any request.
+                           This can be used anytime for requesting a feature on the local server because the data are cached for sure.
         @result: the Deferred entity jid offering the feature, or None
+
         """
         profile = self.memory.getProfileName(profile_key)
 
diff -r 2ef523f0b5c3 -r fab49a1d5ea2 src/memory/memory.py
--- a/src/memory/memory.py	Tue Mar 18 13:52:12 2014 +0100
+++ b/src/memory/memory.py	Fri Mar 21 15:03:51 2014 +0100
@@ -975,7 +975,7 @@
         """Tell if the specified server has the required feature
         @param feature: requested feature
         @param jid_: the jid of the target server (None for profile's server)
-        @param profile: which profile is asking this server?
+        @param profile_key: %(doc_profile_key)s
         """
         profile = self.getProfileName(profile_key)
         if not profile: