summaryrefslogtreecommitdiff
path: root/docs/guide_xep_0030.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/guide_xep_0030.rst')
-rw-r--r--docs/guide_xep_0030.rst19
1 files changed, 9 insertions, 10 deletions
diff --git a/docs/guide_xep_0030.rst b/docs/guide_xep_0030.rst
index 857f7ff1..70f92b0c 100644
--- a/docs/guide_xep_0030.rst
+++ b/docs/guide_xep_0030.rst
@@ -18,7 +18,7 @@ Working with service discovery is about creating and querying these nodes.
According to XEP-0030, a node may contain three types of information:
identities, features, and items. (Further, extensible, information types are
defined in `XEP-0128 <http://xmpp.org/extensions/xep-0128.html>`_, but they are
-not yet implemented by SleekXMPP.) SleekXMPP provides methods to configure each
+not yet implemented by Slixmpp.) Slixmpp provides methods to configure each
of these node attributes.
Configuring Service Discovery
@@ -119,7 +119,7 @@ the same order as expected using positional arguments.
xmpp['xep_0030'].add_identity(category='client',
itype='bot',
- name='Sleek',
+ name='Slixmpp',
node='foo',
jid=xmpp.boundjid.full,
lang='no')
@@ -159,10 +159,10 @@ item itself, and the JID and node that will own the item.
.. note::
In this case, the owning JID and node are provided with the
- parameters ``ijid`` and ``node``.
+ parameters ``ijid`` and ``node``.
Performing Disco Queries
------------------------
+------------------------
The methods ``get_info()`` and ``get_items()`` are used to query remote JIDs
and their nodes for disco information. Since these methods are wrappers for
sending Iq stanzas, they also accept all of the parameters of the ``Iq.send()``
@@ -172,11 +172,10 @@ the `XEP-0059 <http://xmpp.org/extensions/xep-0059.html>`_ plug-in.
.. code-block:: python
- info = self['xep_0030'].get_info(jid='foo@example.com',
- node='bar',
- ifrom='baz@mycomponent.example.com',
- block=True,
- timeout=30)
+ info = yield from self['xep_0030'].get_info(jid='foo@example.com',
+ node='bar',
+ ifrom='baz@mycomponent.example.com',
+ timeout=30)
items = self['xep_0030'].get_info(jid='foo@example.com',
node='bar',
@@ -197,5 +196,5 @@ a full Iq stanza.
info = self['xep_0030'].get_info(node='foo', local=True)
items = self['xep_0030'].get_items(jid='somejid@mycomponent.example.com',
- node='bar',
+ node='bar',
local=True)