summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2011-08-16 14:06:49 -0700
committerAndy McCurdy <andy@andymccurdy.com>2011-08-16 14:06:49 -0700
commit1736a9c94984879eddcccfb046968e36ab5f86f6 (patch)
tree022b2a73c875b4c2091c1ec5748dba9a8948d92c
parentd5fdb5fd9de30fec54a7e82c56b086fa533e0779 (diff)
parent628d65d5f3816bb9a228e2fea32418e97164394a (diff)
downloadredis-py-1736a9c94984879eddcccfb046968e36ab5f86f6.tar.gz
Merge pull request #181 from nicholasknight/master
Tiny documentation fixes.
-rw-r--r--README.md2
-rw-r--r--redis/client.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 855a87c..9e263a9 100644
--- a/README.md
+++ b/README.md
@@ -171,7 +171,7 @@ Pipelines are quite simple to use:
>>> r = redis.Redis(...)
>>> r.set('bing', 'baz')
>>> # Use the pipeline() method to create a pipeline instance
- >>> pipe = redis.pipeline()
+ >>> pipe = r.pipeline()
>>> # The following SET commands are buffered
>>> pipe.set('foo', 'bar')
>>> pipe.get('bing')
diff --git a/redis/client.py b/redis/client.py
index 1aac82b..1c1301f 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -1510,8 +1510,8 @@ class Lock(object):
holding the lock.
Note: If using ``timeout``, you should make sure all the hosts
- that are running clients are within the same timezone and are using
- a network time service like ntp.
+ that are running clients have their time synchronized with a network time
+ service like ntp.
"""
self.redis = redis
self.name = name