Resolve Rachel's Questions. Closing #805

docs/getting-started/brokers/couchdb.rst

@@ -50,8 +50,6 @@ Storing task state and results in CouchDB is currently **not supported**.
 Limitations
 ===========
 
-The Beanstalk message transport does not currently support:
+The CouchDB message transport does not currently support:
 
     * Remote control commands (celeryctl, broadcast)
-
-[Q: What's Beanstalk got to do with CouchDB? what are the CouchDB limitations?]

docs/getting-started/intro.rst

@@ -61,9 +61,7 @@ Celery is…
 
         Workers and clients will automatically retry in the event
         of connection loss or failure, and some brokers support
-        HA in way of *Master/Master* or -- *Master/Slave* replication.
-
-[Q: What's the purpose of the '--' before Master/Slave?]
+        HA in way of *Master/Master* or *Master/Slave* replication.
 
     - **Fast**
 
@@ -214,7 +212,6 @@ Celery is…
         - :ref:`get a list of people and companies using Celery <res-using-celery>`
         - :ref:`write my own remote control command <worker-custom-control-commands>`
         - change worker queues at runtime
-[Q: is there a reference for this?]
 
 .. topic:: Jump to ⟶
 

docs/includes/introduction.txt

@@ -91,16 +91,13 @@ This is a high level overview of the architecture.
 
 .. image:: http://cloud.github.com/downloads/celery/celery/Celery-Overview-v4.jpg
 
-The broker delivers tasks to the worker nodes.
-A worker node is a networked machine running `celeryd`.  This can be one or
-more machines depending on the workload.
+The broker delivers tasks to the worker instances.
+A worker instance is started by running the `celery worker` program.
+You can have many networked machines running worker instances, forming a
+cluster, or you can run everything on a single machine.
 
-[Q: Do you mean 'there can be many worker nodes' or 'A worker node can
-be more than one machine'? I think the former...]
-
-
-The result of the task can be stored for later retrieval (called its
-"tombstone").
+The return value of the task can be stored for later retrieval,
+and the progress of the task can be tracked (called the task's *state*).
 
 .. _celery-example: