Changed all doc references to AMQP_* settings to BROKER_*

FAQ

@@ -255,8 +255,8 @@ Use the following specific settings in your ``settings.py``:
     CARROT_BACKEND = "stomp"
 
     # STOMP hostname and port settings.
-    AMQP_SERVER = "localhost"
-    AMQP_PORT = 61613
+    BROKER_HOST = "localhost"
+    BROKER_PORT = 61613
 
     # The queue name to use (both queue and exchange must be set to the
     # same queue name when using STOMP)
@@ -299,11 +299,11 @@ configuration:
 
     .. code-block:: python
 
-        AMQP_SERVER = "rabbit"
-        AMQP_PORT = 5678
-        AMQP_USER = "myapp"
-        AMQP_PASSWORD = "secret"
-        AMQP_VHOST = "myapp"
+        BROKER_HOST = "rabbit"
+        BROKER_PORT = 5678
+        BROKER_USER = "myapp"
+        BROKER_PASSWORD = "secret"
+        BROKER_VHOST = "myapp"
 
         CELERY_AMQP_CONSUMER_QUEUE = "regular_tasks"
         CELERY_AMQP_EXCHANGE = "tasks"
@@ -315,12 +315,12 @@ configuration:
 
     .. code-block:: python
 
-        AMQP_SERVER = "rabbit"
-        AMQP_PORT = 5678
-        AMQP_USER = "myapp"
-        AMQP_PASSWORD = "secret"
-        AMQP_VHOST = "myapp"
-        
+        BROKER_HOST = "rabbit"
+        BROKER_PORT = 5678
+        BROKER_USER = "myapp"
+        BROKER_PASSWORD = "secret"
+        BROKER_VHOST = "myapp"
+
         CELERY_AMQP_EXCHANGE = "tasks"
         CELERY_AMQP_PUBLISHER_ROUTING_KEY = "task.regular"
         CELERY_AMQP_EXCHANGE_TYPE = "topic"
@@ -392,11 +392,11 @@ configuration using the database backend with MySQL:
 .. code-block:: python
 
     # Broker configuration
-    AMQP_SERVER = "localhost"
-    AMQP_PORT = "5672"
-    AMQP_VHOST = "celery"
-    AMQP_USER = "celery"
-    AMQP_PASSWORD = "celerysecret"
+    BROKER_HOST = "localhost"
+    BROKER_PORT = "5672"
+    BROKER_VHOST = "celery"
+    BROKER_USER = "celery"
+    BROKER_PASSWORD = "celerysecret"
     CARROT_BACKEND="amqp"
 
     # Using the database backend.

docs/configuration.rst

@@ -24,11 +24,11 @@ it should contain all you need to run a basic celery set-up.
     DATABASE_ENGINE = "sqlite3"
     DATABASE_NAME = "mydatabase.db"
 
-    AMQP_SERVER = "localhost"
-    AMQP_PORT = 5672
-    AMQP_VHOST = "/"
-    AMQP_USER = "guest"
-    AMQP_PASSWORD = "guest"
+    BROKER_HOST = "localhost"
+    BROKER_PORT = 5672
+    BROKER_VHOST = "/"
+    BROKER_USER = "guest"
+    BROKER_PASSWORD = "guest"
 
     ## If you're doing mostly I/O you can have higher concurrency,
     ## if mostly spending time in the CPU, try to keep it close to the

docs/introduction.rst

@@ -198,11 +198,11 @@ You only need three simple steps to use celery with your Django project.
     3. Configure celery to use the AMQP user and virtual host we created
         before, by adding the following to your ``settings.py``::
 
-            AMQP_SERVER = "localhost"
-            AMQP_PORT = 5672
-            AMQP_USER = "myuser"
-            AMQP_PASSWORD = "mypassword"
-            AMQP_VHOST = "myvhost"
+            BROKER_HOST = "localhost"
+            BROKER_PORT = 5672
+            BROKER_USER = "myuser"
+            BROKER_PASSWORD = "mypassword"
+            BROKER_VHOST = "myvhost"
 
 
 That's it.

docs/tutorials/otherqueues.rst

@@ -38,9 +38,9 @@ your Redis database::
 
     CARROT_BACKEND = "ghettoq.toproot.Redis"
 
-    AMQP_HOST = "localhost"  # Maps to redis host.
-    AMQP_PORT = 6379         # Maps to redis port.
-    AMQP_VHOST = "celery"    # Maps to database name.
+    BROKER_HOST = "localhost"  # Maps to redis host.
+    BROKER_PORT = 6379         # Maps to redis port.
+    BROKER_VHOST = "celery"    # Maps to database name.
 
 Database
 ========