diff --git a/doc/user-guide-admin/bk-admin-user-guide.xml b/doc/user-guide-admin/bk-admin-user-guide.xml
index 9d2321e5f8..0128dc16de 100644
--- a/doc/user-guide-admin/bk-admin-user-guide.xml
+++ b/doc/user-guide-admin/bk-admin-user-guide.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE book [
 ]>
 <book 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="os-admin-user-guide">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="os-admin-user-guide">
     <title>OpenStack Admin User Guide</title>
     <titleabbrev>Admin User Guide</titleabbrev>
     <info>
diff --git a/doc/user-guide-admin/ch_cli.xml b/doc/user-guide-admin/ch_cli.xml
index 9cd68ddc1d..6eb971c92c 100644
--- a/doc/user-guide-admin/ch_cli.xml
+++ b/doc/user-guide-admin/ch_cli.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE chapter [
 ]>
 <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="admin_ch_cli">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="admin_ch_cli">
     <info>
         <title>OpenStack command-line clients</title>
     </info>
diff --git a/doc/user-guide-admin/ch_dashboard.xml b/doc/user-guide-admin/ch_dashboard.xml
index 9db62ae0fc..f9e0046d78 100644
--- a/doc/user-guide-admin/ch_dashboard.xml
+++ b/doc/user-guide-admin/ch_dashboard.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE chapter [
 ]>
 <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_dashboard">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_dashboard">
     <info>
         <title>Dashboard</title>
     </info>
diff --git a/doc/user-guide-admin/section_cli_admin_manage_environment.xml b/doc/user-guide-admin/section_cli_admin_manage_environment.xml
index 17fe95e2e3..40522350f9 100644
--- a/doc/user-guide-admin/section_cli_admin_manage_environment.xml
+++ b/doc/user-guide-admin/section_cli_admin_manage_environment.xml
@@ -1,7 +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_admin_manage_environment">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_cli_admin_manage_environment">
     <title>Manage the OpenStack environment</title>
     <para>This section includes tasks specific to the OpenStack environment.</para>
     <xi:include href="section_cli_nova_specify_host.xml"/>
diff --git a/doc/user-guide-admin/section_cli_admin_manage_stacks.xml b/doc/user-guide-admin/section_cli_admin_manage_stacks.xml
index ed5df7a64b..242aa4fa06 100644
--- a/doc/user-guide-admin/section_cli_admin_manage_stacks.xml
+++ b/doc/user-guide-admin/section_cli_admin_manage_stacks.xml
@@ -1,7 +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_admin_manage_stacks">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_cli_admin_manage_stacks">
     <title>Launch and manage stacks</title>
     <para>The Orchestration service provides a template-based orchestration engine
         for the OpenStack cloud, which can be used to create and manage cloud
diff --git a/doc/user-guide-admin/section_cli_cinder_quotas.xml b/doc/user-guide-admin/section_cli_cinder_quotas.xml
index 1e2db166c7..6fc40e65ae 100644
--- a/doc/user-guide-admin/section_cli_cinder_quotas.xml
+++ b/doc/user-guide-admin/section_cli_cinder_quotas.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="cli_set_block_storage_quotas"
-    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="cli_set_block_storage_quotas">
     <title>Manage Block Storage service quotas</title>
     <para>As an administrative user, you can update the OpenStack Block
         Storage service quotas for a project. You can also update the quota
diff --git a/doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml b/doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml
index 66b097f519..72901f3254 100644
--- a/doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml
+++ b/doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.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="admin_cli_manage_projects_users">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="admin_cli_manage_projects_users">
     <?dbhtml stop-chunking?>
     <title>Manage projects, users, and roles</title>
     <para>As a cloud administrator, you manage projects, users, and
diff --git a/doc/user-guide-admin/section_cli_keystone_set_quotas.xml b/doc/user-guide-admin/section_cli_keystone_set_quotas.xml
index ab74393f17..fde0fb7862 100644
--- a/doc/user-guide-admin/section_cli_keystone_set_quotas.xml
+++ b/doc/user-guide-admin/section_cli_keystone_set_quotas.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="cli_set_quotas">
 <?dbhtml stop-chunking?>
   <title>Manage quotas</title>
diff --git a/doc/user-guide-admin/section_cli_manage_services.xml b/doc/user-guide-admin/section_cli_manage_services.xml
index a758c0f92c..58442e7804 100644
--- a/doc/user-guide-admin/section_cli_manage_services.xml
+++ b/doc/user-guide-admin/section_cli_manage_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="section_cli_manage_services">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_cli_manage_services">
     <?dbhtml stop-chunking?>
     <title>Manage services</title>
     <xi:include href="../common/section_cli_keystone_services.xml"/>
diff --git a/doc/user-guide-admin/section_cli_nova_floating_ips.xml b/doc/user-guide-admin/section_cli_nova_floating_ips.xml
index 78a8543ada..8be7a17505 100644
--- a/doc/user-guide-admin/section_cli_nova_floating_ips.xml
+++ b/doc/user-guide-admin/section_cli_nova_floating_ips.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="manage_ip_addresses"
-    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="manage_ip_addresses">
     <title>Manage IP addresses</title>
     <para>Each instance has a private, fixed IP address (assigned when launched) and can also have a
         public, or floating, address. Private IP addresses are used for communication between
diff --git a/doc/user-guide-admin/section_cli_nova_host_servers_migrate.xml b/doc/user-guide-admin/section_cli_nova_host_servers_migrate.xml
index 1f48e27272..368e0d6ebb 100644
--- a/doc/user-guide-admin/section_cli_nova_host_servers_migrate.xml
+++ b/doc/user-guide-admin/section_cli_nova_host_servers_migrate.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_host_servers_migrate">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova_cli_host_servers_migrate">
     <title>Migrate all instances to another compute host</title>
     <para>When you want to move all instances from one compute host to
         another, you can use the <command>nova
diff --git a/doc/user-guide-admin/section_cli_nova_manage_flavors.xml b/doc/user-guide-admin/section_cli_nova_manage_flavors.xml
index 2c8d7d284d..a0be857b67 100644
--- a/doc/user-guide-admin/section_cli_nova_manage_flavors.xml
+++ b/doc/user-guide-admin/section_cli_nova_manage_flavors.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_flavors">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_manage_flavors">
     <?dbhtml stop-chunking?>
     <title>Manage flavors</title>
     <para>In OpenStack, flavors define the compute, memory, and
diff --git a/doc/user-guide-admin/section_cli_nova_manage_projects_security.xml b/doc/user-guide-admin/section_cli_nova_manage_projects_security.xml
index 48af2d9288..521091b976 100644
--- a/doc/user-guide-admin/section_cli_nova_manage_projects_security.xml
+++ b/doc/user-guide-admin/section_cli_nova_manage_projects_security.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_manage_projects_security">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova_cli_manage_projects_security">
     <?dbhtml stop-chunking?>
     <title>Manage project security</title>
     <para>Security groups are sets of IP filter rules that are applied
diff --git a/doc/user-guide-admin/section_cli_nova_migrate.xml b/doc/user-guide-admin/section_cli_nova_migrate.xml
index 6542c4977f..1e65b229c0 100644
--- a/doc/user-guide-admin/section_cli_nova_migrate.xml
+++ b/doc/user-guide-admin/section_cli_nova_migrate.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_migrate_single">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova_cli_migrate_single">
     <title>Migrate single instance to another compute host</title>
     <para>When you want to move an instance from one compute host to another,
         you can use the <command>nova migrate</command> command. The scheduler
diff --git a/doc/user-guide-admin/section_cli_nova_services.xml b/doc/user-guide-admin/section_cli_nova_services.xml
index 1682de76bc..9226d51ba0 100644
--- a/doc/user-guide-admin/section_cli_nova_services.xml
+++ b/doc/user-guide-admin/section_cli_nova_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="nova-manage-services">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nova-manage-services">
     <title>Manage Compute services</title>
     <para>You can enable and disable Compute services. The following
         examples disable and enable the <systemitem class="service"
diff --git a/doc/user-guide-admin/section_cli_nova_specify_host.xml b/doc/user-guide-admin/section_cli_nova_specify_host.xml
index f64addc5c9..6ccab704a3 100644
--- a/doc/user-guide-admin/section_cli_nova_specify_host.xml
+++ b/doc/user-guide-admin/section_cli_nova_specify_host.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="specify-host-to-boot-instances-on">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="specify-host-to-boot-instances-on">
     <title>Select hosts where instances are launched</title>
     <para>With the appropriate permissions, you can select which
         host instances are launched on and which roles can boot instances
