diff --git a/doc/common/tables/nova-baremetal.xml b/doc/common/tables/nova-baremetal.xml
index aaa295a862..90f58b41b5 100644
--- a/doc/common/tables/nova-baremetal.xml
+++ b/doc/common/tables/nova-baremetal.xml
@@ -55,6 +55,10 @@
                        <td>pxe_append_params=None</td>
                        <td>(StrOpt) additional append parameters for baremetal PXE boot</td>
               </tr>
+              <tr>
+                       <td>pxe_bootfile_name=pxelinux.0</td>
+                       <td>(StrOpt) This gets passed to Neutron as the bootfile dhcp parameter when the dhcp_options_enabled is set.</td>
+              </tr>
               <tr>
                        <td>pxe_config_template=$pybasedir/nova/virt/baremetal/pxe_config.template</td>
                        <td>(StrOpt) Template file for PXE configuration</td>
diff --git a/doc/common/tables/nova-keymgr.xml b/doc/common/tables/nova-keymgr.xml
index 4ad5b34255..26b5ab302f 100644
--- a/doc/common/tables/nova-keymgr.xml
+++ b/doc/common/tables/nova-keymgr.xml
@@ -16,9 +16,13 @@
           </thead>
           <tbody>
               <tr>
-                       <td>keymgr_api_class=nova.keymgr.key_mgr.KeyManager</td>
+                       <td>api_class=nova.keymgr.conf_key_mgr.ConfKeyManager</td>
                        <td>(StrOpt) The full class name of the key manager API class</td>
               </tr>
+              <tr>
+                       <td>fixed_key=None</td>
+                       <td>(StrOpt) Fixed key returned by key manager, specified in hex</td>
+              </tr>
        </tbody>
         </table>
         </para>
\ No newline at end of file
diff --git a/doc/common/tables/nova-network.xml b/doc/common/tables/nova-network.xml
index 5de36c8dd8..43cc6aa1b4 100644
--- a/doc/common/tables/nova-network.xml
+++ b/doc/common/tables/nova-network.xml
@@ -225,7 +225,7 @@
               </tr>
               <tr>
                        <td>share_dhcp_address=False</td>
-                       <td>(BoolOpt) If True in multi_host mode, all compute hosts share the same dhcp address.</td>
+                       <td>(BoolOpt) If True in multi_host mode, all compute hosts share the same dhcp address. The same IP address used for DHCP will be added on each nova-network node which is only visible to the vms on the same host.</td>
               </tr>
               <tr>
                        <td>teardown_unused_network_gateway=False</td>
diff --git a/tools/autogenerate-config-docs/flagmappings/nova.flagmappings b/tools/autogenerate-config-docs/flagmappings/nova.flagmappings
index 722f2870da..d28c8bb8c4 100644
--- a/tools/autogenerate-config-docs/flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-docs/flagmappings/nova.flagmappings
@@ -10,6 +10,7 @@ allow_same_net_traffic network
 allowed_direct_url_schemes glance
 allowed_rpc_exception_modules testing
 amqp_durable_queues rpc
+api_class keymgr
 api_paste_config wsgi
 amqp_auto_delete rpc
 api_rate_limit authentication
@@ -158,6 +159,7 @@ fatal_exception_format_errors logging
 filesystems glance
 firewall_driver network
 fixed_ip_disassociate_timeout network
+fixed_key keymgr
 fixed_range_v6 ipv6
 flat_injected network
 flat_interface network
@@ -224,7 +226,6 @@ isolated_hosts scheduling
 isolated_images scheduling
 key_file ca
 keymap spice
-keymgr_api_class keymgr
 keys_path ca
 keystone_ec2_url ec2
 kombu_ssl_ca_certs kombu
@@ -391,6 +392,7 @@ project_cert_subject ca
 public_interface network
 publish_errors logging
 pxe_append_params baremetal
+pxe_bootfile_name baremetal
 pxe_config_template baremetal
 pxe_deploy_timeout baremetal
 pxe_network_config baremetal