Fixed documentation errors

celery/task/base.py

@@ -260,8 +260,6 @@ class BaseTask(object):
             be established for you, in that case you need to close this
             connection after use::
 
-            Please be sure to close the connection after use::
-
                 >>> publisher = self.get_publisher()
                 >>> # ... do something with publisher
                 >>> publisher.connection.close()

docs/reference/celery.app.amqp.rst

@@ -36,8 +36,6 @@
 
         .. automethod:: get_task_consumer
         .. automethod:: get_default_queue
-        .. automethod:: get_broker_info
-        .. automethod:: format_broker_info
 
     Queues
     ------

docs/reference/celery.app.rst

@@ -44,8 +44,7 @@
 
         .. automethod:: mail_admins
 
-        .. automethod:: pre_config_merge
-        .. automethod:: post_config_merge
+        .. automethod:: prepare_config
 
         .. automethod:: either
         .. automethod:: merge