diff --git a/doc/common/tables/ceilometer-alarm.xml b/doc/common/tables/ceilometer-alarm.xml
index 16683a9d9b..ff11d19632 100644
--- a/doc/common/tables/ceilometer-alarm.xml
+++ b/doc/common/tables/ceilometer-alarm.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_alarm">
-    <caption>Description of configuration options for alarm</caption>
+    <caption>Description of alarm configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -29,6 +29,10 @@
         <td>partition_rpc_topic = alarm_partition_coordination</td>
         <td>(StrOpt) The topic that ceilometer uses for alarm partition coordination messages.</td>
       </tr>
+      <tr>
+        <td>project_alarm_quota = None</td>
+        <td>(IntOpt) Maximum number of alarms defined for a project.</td>
+      </tr>
       <tr>
         <td>record_history = True</td>
         <td>(BoolOpt) Record alarm change events.</td>
@@ -49,6 +53,10 @@
         <td>rest_notifier_ssl_verify = True</td>
         <td>(BoolOpt) Whether to verify the SSL Server certificate when calling alarm action.</td>
       </tr>
+      <tr>
+        <td>user_alarm_quota = None</td>
+        <td>(IntOpt) Maximum number of alarms defined for a user.</td>
+      </tr>
     </tbody>
   </table>
 </para>
diff --git a/doc/common/tables/ceilometer-amqp.xml b/doc/common/tables/ceilometer-amqp.xml
index 556e21611e..af03709999 100644
--- a/doc/common/tables/ceilometer-amqp.xml
+++ b/doc/common/tables/ceilometer-amqp.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_amqp">
-    <caption>Description of configuration options for amqp</caption>
+    <caption>Description of AMQP configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-api.xml b/doc/common/tables/ceilometer-api.xml
index 71fad5762c..957fb4ab08 100644
--- a/doc/common/tables/ceilometer-api.xml
+++ b/doc/common/tables/ceilometer-api.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_api">
-    <caption>Description of configuration options for api</caption>
+    <caption>Description of API configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-auth.xml b/doc/common/tables/ceilometer-auth.xml
index 8878e2c72c..dedb18ea7a 100644
--- a/doc/common/tables/ceilometer-auth.xml
+++ b/doc/common/tables/ceilometer-auth.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_auth">
-    <caption>Description of configuration options for auth</caption>
+    <caption>Description of authorization configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-auth_token.xml b/doc/common/tables/ceilometer-auth_token.xml
index b815385c5f..cd1714f9d3 100644
--- a/doc/common/tables/ceilometer-auth_token.xml
+++ b/doc/common/tables/ceilometer-auth_token.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_auth_token">
-    <caption>Description of configuration options for auth_token</caption>
+    <caption>Description of authorization token configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-collector.xml b/doc/common/tables/ceilometer-collector.xml
index e346bb8d20..9eca4ae35c 100644
--- a/doc/common/tables/ceilometer-collector.xml
+++ b/doc/common/tables/ceilometer-collector.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_collector">
-    <caption>Description of configuration options for collector</caption>
+    <caption>Description of collector configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-common.xml b/doc/common/tables/ceilometer-common.xml
index 088dd8820b..dbec7b20e7 100644
--- a/doc/common/tables/ceilometer-common.xml
+++ b/doc/common/tables/ceilometer-common.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_common">
-    <caption>Description of configuration options for common</caption>
+    <caption>Description of common configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-database.xml b/doc/common/tables/ceilometer-database.xml
index f9beef8dee..7050fc9974 100644
--- a/doc/common/tables/ceilometer-database.xml
+++ b/doc/common/tables/ceilometer-database.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_database">
-    <caption>Description of configuration options for database</caption>
+    <caption>Description of database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-debug.xml b/doc/common/tables/ceilometer-debug.xml
index 4da2a17c16..d03304099b 100644
--- a/doc/common/tables/ceilometer-debug.xml
+++ b/doc/common/tables/ceilometer-debug.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_debug">
-    <caption>Description of configuration options for debug</caption>
+    <caption>Description of debug configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-events.xml b/doc/common/tables/ceilometer-events.xml
index 1da6c96f56..f381d00a4b 100644
--- a/doc/common/tables/ceilometer-events.xml
+++ b/doc/common/tables/ceilometer-events.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_events">
-    <caption>Description of configuration options for events</caption>
+    <caption>Description of events configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-exchange.xml b/doc/common/tables/ceilometer-exchange.xml
index 0d06999bde..c3eeb4e3bc 100644
--- a/doc/common/tables/ceilometer-exchange.xml
+++ b/doc/common/tables/ceilometer-exchange.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_exchange">
-    <caption>Description of configuration options for exchange</caption>
+    <caption>Description of exchange configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-glance.xml b/doc/common/tables/ceilometer-glance.xml
index 1527419126..e24b1d2c16 100644
--- a/doc/common/tables/ceilometer-glance.xml
+++ b/doc/common/tables/ceilometer-glance.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_glance">
-    <caption>Description of configuration options for glance</caption>
+    <caption>Description of glance configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-inspector.xml b/doc/common/tables/ceilometer-inspector.xml
index 7da8c480d9..f96cd86312 100644
--- a/doc/common/tables/ceilometer-inspector.xml
+++ b/doc/common/tables/ceilometer-inspector.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_inspector">
-    <caption>Description of configuration options for inspector</caption>
+    <caption>Description of inspector configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-logging.xml b/doc/common/tables/ceilometer-logging.xml
index d64fa62fa0..1ad4e323d8 100644
--- a/doc/common/tables/ceilometer-logging.xml
+++ b/doc/common/tables/ceilometer-logging.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_logging">
-    <caption>Description of configuration options for logging</caption>
+    <caption>Description of logging configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-nova_cells.xml b/doc/common/tables/ceilometer-nova_cells.xml
index 4d169ea2a6..3a968722b9 100644
--- a/doc/common/tables/ceilometer-nova_cells.xml
+++ b/doc/common/tables/ceilometer-nova_cells.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_nova_cells">
-    <caption>Description of configuration options for nova_cells</caption>
+    <caption>Description of nova cells configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-qpid.xml b/doc/common/tables/ceilometer-qpid.xml
index 4be8cf37a8..aaff2be500 100644
--- a/doc/common/tables/ceilometer-qpid.xml
+++ b/doc/common/tables/ceilometer-qpid.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_qpid">
-    <caption>Description of configuration options for qpid</caption>
+    <caption>Description of Qpid configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-rabbitmq.xml b/doc/common/tables/ceilometer-rabbitmq.xml
index 471bdb20b7..dd296e6de7 100644
--- a/doc/common/tables/ceilometer-rabbitmq.xml
+++ b/doc/common/tables/ceilometer-rabbitmq.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_rabbitmq">
-    <caption>Description of configuration options for rabbitmq</caption>
+    <caption>Description of RabbitMQ configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-redis.xml b/doc/common/tables/ceilometer-redis.xml
index c63ccaccac..68168231a7 100644
--- a/doc/common/tables/ceilometer-redis.xml
+++ b/doc/common/tables/ceilometer-redis.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_redis">
-    <caption>Description of configuration options for redis</caption>
+    <caption>Description of Redis configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-rpc.xml b/doc/common/tables/ceilometer-rpc.xml
index 5e2bdfdbbe..390525a3bd 100644
--- a/doc/common/tables/ceilometer-rpc.xml
+++ b/doc/common/tables/ceilometer-rpc.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_rpc">
-    <caption>Description of configuration options for rpc</caption>
+    <caption>Description of RPC configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-swift.xml b/doc/common/tables/ceilometer-swift.xml
index 962afdee36..d43fb3b5da 100644
--- a/doc/common/tables/ceilometer-swift.xml
+++ b/doc/common/tables/ceilometer-swift.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_swift">
-    <caption>Description of configuration options for swift</caption>
+    <caption>Description of swift configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-tripleo.xml b/doc/common/tables/ceilometer-tripleo.xml
index e01de141e5..d3bfc5e3f9 100644
--- a/doc/common/tables/ceilometer-tripleo.xml
+++ b/doc/common/tables/ceilometer-tripleo.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_tripleo">
-    <caption>Description of configuration options for tripleo</caption>
+    <caption>Description of TripleO configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/ceilometer-vmware.xml b/doc/common/tables/ceilometer-vmware.xml
index f5bf2ea703..15945c6ca6 100644
--- a/doc/common/tables/ceilometer-vmware.xml
+++ b/doc/common/tables/ceilometer-vmware.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_ceilometer_vmware">
-    <caption>Description of configuration options for vmware</caption>
+    <caption>Description of VMware configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-amqp.xml b/doc/common/tables/heat-amqp.xml
index 088d8bae59..20c66099c5 100644
--- a/doc/common/tables/heat-amqp.xml
+++ b/doc/common/tables/heat-amqp.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_amqp">
-    <caption>Description of configuration options for amqp</caption>
+    <caption>Description of AMQP configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-api.xml b/doc/common/tables/heat-api.xml
index e58378ecea..4e5dadb1fe 100644
--- a/doc/common/tables/heat-api.xml
+++ b/doc/common/tables/heat-api.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_api">
-    <caption>Description of configuration options for api</caption>
+    <caption>Description of API configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-auth_token.xml b/doc/common/tables/heat-auth_token.xml
index 3016d972bf..006fdeece3 100644
--- a/doc/common/tables/heat-auth_token.xml
+++ b/doc/common/tables/heat-auth_token.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_auth_token">
-    <caption>Description of configuration options for auth_token</caption>
+    <caption>Description of authorization token configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-cfn_api.xml b/doc/common/tables/heat-cfn_api.xml
index d0669ef3df..2cfd8eb82f 100644
--- a/doc/common/tables/heat-cfn_api.xml
+++ b/doc/common/tables/heat-cfn_api.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_cfn_api">
-    <caption>Description of configuration options for cfn_api</caption>
+    <caption>Description of Cloudformation-compatible API configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients.xml b/doc/common/tables/heat-clients.xml
index 0a9301f44c..74421c5f0d 100644
--- a/doc/common/tables/heat-clients.xml
+++ b/doc/common/tables/heat-clients.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients">
-    <caption>Description of configuration options for clients</caption>
+    <caption>Description of clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_backends.xml b/doc/common/tables/heat-clients_backends.xml
index dd4ff09817..49090ff2ce 100644
--- a/doc/common/tables/heat-clients_backends.xml
+++ b/doc/common/tables/heat-clients_backends.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_backends">
-    <caption>Description of configuration options for clients_backends</caption>
+    <caption>Description of client backends configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_ceilometer.xml b/doc/common/tables/heat-clients_ceilometer.xml
index cf697cbbb0..4d04701828 100644
--- a/doc/common/tables/heat-clients_ceilometer.xml
+++ b/doc/common/tables/heat-clients_ceilometer.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_ceilometer">
-    <caption>Description of configuration options for clients_ceilometer</caption>
+    <caption>Description of ceilometer clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_cinder.xml b/doc/common/tables/heat-clients_cinder.xml
index 33ef85492d..958c20f27a 100644
--- a/doc/common/tables/heat-clients_cinder.xml
+++ b/doc/common/tables/heat-clients_cinder.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_cinder">
-    <caption>Description of configuration options for clients_cinder</caption>
+    <caption>Description of cinder clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_glance.xml b/doc/common/tables/heat-clients_glance.xml
index d3268f32f2..2fd7ac52aa 100644
--- a/doc/common/tables/heat-clients_glance.xml
+++ b/doc/common/tables/heat-clients_glance.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_glance">
-    <caption>Description of configuration options for clients_glance</caption>
+    <caption>Description of glance clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_heat.xml b/doc/common/tables/heat-clients_heat.xml
index 0acee5acd7..644ca6e567 100644
--- a/doc/common/tables/heat-clients_heat.xml
+++ b/doc/common/tables/heat-clients_heat.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_heat">
-    <caption>Description of configuration options for clients_heat</caption>
+    <caption>Description of heat clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_keystone.xml b/doc/common/tables/heat-clients_keystone.xml
index 9566c5a2d2..f5a20075e4 100644
--- a/doc/common/tables/heat-clients_keystone.xml
+++ b/doc/common/tables/heat-clients_keystone.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_keystone">
-    <caption>Description of configuration options for clients_keystone</caption>
+    <caption>Description of keystone clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_neutron.xml b/doc/common/tables/heat-clients_neutron.xml
index 719ac21fa2..bfbece3979 100644
--- a/doc/common/tables/heat-clients_neutron.xml
+++ b/doc/common/tables/heat-clients_neutron.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_neutron">
-    <caption>Description of configuration options for clients_neutron</caption>
+    <caption>Description of neutron clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_nova.xml b/doc/common/tables/heat-clients_nova.xml
index ed286d9a58..a062a03641 100644
--- a/doc/common/tables/heat-clients_nova.xml
+++ b/doc/common/tables/heat-clients_nova.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_nova">
-    <caption>Description of configuration options for clients_nova</caption>
+    <caption>Description of nova clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_swift.xml b/doc/common/tables/heat-clients_swift.xml
index 574f280df1..1c57415a9b 100644
--- a/doc/common/tables/heat-clients_swift.xml
+++ b/doc/common/tables/heat-clients_swift.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_swift">
-    <caption>Description of configuration options for clients_swift</caption>
+    <caption>Description of swift clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-clients_trove.xml b/doc/common/tables/heat-clients_trove.xml
index 1fdb79e952..0566b0065e 100644
--- a/doc/common/tables/heat-clients_trove.xml
+++ b/doc/common/tables/heat-clients_trove.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_clients_trove">
-    <caption>Description of configuration options for clients_trove</caption>
+    <caption>Description of trove clients configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-cloudwatch_api.xml b/doc/common/tables/heat-cloudwatch_api.xml
index afb9c58fcd..0c43c41fc7 100644
--- a/doc/common/tables/heat-cloudwatch_api.xml
+++ b/doc/common/tables/heat-cloudwatch_api.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_cloudwatch_api">
-    <caption>Description of configuration options for cloudwatch_api</caption>
+    <caption>Description of CloudWatch API configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-common.xml b/doc/common/tables/heat-common.xml
index 6a50691fa3..412cfd4878 100644
--- a/doc/common/tables/heat-common.xml
+++ b/doc/common/tables/heat-common.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_common">
-    <caption>Description of configuration options for common</caption>
+    <caption>Description of common configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-crypt.xml b/doc/common/tables/heat-crypt.xml
index fec0ad44ec..3daca6df8c 100644
--- a/doc/common/tables/heat-crypt.xml
+++ b/doc/common/tables/heat-crypt.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_crypt">
-    <caption>Description of configuration options for crypt</caption>
+    <caption>Description of crypt configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-database.xml b/doc/common/tables/heat-database.xml
index 30a43313a0..a187862455 100644
--- a/doc/common/tables/heat-database.xml
+++ b/doc/common/tables/heat-database.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_database">
-    <caption>Description of configuration options for database</caption>
+    <caption>Description of database configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-debug.xml b/doc/common/tables/heat-debug.xml
index 9c253b1d93..2dd2f5064b 100644
--- a/doc/common/tables/heat-debug.xml
+++ b/doc/common/tables/heat-debug.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_debug">
-    <caption>Description of configuration options for debug</caption>
+    <caption>Description of debug configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-loadbalancer.xml b/doc/common/tables/heat-loadbalancer.xml
index b85512d1bb..08a8cd733c 100644
--- a/doc/common/tables/heat-loadbalancer.xml
+++ b/doc/common/tables/heat-loadbalancer.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_loadbalancer">
-    <caption>Description of configuration options for loadbalancer</caption>
+    <caption>Description of load balancer configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-logging.xml b/doc/common/tables/heat-logging.xml
index fe3e7502a2..5f49b0f874 100644
--- a/doc/common/tables/heat-logging.xml
+++ b/doc/common/tables/heat-logging.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_logging">
-    <caption>Description of configuration options for logging</caption>
+    <caption>Description of logging configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
@@ -23,11 +23,11 @@
       </tr>
       <tr>
         <td>instance_format = "[instance: %(uuid)s] "</td>
-        <td>(StrOpt) The format for an instance that is passed with the log message. </td>
+        <td>(StrOpt) The format for an instance that is passed with the log message.</td>
       </tr>
       <tr>
         <td>instance_uuid_format = "[instance: %(uuid)s] "</td>
-        <td>(StrOpt) The format for an instance UUID that is passed with the log message. </td>
+        <td>(StrOpt) The format for an instance UUID that is passed with the log message.</td>
       </tr>
       <tr>
         <td>log_config_append = None</td>
diff --git a/doc/common/tables/heat-metadata_api.xml b/doc/common/tables/heat-metadata_api.xml
index a1e2cccafb..ed2ce1c2f0 100644
--- a/doc/common/tables/heat-metadata_api.xml
+++ b/doc/common/tables/heat-metadata_api.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_metadata_api">
-    <caption>Description of configuration options for metadata_api</caption>
+    <caption>Description of metadata API configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-notification.xml b/doc/common/tables/heat-notification.xml
index 99610d6417..84cb95f639 100644
--- a/doc/common/tables/heat-notification.xml
+++ b/doc/common/tables/heat-notification.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_notification">
-    <caption>Description of configuration options for notification</caption>
+    <caption>Description of notification configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-qpid.xml b/doc/common/tables/heat-qpid.xml
index ae43c4fa22..9dc02d6605 100644
--- a/doc/common/tables/heat-qpid.xml
+++ b/doc/common/tables/heat-qpid.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_qpid">
-    <caption>Description of configuration options for qpid</caption>
+    <caption>Description of Qpid configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-quota.xml b/doc/common/tables/heat-quota.xml
index e4d25b4172..2a132b82a2 100644
--- a/doc/common/tables/heat-quota.xml
+++ b/doc/common/tables/heat-quota.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_quota">
-    <caption>Description of configuration options for quota</caption>
+    <caption>Description of quota configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-rabbitmq.xml b/doc/common/tables/heat-rabbitmq.xml
index 02904857e1..7aca3cc82c 100644
--- a/doc/common/tables/heat-rabbitmq.xml
+++ b/doc/common/tables/heat-rabbitmq.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_rabbitmq">
-    <caption>Description of configuration options for rabbitmq</caption>
+    <caption>Description of RabbitMQ configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-redis.xml b/doc/common/tables/heat-redis.xml
index 54a5bb2f36..b11db40de3 100644
--- a/doc/common/tables/heat-redis.xml
+++ b/doc/common/tables/heat-redis.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_redis">
-    <caption>Description of configuration options for redis</caption>
+    <caption>Description of Redis configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-rpc.xml b/doc/common/tables/heat-rpc.xml
index 5898d241e4..269777b531 100644
--- a/doc/common/tables/heat-rpc.xml
+++ b/doc/common/tables/heat-rpc.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_rpc">
-    <caption>Description of configuration options for rpc</caption>
+    <caption>Description of RPC configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-waitcondition_api.xml b/doc/common/tables/heat-waitcondition_api.xml
index ea6923d367..c88d7c2a52 100644
--- a/doc/common/tables/heat-waitcondition_api.xml
+++ b/doc/common/tables/heat-waitcondition_api.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_waitcondition_api">
-    <caption>Description of configuration options for waitcondition_api</caption>
+    <caption>Description of waitcondition API configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/doc/common/tables/heat-zeromq.xml b/doc/common/tables/heat-zeromq.xml
index 765e487d2f..51582b62fc 100644
--- a/doc/common/tables/heat-zeromq.xml
+++ b/doc/common/tables/heat-zeromq.xml
@@ -4,7 +4,7 @@
      generated and your changes will be overwritten.
      The tool to do so lives in openstack-doc-tools repository. -->
   <table rules="all" xml:id="config_table_heat_zeromq">
-    <caption>Description of configuration options for zeromq</caption>
+    <caption>Description of ZeroMQ configuration options</caption>
     <col width="50%"/>
     <col width="50%"/>
     <thead>
diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
index 73bb628254..3021686596 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
@@ -101,11 +101,13 @@ verbose logging
 alarm/evaluation_interval alarm
 alarm/notifier_rpc_topic alarm
 alarm/partition_rpc_topic alarm
+alarm/project_alarm_quota alarm
 alarm/record_history alarm
 alarm/rest_notifier_certificate_file alarm
 alarm/rest_notifier_certificate_key alarm
 alarm/rest_notifier_max_retries alarm
 alarm/rest_notifier_ssl_verify alarm
+alarm/user_alarm_quota alarm
 api/enable_reverse_dns_lookup api
 api/host api
 api/port api
diff --git a/tools/autogenerate-config-flagmappings/ceilometer.headers b/tools/autogenerate-config-flagmappings/ceilometer.headers
new file mode 100644
index 0000000000..e1b2202f78
--- /dev/null
+++ b/tools/autogenerate-config-flagmappings/ceilometer.headers
@@ -0,0 +1,7 @@
+alarm alarm
+collector collector
+events events
+exchange exchange
+inspector inspector
+notification notification
+nova_cells nova cells
diff --git a/tools/autogenerate-config-flagmappings/cinder.headers b/tools/autogenerate-config-flagmappings/cinder.headers
index 7728f85d58..8b585fa25c 100644
--- a/tools/autogenerate-config-flagmappings/cinder.headers
+++ b/tools/autogenerate-config-flagmappings/cinder.headers
@@ -1,15 +1,10 @@
-api API
-auth authorization
-auth_token authorization token
 backups backups
 backups_ceph Ceph backup driver
 backups_swift Swift backup driver
 backups_tsm IBM Tivoli Storage Manager backup driver
 block-device block device
-common common
 compute Compute
 coraid Coraid AoE driver
-database database
 emc EMC
 eqlx Dell EqualLogic volume driver
 hds-hnas HDS HNAS iSCSI and NFS driver
@@ -33,13 +28,11 @@ nimble Nimble driver
 prophetstor_dpl ProphetStor Fibre Channel and iSCSi drivers
 pure Pure Storage driver
 quota quota
-rpc RPC
 san SAN
 san-solaris Solaris SAN
 scality Scality SOFS volume driver
 scheduler scheduler
 solidfire SolidFire driver
-ssl SSL
 storage storage
 storage_ceph Ceph storage
 storage_glusterfs GlusterFS storage
@@ -47,8 +40,6 @@ storage_gpfs GPFS storage
 storage_nfs NFS storage
 storage_xen Xen storage
 storwize IBM Storwise driver
-swift swift
-vmware VMware
 windows Windows
 xiv IBM XIV and DS8000 volume driver
 zadara Zadara Storage driver
diff --git a/tools/autogenerate-config-flagmappings/heat.headers b/tools/autogenerate-config-flagmappings/heat.headers
new file mode 100644
index 0000000000..6bc1d1a44d
--- /dev/null
+++ b/tools/autogenerate-config-flagmappings/heat.headers
@@ -0,0 +1,17 @@
+cfn_api Cloudformation-compatible API
+clients clients
+clients_backends client backends
+clients_ceilometer ceilometer clients
+clients_cinder cinder clients
+clients_glance glance clients
+clients_heat heat clients
+clients_keystone keystone clients
+clients_neutron neutron clients
+clients_nova nova clients
+clients_swift swift clients
+clients_trove trove clients
+cloudwatch_api CloudWatch API
+crypt crypt
+loadbalancer load balancer
+metadata_api metadata API
+waitcondition_api waitcondition API
diff --git a/tools/autogenerate-config-flagmappings/shared.headers b/tools/autogenerate-config-flagmappings/shared.headers
new file mode 100644
index 0000000000..742b5133ef
--- /dev/null
+++ b/tools/autogenerate-config-flagmappings/shared.headers
@@ -0,0 +1,20 @@
+amqp AMQP
+api API
+auth authorization
+auth_token authorization token
+common common
+database database
+debug debug
+glance glance
+logging logging
+notification notification
+qpid Qpid
+quota quota
+rabbitmq RabbitMQ
+redis Redis
+rpc RPC
+ssl SSL
+swift swift
+tripleo TripleO
+vmware VMware
+zeromq ZeroMQ
diff --git a/tools/autogenerate-config-flagmappings/trove.headers b/tools/autogenerate-config-flagmappings/trove.headers
index 963cd6137b..a7ac331171 100644
--- a/tools/autogenerate-config-flagmappings/trove.headers
+++ b/tools/autogenerate-config-flagmappings/trove.headers
@@ -1,32 +1,16 @@
-Unknown UNKNOWN
-amqp AMQP
-api API
-auth_token authentication token
 backup backup
 clients clients
-common common
 compute Compute
-database database
 db_cassandra Cassandra database
 db_couchbase Couchbase database
 db_mongodb MongoDB database
 db_mysql MySQL database
 db_percona Percona database
 db_redis Redis database
-debug debug
 dns DNS
 guestagent guest agent
 heat Orchestration module
-logging logging
 network network
 nova nova
-qpid Qpid
-quota quota
-rabbitmq RabbitMQ
-redis Redis
-rpc RPC
-ssl SSL
-swift Object Storage
 taskmanager taskmanager
 volume volume
-zeromq ZeroMQ