diff --git a/doc/source/executors.rst b/doc/source/executors.rst
index 75205322..2fde5b81 100644
--- a/doc/source/executors.rst
+++ b/doc/source/executors.rst
@@ -1,15 +1,13 @@
----------
+=========
 Executors
----------
-
-.. automodule:: oslo_messaging._executors
-
-.. currentmodule:: oslo_messaging
-
-==============
-Executor types
-==============
+=========
 
 Executors are providing the way an incoming message will be dispatched so that
 the message can be used for meaningful work. Different types of executors are
 supported, each with its own set of restrictions and capabilities.
+
+Available Executors
+===================
+
+.. list-plugins:: oslo.messaging.executors
+   :detailed:
diff --git a/doc/source/notifier.rst b/doc/source/notifier.rst
index 202011be..4156b1ec 100644
--- a/doc/source/notifier.rst
+++ b/doc/source/notifier.rst
@@ -1,6 +1,6 @@
---------
-Notifier
---------
+==========
+ Notifier
+==========
 
 .. currentmodule:: oslo_messaging
 
@@ -12,3 +12,9 @@ Notifier
 
 .. autoclass:: LoggingErrorNotificationHandler
    :members:
+
+Available Notifier Drivers
+==========================
+
+.. list-plugins:: oslo.messaging.notify.drivers
+   :detailed:
diff --git a/oslo_messaging/_executors/impl_aioeventlet.py b/oslo_messaging/_executors/impl_aioeventlet.py
index 8f67d795..abd899ef 100644
--- a/oslo_messaging/_executors/impl_aioeventlet.py
+++ b/oslo_messaging/_executors/impl_aioeventlet.py
@@ -30,7 +30,7 @@ class AsyncioEventletExecutor(impl_eventlet.EventletExecutor):
     To use the executor, an aioeventlet event loop must the running in the
     thread executing the executor (usually the main thread). Example of code to
     setup and run an aioeventlet event loop for the executor (in the main
-    thread):
+    thread)::
 
         import aioeventlet
         import trollius
@@ -48,6 +48,7 @@ class AsyncioEventletExecutor(impl_eventlet.EventletExecutor):
         # run the event loop in a new greenthread,
         # close it when it is done
         eventlet.spawn(run_loop, loop)
+
     """
 
     def __init__(self, conf, listener, dispatcher):