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

docs/getting-started/brokers/sqs.rst

@@ -37,6 +37,10 @@ The login credentials can also be set using the environment variables
 :envvar:`AWS_ACCESS_KEY_ID` and :envvar:`AWS_SECRET_ACCESS_KEY`,
 in that case the broker URL may only be ``sqs://``.
 
+If you are using IAM roles on instances, you can set the BROKER_URL to:
+``sqs://`` and kombu will attempt to retrive access tokens from the instance
+metadata.
+
 .. note::
 
     If you specify AWS credentials in the broker URL, then please keep in mind

docs/userguide/periodic-tasks.rst

@@ -179,12 +179,12 @@ Available Fields
 
 * `relative`
 
-    By default :class:`~datetime.timedelta` schedules are scheduled
+    If `relative` is true :class:`~datetime.timedelta` schedules are scheduled
     "by the clock." This means the frequency is rounded to the nearest
     second, minute, hour or day depending on the period of the
     :class:`~datetime.timedelta`.
 
-    If `relative` is true the frequency isn't rounded and will be
+    By default `relative` is false, the frequency isn't rounded and will be
     relative to the time when :program:`celery beat` was started.
 
 .. _beat-crontab: