Merge branch 'master' of github.com:celery/celery

docs/configuration.rst

@@ -211,7 +211,7 @@ Can be one of the following:
 .. _`SQLAlchemy`: http://sqlalchemy.org
 .. _`memcached`: http://memcached.org
 .. _`MongoDB`: http://mongodb.org
-.. _`Redis`: http://code.google.com/p/redis/
+.. _`Redis`: http://redis.io
 .. _`Cassandra`: http://cassandra.apache.org/
 
 .. setting:: CELERY_RESULT_SERIALIZER

examples/celery_http_gateway/manage.py

@@ -6,7 +6,7 @@ except ImportError:
     import sys
     sys.stderr.write(
         "Error: Can't find the file 'settings.py' in the directory "
-        "containing {0!r}.".format(__file__)
+        "containing {0!r}.".format(__file__))
     sys.exit(1)
 
 if __name__ == '__main__':