diff --git a/doc/user-guide-admin/section_cli_swift_analyze_log_files.xml b/doc/user-guide-admin/section_cli_swift_analyze_log_files.xml
index 279a247e1e..b1b8a2fdc4 100644
--- a/doc/user-guide-admin/section_cli_swift_analyze_log_files.xml
+++ b/doc/user-guide-admin/section_cli_swift_analyze_log_files.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="analyzing-log-files-with-swift-cli">
+<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="analyzing-log-files-with-swift-cli">
     <title>Analyze log files</title>
     <para>Use the swift command-line client to analyze log files.</para>
     <para>The swift client is simple to use, scalable, and flexible.</para><para>Use the swift client <option>-o</option> or
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml b/doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml
index 51b64f9fbc..cb0ebbb6e9 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_flavors.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_flavors.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_manage_flavors">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_manage_flavors">
     <?dbhtml stop-chunking?>
     <title>Manage flavors</title>
     <para>In OpenStack, a flavor defines the compute, memory, and storage
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_host_aggregates.xml b/doc/user-guide-admin/section_dashboard_admin_manage_host_aggregates.xml
index 7e6f4d6aac..5e03539fbb 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_host_aggregates.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_host_aggregates.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="dashboard_manage_host_aggregates">
   <?dbhtml stop-chunking?>
   <title>Create and manage host aggregates</title>
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_images.xml b/doc/user-guide-admin/section_dashboard_admin_manage_images.xml
index cce43b088a..ebe256ca54 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_images.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_images.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="dashboard_manage_images">
   <?dbhtml stop-chunking?>
   <title>Create and manage images</title>
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml b/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
index 6d3137a26e..8d84cb3220 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_instances.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="dashboard_manage_instances">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_manage_instances">
     <?dbhtml stop-chunking?>
     <title>Manage instances</title>
     <para>As an administrative user, you can manage instances for
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_projects_security.xml b/doc/user-guide-admin/section_dashboard_admin_manage_projects_security.xml
index 6d7a125365..ac77a317f5 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_projects_security.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_projects_security.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_manage_projects_security">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_manage_projects_security">
     <?dbhtml stop-chunking?>
     <title>Manage project security</title>
     <para>Security groups are sets of IP filter rules that define networking
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_projects_users.xml b/doc/user-guide-admin/section_dashboard_admin_manage_projects_users.xml
index 57aecb1e8e..9ece42db3b 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_projects_users.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_projects_users.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_manage_projects_users">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_manage_projects_users">
     <?dbhtml stop-chunking?>
     <title>Manage projects and users</title>
     <para>As an OpenStack cloud administrator, you manage both
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_resources.xml b/doc/user-guide-admin/section_dashboard_admin_manage_resources.xml
index ea4e7a736e..ee09a2d8f3 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_resources.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_resources.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="section_dashboard_admin_manage_resources">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_dashboard_admin_manage_resources">
     <title>View cloud resources</title>
     <xi:include href="section_dashboard_admin_manage_services.xml"/>
     <xi:include href="section_dashboard_admin_view_cloud_resources.xml"/>
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_roles.xml b/doc/user-guide-admin/section_dashboard_admin_manage_roles.xml
index ef4afd18e4..b29de796be 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_roles.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_roles.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="section_dashboard_admin_manage_roles">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_dashboard_admin_manage_roles">
     <?dbhtml stop-chunking?>
     <title>Create and manage roles</title>
     <para>A role is a personality that a user assumes to perform a specific set
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_services.xml b/doc/user-guide-admin/section_dashboard_admin_manage_services.xml
index 062ecd1492..b21bbff03d 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_services.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_services.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook" 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_view_services">
   <title>View services information</title>
   <para>As an administrative user, you can view information for
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_stacks.xml b/doc/user-guide-admin/section_dashboard_admin_manage_stacks.xml
index 0d2f019106..1d03d2c628 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_stacks.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_stacks.xml
@@ -1,7 +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_dashboard_admin_manage_stacks">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_dashboard_admin_manage_stacks">
     <title>Launch and manage stacks</title>
     <para>The Orchestration service provides a template-based orchestration engine
         for the OpenStack cloud, which can be used to create and manage cloud
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml b/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml
index 9eafd72799..f252689330 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_volumes.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_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="dashboard_manage_volumes">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_manage_volumes">
     <?dbhtml stop-chunking?>
     <title>Manage volumes and volume types</title>
     <para>Volumes are the Block Storage devices that you attach to
diff --git a/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml b/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml
index a900627b5a..908a6cea7e 100644
--- a/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml
@@ -3,9 +3,10 @@
 <!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
 %openstack;
 ]>
-<section xmlns="http://docbook.org/ns/docbook" 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_set_quotas">
   <?dbhtml stop-chunking?>
   <title>View and manage quotas</title>
diff --git a/doc/user-guide-admin/section_dashboard_admin_view_cloud_resources.xml b/doc/user-guide-admin/section_dashboard_admin_view_cloud_resources.xml
index 5bd183d568..a68d05243b 100644
--- a/doc/user-guide-admin/section_dashboard_admin_view_cloud_resources.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_view_cloud_resources.xml
@@ -1,8 +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="section_ceilometer_dashboard">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_ceilometer_dashboard">
     <title>View cloud usage statistics</title>
     <para>The Telemetry module provides user-level usage data for OpenStack-based clouds,
         which can be used for customer billing, system monitoring, or alerts. Data can be