diff --git a/doc/user-guide/app_cheat_sheet.xml b/doc/user-guide/app_cheat_sheet.xml
index 70a6da0b3b..762e481290 100644
--- a/doc/user-guide/app_cheat_sheet.xml
+++ b/doc/user-guide/app_cheat_sheet.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_cheat_sheet">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="app_cheat_sheet">
     <?dbhtml stop-chunking?>
     <title>OpenStack command-line interface cheat sheet</title>
 
diff --git a/doc/user-guide/bk-user-guide.xml b/doc/user-guide/bk-user-guide.xml
index 4aad53d0ad..10edc8c0d4 100644
--- a/doc/user-guide/bk-user-guide.xml
+++ b/doc/user-guide/bk-user-guide.xml
@@ -2,9 +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-user-guide">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="os-user-guide">
     <title>OpenStack End User Guide</title>
     <titleabbrev>End User Guide</titleabbrev>
     <info>
diff --git a/doc/user-guide/ch_cli.xml b/doc/user-guide/ch_cli.xml
index 7ffa123ca1..1339bd34bd 100644
--- a/doc/user-guide/ch_cli.xml
+++ b/doc/user-guide/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="ch_cli">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_cli">
     <info>
         <title>OpenStack command-line clients</title>
     </info>
diff --git a/doc/user-guide/ch_dashboard.xml b/doc/user-guide/ch_dashboard.xml
index 17cb1e48d0..b8ac942879 100644
--- a/doc/user-guide/ch_dashboard.xml
+++ b/doc/user-guide/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>OpenStack dashboard</title>
     </info>
diff --git a/doc/user-guide/ch_sdk.xml b/doc/user-guide/ch_sdk.xml
index 8a006efe07..aa6dd7d8a3 100644
--- a/doc/user-guide/ch_sdk.xml
+++ b/doc/user-guide/ch_sdk.xml
@@ -1,7 +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" xml:id="ch_sdk">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_sdk">
   <info>
     <title>OpenStack Python SDK</title>
   </info>
diff --git a/doc/user-guide/section_cli_ceilometer.xml b/doc/user-guide/section_cli_ceilometer.xml
index 8c0d7a1a42..85a156e9fd 100644
--- a/doc/user-guide/section_cli_ceilometer.xml
+++ b/doc/user-guide/section_cli_ceilometer.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="ceilometer_cli_commands">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ceilometer_cli_commands">
     <title>Measure cloud resources</title>
     <para>Telemetry measures cloud resources in OpenStack. It collects data related to billing. Currently, this metering service is available through
         only the <command>ceilometer</command> command-line client.</para>
diff --git a/doc/user-guide/section_cli_heat.xml b/doc/user-guide/section_cli_heat.xml
index e8370062bf..923b48cb82 100644
--- a/doc/user-guide/section_cli_heat.xml
+++ b/doc/user-guide/section_cli_heat.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="heat-stack-create">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="heat-stack-create">
     <?dbhtml stop-chunking?>
     <title>Create and manage stacks</title>
     <para>The Orchestration module enables you to orchestrate multiple composite cloud applications.
diff --git a/doc/user-guide/section_cli_nova_config-drive.xml b/doc/user-guide/section_cli_nova_config-drive.xml
index a9ee085800..e94497294c 100644
--- a/doc/user-guide/section_cli_nova_config-drive.xml
+++ b/doc/user-guide/section_cli_nova_config-drive.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="config-drive">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="config-drive">
     <title>Store metadata on a configuration drive</title>
     <para>You can configure OpenStack to write metadata to a special
         configuration drive that attaches to the instance when it boots. The
diff --git a/doc/user-guide/section_cli_nova_configure_instances.xml b/doc/user-guide/section_cli_nova_configure_instances.xml
index 3d2918bc11..a8ef47ce28 100644
--- a/doc/user-guide/section_cli_nova_configure_instances.xml
+++ b/doc/user-guide/section_cli_nova_configure_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="cli_configure_instances">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_configure_instances">
     <title>Configure access and security for instances</title>
     <?dbhtml stop-chunking?>
     <para>When you launch a virtual machine, you can inject a <emphasis
diff --git a/doc/user-guide/section_cli_nova_floating_ips.xml b/doc/user-guide/section_cli_nova_floating_ips.xml
index 6807259178..591b8ebdb3 100644
--- a/doc/user-guide/section_cli_nova_floating_ips.xml
+++ b/doc/user-guide/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 and can also have a public, or floating,
         address. Private IP addresses are used for communication between instances, and public
diff --git a/doc/user-guide/section_cli_nova_manage_instances.xml b/doc/user-guide/section_cli_nova_manage_instances.xml
index 47ce6f7465..8e9106f9b5 100644
--- a/doc/user-guide/section_cli_nova_manage_instances.xml
+++ b/doc/user-guide/section_cli_nova_manage_instances.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_instances">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_manage_instances">
     <title>Manage instances and hosts</title>
     <para>Instances are virtual machines that run inside the cloud on
         physical compute nodes. The Compute service manages instances.
diff --git a/doc/user-guide/section_cli_nova_migrate_instances.xml b/doc/user-guide/section_cli_nova_migrate_instances.xml
index 579ea1af4b..3a0707e803 100644
--- a/doc/user-guide/section_cli_nova_migrate_instances.xml
+++ b/doc/user-guide/section_cli_nova_migrate_instances.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_migrate_instances">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="cli_migrate_instances">
     <?dbhtml stop-chunking?>
     <title>Use snapshots to migrate instances</title>
     <para>To use snapshots to migrate instances from OpenStack projects to clouds, complete these steps.</para>
diff --git a/doc/user-guide/section_cli_swift_howto.xml b/doc/user-guide/section_cli_swift_howto.xml
index cfb07f5f9c..4d2d84b087 100644
--- a/doc/user-guide/section_cli_swift_howto.xml
+++ b/doc/user-guide/section_cli_swift_howto.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="managing-openstack-object-storage-with-swift-cli">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="managing-openstack-object-storage-with-swift-cli">
     <title>Manage objects and containers</title>
     <?dbhtml stop-chunking?>
     <para>The OpenStack Object Storage service provides the
diff --git a/doc/user-guide/section_cli_trove.xml b/doc/user-guide/section_cli_trove.xml
index d9c8cbdde2..e27f5d4734 100644
--- a/doc/user-guide/section_cli_trove.xml
+++ b/doc/user-guide/section_cli_trove.xml
@@ -4,10 +4,10 @@
 %openstack;
 ]>
 <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="trove-manage-db">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="trove-manage-db">
     <?dbhtml stop-chunking?>
     <title>Create and manage databases</title>
     <para>The Database service provides scalable and reliable cloud provisioning functionality for both relational and non-relational database engines. Users can quickly and easily use database features without the burden of handling complex administrative tasks.</para>
diff --git a/doc/user-guide/section_dashboard_access_and_security.xml b/doc/user-guide/section_dashboard_access_and_security.xml
index 3456d6d7ee..e982564662 100644
--- a/doc/user-guide/section_dashboard_access_and_security.xml
+++ b/doc/user-guide/section_dashboard_access_and_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="Launching_Instances_using_Dashboard">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="Launching_Instances_using_Dashboard">
     <title>Configure access and security for instances</title>
     <?dbhtml stop-chunking?>
     <para>Before you launch an instance, you should add security group rules to
diff --git a/doc/user-guide/section_dashboard_create_networks.xml b/doc/user-guide/section_dashboard_create_networks.xml
index cf9105cc74..49dc5a4256 100644
--- a/doc/user-guide/section_dashboard_create_networks.xml
+++ b/doc/user-guide/section_dashboard_create_networks.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_create_networks">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_create_networks">
     <title>Create and manage networks</title>
     <?dbhtml stop-chunking?>
       <para>The OpenStack Networking service provides a scalable
diff --git a/doc/user-guide/section_dashboard_launch_instances.xml b/doc/user-guide/section_dashboard_launch_instances.xml
index 483bcd89e3..f1f9c025ce 100644
--- a/doc/user-guide/section_dashboard_launch_instances.xml
+++ b/doc/user-guide/section_dashboard_launch_instances.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">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_launch_instances">
     <title>Launch and manage instances</title>
     <para>Instances are virtual machines that run inside the
         cloud.</para>
diff --git a/doc/user-guide/section_dashboard_launch_instances_from_image.xml b/doc/user-guide/section_dashboard_launch_instances_from_image.xml
index cfc2c8805b..4e2b25f7c8 100644
--- a/doc/user-guide/section_dashboard_launch_instances_from_image.xml
+++ b/doc/user-guide/section_dashboard_launch_instances_from_image.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_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</title>
     <?dbhtml stop-chunking?>
     <para>When you launch an instance from an image, OpenStack creates a local
diff --git a/doc/user-guide/section_dashboard_manage_containers.xml b/doc/user-guide/section_dashboard_manage_containers.xml
index 1f45d136c5..3c1e159265 100644
--- a/doc/user-guide/section_dashboard_manage_containers.xml
+++ b/doc/user-guide/section_dashboard_manage_containers.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:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="dashboard_manage_containers">
     <title>Create and manage object containers</title>
     <?dbhtml stop-chunking?>
diff --git a/doc/user-guide/section_dashboard_manage_images.xml b/doc/user-guide/section_dashboard_manage_images.xml
index 58aa8c96b1..bfa6faa3df 100644
--- a/doc/user-guide/section_dashboard_manage_images.xml
+++ b/doc/user-guide/section_dashboard_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">
   <title>Upload and manage images</title>
   <para>A virtual machine image, referred to in this document simply
diff --git a/doc/user-guide/section_dashboard_manage_volumes.xml b/doc/user-guide/section_dashboard_manage_volumes.xml
index ef58dace09..7796717a1c 100644
--- a/doc/user-guide/section_dashboard_manage_volumes.xml
+++ b/doc/user-guide/section_dashboard_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">
     <title>Create and manage volumes</title>
     <?dbhtml stop-chunking?>
     <para>Volumes are block storage devices that you attach to
