diff --git a/doc/common/tables/neutron-agent.xml b/doc/common/tables/neutron-agent.xml
index f0c3659399..b8cadf4741 100644
--- a/doc/common/tables/neutron-agent.xml
+++ b/doc/common/tables/neutron-agent.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_neutron_agent">
- <caption>Description of configuration options for agent</caption>
+ <caption>Description of agent configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-api.xml b/doc/common/tables/neutron-api.xml
index db06d13777..075a58a0e9 100644
--- a/doc/common/tables/neutron-api.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-auth_token.xml b/doc/common/tables/neutron-auth_token.xml
index c87b0b0f8e..4bd36cbe79 100644
--- a/doc/common/tables/neutron-auth_token.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-bigswitch.xml b/doc/common/tables/neutron-bigswitch.xml
index 94f3b8600c..3cf8d37242 100644
--- a/doc/common/tables/neutron-bigswitch.xml
+++ b/doc/common/tables/neutron-bigswitch.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_neutron_bigswitch">
- <caption>Description of configuration options for bigswitch</caption>
+ <caption>Description of BigSwitch configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
@@ -109,7 +109,7 @@
<td>(IntOpt) Time between verifications that the backend controller database is consistent with Neutron. (0 to disable)</td>
</tr>
<tr>
- <td>neutron_id = neutron-shock</td>
+ <td>neutron_id = neutron-linux-6dv9.site</td>
<td>(StrOpt) User defined identifier for this Neutron deployment</td>
</tr>
<tr>
diff --git a/doc/common/tables/neutron-brocade.xml b/doc/common/tables/neutron-brocade.xml
index 7c8f4037e9..b7f0a57810 100644
--- a/doc/common/tables/neutron-brocade.xml
+++ b/doc/common/tables/neutron-brocade.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_neutron_brocade">
- <caption>Description of configuration options for brocade</caption>
+ <caption>Description of Brocade configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-cfg_agent.xml b/doc/common/tables/neutron-cfg_agent.xml
index da8f4b2fe5..22c4579a59 100644
--- a/doc/common/tables/neutron-cfg_agent.xml
+++ b/doc/common/tables/neutron-cfg_agent.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_neutron_cfg_agent">
- <caption>Description of configuration options for cfg_agent</caption>
+ <caption>Description of cfg agent configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-cisco.xml b/doc/common/tables/neutron-cisco.xml
index e92b13a0ec..d438984a8d 100644
--- a/doc/common/tables/neutron-cisco.xml
+++ b/doc/common/tables/neutron-cisco.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_neutron_cisco">
- <caption>Description of configuration options for cisco</caption>
+ <caption>Description of Cisco configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
@@ -89,7 +89,7 @@
<td>(StrOpt) N1K Network VLAN Ranges</td>
</tr>
<tr>
- <td>poll_duration = 10</td>
+ <td>poll_duration = 60</td>
<td>(IntOpt) N1K Policy profile polling duration in seconds</td>
</tr>
<tr>
diff --git a/doc/common/tables/neutron-common.xml b/doc/common/tables/neutron-common.xml
index 2b45e720bf..4fe35bb6b6 100644
--- a/doc/common/tables/neutron-common.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-compute.xml b/doc/common/tables/neutron-compute.xml
index ad85507341..71f0b32010 100644
--- a/doc/common/tables/neutron-compute.xml
+++ b/doc/common/tables/neutron-compute.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_neutron_compute">
- <caption>Description of configuration options for compute</caption>
+ <caption>Description of Compute configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-database.xml b/doc/common/tables/neutron-database.xml
index fe92297925..750c7a864e 100644
--- a/doc/common/tables/neutron-database.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-dhcp_agent.xml b/doc/common/tables/neutron-dhcp_agent.xml
index 506da8ffbd..fef44fd5cd 100644
--- a/doc/common/tables/neutron-dhcp_agent.xml
+++ b/doc/common/tables/neutron-dhcp_agent.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_neutron_dhcp_agent">
- <caption>Description of configuration options for dhcp_agent</caption>
+ <caption>Description of DHCP agent configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-dvr.xml b/doc/common/tables/neutron-dvr.xml
index 3a789fb607..cb00eb0923 100644
--- a/doc/common/tables/neutron-dvr.xml
+++ b/doc/common/tables/neutron-dvr.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_neutron_dvr">
- <caption>Description of configuration options for dvr</caption>
+ <caption>Description of DVR configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-embrane.xml b/doc/common/tables/neutron-embrane.xml
index faf56fe3b1..e7892ab5cc 100644
--- a/doc/common/tables/neutron-embrane.xml
+++ b/doc/common/tables/neutron-embrane.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_neutron_embrane">
- <caption>Description of configuration options for embrane</caption>
+ <caption>Description of Embrane configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-embrane_lb.xml b/doc/common/tables/neutron-embrane_lb.xml
index 49a9dba0b1..54219d33e5 100644
--- a/doc/common/tables/neutron-embrane_lb.xml
+++ b/doc/common/tables/neutron-embrane_lb.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_neutron_embrane_lb">
- <caption>Description of configuration options for embrane_lb</caption>
+ <caption>Description of Embrane LBaaS driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-fwaas.xml b/doc/common/tables/neutron-fwaas.xml
index f61d87936e..a5a26301a1 100644
--- a/doc/common/tables/neutron-fwaas.xml
+++ b/doc/common/tables/neutron-fwaas.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_neutron_fwaas">
- <caption>Description of configuration options for fwaas</caption>
+ <caption>Description of FwaaS configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-hyperv_agent.xml b/doc/common/tables/neutron-hyperv_agent.xml
index 51e21db12f..82888c846f 100644
--- a/doc/common/tables/neutron-hyperv_agent.xml
+++ b/doc/common/tables/neutron-hyperv_agent.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_neutron_hyperv_agent">
- <caption>Description of configuration options for hyperv_agent</caption>
+ <caption>Description of HyperV agent configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ipv6_ra.xml b/doc/common/tables/neutron-ipv6_ra.xml
index e4b63d3a1a..8faeb3aac1 100644
--- a/doc/common/tables/neutron-ipv6_ra.xml
+++ b/doc/common/tables/neutron-ipv6_ra.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_neutron_ipv6_ra">
- <caption>Description of configuration options for ipv6_ra</caption>
+ <caption>Description of IPv6 router advertisement configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-l3_agent.xml b/doc/common/tables/neutron-l3_agent.xml
index 2df34e56be..e433f0db64 100644
--- a/doc/common/tables/neutron-l3_agent.xml
+++ b/doc/common/tables/neutron-l3_agent.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_neutron_l3_agent">
- <caption>Description of configuration options for l3_agent</caption>
+ <caption>Description of L3 agent configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-lbaas.xml b/doc/common/tables/neutron-lbaas.xml
index 45d892e6cc..baf9eec87f 100644
--- a/doc/common/tables/neutron-lbaas.xml
+++ b/doc/common/tables/neutron-lbaas.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_neutron_lbaas">
- <caption>Description of configuration options for lbaas</caption>
+ <caption>Description of LBaaS configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-lbaas_haproxy.xml b/doc/common/tables/neutron-lbaas_haproxy.xml
index 99d777fb65..91de325928 100644
--- a/doc/common/tables/neutron-lbaas_haproxy.xml
+++ b/doc/common/tables/neutron-lbaas_haproxy.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_neutron_lbaas_haproxy">
- <caption>Description of configuration options for lbaas_haproxy</caption>
+ <caption>Description of LBaaS haproxy configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-lbaas_netscalar.xml b/doc/common/tables/neutron-lbaas_netscalar.xml
index aa9efaf2e6..ad851b5126 100644
--- a/doc/common/tables/neutron-lbaas_netscalar.xml
+++ b/doc/common/tables/neutron-lbaas_netscalar.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_neutron_lbaas_netscalar">
- <caption>Description of configuration options for lbaas_netscalar</caption>
+ <caption>Description of LBaaS Netscaler configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-lbaas_radware.xml b/doc/common/tables/neutron-lbaas_radware.xml
index 2fb152d6eb..445f55f545 100644
--- a/doc/common/tables/neutron-lbaas_radware.xml
+++ b/doc/common/tables/neutron-lbaas_radware.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_neutron_lbaas_radware">
- <caption>Description of configuration options for lbaas_radware</caption>
+ <caption>Description of LBaaS Radware configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-linuxbridge_agent.xml b/doc/common/tables/neutron-linuxbridge_agent.xml
index 4de4eb21df..2601b89478 100644
--- a/doc/common/tables/neutron-linuxbridge_agent.xml
+++ b/doc/common/tables/neutron-linuxbridge_agent.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_neutron_linuxbridge_agent">
- <caption>Description of configuration options for linuxbridge_agent</caption>
+ <caption>Description of Linux Bridge agent configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-logging.xml b/doc/common/tables/neutron-logging.xml
index 9ee3cded2c..a5e2399f55 100644
--- a/doc/common/tables/neutron-logging.xml
+++ b/doc/common/tables/neutron-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_neutron_logging">
- <caption>Description of configuration options for logging</caption>
+ <caption>Description of logging configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
@@ -31,11 +31,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/neutron-meta.xml b/doc/common/tables/neutron-meta.xml
index b42c69ba49..06792612fd 100644
--- a/doc/common/tables/neutron-meta.xml
+++ b/doc/common/tables/neutron-meta.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_neutron_meta">
- <caption>Description of configuration options for meta</caption>
+ <caption>Description of meta configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-metadata.xml b/doc/common/tables/neutron-metadata.xml
index 90c16a2179..edcd849191 100644
--- a/doc/common/tables/neutron-metadata.xml
+++ b/doc/common/tables/neutron-metadata.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_neutron_metadata">
- <caption>Description of configuration options for metadata</caption>
+ <caption>Description of metadata configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-metering_agent.xml b/doc/common/tables/neutron-metering_agent.xml
index 7974879435..85899b9ea9 100644
--- a/doc/common/tables/neutron-metering_agent.xml
+++ b/doc/common/tables/neutron-metering_agent.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_neutron_metering_agent">
- <caption>Description of configuration options for metering_agent</caption>
+ <caption>Description of metering agent configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-midonet.xml b/doc/common/tables/neutron-midonet.xml
index 8133daf834..7b47a99827 100644
--- a/doc/common/tables/neutron-midonet.xml
+++ b/doc/common/tables/neutron-midonet.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_neutron_midonet">
- <caption>Description of configuration options for midonet</caption>
+ <caption>Description of Midonet configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2.xml b/doc/common/tables/neutron-ml2.xml
index afd39e7f73..8dcd155bbc 100644
--- a/doc/common/tables/neutron-ml2.xml
+++ b/doc/common/tables/neutron-ml2.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_neutron_ml2">
- <caption>Description of configuration options for ml2</caption>
+ <caption>Description of ML2 configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_arista.xml b/doc/common/tables/neutron-ml2_arista.xml
index 4c6968eaee..2899b6708e 100644
--- a/doc/common/tables/neutron-ml2_arista.xml
+++ b/doc/common/tables/neutron-ml2_arista.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_neutron_ml2_arista">
- <caption>Description of configuration options for ml2_arista</caption>
+ <caption>Description of ML2 Arista mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_bigswitch.xml b/doc/common/tables/neutron-ml2_bigswitch.xml
index f8ad4e87a3..d61a980776 100644
--- a/doc/common/tables/neutron-ml2_bigswitch.xml
+++ b/doc/common/tables/neutron-ml2_bigswitch.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_neutron_ml2_bigswitch">
- <caption>Description of configuration options for ml2_bigswitch</caption>
+ <caption>Description of ML2 BigSwitch mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
@@ -109,7 +109,7 @@
<td>(IntOpt) Time between verifications that the backend controller database is consistent with Neutron. (0 to disable)</td>
</tr>
<tr>
- <td>neutron_id = neutron-shock</td>
+ <td>neutron_id = neutron-linux-6dv9.site</td>
<td>(StrOpt) User defined identifier for this Neutron deployment</td>
</tr>
<tr>
diff --git a/doc/common/tables/neutron-ml2_brocade.xml b/doc/common/tables/neutron-ml2_brocade.xml
index 4e1fdc6c11..49c6032163 100644
--- a/doc/common/tables/neutron-ml2_brocade.xml
+++ b/doc/common/tables/neutron-ml2_brocade.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_neutron_ml2_brocade">
- <caption>Description of configuration options for ml2_brocade</caption>
+ <caption>Description of ML2 Brocade mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_cisco.xml b/doc/common/tables/neutron-ml2_cisco.xml
index f6c929d3c3..b09ebedd4b 100644
--- a/doc/common/tables/neutron-ml2_cisco.xml
+++ b/doc/common/tables/neutron-ml2_cisco.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_neutron_ml2_cisco">
- <caption>Description of configuration options for ml2_cisco</caption>
+ <caption>Description of ML2 Cisco mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_cisco_apic.xml b/doc/common/tables/neutron-ml2_cisco_apic.xml
index 1944353c0e..f1a9326a6a 100644
--- a/doc/common/tables/neutron-ml2_cisco_apic.xml
+++ b/doc/common/tables/neutron-ml2_cisco_apic.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_neutron_ml2_cisco_apic">
- <caption>Description of configuration options for ml2_cisco_apic</caption>
+ <caption>Description of ML2 Cisco mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_flat.xml b/doc/common/tables/neutron-ml2_flat.xml
index d92bc731ec..6f0b1bec70 100644
--- a/doc/common/tables/neutron-ml2_flat.xml
+++ b/doc/common/tables/neutron-ml2_flat.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_neutron_ml2_flat">
- <caption>Description of configuration options for ml2_flat</caption>
+ <caption>Description of ML2 Flat mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_fslsdn.xml b/doc/common/tables/neutron-ml2_fslsdn.xml
index 2a806aca50..1b2c3abe96 100644
--- a/doc/common/tables/neutron-ml2_fslsdn.xml
+++ b/doc/common/tables/neutron-ml2_fslsdn.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_neutron_ml2_fslsdn">
- <caption>Description of configuration options for ml2_fslsdn</caption>
+ <caption>Description of ML2 Freescale SDN mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_gre.xml b/doc/common/tables/neutron-ml2_gre.xml
index 3b53645e14..2d39b87c62 100644
--- a/doc/common/tables/neutron-ml2_gre.xml
+++ b/doc/common/tables/neutron-ml2_gre.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_neutron_ml2_gre">
- <caption>Description of configuration options for ml2_gre</caption>
+ <caption>Description of ML2 GRE configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_l2pop.xml b/doc/common/tables/neutron-ml2_l2pop.xml
index 62a5824d8b..36320c86c7 100644
--- a/doc/common/tables/neutron-ml2_l2pop.xml
+++ b/doc/common/tables/neutron-ml2_l2pop.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_neutron_ml2_l2pop">
- <caption>Description of configuration options for ml2_l2pop</caption>
+ <caption>Description of ML2 L2 population configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_mlnx.xml b/doc/common/tables/neutron-ml2_mlnx.xml
index eb832a67cd..b36756a1fc 100644
--- a/doc/common/tables/neutron-ml2_mlnx.xml
+++ b/doc/common/tables/neutron-ml2_mlnx.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_neutron_ml2_mlnx">
- <caption>Description of configuration options for ml2_mlnx</caption>
+ <caption>Description of Mellanox ML2 mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_ncs.xml b/doc/common/tables/neutron-ml2_ncs.xml
index 698ff4271c..09137c3525 100644
--- a/doc/common/tables/neutron-ml2_ncs.xml
+++ b/doc/common/tables/neutron-ml2_ncs.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_neutron_ml2_ncs">
- <caption>Description of configuration options for ml2_ncs</caption>
+ <caption>Description of ML2 NCS mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_odl.xml b/doc/common/tables/neutron-ml2_odl.xml
index 67fa1b2dc9..031f51dcc2 100644
--- a/doc/common/tables/neutron-ml2_odl.xml
+++ b/doc/common/tables/neutron-ml2_odl.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_neutron_ml2_odl">
- <caption>Description of configuration options for ml2_odl</caption>
+ <caption>Description of ML2 OpenDaylight mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_ofa.xml b/doc/common/tables/neutron-ml2_ofa.xml
index 1293b81d59..cded7d2109 100644
--- a/doc/common/tables/neutron-ml2_ofa.xml
+++ b/doc/common/tables/neutron-ml2_ofa.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_neutron_ml2_ofa">
- <caption>Description of configuration options for ml2_ofa</caption>
+ <caption>Description of ML2 ofagent mechanism driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_sriov.xml b/doc/common/tables/neutron-ml2_sriov.xml
index ae42c61a5b..20dcf41295 100644
--- a/doc/common/tables/neutron-ml2_sriov.xml
+++ b/doc/common/tables/neutron-ml2_sriov.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_neutron_ml2_sriov">
- <caption>Description of configuration options for ml2_sriov</caption>
+ <caption>Description of ML2 ML2 SR-IOV driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_vlan.xml b/doc/common/tables/neutron-ml2_vlan.xml
index 9b244f0127..1a91c9f593 100644
--- a/doc/common/tables/neutron-ml2_vlan.xml
+++ b/doc/common/tables/neutron-ml2_vlan.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_neutron_ml2_vlan">
- <caption>Description of configuration options for ml2_vlan</caption>
+ <caption>Description of ML2 VLAN configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ml2_vxlan.xml b/doc/common/tables/neutron-ml2_vxlan.xml
index 3bf50df32f..24ba0f43c8 100644
--- a/doc/common/tables/neutron-ml2_vxlan.xml
+++ b/doc/common/tables/neutron-ml2_vxlan.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_neutron_ml2_vxlan">
- <caption>Description of configuration options for ml2_vxlan</caption>
+ <caption>Description of ML2 VXLN configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-mlnx.xml b/doc/common/tables/neutron-mlnx.xml
index df0bb7d636..ae3ce4ff26 100644
--- a/doc/common/tables/neutron-mlnx.xml
+++ b/doc/common/tables/neutron-mlnx.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_neutron_mlnx">
- <caption>Description of configuration options for mlnx</caption>
+ <caption>Description of Mellanox configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-nec.xml b/doc/common/tables/neutron-nec.xml
index 8f4d14a166..2eb041302f 100644
--- a/doc/common/tables/neutron-nec.xml
+++ b/doc/common/tables/neutron-nec.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_neutron_nec">
- <caption>Description of configuration options for nec</caption>
+ <caption>Description of Nec configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-notifier.xml b/doc/common/tables/neutron-notifier.xml
index a1d0624161..d9210f99ea 100644
--- a/doc/common/tables/neutron-notifier.xml
+++ b/doc/common/tables/neutron-notifier.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_neutron_notifier">
- <caption>Description of configuration options for notifier</caption>
+ <caption>Description of notifier configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-nuage.xml b/doc/common/tables/neutron-nuage.xml
index a035faba12..e7b01c8f31 100644
--- a/doc/common/tables/neutron-nuage.xml
+++ b/doc/common/tables/neutron-nuage.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_neutron_nuage">
- <caption>Description of configuration options for nuage</caption>
+ <caption>Description of Nuage configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-nvsd.xml b/doc/common/tables/neutron-nvsd.xml
index 69d8d588d3..e4380cb58f 100644
--- a/doc/common/tables/neutron-nvsd.xml
+++ b/doc/common/tables/neutron-nvsd.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_neutron_nvsd">
- <caption>Description of configuration options for nvsd</caption>
+ <caption>Description of NVSD driver configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-opencontrail.xml b/doc/common/tables/neutron-opencontrail.xml
index 6a151ff235..2af05ba822 100644
--- a/doc/common/tables/neutron-opencontrail.xml
+++ b/doc/common/tables/neutron-opencontrail.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_neutron_opencontrail">
- <caption>Description of configuration options for opencontrail</caption>
+ <caption>Description of OpenContrail configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-openvswitch_agent.xml b/doc/common/tables/neutron-openvswitch_agent.xml
index 27b3249dac..055a85247c 100644
--- a/doc/common/tables/neutron-openvswitch_agent.xml
+++ b/doc/common/tables/neutron-openvswitch_agent.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_neutron_openvswitch_agent">
- <caption>Description of configuration options for openvswitch_agent</caption>
+ <caption>Description of Open vSwitch agent configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
@@ -34,7 +34,7 @@
</tr>
<tr>
<td>arp_responder = False</td>
- <td>(BoolOpt) Enable local ARP responder if it is supported</td>
+ <td>(BoolOpt) Enable local ARP responder if it is supported. Requires OVS 2.1 and ML2 l2population driver. Allows the switch (when supporting an overlay) to respond to an ARP request locally without performing a costly ARP broadcast into the overlay</td>
</tr>
<tr>
<td>dont_fragment = True</td>
@@ -42,11 +42,11 @@
</tr>
<tr>
<td>enable_distributed_routing = False</td>
- <td>(BoolOpt) Make the l2 agent run in DVR mode</td>
+ <td>(BoolOpt) Make the l2 agent run in DVR mode.</td>
</tr>
<tr>
<td>l2_population = False</td>
- <td>(BoolOpt) Use ml2 l2population mechanism driver to learn remote mac and IPs and improve tunnel scalability</td>
+ <td>(BoolOpt) Use ML2 l2population mechanism driver to learn remote mac and IPs and improve tunnel scalability</td>
</tr>
<tr>
<td>minimize_polling = True</td>
diff --git a/doc/common/tables/neutron-plumgrid.xml b/doc/common/tables/neutron-plumgrid.xml
index 279ad0ef01..98dbe4268a 100644
--- a/doc/common/tables/neutron-plumgrid.xml
+++ b/doc/common/tables/neutron-plumgrid.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_neutron_plumgrid">
- <caption>Description of configuration options for plumgrid</caption>
+ <caption>Description of PLUMgrid configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-policy.xml b/doc/common/tables/neutron-policy.xml
index dba6da4925..03677c9896 100644
--- a/doc/common/tables/neutron-policy.xml
+++ b/doc/common/tables/neutron-policy.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_neutron_policy">
- <caption>Description of configuration options for policy</caption>
+ <caption>Description of policy configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-qpid.xml b/doc/common/tables/neutron-qpid.xml
index 99acdc3caf..a189bb315e 100644
--- a/doc/common/tables/neutron-qpid.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-quotas.xml b/doc/common/tables/neutron-quotas.xml
index 5e39ecebf6..32164f3bed 100644
--- a/doc/common/tables/neutron-quotas.xml
+++ b/doc/common/tables/neutron-quotas.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_neutron_quotas">
- <caption>Description of configuration options for quotas</caption>
+ <caption>Description of quotas configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-rabbitmq.xml b/doc/common/tables/neutron-rabbitmq.xml
index 925137b352..1b882cba92 100644
--- a/doc/common/tables/neutron-rabbitmq.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-redis.xml b/doc/common/tables/neutron-redis.xml
index 512c816ad3..5b4bcaf7a4 100644
--- a/doc/common/tables/neutron-redis.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-rootwrap.xml b/doc/common/tables/neutron-rootwrap.xml
index 2dfbe7ad35..9311d7b924 100644
--- a/doc/common/tables/neutron-rootwrap.xml
+++ b/doc/common/tables/neutron-rootwrap.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_neutron_rootwrap">
- <caption>Description of configuration options for rootwrap</caption>
+ <caption>Description of rootwrap configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-rpc.xml b/doc/common/tables/neutron-rpc.xml
index 4a81ec7853..617b3ff66e 100644
--- a/doc/common/tables/neutron-rpc.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-ryu.xml b/doc/common/tables/neutron-ryu.xml
index 4412a8e79d..66c4144cbf 100644
--- a/doc/common/tables/neutron-ryu.xml
+++ b/doc/common/tables/neutron-ryu.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_neutron_ryu">
- <caption>Description of configuration options for ryu</caption>
+ <caption>Description of RYU configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-scheduler.xml b/doc/common/tables/neutron-scheduler.xml
index 1648900ba9..ed9c99f7c3 100644
--- a/doc/common/tables/neutron-scheduler.xml
+++ b/doc/common/tables/neutron-scheduler.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_neutron_scheduler">
- <caption>Description of configuration options for scheduler</caption>
+ <caption>Description of scheduler configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-sdnve.xml b/doc/common/tables/neutron-sdnve.xml
index 435265238f..cb872b8923 100644
--- a/doc/common/tables/neutron-sdnve.xml
+++ b/doc/common/tables/neutron-sdnve.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_neutron_sdnve">
- <caption>Description of configuration options for sdnve</caption>
+ <caption>Description of SDN-VE configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-securitygroups.xml b/doc/common/tables/neutron-securitygroups.xml
index cf7407309f..016d1600a5 100644
--- a/doc/common/tables/neutron-securitygroups.xml
+++ b/doc/common/tables/neutron-securitygroups.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_neutron_securitygroups">
- <caption>Description of configuration options for securitygroups</caption>
+ <caption>Description of security groups configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-sriov.xml b/doc/common/tables/neutron-sriov.xml
index 1ce82acdd3..de83a454ea 100644
--- a/doc/common/tables/neutron-sriov.xml
+++ b/doc/common/tables/neutron-sriov.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_neutron_sriov">
- <caption>Description of configuration options for sriov</caption>
+ <caption>Description of SR-IOV configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-ssl.xml b/doc/common/tables/neutron-ssl.xml
index 9ea48a20b1..437c50752e 100644
--- a/doc/common/tables/neutron-ssl.xml
+++ b/doc/common/tables/neutron-ssl.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_neutron_ssl">
- <caption>Description of configuration options for ssl</caption>
+ <caption>Description of SSL configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-testing.xml b/doc/common/tables/neutron-testing.xml
index e98aba99f8..1a8846b0f9 100644
--- a/doc/common/tables/neutron-testing.xml
+++ b/doc/common/tables/neutron-testing.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_neutron_testing">
- <caption>Description of configuration options for testing</caption>
+ <caption>Description of testing configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-varmour.xml b/doc/common/tables/neutron-varmour.xml
index ac44b5006a..ce6e422484 100644
--- a/doc/common/tables/neutron-varmour.xml
+++ b/doc/common/tables/neutron-varmour.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_neutron_varmour">
- <caption>Description of configuration options for varmour</caption>
+ <caption>Description of vArmour configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-vmware.xml b/doc/common/tables/neutron-vmware.xml
index 5efce764c0..e641e2459b 100644
--- a/doc/common/tables/neutron-vmware.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron-vpn.xml b/doc/common/tables/neutron-vpn.xml
index e88ab0bb6a..72dba77ddb 100644
--- a/doc/common/tables/neutron-vpn.xml
+++ b/doc/common/tables/neutron-vpn.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_neutron_vpn">
- <caption>Description of configuration options for vpn</caption>
+ <caption>Description of VPN configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-wsgi.xml b/doc/common/tables/neutron-wsgi.xml
index 5817376f50..1e4b1a3e20 100644
--- a/doc/common/tables/neutron-wsgi.xml
+++ b/doc/common/tables/neutron-wsgi.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_neutron_wsgi">
- <caption>Description of configuration options for wsgi</caption>
+ <caption>Description of WSGI configuration options</caption>
<col width="50%"/>
<col width="50%"/>
<thead>
diff --git a/doc/common/tables/neutron-zeromq.xml b/doc/common/tables/neutron-zeromq.xml
index ce53716241..b8631280ef 100644
--- a/doc/common/tables/neutron-zeromq.xml
+++ b/doc/common/tables/neutron-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_neutron_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/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers
new file mode 100644
index 0000000000..d8816e846f
--- /dev/null
+++ b/tools/autogenerate-config-flagmappings/neutron.headers
@@ -0,0 +1,60 @@
+agent agent
+bigswitch BigSwitch
+brocade Brocade
+cfg_agent cfg agent
+cisco Cisco
+compute Compute
+dhcp_agent DHCP agent
+dvr DVR
+embrane Embrane
+embrane_lb Embrane LBaaS driver
+fwaas FwaaS
+hyperv_agent HyperV agent
+ipv6_ra IPv6 router advertisement
+l3_agent L3 agent
+lbaas LBaaS
+lbaas_haproxy LBaaS haproxy
+# Rename option to netscaler
+lbaas_netscalar LBaaS Netscaler
+lbaas_radware LBaaS Radware
+linuxbridge_agent Linux Bridge agent
+meta meta
+metadata metadata
+metering_agent metering agent
+midonet Midonet
+ml2 ML2
+ml2_arista ML2 Arista mechanism driver
+ml2_bigswitch ML2 BigSwitch mechanism driver
+ml2_brocade ML2 Brocade mechanism driver
+ml2_cisco ML2 Cisco mechanism driver
+ml2_cisco_apic ML2 Cisco mechanism driver
+ml2_flat ML2 Flat mechanism driver
+ml2_fslsdn ML2 Freescale SDN mechanism driver
+ml2_gre ML2 GRE
+ml2_l2pop ML2 L2 population
+ml2_mlnx Mellanox ML2 mechanism driver
+ml2_ncs ML2 NCS mechanism driver
+ml2_odl ML2 OpenDaylight mechanism driver
+ml2_ofa ML2 ofagent mechanism driver
+ml2_sriov ML2 ML2 SR-IOV driver
+ml2_vlan ML2 VLAN
+ml2_vxlan ML2 VXLN
+mlnx Mellanox
+nec Nec
+notifier notifier
+nuage Nuage
+nvsd NVSD driver
+opencontrail OpenContrail
+openvswitch_agent Open vSwitch agent
+plumgrid PLUMgrid
+policy policy
+quotas quotas
+ryu RYU
+scheduler scheduler
+sdnve SDN-VE
+securitygroups security groups
+sriov SR-IOV
+testing testing
+varmour vArmour
+vpn VPN
+wsgi WSGI