rst fixes

docs/reference/celery.app.amqp.rst

@@ -17,13 +17,7 @@
 
         .. attribute:: Consumer
 
-            The task consumer class used.
-            Default is :class:`kombu.compat.Consumer`.
-
-        .. attribute:: ConsumerSet
-
-            The class used to consume from multiple queues using the
-            same channel.
+            Base Consumer class used.  Default is :class:`kombu.compat.Consumer`.
 
         .. attribute:: queues
 
@@ -31,11 +25,15 @@
 
         .. automethod:: Queues
         .. automethod:: Router
-        .. automethod:: TaskConsumer
-        .. automethod:: TaskPublisher
+        .. autoattribute:: TaskConsumer
+        .. autoattribute:: TaskProducer
+        .. automethod:: flush_routes
 
-        .. automethod:: get_task_consumer
-        .. automethod:: get_default_queue
+        .. autoattribute:: default_queue
+        .. autoattribute:: default_exchange
+        .. autoattribute:: publisher_pool
+        .. autoattribute:: router
+        .. autoattribute:: routes
 
     Queues
     ------
@@ -44,13 +42,13 @@
 
         .. automethod:: add
 
-        .. automethod:: options
-
         .. automethod:: format
 
         .. automethod:: select_subset
 
-        .. automethod:: with_defaults
+        .. automethod:: new_missing
+
+        .. autoattribute:: consume_from
 
     TaskPublisher
     -------------

docs/whatsnew-2.6.rst

@@ -341,8 +341,7 @@ Unorganized
 
 * ``TasksetResult.taskset_id`` renamed to ``.id``
 
-
-* ``xmap(task, sequence)`` and ``xstarmap(task, sequence)`
+* ``xmap(task, sequence)`` and ``xstarmap(task, sequence)``
 
     Returns a list of the results applying the task to every item
     in the sequence.