Merge branch 'master' of github.com:andymccurdy/redis-py

2 files changed, 4 insertions, 4 deletions

diff --git a/CHANGES b/CHANGES
index ac1bbd0..0c353d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -257,8 +257,8 @@
       threads will retrieve an available connection from the pool, use it and
       release it. It should now be trivial to use redis-py with eventlet or
       greenlet.
-    * ZADD now accepts pairs of value=score keyword arguements. This should help
-      resolve the long standing #72. The older value and score arguements have
+    * ZADD now accepts pairs of value=score keyword arguments. This should help
+      resolve the long standing #72. The older value and score arguments have
       been deprecated in favor of the keyword argument style.
     * Client instances now get their own copy of RESPONSE_CALLBACKS. The new
       set_response_callback method adds a user defined callback to the instance.
diff --git a/redis/client.py b/redis/client.py
index afa512a..5285820 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -413,7 +413,7 @@ class StrictRedis(object):
         """
         Convenience method for executing the callable `func` as a transaction
         while watching all keys specified in `watches`. The 'func' callable
-        should expect a single arguement which is a Pipeline object.
+        should expect a single argument which is a Pipeline object.
         """
         shard_hint = kwargs.pop('shard_hint', None)
         value_from_callable = kwargs.pop('value_from_callable', False)
@@ -610,7 +610,7 @@ class StrictRedis(object):
     def slaveof(self, host=None, port=None):
         """
         Set the server to be a replicated slave of the instance identified
-        by the ``host`` and ``port``. If called without arguements, the
+        by the ``host`` and ``port``. If called without arguments, the
         instance is promoted to a master instead.
         """
         if host is None and port is None: