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

README.rst

@@ -174,7 +174,7 @@ set_response_callback method. This method accepts two arguments: a command
 name and the callback. Callbacks added in this manner are only valid on the
 instance the callback is added to. If you want to define or override a callback
 globally, you should make a subclass of the Redis client and add your callback
-to its REDIS_CALLBACKS class dictionary.
+to its RESPONSE_CALLBACKS class dictionary.
 
 Response callbacks take at least one parameter: the response from the Redis
 server. Keyword arguments may also be accepted in order to further control

redis/client.py

@@ -1272,7 +1272,7 @@ def brpop(self, keys, timeout=0):
         RPOP a value off of the first non-empty list
         named in the ``keys`` list.
 
-        If none of the lists in ``keys`` has a value to LPOP, then block
+        If none of the lists in ``keys`` has a value to RPOP, then block
         for ``timeout`` seconds, or until a value gets pushed on to one
         of the lists.