Merge branch 'gvangool/docs_update'

celery/platforms.py

@@ -50,7 +50,7 @@ def install_signal_handler(signal_name, handler):
 def set_process_title(progname, info=None):
     """Set the ps name for the currently running process.
 
-    Only works if :mod`setproctitle` is installed.
+    Only works if :mod:`setproctitle` is installed.
 
     """
     proctitle = "[%s]" % progname

docs/userguide/tasks.rst

@@ -198,7 +198,7 @@ Task options
 * max_retries
 
     The maximum number of attempted retries before giving up.
-    If this is exceeded the :exc`~celery.exceptions.MaxRetriesExceeded`
+    If this is exceeded the :exc:`~celery.exceptions.MaxRetriesExceeded`
     exception will be raised. Note that you have to retry manually, it's
     not something that happens automatically.
 
@@ -206,7 +206,7 @@ Task options
 
     Default time in seconds before a retry of the task should be
     executed. Can be either an ``int`` or a ``float``.
-    Default is a 1 minute delay (``60 seconds``).
+    Default is a 3 minute delay (``180 seconds``).
 
 * rate_limit