summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.rst15
-rwxr-xr-xexamples/adhoc_provider.py6
-rwxr-xr-xexamples/adhoc_user.py4
-rwxr-xr-xexamples/disco_browser.py4
-rwxr-xr-xexamples/echo_client.py4
-rwxr-xr-xexamples/muc.py4
-rwxr-xr-xexamples/ping.py4
-rwxr-xr-xexamples/proxy_echo_client.py4
-rw-r--r--examples/roster_browser.py4
-rwxr-xr-xexamples/send_client.py4
-rw-r--r--sleekxmpp/plugins/xep_0050/adhoc.py2
-rw-r--r--sleekxmpp/version.py4
12 files changed, 31 insertions, 28 deletions
diff --git a/README.rst b/README.rst
index d175822c..e2c289d9 100644
--- a/README.rst
+++ b/README.rst
@@ -44,7 +44,13 @@ The latest source code for SleekXMPP may be found on `Github
``master`` branch, while the latest development version is in the
``develop`` branch.
-**Stable Releases**
+**Latest Release**
+ - `1.0 <http://github.com/fritzy/SleekXMPP/zipball/1.0>`_
+
+**Develop Releases**
+ - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_
+
+**Older Stable Releases**
- `1.0 RC3 <http://github.com/fritzy/SleekXMPP/zipball/1.0-RC3>`_
- `1.0 RC2 <http://github.com/fritzy/SleekXMPP/zipball/1.0-RC2>`_
- `1.0 RC1 <http://github.com/fritzy/SleekXMPP/zipball/1.0-RC1>`_
@@ -55,9 +61,6 @@ The latest source code for SleekXMPP may be found on `Github
- `1.0 Beta2 <http://github.com/fritzy/SleekXMPP/zipball/1.0-Beta2>`_
- `1.0 Beta1 <http://github.com/fritzy/SleekXMPP/zipball/1.0-Beta1>`_
-**Develop Releases**
- - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_
-
Installing DNSPython
---------------------
If you are using Python3 and wish to use dnspython, you will have to checkout and
@@ -162,8 +165,8 @@ Credits
`@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.
+ <http://code.google.com/p/seesmic-as3-xmpp/>`_, and a former member of
+ the XMPP Council.
**Co-Author:** Lance Stout
`lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_,
diff --git a/examples/adhoc_provider.py b/examples/adhoc_provider.py
index cfe72755..a72158c3 100755
--- a/examples/adhoc_provider.py
+++ b/examples/adhoc_provider.py
@@ -40,7 +40,7 @@ class CommandBot(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster.
self.add_event_handler("session_start", self.start)
@@ -49,7 +49,7 @@ class CommandBot(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
Arguments:
@@ -71,7 +71,7 @@ class CommandBot(sleekxmpp.ClientXMPP):
def _handle_command(self, iq, session):
"""
- Respond to the intial request for a command.
+ Respond to the initial request for a command.
Arguments:
iq -- The iq stanza containing the command request.
diff --git a/examples/adhoc_user.py b/examples/adhoc_user.py
index c155d4b8..bbd42d81 100755
--- a/examples/adhoc_user.py
+++ b/examples/adhoc_user.py
@@ -43,7 +43,7 @@ class CommandUserBot(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster.
self.add_event_handler("session_start", self.start)
self.add_event_handler("message", self.message)
@@ -53,7 +53,7 @@ class CommandUserBot(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
Arguments:
diff --git a/examples/disco_browser.py b/examples/disco_browser.py
index 20d012bc..0d282d78 100755
--- a/examples/disco_browser.py
+++ b/examples/disco_browser.py
@@ -60,7 +60,7 @@ class Disco(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster.
self.add_event_handler("session_start", self.start)
@@ -69,7 +69,7 @@ class Disco(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
In this case, we send disco#info and disco#items
diff --git a/examples/echo_client.py b/examples/echo_client.py
index db0064f9..7e553c4a 100755
--- a/examples/echo_client.py
+++ b/examples/echo_client.py
@@ -40,7 +40,7 @@ class EchoBot(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster.
self.add_event_handler("session_start", self.start)
@@ -54,7 +54,7 @@ class EchoBot(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
Arguments:
diff --git a/examples/muc.py b/examples/muc.py
index 7586c61c..8fe2eb49 100755
--- a/examples/muc.py
+++ b/examples/muc.py
@@ -44,7 +44,7 @@ class MUCBot(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster.
self.add_event_handler("session_start", self.start)
@@ -68,7 +68,7 @@ class MUCBot(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
Arguments:
diff --git a/examples/ping.py b/examples/ping.py
index 8630b321..258fd764 100755
--- a/examples/ping.py
+++ b/examples/ping.py
@@ -43,7 +43,7 @@ class PingTest(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster.
self.add_event_handler("session_start", self.start)
@@ -52,7 +52,7 @@ class PingTest(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
Arguments:
diff --git a/examples/proxy_echo_client.py b/examples/proxy_echo_client.py
index 6655ec59..25bfc891 100755
--- a/examples/proxy_echo_client.py
+++ b/examples/proxy_echo_client.py
@@ -40,7 +40,7 @@ class EchoBot(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster.
self.add_event_handler("session_start", self.start)
@@ -54,7 +54,7 @@ class EchoBot(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
Arguments:
diff --git a/examples/roster_browser.py b/examples/roster_browser.py
index 7e7ec816..b366d00f 100644
--- a/examples/roster_browser.py
+++ b/examples/roster_browser.py
@@ -42,7 +42,7 @@ class RosterBrowser(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster. We need threaded=True so that the
# session_start handler doesn't block event processing
# while we wait for presence stanzas to arrive.
@@ -57,7 +57,7 @@ class RosterBrowser(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
Arguments:
diff --git a/examples/send_client.py b/examples/send_client.py
index adf5fcc6..caf47687 100755
--- a/examples/send_client.py
+++ b/examples/send_client.py
@@ -45,7 +45,7 @@ class SendMsgBot(sleekxmpp.ClientXMPP):
# The session_start event will be triggered when
# the bot establishes its connection with the server
# and the XML streams are ready for use. We want to
- # listen for this event so that we we can intialize
+ # listen for this event so that we we can initialize
# our roster.
self.add_event_handler("session_start", self.start)
@@ -54,7 +54,7 @@ class SendMsgBot(sleekxmpp.ClientXMPP):
Process the session_start event.
Typical actions for the session_start event are
- requesting the roster and broadcasting an intial
+ requesting the roster and broadcasting an initial
presence stanza.
Arguments:
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py
index 7dbef31c..ec7b7041 100644
--- a/sleekxmpp/plugins/xep_0050/adhoc.py
+++ b/sleekxmpp/plugins/xep_0050/adhoc.py
@@ -149,7 +149,7 @@ class xep_0050(base_plugin):
Access control may be implemented in the provided handler.
Command workflow is done across a sequence of command handlers. The
- first handler is given the intial Iq stanza of the request in order
+ first handler is given the initial Iq stanza of the request in order
to support access control. Subsequent handlers are given only the
payload items of the command. All handlers will receive the command's
session data.
diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py
index 24bee091..037c6463 100644
--- a/sleekxmpp/version.py
+++ b/sleekxmpp/version.py
@@ -9,5 +9,5 @@
# We don't want to have to import the entire library
# just to get the version info for setup.py
-__version__ = '1.0rc4'
-__version_info__ = (1, 0, 0, 'rc4', 0)
+__version__ = '1.0'
+__version_info__ = (1, 0, 0, '', 0)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 06:25:34 +0000