diff --git a/doc/user-guide/section_dashboard_stacks.xml b/doc/user-guide/section_dashboard_stacks.xml
index 3ef2c824a8..3c985d8e01 100644
--- a/doc/user-guide/section_dashboard_stacks.xml
+++ b/doc/user-guide/section_dashboard_stacks.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_stacks">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="dashboard_stacks">
     <title>Launch and manage stacks</title>
     <?dbhtml stop-chunking?>
     <para>OpenStack Orchestration is a service that you can use to
diff --git a/doc/user-guide/section_sdk_auth_glance.xml b/doc/user-guide/section_sdk_auth_glance.xml
index 2557ee5d37..ccfc08cded 100644
--- a/doc/user-guide/section_sdk_auth_glance.xml
+++ b/doc/user-guide/section_sdk_auth_glance.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="sdk_auth_glance">
   <title>Authenticate against an Image Service endpoint</title>
   <para>To authenticate against an Image Service endpoint, instantiate
diff --git a/doc/user-guide/section_sdk_auth_keystone.xml b/doc/user-guide/section_sdk_auth_keystone.xml
index 6a25fa20ea..fdf224a12b 100644
--- a/doc/user-guide/section_sdk_auth_keystone.xml
+++ b/doc/user-guide/section_sdk_auth_keystone.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="sdk_auth_keystone">
   <title>Authenticate against an Identity endpoint</title>
   <para>To authenticate against the Identity v2.0 endpoint,
diff --git a/doc/user-guide/section_sdk_auth_neutron.xml b/doc/user-guide/section_sdk_auth_neutron.xml
index ac065a645e..2a7782fa66 100644
--- a/doc/user-guide/section_sdk_auth_neutron.xml
+++ b/doc/user-guide/section_sdk_auth_neutron.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="sdk_auth_neutron">
   <title>Authenticate against a Networking endpoint</title>
   <para>To authenticate against a Networking endpoint, instantiate a
diff --git a/doc/user-guide/section_sdk_auth_nova.xml b/doc/user-guide/section_sdk_auth_nova.xml
index 00b54dde41..eef0731df4 100644
--- a/doc/user-guide/section_sdk_auth_nova.xml
+++ b/doc/user-guide/section_sdk_auth_nova.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="sdk_auth_nova">
   <title>Authenticate against a Compute endpoint</title>
   <para>To authenticate against a Compute endpoint, instantiate a
diff --git a/doc/user-guide/section_sdk_authenticate.xml b/doc/user-guide/section_sdk_authenticate.xml
index da9658fa20..e21f607984 100644
--- a/doc/user-guide/section_sdk_authenticate.xml
+++ b/doc/user-guide/section_sdk_authenticate.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="sdk_auth">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="sdk_auth">
   <title>Authenticate</title>
   <para>When using the SDK, you must authenticate against an OpenStack
     endpoint before you can use OpenStack services. Each project uses
diff --git a/doc/user-guide/section_sdk_configure_instances.xml b/doc/user-guide/section_sdk_configure_instances.xml
index 298289642d..a5d6b586ed 100644
--- a/doc/user-guide/section_sdk_configure_instances.xml
+++ b/doc/user-guide/section_sdk_configure_instances.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="sdk_configure_instances">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="sdk_configure_instances">
     <title>Configure access and security for instances</title>
     <para>When working with images in the SDK, you will call
             <literal>novaclient</literal> methods.</para>
diff --git a/doc/user-guide/section_sdk_install.xml b/doc/user-guide/section_sdk_install.xml
index a41b71cfe4..4f57963165 100644
--- a/doc/user-guide/section_sdk_install.xml
+++ b/doc/user-guide/section_sdk_install.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="sdk_install">
   <title>Install the OpenStack SDK</title>
   <para>Each OpenStack project has its own Python library. These
diff --git a/doc/user-guide/section_sdk_manage_images.xml b/doc/user-guide/section_sdk_manage_images.xml
index f6f2dd0223..24d8849e0c 100644
--- a/doc/user-guide/section_sdk_manage_images.xml
+++ b/doc/user-guide/section_sdk_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="sdk_manage_images">
   <?dbhtml stop-chunking?>
   <title>Manage images</title>
diff --git a/doc/user-guide/section_sdk_neutron.xml b/doc/user-guide/section_sdk_neutron.xml
index 3c9cbc9b25..c22ce38e3f 100644
--- a/doc/user-guide/section_sdk_neutron.xml
+++ b/doc/user-guide/section_sdk_neutron.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="sdk_neutron_apis">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="sdk_neutron_apis">
     <title>Networking</title>
     <?dbhtml stop-chunking?>
     <para>To use the information in this section, you should have a
diff --git a/doc/user-guide/section_sdk_nova.xml b/doc/user-guide/section_sdk_nova.xml
index 34776fdfaf..8ab6622e5a 100644
--- a/doc/user-guide/section_sdk_nova.xml
+++ b/doc/user-guide/section_sdk_nova.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="sdk_compute_apis">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="sdk_compute_apis">
     <title>Compute</title>
     <?dbhtml stop-chunking?>
     <para>To use the information in this section, you must be familiar with OpenStack Compute.</para>