summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-01-18 15:16:56 -0800
committerLance Stout <lancestout@gmail.com>2012-01-18 15:16:56 -0800
commit4f4c121d9b64a02fa86438066fca6fd81e66032f (patch)
tree3c7c4210700995545467e9edf7f093f4ae8c6022 /docs/index.rst
parent72e1ab47fc393176cb99ddaeaad1098e88472417 (diff)
downloadslixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.gz
slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.bz2
slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.xz
slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.zip
Fix merge errors and bot example.
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst31
1 files changed, 21 insertions, 10 deletions
diff --git a/docs/index.rst b/docs/index.rst
index fe7df7f9..8b2d4d3d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -78,12 +78,12 @@ Here's your first SleekXMPP Bot:
self.add_event_handler("session_start", self.session_start)
self.add_event_handler("message", self.message)
- self.register_plugin('xep_0030') # Service Discovery
- self.register_plugin('xep_0199') # XMPP Ping
+ # If you wanted more functionality, here's how to register plugins:
+ # self.register_plugin('xep_0030') # Service Discovery
+ # self.register_plugin('xep_0199') # XMPP Ping
# Here's how to access plugins once you've registered them:
- # self['xep_0030'].add_feature('echodemo')
- # You can also use self.plugin['xep_0030']
+ # self['xep_0030'].add_feature('echo_demo')
# If you are working with an OpenFire server, you will
# need to use a different SSL version:
@@ -222,13 +222,24 @@ Additional Info
Credits
-------
-**Main Author:** Nathan Fritz
- `fritzy@netflint.net <xmpp:fritzy@netflint.net?message>`_,
- `@fritzy <http://twitter.com/fritzy>`_
- Nathan is also the author of XMPPHP and `Seesmic-AS3-XMPP
- <http://code.google.com/p/seesmic-as3-xmpp/>`_, and a member of the XMPP
- Council.
+**Main Author:** `Nathan Fritz <http://andyet.net/team/fritzy>`_
+ `fritzy@netflint.net <xmpp:fritzy@netflint.net?message>`_,
+ `@fritzy <http://twitter.com/fritzy>`_
+
+ Nathan is also the author of XMPPHP and `Seesmic-AS3-XMPP
+ <http://code.google.com/p/seesmic-as3-xmpp/>`_, and a former member of the XMPP
+ Council.
+
+**Co-Author:** `Lance Stout <http://andyet.net/team/lance>`_
+ `lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_,
+ `@lancestout <http://twitter.com/lancestout>`_
+
+Both Fritzy and Lance work for `&yet <http://andyet.net>`_, which specializes in
+realtime web and XMPP applications.
+
+ - `contact@andyet.net <mailto:contact@andyet.net>`_
+ - `XMPP Consulting <http://xmppconsulting.com>`_
**Co-Author:** Lance Stout
`lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_,