Merge branch 'master' into config-support

This commit is contained in:
Armin Ronacher 2010-05-27 13:55:36 +02:00
commit 78fc9949aa
3 changed files with 5 additions and 5 deletions

View file

@ -34,7 +34,7 @@ memcached server then::
from werkzeug.contrib.cache import MemcachedCache from werkzeug.contrib.cache import MemcachedCache
cache = MemcachedCache(['127.0.0.1:11211']) cache = MemcachedCache(['127.0.0.1:11211'])
If you are using appengine, you can connect to the appengine memcache If you are using App Engine, you can connect to the App Engine memcache
server easily:: server easily::
from werkzeug.contrib.cache import GAEMemcachedCache from werkzeug.contrib.cache import GAEMemcachedCache