From b2235bf3fbaf12f79104f825325a92a3890c662b Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Wed, 9 Jul 2014 22:21:55 +0200
Subject: [PATCH] Unified the syntax of the XML root element (common)

Execluded all XML files in the directory doc/common/tables because
they are autogenerated.

The XML root element of Docbook XML files should match the following
format:

<ELEMENT xmlns="http://docbook.org/ns/docbook"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:xlink="http://www.w3.org/1999/xlink"
  version="5.0"
  xml:id="THE_XML_ID_OF_THE_ELEMENT">

Change-Id: If12091be81ec8b2e6e53bfcb4c3a883a65e24736
---
 doc/common/app_support.xml                            |  7 ++++---
 doc/common/ch_cli_ceilometer_commands.xml             |  7 ++++---
 doc/common/ch_cli_cinder_commands.xml                 |  7 ++++---
 doc/common/ch_cli_glance_commands.xml                 |  7 ++++---
 doc/common/ch_cli_heat_commands.xml                   |  7 ++++---
 doc/common/ch_cli_keystone_commands.xml               |  7 ++++---
 doc/common/ch_cli_neutron_commands.xml                |  7 ++++---
 doc/common/ch_cli_nova_commands.xml                   |  7 ++++---
 doc/common/ch_cli_swift_commands.xml                  |  7 ++++---
 doc/common/ch_cli_trove_commands.xml                  |  7 ++++---
 doc/common/ch_getstart.xml                            |  7 ++++---
 doc/common/ch_preface.xml                             |  8 ++++----
 doc/common/ch_using_openstack_overview.xml            |  8 ++++----
 doc/common/section_about-object-storage.xml           |  8 ++++----
 doc/common/section_cli_cinder_manage_volumes.xml      |  7 ++++---
 doc/common/section_cli_cinder_read-only-volumes.xml   |  7 ++++---
 doc/common/section_cli_glance_manage_images.xml       |  7 ++++---
 doc/common/section_cli_help.xml                       |  7 ++++---
 doc/common/section_cli_install.xml                    |  7 ++++---
 doc/common/section_cli_keystone_apiv3.xml             |  8 +++++---
 doc/common/section_cli_keystone_credentials.xml       |  7 ++++---
 doc/common/section_cli_keystone_example_usage.xml     |  7 ++++---
 doc/common/section_cli_keystone_services.xml          |  7 ++++---
 doc/common/section_cli_neutron-quotas.xml             |  7 ++++---
 doc/common/section_cli_neutron_manage_networks.xml    |  8 ++++----
 doc/common/section_cli_nova_baremetal.xml             |  6 ++++--
 doc/common/section_cli_nova_boot.xml                  |  7 ++++---
 doc/common/section_cli_nova_boot_from_volume.xml      |  3 ++-
 doc/common/section_cli_nova_customize_flavors.xml     |  9 +++++----
 doc/common/section_cli_nova_evacuate.xml              |  7 ++++---
 doc/common/section_cli_nova_fileinjection.xml         | 11 +++++------
 doc/common/section_cli_nova_get_console.xml           |  9 +++++----
 doc/common/section_cli_nova_host_aggregates.xml       |  7 ++++---
 doc/common/section_cli_nova_images.xml                |  7 ++++---
 doc/common/section_cli_nova_manage_images.xml         |  7 ++++---
 doc/common/section_cli_nova_metadata.xml              | 11 +++++------
 doc/common/section_cli_nova_quotas.xml                |  3 ++-
 doc/common/section_cli_nova_reboot.xml                |  8 +++++---
 doc/common/section_cli_nova_resizerebuild.xml         |  3 ++-
 doc/common/section_cli_nova_search_ip.xml             | 10 +++++-----
 doc/common/section_cli_nova_secgroups.xml             |  7 ++++---
 doc/common/section_cli_nova_sshkeys.xml               |  3 ++-
 doc/common/section_cli_nova_startstop.xml             |  3 ++-
 doc/common/section_cli_nova_terminate.xml             | 11 +++++------
 doc/common/section_cli_nova_usage_statistics.xml      |  7 ++++---
 doc/common/section_cli_nova_userdata.xml              |  3 ++-
 doc/common/section_cli_nova_volumes.xml               | 11 +++++------
 doc/common/section_cli_openrc.xml                     |  7 ++++---
 doc/common/section_cli_overview.xml                   |  8 ++++----
 doc/common/section_cli_version.xml                    |  7 ++++---
 doc/common/section_compute-configure-console.xml      |  3 ++-
 doc/common/section_compute-configure-ec2.xml          |  8 ++++----
 doc/common/section_compute-configure-spice.xml        |  3 ++-
 doc/common/section_compute-configure-vnc.xml          |  3 ++-
 doc/common/section_compute_config-api.xml             |  7 ++++---
 doc/common/section_compute_config-firewalls.xml       |  7 ++++---
 doc/common/section_config_format.xml                  |  9 +++++----
 doc/common/section_conventions.xml                    |  8 ++++----
 doc/common/section_dashboard-configure-http.xml       |  9 +++++----
 doc/common/section_dashboard-configure-https.xml      |  9 +++++----
 doc/common/section_dashboard-configure-vnc-window.xml |  9 +++++----
 doc/common/section_dashboard-configure.xml            |  9 +++++----
 doc/common/section_dashboard_access.xml               |  8 ++++----
 doc/common/section_dashboard_customizing.xml          |  9 +++++----
 .../section_dashboard_launch_instances_from_image.xml |  7 ++++---
 doc/common/section_dashboard_sessions.xml             |  9 +++++----
 doc/common/section_dochistory.xml                     |  9 +++++----
 doc/common/section_fibrechannel.xml                   |  6 ++++--
 doc/common/section_getstart_block-storage.xml         |  7 ++++---
 doc/common/section_getstart_compute.xml               |  3 ++-
 doc/common/section_getstart_conceptual_arch.xml       |  7 ++++---
 doc/common/section_getstart_dashboard.xml             |  7 ++++---
 doc/common/section_getstart_image.xml                 |  7 ++++---
 doc/common/section_getstart_logical_arch.xml          |  3 ++-
 doc/common/section_getstart_networking.xml            |  3 ++-
 doc/common/section_getstart_object-storage.xml        |  3 ++-
 doc/common/section_getstart_orchestration.xml         |  3 ++-
 doc/common/section_getstart_telemetry.xml             |  7 ++++---
 doc/common/section_getstart_trove.xml                 |  3 ++-
 doc/common/section_identity-troubleshooting.xml       |  9 +++++----
 .../section_keystone-concepts-domain-management.xml   |  7 ++++---
 .../section_keystone-concepts-group-management.xml    |  7 ++++---
 .../section_keystone-concepts-service-management.xml  |  7 ++++---
 .../section_keystone-concepts-user-management.xml     |  7 ++++---
 doc/common/section_keystone-concepts.xml              |  7 ++++---
 doc/common/section_keystone-external-auth.xml         |  9 +++++----
 doc/common/section_keystone-ssl-config.xml            |  7 ++++---
 doc/common/section_keystone_certificates-for-pki.xml  |  7 ++++---
 .../section_keystone_config_ldap-assignments.xml      |  7 ++++---
 doc/common/section_keystone_config_ldap-hardening.xml |  7 ++++---
 doc/common/section_keystone_config_ldap.xml           |  7 ++++---
 doc/common/section_keystone_db_sync.xml               |  7 ++++---
 doc/common/section_kvm_enable.xml                     |  7 ++++---
 doc/common/section_objectstorage-account-reaper.xml   |  8 ++++----
 doc/common/section_objectstorage-arch.xml             |  8 ++++----
 doc/common/section_objectstorage-characteristics.xml  |  8 ++++----
 doc/common/section_objectstorage-components.xml       |  8 ++++----
 doc/common/section_objectstorage-features.xml         |  8 ++++----
 doc/common/section_objectstorage-intro.xml            |  8 ++++----
 doc/common/section_objectstorage-replication.xml      |  7 ++++---
 doc/common/section_objectstorage-ringbuilder.xml      |  7 ++++---
 doc/common/section_objectstorage-troubleshoot.xml     |  7 ++++---
 ...on_objectstorage_tenant-specific-image-storage.xml |  7 ++++---
 doc/common/section_rpc-for-networking.xml             |  3 ++-
 doc/common/section_rpc.xml                            |  3 ++-
 doc/common/section_storage-concepts.xml               |  3 ++-
 doc/common/section_support-compute.xml                |  7 ++++---
 doc/common/section_trusted-compute-pools.xml          |  7 ++++---
 doc/common/section_user-data.xml                      |  7 ++++---
 doc/common/section_using-vnc-console.xml              |  3 ++-
 doc/common/section_xapi-ami-setup.xml                 |  7 ++++---
 doc/common/section_xapi-install-plugins.xml           |  7 ++++---
 doc/common/section_xapi-resize-setup.xml              |  7 ++++---
 doc/common/section_xen-install.xml                    |  7 ++++---
 114 files changed, 437 insertions(+), 342 deletions(-)

diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index db90c8838e..d71b2a8834 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appendix xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="app_community_support">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="app_community_support">
     <?dbhtml stop-chunking?>
     <title>Community support</title>
     <para>The following resources are available to help you run and use
diff --git a/doc/common/ch_cli_ceilometer_commands.xml b/doc/common/ch_cli_ceilometer_commands.xml
index 71cfaa360e..dc3c9e7555 100644
--- a/doc/common/ch_cli_ceilometer_commands.xml
+++ b/doc/common/ch_cli_ceilometer_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="ceilometerclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ceilometerclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_cli_cinder_commands.xml b/doc/common/ch_cli_cinder_commands.xml
index 6bd3503030..cbd5701a37 100644
--- a/doc/common/ch_cli_cinder_commands.xml
+++ b/doc/common/ch_cli_cinder_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="cinderclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cinderclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_cli_glance_commands.xml b/doc/common/ch_cli_glance_commands.xml
index 36b34877a7..2bc80b3bd2 100644
--- a/doc/common/ch_cli_glance_commands.xml
+++ b/doc/common/ch_cli_glance_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="glanceclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="glanceclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_cli_heat_commands.xml b/doc/common/ch_cli_heat_commands.xml
index 71186604a3..f3ea0b68f6 100644
--- a/doc/common/ch_cli_heat_commands.xml
+++ b/doc/common/ch_cli_heat_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="heatclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="heatclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_cli_keystone_commands.xml b/doc/common/ch_cli_keystone_commands.xml
index d301fd8278..0a8bfde622 100644
--- a/doc/common/ch_cli_keystone_commands.xml
+++ b/doc/common/ch_cli_keystone_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="keystoneclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="keystoneclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_cli_neutron_commands.xml b/doc/common/ch_cli_neutron_commands.xml
index 881d8a7e8a..adec2367d8 100644
--- a/doc/common/ch_cli_neutron_commands.xml
+++ b/doc/common/ch_cli_neutron_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="neutronclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="neutronclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_cli_nova_commands.xml b/doc/common/ch_cli_nova_commands.xml
index 53b46c7589..943d8fc708 100644
--- a/doc/common/ch_cli_nova_commands.xml
+++ b/doc/common/ch_cli_nova_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="novaclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="novaclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_cli_swift_commands.xml b/doc/common/ch_cli_swift_commands.xml
index 2cb4851a80..80eb1ea1b3 100644
--- a/doc/common/ch_cli_swift_commands.xml
+++ b/doc/common/ch_cli_swift_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="swiftclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="swiftclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_cli_trove_commands.xml b/doc/common/ch_cli_trove_commands.xml
index c3bae32cd6..6a05cd9180 100644
--- a/doc/common/ch_cli_trove_commands.xml
+++ b/doc/common/ch_cli_trove_commands.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="troveclient_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="troveclient_commands">
 
     <!-- This file is automatically generated, do not edit -->
 
diff --git a/doc/common/ch_getstart.xml b/doc/common/ch_getstart.xml
index 2db6be7371..37d751accd 100644
--- a/doc/common/ch_getstart.xml
+++ b/doc/common/ch_getstart.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="ch_getting-started-with-openstack">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_getting-started-with-openstack">
     <title>Get started with OpenStack</title>
     <para xml:id="para1">The OpenStack project is an open source cloud
         computing platform for all types of clouds, which aims to be
diff --git a/doc/common/ch_preface.xml b/doc/common/ch_preface.xml
index 0dd229fa8a..07e7c2c596 100644
--- a/doc/common/ch_preface.xml
+++ b/doc/common/ch_preface.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <preface xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    version="5.0"
-    xml:id="ch_preface">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_preface">
     <title>Preface</title>
     <?dbhtml stop-chunking?>
 
diff --git a/doc/common/ch_using_openstack_overview.xml b/doc/common/ch_using_openstack_overview.xml
index 7363e5cfe8..762a567f2d 100644
--- a/doc/common/ch_using_openstack_overview.xml
+++ b/doc/common/ch_using_openstack_overview.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <preface xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    version="5.0"
-    xml:id="openstack_user_guide">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="openstack_user_guide">
     <title>How can I <phrase audience="enduser">use</phrase><phrase
             audience="adminuser">administer</phrase> an OpenStack
         cloud?</title>
diff --git a/doc/common/section_about-object-storage.xml b/doc/common/section_about-object-storage.xml
index b24e259853..a45ff2412f 100644
--- a/doc/common/section_about-object-storage.xml
+++ b/doc/common/section_about-object-storage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="ch_introduction-to-openstack-object-storage">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_introduction-to-openstack-object-storage">
     <title>Introduction to Object Storage</title>
     <para>Object Storage is a robust, highly scalable and
           fault tolerant storage platform for unstructured data
diff --git a/doc/common/section_cli_cinder_manage_volumes.xml b/doc/common/section_cli_cinder_manage_volumes.xml
index d0544c3674..4f928c67df 100644
--- a/doc/common/section_cli_cinder_manage_volumes.xml
+++ b/doc/common/section_cli_cinder_manage_volumes.xml
@@ -4,9 +4,10 @@
 %openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="cli_manage_volumes">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_manage_volumes">
     <?dbhtml stop-chunking?>
     <title>Manage volumes</title>
     <para>A volume is a detachable block storage device, similar to a USB hard drive. You can attach a volume to only one
diff --git a/doc/common/section_cli_cinder_read-only-volumes.xml b/doc/common/section_cli_cinder_read-only-volumes.xml
index cb5bab322b..64ed0d025f 100644
--- a/doc/common/section_cli_cinder_read-only-volumes.xml
+++ b/doc/common/section_cli_cinder_read-only-volumes.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="cli_read-only-volumes">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_read-only-volumes">
     <title>Set a volume to read-only access</title>
     <para>To give multiple users shared, secure access to the same
         data, you can set a volume to read-only access.</para>
diff --git a/doc/common/section_cli_glance_manage_images.xml b/doc/common/section_cli_glance_manage_images.xml
index 43be58d095..adabf5320e 100644
--- a/doc/common/section_cli_glance_manage_images.xml
+++ b/doc/common/section_cli_glance_manage_images.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="cli_manage_images">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_manage_images">
     <?dbhtml stop-chunking?>
     <title>Manage images</title>
     <para>The cloud operator assigns roles to users. Roles determine
diff --git a/doc/common/section_cli_help.xml b/doc/common/section_cli_help.xml
index c23e7d03e6..2437a57433 100644
--- a/doc/common/section_cli_help.xml
+++ b/doc/common/section_cli_help.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="cli_help">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_help">
     <title>Get help for client commands</title>
     <para>To get usage information, including a list of commands with
         descriptions, for a client, run the following command:</para>
diff --git a/doc/common/section_cli_install.xml b/doc/common/section_cli_install.xml
index 8452cd17f1..6b399b6524 100644
--- a/doc/common/section_cli_install.xml
+++ b/doc/common/section_cli_install.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="install_clients">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="install_clients">
     <?dbhtml stop-chunking?>
     <title>Install the OpenStack command-line clients</title>
     <para>Install the prerequisite software and the Python package for
diff --git a/doc/common/section_cli_keystone_apiv3.xml b/doc/common/section_cli_keystone_apiv3.xml
index 4cd7f1d341..368585da71 100644
--- a/doc/common/section_cli_keystone_apiv3.xml
+++ b/doc/common/section_cli_keystone_apiv3.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="use-v3-instead-of-default-v2" xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="use-v3-instead-of-default-v2">
     <title>Use Identity Service API v3 instead of API v2.0</title>
     <para>Use the following parameters in combination on any
         keystone command to specify which version of the API to
diff --git a/doc/common/section_cli_keystone_credentials.xml b/doc/common/section_cli_keystone_credentials.xml
index d3a7ac8941..0e03ab1469 100644
--- a/doc/common/section_cli_keystone_credentials.xml
+++ b/doc/common/section_cli_keystone_credentials.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="configure_keystone_client">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configure_keystone_client">
     <title>Set up credentials for the keystone client</title>
     <para>You can configure the
             <package>python-keystoneclient</package> with admin
diff --git a/doc/common/section_cli_keystone_example_usage.xml b/doc/common/section_cli_keystone_example_usage.xml
index 7629ef2bf8..85c57c8d8a 100644
--- a/doc/common/section_cli_keystone_example_usage.xml
+++ b/doc/common/section_cli_keystone_example_usage.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="example-usage">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="example-usage">
     <title>keystone command-line client example usage</title>
     <para>Before you can use keystone client commands, you must
         download and source an OpenStack RC file. For information, see
diff --git a/doc/common/section_cli_keystone_services.xml b/doc/common/section_cli_keystone_services.xml
index 3c5412c693..38fc5b0c16 100644
--- a/doc/common/section_cli_keystone_services.xml
+++ b/doc/common/section_cli_keystone_services.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="adding-users-tenants-and-roles-with-python-keystoneclient">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="adding-users-tenants-and-roles-with-python-keystoneclient">
     <?dbhtml stop-chunking?>
     <title>Create and manage services and service users</title>
     <para>The Identity Service enables you to define services, as
diff --git a/doc/common/section_cli_neutron-quotas.xml b/doc/common/section_cli_neutron-quotas.xml
index 1eccc1ecc8..b931b063c9 100644
--- a/doc/common/section_cli_neutron-quotas.xml
+++ b/doc/common/section_cli_neutron-quotas.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_networking-advanced-quotas"
-  xmlns="http://docbook.org/ns/docbook"
+<section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_networking-advanced-quotas">
   <title>Manage Networking service quotas</title>
   <para>A quota limits the number of available resources. A default
     quota might be enforced for all tenants. When you try to create
diff --git a/doc/common/section_cli_neutron_manage_networks.xml b/doc/common/section_cli_neutron_manage_networks.xml
index b79de84456..66fa0c640f 100644
--- a/doc/common/section_cli_neutron_manage_networks.xml
+++ b/doc/common/section_cli_neutron_manage_networks.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    version="5.0"
-    xml:id="neutron_client_sample_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="neutron_client_sample_commands">
     <title>Create and manage networks</title>
     <para>Before you run commands, set the following environment
         variables:</para>
diff --git a/doc/common/section_cli_nova_baremetal.xml b/doc/common/section_cli_nova_baremetal.xml
index c056724437..27950ce1b0 100644
--- a/doc/common/section_cli_nova_baremetal.xml
+++ b/doc/common/section_cli_nova_baremetal.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="baremetal" xmlns="http://docbook.org/ns/docbook"
+<section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="baremetal">
   <title>Manage bare-metal nodes</title>
   <para>The bare-metal driver for OpenStack Compute manages provisioning of
     physical hardware by using common cloud APIs and tools such as Orchestration
diff --git a/doc/common/section_cli_nova_boot.xml b/doc/common/section_cli_nova_boot.xml
index c50e467f09..244ec5dc79 100644
--- a/doc/common/section_cli_nova_boot.xml
+++ b/doc/common/section_cli_nova_boot.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="cli_launch_instances">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_launch_instances">
     <title wordsize="20">Launch instances</title>
     <para>Instances are virtual machines that run inside the
         cloud.</para>
diff --git a/doc/common/section_cli_nova_boot_from_volume.xml b/doc/common/section_cli_nova_boot_from_volume.xml
index f8ddc8b89f..1b325bb532 100644
--- a/doc/common/section_cli_nova_boot_from_volume.xml
+++ b/doc/common/section_cli_nova_boot_from_volume.xml
@@ -5,7 +5,8 @@
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="boot_from_volume">
   <title>Launch an instance from a volume</title>
   <para>You can boot instances from a volume instead of an image.</para>
diff --git a/doc/common/section_cli_nova_customize_flavors.xml b/doc/common/section_cli_nova_customize_flavors.xml
index 2e2e2b8f0d..7dc1e971d3 100644
--- a/doc/common/section_cli_nova_customize_flavors.xml
+++ b/doc/common/section_cli_nova_customize_flavors.xml
@@ -3,10 +3,11 @@
 <!ENTITY % openstack SYSTEM "entities/openstack.ent">
 %openstack;
 ]>
-<section xml:id="customize-flavors"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="customize-flavors">
     <title>Flavors</title>
     <para>Admin users can use the <command>nova flavor-</command>
         commands to customize and manage flavors. To see the available
diff --git a/doc/common/section_cli_nova_evacuate.xml b/doc/common/section_cli_nova_evacuate.xml
index ac6bf5bb57..3dfb9afbdb 100644
--- a/doc/common/section_cli_nova_evacuate.xml
+++ b/doc/common/section_cli_nova_evacuate.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="nova_cli_evacuate">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova_cli_evacuate">
     <title>Evacuate instances</title>
     <para>If a cloud compute node fails due to a hardware malfunction or another reason, you can
         evacuate instances to make them available again. You can choose evacuation parameters for
diff --git a/doc/common/section_cli_nova_fileinjection.xml b/doc/common/section_cli_nova_fileinjection.xml
index 5af065f785..93398d28ad 100644
--- a/doc/common/section_cli_nova_fileinjection.xml
+++ b/doc/common/section_cli_nova_fileinjection.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="inserting_files">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="inserting_files">
 
 
   <title>Inject files into instances</title>
diff --git a/doc/common/section_cli_nova_get_console.xml b/doc/common/section_cli_nova_get_console.xml
index 5e59479567..d770398e36 100644
--- a/doc/common/section_cli_nova_get_console.xml
+++ b/doc/common/section_cli_nova_get_console.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="instance_console" xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="instance_console">
     <title>Access an instance through a console</title>
     <para>To access an instance through a VNC console, run the
         following command:</para> <screen><prompt>$</prompt> <userinput>nova get-vnc-console <replaceable>INSTANCE_NAME</replaceable> xvpvnc</userinput></screen>
diff --git a/doc/common/section_cli_nova_host_aggregates.xml b/doc/common/section_cli_nova_host_aggregates.xml
index b945f565e5..4d78398d1b 100644
--- a/doc/common/section_cli_nova_host_aggregates.xml
+++ b/doc/common/section_cli_nova_host_aggregates.xml
@@ -4,9 +4,10 @@
 %openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="host-aggregates">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="host-aggregates">
     <title>Host aggregates</title>
     <para>Host aggregates are a mechanism to further partition an
         availability zone; while availability zones are visible to
diff --git a/doc/common/section_cli_nova_images.xml b/doc/common/section_cli_nova_images.xml
index 3b8d96018a..a119305598 100644
--- a/doc/common/section_cli_nova_images.xml
+++ b/doc/common/section_cli_nova_images.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="nova_manage_images">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova_manage_images">
     <title>Manage images with the nova client</title>
     <para>You can use the nova client to list images, set and delete
         image metadata, delete images, and take a snapshot of a
diff --git a/doc/common/section_cli_nova_manage_images.xml b/doc/common/section_cli_nova_manage_images.xml
index 55d719bde0..ac954ee06a 100644
--- a/doc/common/section_cli_nova_manage_images.xml
+++ b/doc/common/section_cli_nova_manage_images.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="nova_manage_images">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova_manage_images">
     <title>Create an image (nova)</title>
     <para>You can use the <command>nova</command> client to take a snapshot of a
         running instance to create an image.</para>
diff --git a/doc/common/section_cli_nova_metadata.xml b/doc/common/section_cli_nova_metadata.xml
index 10eccf6353..6b0889cfdd 100644
--- a/doc/common/section_cli_nova_metadata.xml
+++ b/doc/common/section_cli_nova_metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- moved this information to "launch a server" section -->
-<section
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="inserting_metadata">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="inserting_metadata">
   <title>Insert metadata during launch</title>
   <para>When booting a server, you can also add metadata, so that you
   can more easily identify it amongst your ever-growing elastic
diff --git a/doc/common/section_cli_nova_quotas.xml b/doc/common/section_cli_nova_quotas.xml
index 87e43ceaad..ceacf2f0be 100644
--- a/doc/common/section_cli_nova_quotas.xml
+++ b/doc/common/section_cli_nova_quotas.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="cli_set_compute_quotas">
   <title>Manage Compute service quotas</title>
   <para>As an administrative user, you can use the <command>nova quota-*</command>
diff --git a/doc/common/section_cli_nova_reboot.xml b/doc/common/section_cli_nova_reboot.xml
index c628b3d7ea..0b811d57c3 100644
--- a/doc/common/section_cli_nova_reboot.xml
+++ b/doc/common/section_cli_nova_reboot.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="reboot" xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="reboot">
     <title>Reboot an instance</title>
 <para>You can soft or hard reboot a running instance. A soft reboot
         attempts a graceful shut down and restart of the instance. A
diff --git a/doc/common/section_cli_nova_resizerebuild.xml b/doc/common/section_cli_nova_resizerebuild.xml
index 850fd07404..1de145c314 100644
--- a/doc/common/section_cli_nova_resizerebuild.xml
+++ b/doc/common/section_cli_nova_resizerebuild.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="nova_cli_resize">
   <title>Change the size of your server</title>
   <para>You change the size of a server by changing its flavor.</para>
diff --git a/doc/common/section_cli_nova_search_ip.xml b/doc/common/section_cli_nova_search_ip.xml
index 3f46a5c192..7743db344a 100644
--- a/doc/common/section_cli_nova_search_ip.xml
+++ b/doc/common/section_cli_nova_search_ip.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section
-xmlns="http://docbook.org/ns/docbook"
-xmlns:xi="http://www.w3.org/2001/XInclude"
-xmlns:xlink="http://www.w3.org/1999/xlink"
-xml:id="search_ip" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="search_ip">
   <title>Search for an instance using IP address</title>
   <para>You can search for an instance using the IP address parameter,
       <literal>--ip</literal>, with the <command>nova list</command>
diff --git a/doc/common/section_cli_nova_secgroups.xml b/doc/common/section_cli_nova_secgroups.xml
index 4224321880..6c7ef4b50c 100644
--- a/doc/common/section_cli_nova_secgroups.xml
+++ b/doc/common/section_cli_nova_secgroups.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="nova_cli_security_groups">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova_cli_security_groups">
     <title>Add security group and rules</title>
     <para>The following procedure shows you how to add security groups
         and add rules to the default security group.</para>
diff --git a/doc/common/section_cli_nova_sshkeys.xml b/doc/common/section_cli_nova_sshkeys.xml
index 1378c69a55..69b011f145 100644
--- a/doc/common/section_cli_nova_sshkeys.xml
+++ b/doc/common/section_cli_nova_sshkeys.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="nova_cli_keygen">
   <title>Add keypair</title>
   <para>Create at least one keypair for each project. If you have
diff --git a/doc/common/section_cli_nova_startstop.xml b/doc/common/section_cli_nova_startstop.xml
index ae2ee857ba..c1e777e7e1 100644
--- a/doc/common/section_cli_nova_startstop.xml
+++ b/doc/common/section_cli_nova_startstop.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="nova_cli_stop_start">
   <title>Stop and start an instance</title>
   <para>Use one of the following methods to stop and start an
diff --git a/doc/common/section_cli_nova_terminate.xml b/doc/common/section_cli_nova_terminate.xml
index 217cee9c14..732971c304 100644
--- a/doc/common/section_cli_nova_terminate.xml
+++ b/doc/common/section_cli_nova_terminate.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="terminating">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="terminating">
   <title>Delete an instance</title>
   <para>When you no longer need an instance, you can delete it.</para>
 <procedure><step>
diff --git a/doc/common/section_cli_nova_usage_statistics.xml b/doc/common/section_cli_nova_usage_statistics.xml
index 3c9c268889..88a551c895 100644
--- a/doc/common/section_cli_nova_usage_statistics.xml
+++ b/doc/common/section_cli_nova_usage_statistics.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         version="5.0" xml:id="usage_statistics">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="usage_statistics">
   <title>Show usage statistics for hosts and instances</title>
   <para>You can show basic
         statistics on resource usage for hosts and instances.</para>
diff --git a/doc/common/section_cli_nova_userdata.xml b/doc/common/section_cli_nova_userdata.xml
index f4fba471b3..2295892215 100644
--- a/doc/common/section_cli_nova_userdata.xml
+++ b/doc/common/section_cli_nova_userdata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="inserting_userdata">
   <title>Provide user data to instances</title>
   <para>A <glossterm baseform="user data">user data</glossterm> file is a special key in the metadata service that
diff --git a/doc/common/section_cli_nova_volumes.xml b/doc/common/section_cli_nova_volumes.xml
index 30b1923fa8..63fcf997ca 100644
--- a/doc/common/section_cli_nova_volumes.xml
+++ b/doc/common/section_cli_nova_volumes.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="nova_cli_volumes">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova_cli_volumes">
   <title>Manage Volumes</title>
   <para>Depending on the setup of your cloud provider, they may give you an endpoint to use to
     manage volumes, or there may be an extension under the covers. In either case, you can use the
diff --git a/doc/common/section_cli_openrc.xml b/doc/common/section_cli_openrc.xml
index 5f2b802228..1705f26dcb 100644
--- a/doc/common/section_cli_openrc.xml
+++ b/doc/common/section_cli_openrc.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="cli_openrc">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_openrc">
     <?dbhtml stop-chunking?>
     <title>Set environment variables using the OpenStack RC
         file</title>
diff --git a/doc/common/section_cli_overview.xml b/doc/common/section_cli_overview.xml
index 1b415d5477..53970c338e 100644
--- a/doc/common/section_cli_overview.xml
+++ b/doc/common/section_cli_overview.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="section_cli_overview">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_cli_overview">
     <title>Overview</title>
     <para>
       Each OpenStack project provides a command-line client, which
diff --git a/doc/common/section_cli_version.xml b/doc/common/section_cli_version.xml
index 1440ba24c7..0e95e708dd 100644
--- a/doc/common/section_cli_version.xml
+++ b/doc/common/section_cli_version.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-        xml:id="checking_version_cli">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="checking_version_cli">
         <title>Discover the version number for a client</title>
         <para>Run the following command to discover the version number
                 for a client:</para>
diff --git a/doc/common/section_compute-configure-console.xml b/doc/common/section_compute-configure-console.xml
index 167dc65419..cbbbf415a6 100644
--- a/doc/common/section_compute-configure-console.xml
+++ b/doc/common/section_compute-configure-console.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="remote-console-access">
   <title>Configure remote console access</title>
   <!--<?dbhtml stop-chunking?>-->
diff --git a/doc/common/section_compute-configure-ec2.xml b/doc/common/section_compute-configure-ec2.xml
index abf03ba4bc..a707cf4b7f 100644
--- a/doc/common/section_compute-configure-ec2.xml
+++ b/doc/common/section_compute-configure-ec2.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="configuring-ec2-api"
-  xmlns="http://docbook.org/ns/docbook"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
+<section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configuring-ec2-api">
   <title>Configure the EC2 API</title>
   <para>You can set options in the <filename>nova.conf</filename>
     configuration file to control which network address and port the
diff --git a/doc/common/section_compute-configure-spice.xml b/doc/common/section_compute-configure-spice.xml
index 599a576464..b4eb9664c4 100644
--- a/doc/common/section_compute-configure-spice.xml
+++ b/doc/common/section_compute-configure-spice.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="spice-console">
   <title>SPICE console</title>
   <para>OpenStack Compute supports VNC consoles to guests. The VNC
diff --git a/doc/common/section_compute-configure-vnc.xml b/doc/common/section_compute-configure-vnc.xml
index b8bb9996b9..f6612bc1f1 100644
--- a/doc/common/section_compute-configure-vnc.xml
+++ b/doc/common/section_compute-configure-vnc.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="getting-started-with-vnc-proxy">
   <title>VNC console proxy</title>
   <para>The VNC proxy is an OpenStack component that enables compute
diff --git a/doc/common/section_compute_config-api.xml b/doc/common/section_compute_config-api.xml
index 371f40b843..6fd9d90ed2 100644
--- a/doc/common/section_compute_config-api.xml
+++ b/doc/common/section_compute_config-api.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="configuring-compute-API">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configuring-compute-API">
     <title>Configure the Compute API</title>
     <para>The Compute API, run by the <systemitem class="service"
             >nova-api</systemitem> daemon, is the component of
diff --git a/doc/common/section_compute_config-firewalls.xml b/doc/common/section_compute_config-firewalls.xml
index ba95cc5438..83163e248d 100644
--- a/doc/common/section_compute_config-firewalls.xml
+++ b/doc/common/section_compute_config-firewalls.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="default_ports">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="default_ports">
     <title>Compute service node firewall requirements</title>
     <para>Console connections for virtual machines, whether direct or through a proxy, are received
         on ports <literal>5900</literal> to <literal>5999</literal>. You must configure the firewall
diff --git a/doc/common/section_config_format.xml b/doc/common/section_config_format.xml
index 0c8a244bc7..04ddab5d0b 100644
--- a/doc/common/section_config_format.xml
+++ b/doc/common/section_config_format.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="config_format"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="config_format">
 
   <?dbhtml stop-chunking?>
   <title>Configuration file format</title>
diff --git a/doc/common/section_conventions.xml b/doc/common/section_conventions.xml
index 01aa08d5d8..4fd5d58df1 100644
--- a/doc/common/section_conventions.xml
+++ b/doc/common/section_conventions.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="section_conventions">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_conventions">
     <?dbhtml stop-chunking?>
     <title>Conventions</title>
     <para>The OpenStack documentation uses several typesetting
diff --git a/doc/common/section_dashboard-configure-http.xml b/doc/common/section_dashboard-configure-http.xml
index 0493616595..a3c567a95d 100644
--- a/doc/common/section_dashboard-configure-http.xml
+++ b/doc/common/section_dashboard-configure-http.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="configure-dashboard-http"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configure-dashboard-http">
     <title>Configure the dashboard for HTTP</title>
     <?dbhtml stop-chunking?>
     <para>You can configure the dashboard for a simple HTTP deployment. The standard installation
diff --git a/doc/common/section_dashboard-configure-https.xml b/doc/common/section_dashboard-configure-https.xml
index dc6cde5351..4c1e2e3dc1 100644
--- a/doc/common/section_dashboard-configure-https.xml
+++ b/doc/common/section_dashboard-configure-https.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="dashboard-config-https"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard-config-https">
     <title>Configure the dashboard for HTTPS</title>
     <para>You can configure the dashboard for a secured HTTPS
         deployment. While the standard installation uses a
diff --git a/doc/common/section_dashboard-configure-vnc-window.xml b/doc/common/section_dashboard-configure-vnc-window.xml
index 7555f4ba45..b9f882ab4e 100644
--- a/doc/common/section_dashboard-configure-vnc-window.xml
+++ b/doc/common/section_dashboard-configure-vnc-window.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="vnc-window"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="vnc-window">
     <title>Change the size of the dashboard VNC window</title>
     <para>The <filename>_detail_vnc.html</filename> file defines
         the size of the VNC window. To change the window size, edit
diff --git a/doc/common/section_dashboard-configure.xml b/doc/common/section_dashboard-configure.xml
index 16714c5d17..218e538b06 100644
--- a/doc/common/section_dashboard-configure.xml
+++ b/doc/common/section_dashboard-configure.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="configure-dashboard"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configure-dashboard">
     <title>Configure the dashboard</title>
     <?dbhtml stop-chunking?>
     <para>You can configure the dashboard for a simple HTTP
diff --git a/doc/common/section_dashboard_access.xml b/doc/common/section_dashboard_access.xml
index 63df27f90d..5616d7bb45 100644
--- a/doc/common/section_dashboard_access.xml
+++ b/doc/common/section_dashboard_access.xml
@@ -4,10 +4,10 @@
 %openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="log_in_dashboard">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="log_in_dashboard">
     <?dbhtml stop-chunking?>
     <title>Log in to the dashboard</title>
     <para>The dashboard is available on the node with the
diff --git a/doc/common/section_dashboard_customizing.xml b/doc/common/section_dashboard_customizing.xml
index 0a7be1b330..baf92cc6a3 100644
--- a/doc/common/section_dashboard_customizing.xml
+++ b/doc/common/section_dashboard_customizing.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="dashboard-custom-brand"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard-custom-brand">
     <title>Customize the dashboard</title>
     <para>Adapted from <link
             xlink:href="http://www.prestonlee.com/2012/05/09/how-to-custom-brand-the-openstack-horizon-dashboard/"
diff --git a/doc/common/section_dashboard_launch_instances_from_image.xml b/doc/common/section_dashboard_launch_instances_from_image.xml
index 9fc26aee94..a64fd58e17 100644
--- a/doc/common/section_dashboard_launch_instances_from_image.xml
+++ b/doc/common/section_dashboard_launch_instances_from_image.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="dashboard_launch_instances_from_image">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_launch_instances_from_image">
     <title>Launch an instance from an image</title>
     <?dbhtml stop-chunking?>
     <para>Instances are virtual machines that run inside the
diff --git a/doc/common/section_dashboard_sessions.xml b/doc/common/section_dashboard_sessions.xml
index 13eff1d594..ab4c3536fa 100644
--- a/doc/common/section_dashboard_sessions.xml
+++ b/doc/common/section_dashboard_sessions.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="dashboard-sessions"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard-sessions">
     <title>Set up session storage for the dashboard</title>
     <para>The dashboard uses <link
             xlink:href="https://docs.djangoproject.com/en/dev/topics/http/sessions/"
diff --git a/doc/common/section_dochistory.xml b/doc/common/section_dochistory.xml
index b6264fad49..ebab74dfcf 100644
--- a/doc/common/section_dochistory.xml
+++ b/doc/common/section_dochistory.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="doc_change_history"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="doc_change_history">
     <title>Document change history</title>
     <?dbhtml stop-chunking?>
     <para>This version of the guide replaces and obsoletes all
diff --git a/doc/common/section_fibrechannel.xml b/doc/common/section_fibrechannel.xml
index fffa1b28c6..8453051315 100644
--- a/doc/common/section_fibrechannel.xml
+++ b/doc/common/section_fibrechannel.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="fibrechannel">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="fibrechannel">
     <title>Fibre Channel support in Compute</title>
     <para>Fibre Channel support in OpenStack Compute is remote block
         storage attached to compute nodes for VMs.</para>
diff --git a/doc/common/section_getstart_block-storage.xml b/doc/common/section_getstart_block-storage.xml
index e37afa6219..cd3d40998a 100644
--- a/doc/common/section_getstart_block-storage.xml
+++ b/doc/common/section_getstart_block-storage.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="block-storage-service">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="block-storage-service">
       <title>OpenStack Block Storage</title>
       <para>The Openstack Block Storage service (cinder) adds
         persistent storage to a virtual machine. Block
diff --git a/doc/common/section_getstart_compute.xml b/doc/common/section_getstart_compute.xml
index 93abab9f5f..f27dca7e41 100644
--- a/doc/common/section_getstart_compute.xml
+++ b/doc/common/section_getstart_compute.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="compute-service">
   <title>OpenStack Compute</title>
   <para>Use OpenStack Compute to host and manage cloud computing
diff --git a/doc/common/section_getstart_conceptual_arch.xml b/doc/common/section_getstart_conceptual_arch.xml
index a7c223a779..cd24b0b374 100644
--- a/doc/common/section_getstart_conceptual_arch.xml
+++ b/doc/common/section_getstart_conceptual_arch.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="conceptual-architecture">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="conceptual-architecture">
     <title>Conceptual architecture</title>
     <para>The following diagram shows the relationships among the
         OpenStack services:</para>
diff --git a/doc/common/section_getstart_dashboard.xml b/doc/common/section_getstart_dashboard.xml
index 7beaf216dd..0e321d7215 100644
--- a/doc/common/section_getstart_dashboard.xml
+++ b/doc/common/section_getstart_dashboard.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="dashboard-service">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard-service">
       <title>OpenStack dashboard</title>
       <para>The OpenStack dashboard is a modular <link
           xlink:href="https://www.djangoproject.com/">Django web
diff --git a/doc/common/section_getstart_image.xml b/doc/common/section_getstart_image.xml
index ab540a8ef8..451247452c 100644
--- a/doc/common/section_getstart_image.xml
+++ b/doc/common/section_getstart_image.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="image-service-overview">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="image-service-overview">
       <title>OpenStack Image Service</title>
       <para>The OpenStack Image Service is central to Infrastructure-as-a-Service (IaaS)
         as shown in <xref linkend="conceptual-architecture"/>. It accepts API requests
diff --git a/doc/common/section_getstart_logical_arch.xml b/doc/common/section_getstart_logical_arch.xml
index 80b81a1de5..c7d43d1a6b 100644
--- a/doc/common/section_getstart_logical_arch.xml
+++ b/doc/common/section_getstart_logical_arch.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="logical-architecture">
   <title>Logical architecture</title>
   <para>To design, deploy, and configure OpenStack, administrators must understand the logical architecture.</para>
diff --git a/doc/common/section_getstart_networking.xml b/doc/common/section_getstart_networking.xml
index 39c4b955a4..af08cd395d 100644
--- a/doc/common/section_getstart_networking.xml
+++ b/doc/common/section_getstart_networking.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="networking-service-overview">
   <title>OpenStack Networking</title>
   <para>OpenStack Networking allows you to create and
diff --git a/doc/common/section_getstart_object-storage.xml b/doc/common/section_getstart_object-storage.xml
index 64f349ee53..c372abeef1 100644
--- a/doc/common/section_getstart_object-storage.xml
+++ b/doc/common/section_getstart_object-storage.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="object-storage-service">
   <title>OpenStack Object Storage</title>
   <para>The OpenStack Object Storage is a multi-tenant object storage system.
diff --git a/doc/common/section_getstart_orchestration.xml b/doc/common/section_getstart_orchestration.xml
index f84b5c66e6..8e08bf04b2 100644
--- a/doc/common/section_getstart_orchestration.xml
+++ b/doc/common/section_getstart_orchestration.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="orchestration-service">
   <title>Orchestration module concepts</title>
   <para>The Orchestration module provides a template-based
diff --git a/doc/common/section_getstart_telemetry.xml b/doc/common/section_getstart_telemetry.xml
index 9d3fe55666..2874a5bee6 100644
--- a/doc/common/section_getstart_telemetry.xml
+++ b/doc/common/section_getstart_telemetry.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="metering-service">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="metering-service">
       <title>Telemetry module</title>
       <para>The Telemetry module performs the following functions:</para>
       <para>
diff --git a/doc/common/section_getstart_trove.xml b/doc/common/section_getstart_trove.xml
index 1f5c0306f6..1f403621df 100644
--- a/doc/common/section_getstart_trove.xml
+++ b/doc/common/section_getstart_trove.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="trove-service">
   <title>Database service overview</title>
   <para>The Database service provides scalable and reliable cloud provisioning
diff --git a/doc/common/section_identity-troubleshooting.xml b/doc/common/section_identity-troubleshooting.xml
index e86c13094d..faf6f90334 100644
--- a/doc/common/section_identity-troubleshooting.xml
+++ b/doc/common/section_identity-troubleshooting.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="troubleshooting-identity-service"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="troubleshooting-identity-service">
     <title>Troubleshoot the Identity service</title>
     <para>To troubleshoot the Identity service, review the logs in the
             <filename>/var/log/keystone/keystone.log</filename> file.</para>
diff --git a/doc/common/section_keystone-concepts-domain-management.xml b/doc/common/section_keystone-concepts-domain-management.xml
index 3d8fb9aa58..d34f7e9c87 100644
--- a/doc/common/section_keystone-concepts-domain-management.xml
+++ b/doc/common/section_keystone-concepts-domain-management.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="identity-domains">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="identity-domains">
         <title>Domains</title>
     <para>A domain defines administrative boundaries for the management of Identity entities. A
         domain may represent an individual, company, or operator-owned space. It is used for
diff --git a/doc/common/section_keystone-concepts-group-management.xml b/doc/common/section_keystone-concepts-group-management.xml
index b0c000de5e..229fa938cc 100644
--- a/doc/common/section_keystone-concepts-group-management.xml
+++ b/doc/common/section_keystone-concepts-group-management.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="identity-groups">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="identity-groups">
         <title>Groups</title>
         <para>A group is a collection of users. Administrators can
         create groups and add users to them. Then, rather than assign
diff --git a/doc/common/section_keystone-concepts-service-management.xml b/doc/common/section_keystone-concepts-service-management.xml
index 034cfbd488..1c955de8e7 100644
--- a/doc/common/section_keystone-concepts-service-management.xml
+++ b/doc/common/section_keystone-concepts-service-management.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="keystone-service-mgmt">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="keystone-service-mgmt">
         <title>Service management</title>
       <para>The Identity Service provides
         identity, token, catalog, and policy services.
diff --git a/doc/common/section_keystone-concepts-user-management.xml b/doc/common/section_keystone-concepts-user-management.xml
index f2a822be74..2e395acfb1 100644
--- a/doc/common/section_keystone-concepts-user-management.xml
+++ b/doc/common/section_keystone-concepts-user-management.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="keystone-user-management">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="keystone-user-management">
     <title>User management</title>
     <para>The main components of Identity user management are:</para>
     <itemizedlist>
diff --git a/doc/common/section_keystone-concepts.xml b/doc/common/section_keystone-concepts.xml
index b61e7bb70e..becb709fe9 100644
--- a/doc/common/section_keystone-concepts.xml
+++ b/doc/common/section_keystone-concepts.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="keystone-concepts">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="keystone-concepts">
     <?dbhtml stop-chunking?>
     <title>OpenStack Identity concepts</title>
     <para>The OpenStack<glossterm>Identity Service</glossterm> performs the
diff --git a/doc/common/section_keystone-external-auth.xml b/doc/common/section_keystone-external-auth.xml
index d1ebbd7162..d663ac0e0f 100644
--- a/doc/common/section_keystone-external-auth.xml
+++ b/doc/common/section_keystone-external-auth.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="keystone-external-auth"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="keystone-external-auth">
     <?dbhtml stop-chunking?>
     <title>External authentication with Identity</title>
     <para>When Identity runs in <literal>apache-httpd</literal>, you
diff --git a/doc/common/section_keystone-ssl-config.xml b/doc/common/section_keystone-ssl-config.xml
index e3645a70d5..f930eace46 100644
--- a/doc/common/section_keystone-ssl-config.xml
+++ b/doc/common/section_keystone-ssl-config.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="keystone-ssl-config">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="keystone-ssl-config">
     <?dbhtml stop-chunking?>
     <title>Configure the Identity Service with SSL</title>
     <para>You can configure the Identity Service to support two-way
diff --git a/doc/common/section_keystone_certificates-for-pki.xml b/doc/common/section_keystone_certificates-for-pki.xml
index b83e1d0428..41f0d5daf9 100644
--- a/doc/common/section_keystone_certificates-for-pki.xml
+++ b/doc/common/section_keystone_certificates-for-pki.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="certificates-for-pki">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="certificates-for-pki">
     <?dbhtml stop-chunking?>
     <title>Certificates for PKI</title>
     <para>PKI stands for Public Key Infrastructure. Tokens are
diff --git a/doc/common/section_keystone_config_ldap-assignments.xml b/doc/common/section_keystone_config_ldap-assignments.xml
index 9ee3fff23a..72efe3aebb 100644
--- a/doc/common/section_keystone_config_ldap-assignments.xml
+++ b/doc/common/section_keystone_config_ldap-assignments.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="configuring-keystone-for-ldap-backend-assignments">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configuring-keystone-for-ldap-backend-assignments">
 <title>Separate role authorization and user authentication</title>
     <para>When you configure the Identity service to use an LDAP back
     end, you can split authentication and authorization using the
diff --git a/doc/common/section_keystone_config_ldap-hardening.xml b/doc/common/section_keystone_config_ldap-hardening.xml
index 4a30c04ded..fc92e5dd5d 100644
--- a/doc/common/section_keystone_config_ldap-hardening.xml
+++ b/doc/common/section_keystone_config_ldap-hardening.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="configuring-keystone-for-ldap-backend-harden">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configuring-keystone-for-ldap-backend-harden">
     <title>Secure the OpenStack Identity service connection to an
     LDAP back end</title>
     <para>The Identity service supports the use of TLS to encrypt LDAP
diff --git a/doc/common/section_keystone_config_ldap.xml b/doc/common/section_keystone_config_ldap.xml
index 50678089b5..84702294f3 100644
--- a/doc/common/section_keystone_config_ldap.xml
+++ b/doc/common/section_keystone_config_ldap.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="configuring-keystone-for-ldap-backend">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configuring-keystone-for-ldap-backend">
     <title>Integrate Identity with LDAP</title>
     <para>Identity Service supports integration with an existing LDAP
         directory for authentication and authorization
diff --git a/doc/common/section_keystone_db_sync.xml b/doc/common/section_keystone_db_sync.xml
index bc57a2b51b..cab9a788c7 100644
--- a/doc/common/section_keystone_db_sync.xml
+++ b/doc/common/section_keystone_db_sync.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="keystone-db_sync">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="keystone-db_sync">
     <title>Migrate the Identity Service database</title>
     <para>Between revisions of the Identity Service project, you might
         need to complete SQL migrations. The Identity Service project
diff --git a/doc/common/section_kvm_enable.xml b/doc/common/section_kvm_enable.xml
index 891ab518ca..073ad28c85 100644
--- a/doc/common/section_kvm_enable.xml
+++ b/doc/common/section_kvm_enable.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="section_kvm_enable">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_kvm_enable">
     <title>Enable KVM</title>
     <para>To perform these steps, you must be logged in as the
             <systemitem>root</systemitem> user.</para>
diff --git a/doc/common/section_objectstorage-account-reaper.xml b/doc/common/section_objectstorage-account-reaper.xml
index 7dc0451364..4be6751f34 100644
--- a/doc/common/section_objectstorage-account-reaper.xml
+++ b/doc/common/section_objectstorage-account-reaper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="section_objectstorage-account-reaper">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_objectstorage-account-reaper">
     <title>Account reaper</title>
     <para>In the background, the account reaper removes data from the deleted accounts.</para>
     <para>A reseller marks an account for deletion by issuing a <code>DELETE</code> request on the account’s
diff --git a/doc/common/section_objectstorage-arch.xml b/doc/common/section_objectstorage-arch.xml
index 8e1075ac81..a134a203ff 100644
--- a/doc/common/section_objectstorage-arch.xml
+++ b/doc/common/section_objectstorage-arch.xml
@@ -4,10 +4,10 @@
 %openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="section_objectstorage-cluster-architecture">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_objectstorage-cluster-architecture">
     <title>Cluster architecture</title>
     <section xml:id="section_access-tier">
         <title>Access tier</title>
diff --git a/doc/common/section_objectstorage-characteristics.xml b/doc/common/section_objectstorage-characteristics.xml
index 9bd6faf758..dbf80a8735 100644
--- a/doc/common/section_objectstorage-characteristics.xml
+++ b/doc/common/section_objectstorage-characteristics.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="objectstorage_characteristics">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="objectstorage_characteristics">
     <title>Object Storage characteristics</title>
     <para>The key characteristics of Object Storage are that:</para>
     <itemizedlist>
diff --git a/doc/common/section_objectstorage-components.xml b/doc/common/section_objectstorage-components.xml
index 3d45195e4e..ef53a40d5b 100644
--- a/doc/common/section_objectstorage-components.xml
+++ b/doc/common/section_objectstorage-components.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="section_objectstorage-components">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_objectstorage-components">
     <title>Components</title>
         <para>The components that enable Object Storage to deliver high availability, high
         durability, and high concurrency are:</para>
diff --git a/doc/common/section_objectstorage-features.xml b/doc/common/section_objectstorage-features.xml
index 8692fa7d4c..b477f0dbd4 100644
--- a/doc/common/section_objectstorage-features.xml
+++ b/doc/common/section_objectstorage-features.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="section_objectstorage_features">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_objectstorage_features">
     <title>Features and benefits</title>
 
     <informaltable>
diff --git a/doc/common/section_objectstorage-intro.xml b/doc/common/section_objectstorage-intro.xml
index 31db4a3583..c774fd0fcb 100644
--- a/doc/common/section_objectstorage-intro.xml
+++ b/doc/common/section_objectstorage-intro.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0"
-    xml:id="section_objectstorage-intro">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_objectstorage-intro">
     <title>Introduction to Object Storage</title>
     <para>OpenStack Object Storage (code-named swift) is open source software for creating
         redundant, scalable data storage using clusters of standardized servers to store petabytes
diff --git a/doc/common/section_objectstorage-replication.xml b/doc/common/section_objectstorage-replication.xml
index f180fa0bd8..7da90def90 100644
--- a/doc/common/section_objectstorage-replication.xml
+++ b/doc/common/section_objectstorage-replication.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="section_objectstorage-replication">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_objectstorage-replication">
     <title>Replication</title>
     <para>Because each replica in Object Storage functions
         independently and clients generally require only a simple
diff --git a/doc/common/section_objectstorage-ringbuilder.xml b/doc/common/section_objectstorage-ringbuilder.xml
index b68d9c3ed0..68e0f34291 100644
--- a/doc/common/section_objectstorage-ringbuilder.xml
+++ b/doc/common/section_objectstorage-ringbuilder.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="section_objectstorage-ringbuilder">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_objectstorage-ringbuilder">
     <title>Ring-builder</title>
     <para>Use the swift-ring-builder utility to build and manage rings. This
         utility assigns partitions to devices and writes an optimized
diff --git a/doc/common/section_objectstorage-troubleshoot.xml b/doc/common/section_objectstorage-troubleshoot.xml
index 308f251b59..01d6f19aaf 100644
--- a/doc/common/section_objectstorage-troubleshoot.xml
+++ b/doc/common/section_objectstorage-troubleshoot.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="troubleshooting-openstack-object-storage">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="troubleshooting-openstack-object-storage">
     <title>Troubleshoot Object Storage</title>
     <para>For Object Storage, everything is logged in <filename>/var/log/syslog</filename> (or messages on some distros).
         Several settings enable further customization of logging, such as <literal>log_name</literal>, <literal>log_facility</literal>,
diff --git a/doc/common/section_objectstorage_tenant-specific-image-storage.xml b/doc/common/section_objectstorage_tenant-specific-image-storage.xml
index 4da2d80feb..a15e305a43 100644
--- a/doc/common/section_objectstorage_tenant-specific-image-storage.xml
+++ b/doc/common/section_objectstorage_tenant-specific-image-storage.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="configuring-tenant-specific-storage-for-images">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configuring-tenant-specific-storage-for-images">
     <title>Configure tenant-specific image locations with Object
         Storage</title>
     <para>For some deployers, it is not ideal to store all images in
diff --git a/doc/common/section_rpc-for-networking.xml b/doc/common/section_rpc-for-networking.xml
index 988d4e28a7..2625167578 100644
--- a/doc/common/section_rpc-for-networking.xml
+++ b/doc/common/section_rpc-for-networking.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="networking-configuring-rpc">
   <?dbhtml stop-chunking?>
   <title>Configure the Oslo RPC messaging system</title>
diff --git a/doc/common/section_rpc.xml b/doc/common/section_rpc.xml
index 0aeb117de5..255a9afd2f 100644
--- a/doc/common/section_rpc.xml
+++ b/doc/common/section_rpc.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="configuring-rpc">
   <?dbhtml stop-chunking?>
   <title>Configure the Oslo RPC messaging system</title>
diff --git a/doc/common/section_storage-concepts.xml b/doc/common/section_storage-concepts.xml
index ed0ac80319..10c6305bba 100644
--- a/doc/common/section_storage-concepts.xml
+++ b/doc/common/section_storage-concepts.xml
@@ -5,7 +5,8 @@
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="storage-concepts">
   <title>Storage concepts</title>
   <para>The OpenStack stack uses the following storage types:</para>
diff --git a/doc/common/section_support-compute.xml b/doc/common/section_support-compute.xml
index f26d5c270b..b032ed0823 100644
--- a/doc/common/section_support-compute.xml
+++ b/doc/common/section_support-compute.xml
@@ -4,9 +4,10 @@
 %openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="section_compute-troubleshooting">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_compute-troubleshooting">
     <title>Troubleshoot Compute</title>
     <para>Common problems for Compute typically involve misconfigured
         networking or credentials that are not sourced properly in the
diff --git a/doc/common/section_trusted-compute-pools.xml b/doc/common/section_trusted-compute-pools.xml
index 9b91bad26b..04d3896087 100644
--- a/doc/common/section_trusted-compute-pools.xml
+++ b/doc/common/section_trusted-compute-pools.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="trusted-compute-pools">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="trusted-compute-pools">
     <title>Trusted compute pools</title>
     <para>Trusted compute pools enable administrators to designate a group of compute hosts as
         trusted. These hosts use hardware-based security features, such as the Intel Trusted
diff --git a/doc/common/section_user-data.xml b/doc/common/section_user-data.xml
index 143f21aa95..f586a15345 100644
--- a/doc/common/section_user-data.xml
+++ b/doc/common/section_user-data.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="user-data">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="user-data">
     <title>Configure instances at boot</title>
     <para>When you boot instances in an OpenStack cloud, you can use
         user data or <package>cloud-init</package> to automatically
diff --git a/doc/common/section_using-vnc-console.xml b/doc/common/section_using-vnc-console.xml
index 7c2df70203..fc6ad30a9a 100644
--- a/doc/common/section_using-vnc-console.xml
+++ b/doc/common/section_using-vnc-console.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="using-vnc-console">
   <title>Use the VNC console</title>
   <para>To interact through the VNC console, you can use a VNC client
diff --git a/doc/common/section_xapi-ami-setup.xml b/doc/common/section_xapi-ami-setup.xml
index 49efff49d2..69686c6dfa 100644
--- a/doc/common/section_xapi-ami-setup.xml
+++ b/doc/common/section_xapi-ami-setup.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="xapi-ami-setup">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="xapi-ami-setup">
     <?dbhtml stop-chunking?>
     <title>Prepare for AMI type images</title>
     <para>To support AMI type images in your OpenStack installation,
diff --git a/doc/common/section_xapi-install-plugins.xml b/doc/common/section_xapi-install-plugins.xml
index 6dcd8e7750..625a6f74f9 100644
--- a/doc/common/section_xapi-install-plugins.xml
+++ b/doc/common/section_xapi-install-plugins.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="xapi-install-plugins">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="xapi-install-plugins">
     <?dbhtml stop-chunking?>
     <title>Install the XenAPI plug-ins</title>
     <para>When you use Xen as the hypervisor for OpenStack Compute,
diff --git a/doc/common/section_xapi-resize-setup.xml b/doc/common/section_xapi-resize-setup.xml
index c71bcc913c..cb1bded7a6 100644
--- a/doc/common/section_xapi-resize-setup.xml
+++ b/doc/common/section_xapi-resize-setup.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="xapi-resize-setup">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="xapi-resize-setup">
     <?dbhtml stop-chunking?>
     <title>Modify Dom0 for resize/migration support</title>
     <para>To resize servers with XenServer and XCP, you must:</para>
diff --git a/doc/common/section_xen-install.xml b/doc/common/section_xen-install.xml
index 62e8151eff..e250bc2b37 100644
--- a/doc/common/section_xen-install.xml
+++ b/doc/common/section_xen-install.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="xenapi-install">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="xenapi-install">
     <title xml:id="xenapi-install.title">Install XenServer and
         XCP</title>
     <para>Before you can run OpenStack with XCP or XenServer, you must