diff --git a/doc/common/tables/cinder-rpc.xml b/doc/common/tables/cinder-rpc.xml
index 19406441c8..bbef30b620 100644
--- a/doc/common/tables/cinder-rpc.xml
+++ b/doc/common/tables/cinder-rpc.xml
@@ -17,6 +17,10 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
+      <tr>
+        <td>allowed_rpc_exception_modules = nova.exception, cinder.exception, exceptions</td>
+        <td>(ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call.</td>
+      </tr>
       <tr>
         <td>amqp_auto_delete = False</td>
         <td>(BoolOpt) Auto-delete queues in amqp.</td>
@@ -27,7 +31,7 @@
       </tr>
       <tr>
         <td>control_exchange = openstack</td>
-        <td>(StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.</td>
+        <td>(StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid</td>
       </tr>
       <tr>
         <td>default_timeout = 525600</td>
@@ -35,7 +39,7 @@
       </tr>
       <tr>
         <td>fake_rabbit = False</td>
-        <td>(BoolOpt) If passed, use a fake RabbitMQ provider.</td>
+        <td>(BoolOpt) If passed, use a fake RabbitMQ provider</td>
       </tr>
       <tr>
         <td>kombu_reconnect_delay = 1.0</td>
@@ -166,8 +170,8 @@
         <td>(StrOpt) The RabbitMQ virtual host.</td>
       </tr>
       <tr>
-        <td>rpc_backend = rabbit</td>
-        <td>(StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq.</td>
+        <td>rpc_backend = cinder.openstack.common.rpc.impl_kombu</td>
+        <td>(StrOpt) The messaging module to use, defaults to kombu.</td>
       </tr>
       <tr>
         <td>rpc_cast_timeout = 30</td>
@@ -175,15 +179,15 @@
       </tr>
       <tr>
         <td>rpc_conn_pool_size = 30</td>
-        <td>(IntOpt) Size of RPC connection pool.</td>
+        <td>(IntOpt) Size of RPC connection pool</td>
       </tr>
       <tr>
         <td>rpc_response_timeout = 60</td>
-        <td>(IntOpt) Seconds to wait for a response from a call.</td>
+        <td>(IntOpt) Seconds to wait for a response from call or multicall</td>
       </tr>
       <tr>
         <td>rpc_thread_pool_size = 64</td>
-        <td>(IntOpt) Size of RPC greenthread pool.</td>
+        <td>(IntOpt) Size of RPC thread pool</td>
       </tr>
       <tr>
         <td>rpc_zmq_bind_address = *</td>
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index a9123f5d15..45519240b2 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -1,5 +1,6 @@
 allocated_capacity_weight_multiplier storage
 allowed_direct_url_schemes images
+allowed_rpc_exception_modules rpc
 amqp_auto_delete rpc
 amqp_durable_queues rpc
 api_paste_config api
@@ -105,6 +106,12 @@ hp3par_password hp3par
 hp3par_snapshot_expiration hp3par
 hp3par_snapshot_retention hp3par
 hp3par_username hp3par
+hplefthand_api_url hplefthand
+hplefthand_clustername hplefthand
+hplefthand_debug hplefthand
+hplefthand_iscsi_chap_enabled hplefthand
+hplefthand_password hplefthand
+hplefthand_username hplefthand
 iet_conf common
 image_conversion_dir images
 initiator_auto_registration emc