Merge branch '3.1' of github.com:celery/celery into 3.1

celery/app/annotations.py

@@ -3,7 +3,7 @@
     celery.app.annotations
     ~~~~~~~~~~~~~~~~~~~~~~
 
-    Annotations is a nice term for moneky patching
+    Annotations is a nice term for monkey patching
     task classes in the configuration.
 
     This prepares and performs the annotations in the

docs/userguide/tasks.rst

@@ -1622,7 +1622,8 @@ blog/tasks.py
 
         comment = Comment.objects.get(pk=comment_id)
         current_domain = Site.objects.get_current().domain
-        akismet = Akismet(settings.AKISMET_KEY, 'http://{0}'.format(domain))
+        akismet = Akismet(settings.AKISMET_KEY,
+                          'http://{0}'.format(current_domain))
         if not akismet.verify_key():
             raise ImproperlyConfigured('Invalid AKISMET_KEY')