Merge branch 'master' into asynchronous-broadcastsasynchronous-broadcasts

3 files changed, 47 insertions, 0 deletions

diff --git a/docs/reference/index.rst b/docs/reference/index.rst
index 551ea1b7..c6186341 100644
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@@ -22,10 +22,12 @@
     kombu.transport
     kombu.transport.amqplib
     kombu.transport.librabbitmq
+    kombu.transport.pyamqp
     kombu.transport.pika
     kombu.transport.pika2
     kombu.transport.memory
     kombu.transport.redis
+    kombu.transport.zmq
     kombu.transport.beanstalk
     kombu.transport.mongodb
     kombu.transport.couchdb
diff --git a/docs/reference/kombu.transport.pyamqp.rst b/docs/reference/kombu.transport.pyamqp.rst
new file mode 100644
index 00000000..33ebf0b4
--- /dev/null
+++ b/docs/reference/kombu.transport.pyamqp.rst
@@ -0,0 +1,36 @@
+.. currentmodule:: kombu.transport.pyamqp
+
+.. automodule:: kombu.transport.pyamqp
+
+    .. contents::
+        :local:
+
+    Transport
+    ---------
+
+    .. autoclass:: Transport
+        :members:
+        :undoc-members:
+
+    Connection
+    ----------
+
+    .. autoclass:: Connection
+        :members:
+        :undoc-members:
+        :inherited-members:
+
+    Channel
+    -------
+
+    .. autoclass:: Channel
+        :members:
+        :undoc-members:
+
+    Message
+    -------
+
+    .. autoclass:: Message
+        :members:
+        :undoc-members:
+
diff --git a/docs/reference/kombu.transport.zmq.rst b/docs/reference/kombu.transport.zmq.rst
new file mode 100644
index 00000000..0735840b
--- /dev/null
+++ b/docs/reference/kombu.transport.zmq.rst
@@ -0,0 +1,9 @@
+.. currentmodule:: kombu.transport.zmq
+
+.. automodule:: kombu.transport.zmq
+
+    .. contents::
+        :local:
+
+    :members:
+    :undoc-members: