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

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: I1e0804e2c5021bd78b77483f3156c5b069453555
---
 doc/install-guide/app_reserved_uids.xml                  | 7 ++++---
 doc/install-guide/bk-openstack-install-guide.xml         | 9 ++++-----
 doc/install-guide/ch_basics.xml                          | 4 +++-
 doc/install-guide/ch_ceilometer.xml                      | 7 ++++---
 doc/install-guide/ch_cinder.xml                          | 3 ++-
 doc/install-guide/ch_clients.xml                         | 7 ++++---
 doc/install-guide/ch_debconf.xml                         | 7 ++++---
 doc/install-guide/ch_glance.xml                          | 3 ++-
 doc/install-guide/ch_heat.xml                            | 3 ++-
 doc/install-guide/ch_horizon.xml                         | 3 ++-
 doc/install-guide/ch_keystone.xml                        | 7 ++++---
 doc/install-guide/ch_launch-instance.xml                 | 3 ++-
 doc/install-guide/ch_networking.xml                      | 3 ++-
 doc/install-guide/ch_nova.xml                            | 3 ++-
 doc/install-guide/ch_overview.xml                        | 3 ++-
 doc/install-guide/ch_swift.xml                           | 3 ++-
 doc/install-guide/ch_trove.xml                           | 7 ++++---
 .../section_object-storage-adding-proxy-server.xml       | 9 +++++----
 .../section_object-storage-example-install-arch.xml      | 9 +++++----
 .../section_object-storage-install-config-proxy-node.xml | 9 +++++----
 ...ction_object-storage-install-config-storage-nodes.xml | 9 +++++----
 .../object-storage/section_object-storage-install.xml    | 9 +++++----
 .../section_object-storage-network-planning.xml          | 7 ++++---
 .../section_object-storage-sys-requirements.xml          | 9 +++++----
 .../section_object-storage-verifying-install.xml         | 9 +++++----
 .../section_start-storage-node-services.xml              | 9 +++++----
 doc/install-guide/section_basics-database.xml            | 3 ++-
 doc/install-guide/section_basics-networking-neutron.xml  | 3 ++-
 doc/install-guide/section_basics-networking-nova.xml     | 3 ++-
 doc/install-guide/section_basics-networking.xml          | 3 ++-
 doc/install-guide/section_basics-ntp.xml                 | 3 ++-
 doc/install-guide/section_basics-packages.xml            | 3 ++-
 doc/install-guide/section_basics-passwords.xml           | 3 ++-
 doc/install-guide/section_basics-prerequisites.xml       | 3 ++-
 doc/install-guide/section_basics-queue.xml               | 3 ++-
 doc/install-guide/section_ceilometer-cinder.xml          | 7 ++++---
 doc/install-guide/section_ceilometer-glance.xml          | 7 ++++---
 doc/install-guide/section_ceilometer-install.xml         | 7 ++++---
 doc/install-guide/section_ceilometer-nova.xml            | 7 ++++---
 doc/install-guide/section_ceilometer-swift.xml           | 7 ++++---
 doc/install-guide/section_ceilometer-verify.xml          | 6 ++++--
 doc/install-guide/section_cinder-controller.xml          | 3 ++-
 doc/install-guide/section_cinder-node.xml                | 3 ++-
 doc/install-guide/section_cinder-verify.xml              | 6 ++++--
 doc/install-guide/section_dashboard-install.xml          | 9 +++++----
 doc/install-guide/section_dashboard-system-reqs.xml      | 9 +++++----
 doc/install-guide/section_debconf-api-endpoints.xml      | 7 ++++---
 doc/install-guide/section_debconf-concepts.xml           | 7 ++++---
 doc/install-guide/section_debconf-dbconfig-common.xml    | 7 ++++---
 doc/install-guide/section_debconf-keystone_authtoken.xml | 7 ++++---
 doc/install-guide/section_debconf-preseeding.xml         | 7 ++++---
 doc/install-guide/section_debconf-rabbitmq.xml           | 7 ++++---
 doc/install-guide/section_glance-install.xml             | 6 ++++--
 doc/install-guide/section_glance-verify.xml              | 6 ++++--
 doc/install-guide/section_heat-install.xml               | 6 ++++--
 doc/install-guide/section_heat-verify.xml                | 6 ++++--
 doc/install-guide/section_keystone-install.xml           | 7 ++++---
 doc/install-guide/section_keystone-services.xml          | 3 ++-
 doc/install-guide/section_keystone-users.xml             | 3 ++-
 doc/install-guide/section_launch-instance-neutron.xml    | 3 ++-
 doc/install-guide/section_launch-instance-nova.xml       | 3 ++-
 doc/install-guide/section_neutron-concepts.xml           | 7 ++++---
 doc/install-guide/section_neutron-initial-networks.xml   | 7 ++++---
 doc/install-guide/section_neutron-ml2-compute-node.xml   | 7 ++++---
 .../section_neutron-ml2-controller-node.xml              | 7 ++++---
 doc/install-guide/section_neutron-ml2-network-node.xml   | 7 ++++---
 doc/install-guide/section_neutron-ovs-compute-node.xml   | 7 ++++---
 .../section_neutron-ovs-controller-node.xml              | 7 ++++---
 doc/install-guide/section_neutron-ovs-network-node.xml   | 7 ++++---
 doc/install-guide/section_nova-compute-install.xml       | 3 ++-
 doc/install-guide/section_nova-controller-install.xml    | 3 ++-
 .../section_nova-networking-compute-node.xml             | 3 ++-
 .../section_nova-networking-controller-node.xml          | 3 ++-
 .../section_nova-networking-initial-network.xml          | 3 ++-
 doc/install-guide/section_nova-verify.xml                | 3 ++-
 doc/install-guide/section_trove-install.xml              | 6 +++++-
 doc/install-guide/section_trove-verify.xml               | 6 ++++--
 77 files changed, 258 insertions(+), 172 deletions(-)

diff --git a/doc/install-guide/app_reserved_uids.xml b/doc/install-guide/app_reserved_uids.xml
index 6ec5e09647..1fe1422cc2 100644
--- a/doc/install-guide/app_reserved_uids.xml
+++ b/doc/install-guide/app_reserved_uids.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<appendix xml:id="reserved_uids"
-  xmlns="http://docbook.org/ns/docbook"
+<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">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="reserved_uids">
   <title>Reserved user IDs</title>
 
   <para>
diff --git a/doc/install-guide/bk-openstack-install-guide.xml b/doc/install-guide/bk-openstack-install-guide.xml
index 58ecb98039..e5ca357967 100644
--- a/doc/install-guide/bk-openstack-install-guide.xml
+++ b/doc/install-guide/bk-openstack-install-guide.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="openstack-install-manual-juno"
-    status="draft">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="openstack-install-manual-juno">
     <title>OpenStack Installation Guide for
         <phrase os="rhel;centos;fedora">Red Hat Enterprise Linux, CentOS, and Fedora</phrase>
         <phrase os="ubuntu">Ubuntu 12.04/14.04 (LTS)</phrase>
diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basics.xml
index dd0bdf28d3..bb8dfd7292 100644
--- a/doc/install-guide/ch_basics.xml
+++ b/doc/install-guide/ch_basics.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" version="5.0" xml:id="ch_basics">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_basics">
   <?dbhtml-stop-chunking?>
   <title>Basic environment configuration</title>
 
diff --git a/doc/install-guide/ch_ceilometer.xml b/doc/install-guide/ch_ceilometer.xml
index 8eba0543aa..4458c5803f 100644
--- a/doc/install-guide/ch_ceilometer.xml
+++ b/doc/install-guide/ch_ceilometer.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_ceilometer">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_ceilometer">
      <title>Add the Telemetry module</title>
      <para>Telemetry provides a framework for monitoring and metering
           the OpenStack cloud. It is also known as the ceilometer
diff --git a/doc/install-guide/ch_cinder.xml b/doc/install-guide/ch_cinder.xml
index 3d593441ea..a62400b442 100644
--- a/doc/install-guide/ch_cinder.xml
+++ b/doc/install-guide/ch_cinder.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="ch_cinder">
   <title>Add the Block Storage service</title>
   <para>The OpenStack Block Storage service works through the
diff --git a/doc/install-guide/ch_clients.xml b/doc/install-guide/ch_clients.xml
index 11724dfc5b..2677c65692 100644
--- a/doc/install-guide/ch_clients.xml
+++ b/doc/install-guide/ch_clients.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_clients">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_clients">
     <title>Install and configure the OpenStack clients</title>
     <para>The following sections contain information about working
         with the OpenStack clients. Recall: in the previous section,
diff --git a/doc/install-guide/ch_debconf.xml b/doc/install-guide/ch_debconf.xml
index 8073484787..4333ba057f 100644
--- a/doc/install-guide/ch_debconf.xml
+++ b/doc/install-guide/ch_debconf.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_debconf" os="debian">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_debconf">
     <title>Configure OpenStack with debconf</title>
     <xi:include href="section_debconf-concepts.xml"/>
     <xi:include href="section_debconf-dbconfig-common.xml"/>
diff --git a/doc/install-guide/ch_glance.xml b/doc/install-guide/ch_glance.xml
index 3a023be035..2ccb3d6c7f 100644
--- a/doc/install-guide/ch_glance.xml
+++ b/doc/install-guide/ch_glance.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="ch_glance">
   <title>Add the Image Service</title>
   <para>The OpenStack Image Service (glance) enables users to discover,
diff --git a/doc/install-guide/ch_heat.xml b/doc/install-guide/ch_heat.xml
index 14a5983ac3..1de413462f 100644
--- a/doc/install-guide/ch_heat.xml
+++ b/doc/install-guide/ch_heat.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="ch_heat">
   <title>Add the Orchestration module</title>
   <para>The Orchestration module (heat) uses a heat orchestration template
diff --git a/doc/install-guide/ch_horizon.xml b/doc/install-guide/ch_horizon.xml
index 2b47447040..14e72da7a2 100644
--- a/doc/install-guide/ch_horizon.xml
+++ b/doc/install-guide/ch_horizon.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="ch_horizon">
   <title>Add the dashboard</title>
   <para>The OpenStack dashboard, also known as <link
diff --git a/doc/install-guide/ch_keystone.xml b/doc/install-guide/ch_keystone.xml
index 0292c18261..d6c612f2fb 100644
--- a/doc/install-guide/ch_keystone.xml
+++ b/doc/install-guide/ch_keystone.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_keystone">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_keystone">
     <title>Add the Identity service</title>
     <xi:include href="../common/section_keystone-concepts.xml"/>
     <xi:include href="section_keystone-install.xml"/>
diff --git a/doc/install-guide/ch_launch-instance.xml b/doc/install-guide/ch_launch-instance.xml
index cdc00b44a3..7fb1a1c4db 100644
--- a/doc/install-guide/ch_launch-instance.xml
+++ b/doc/install-guide/ch_launch-instance.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="launch-instance">
   <title>Launch an instance</title>
   <para>An instance is a VM that OpenStack provisions on a compute node.
diff --git a/doc/install-guide/ch_networking.xml b/doc/install-guide/ch_networking.xml
index 691de64300..c9612c37b3 100644
--- a/doc/install-guide/ch_networking.xml
+++ b/doc/install-guide/ch_networking.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="ch_networking">
   <title>Add a networking component</title>
   <para>This chapter explains how to install and configure either
diff --git a/doc/install-guide/ch_nova.xml b/doc/install-guide/ch_nova.xml
index 77ddc375e4..4a2ba62804 100644
--- a/doc/install-guide/ch_nova.xml
+++ b/doc/install-guide/ch_nova.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="ch_nova">
   <?dbhtml-stop-chunking?>
   <title>Add the Compute service</title>
diff --git a/doc/install-guide/ch_overview.xml b/doc/install-guide/ch_overview.xml
index 1c6bd604fe..ac1265037d 100644
--- a/doc/install-guide/ch_overview.xml
+++ b/doc/install-guide/ch_overview.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="ch_overview">
   <?dbhtml stop-chunking?>
   <title>Architecture</title>
diff --git a/doc/install-guide/ch_swift.xml b/doc/install-guide/ch_swift.xml
index 31d3d355c2..49ea6e8a95 100644
--- a/doc/install-guide/ch_swift.xml
+++ b/doc/install-guide/ch_swift.xml
@@ -1,7 +1,8 @@
 <?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"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
   xml:id="ch_swift">
   <title>Add Object Storage</title>
   <para>The OpenStack Object Storage services work together to provide
diff --git a/doc/install-guide/ch_trove.xml b/doc/install-guide/ch_trove.xml
index 721120ecd7..3c9bdf53fb 100644
--- a/doc/install-guide/ch_trove.xml
+++ b/doc/install-guide/ch_trove.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_trove">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_trove">
   <title>Add the Database service</title>
        <para>Use the <glossterm baseform="Database Service">Database
           module</glossterm> to create cloud database resources. The
diff --git a/doc/install-guide/object-storage/section_object-storage-adding-proxy-server.xml b/doc/install-guide/object-storage/section_object-storage-adding-proxy-server.xml
index 37e5943cc1..41a85b9e04 100644
--- a/doc/install-guide/object-storage/section_object-storage-adding-proxy-server.xml
+++ b/doc/install-guide/object-storage/section_object-storage-adding-proxy-server.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="adding-proxy-server"
-        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="adding-proxy-server">
                 <title>Add another proxy server</title>
                 <para>To provide additional reliability and bandwidth
                         to your cluster, you can add proxy servers. You can
diff --git a/doc/install-guide/object-storage/section_object-storage-example-install-arch.xml b/doc/install-guide/object-storage/section_object-storage-example-install-arch.xml
index c18714dca7..504da6fd15 100644
--- a/doc/install-guide/object-storage/section_object-storage-example-install-arch.xml
+++ b/doc/install-guide/object-storage/section_object-storage-example-install-arch.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="example-object-storage-installation-architecture"
-    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="example-object-storage-installation-architecture">
     <title>Example of Object Storage installation architecture</title>
     <itemizedlist>
         <listitem>
diff --git a/doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml b/doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml
index e48fd24046..1f4895ebeb 100644
--- a/doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml
+++ b/doc/install-guide/object-storage/section_object-storage-install-config-proxy-node.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="installing-and-configuring-the-proxy-node"
-    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="installing-and-configuring-the-proxy-node">
     <title>Install and configure the proxy node</title>
     <para>The proxy server takes each request and looks up locations
         for the account, container, or object and routes the requests
diff --git a/doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml b/doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml
index 36c3183dd0..99031d150a 100644
--- a/doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml
+++ b/doc/install-guide/object-storage/section_object-storage-install-config-storage-nodes.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="installing-and-configuring-storage-nodes"
-    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="installing-and-configuring-storage-nodes">
     <title>Install and configure storage nodes</title>
     <note>
         <para>Object Storage works on any file system that supports
diff --git a/doc/install-guide/object-storage/section_object-storage-install.xml b/doc/install-guide/object-storage/section_object-storage-install.xml
index 4082ab2b95..dc6b51461c 100644
--- a/doc/install-guide/object-storage/section_object-storage-install.xml
+++ b/doc/install-guide/object-storage/section_object-storage-install.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="installing-openstack-object-storage"
-    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="installing-openstack-object-storage">
     <title>Install Object Storage</title>
     <para>Though you can install OpenStack Object Storage for development or
         testing purposes on one server, a multiple-server installation enables
diff --git a/doc/install-guide/object-storage/section_object-storage-network-planning.xml b/doc/install-guide/object-storage/section_object-storage-network-planning.xml
index 927c77793a..be87c193f5 100644
--- a/doc/install-guide/object-storage/section_object-storage-network-planning.xml
+++ b/doc/install-guide/object-storage/section_object-storage-network-planning.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="object-storage-network-planning"
-  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="object-storage-network-planning">
   <title>Plan networking for Object Storage</title>
   <para>For both conserving network resources and ensuring that
     network administrators understand the needs for networks and
diff --git a/doc/install-guide/object-storage/section_object-storage-sys-requirements.xml b/doc/install-guide/object-storage/section_object-storage-sys-requirements.xml
index 062eeb895a..e92f04861b 100644
--- a/doc/install-guide/object-storage/section_object-storage-sys-requirements.xml
+++ b/doc/install-guide/object-storage/section_object-storage-sys-requirements.xml
@@ -3,10 +3,11 @@
 <!ENTITY % openstack SYSTEM "../../common/entities/openstack.ent">
 %openstack;
 ]>
-<section xml:id="object-storage-system-requirements"
-    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="object-storage-system-requirements">
     <?dbhtml-stop-chunking?>
     <title>System requirements for Object Storage</title>
     <para><emphasis role="bold">Hardware</emphasis>: OpenStack Object
diff --git a/doc/install-guide/object-storage/section_object-storage-verifying-install.xml b/doc/install-guide/object-storage/section_object-storage-verifying-install.xml
index e841f8c8b2..4d5d6d9437 100644
--- a/doc/install-guide/object-storage/section_object-storage-verifying-install.xml
+++ b/doc/install-guide/object-storage/section_object-storage-verifying-install.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="verify-object-storage-installation"
-    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="verify-object-storage-installation">
     <title>Verify the installation</title>
     <para>You can run these commands from the proxy server or any
         server that has access to the Identity Service.</para>
diff --git a/doc/install-guide/object-storage/section_start-storage-node-services.xml b/doc/install-guide/object-storage/section_start-storage-node-services.xml
index c7ed906d80..69d22a5273 100644
--- a/doc/install-guide/object-storage/section_start-storage-node-services.xml
+++ b/doc/install-guide/object-storage/section_start-storage-node-services.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="start-storage-node-services"
-    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="start-storage-node-services">
     <?dbhtml-stop-chunking?>
     <title>Start services on the storage nodes</title>
     <para>Now that the ring files are on each storage node, you can
diff --git a/doc/install-guide/section_basics-database.xml b/doc/install-guide/section_basics-database.xml
index 475a8cc7d5..7972bd34e9 100644
--- a/doc/install-guide/section_basics-database.xml
+++ b/doc/install-guide/section_basics-database.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="basics-database">
   <?dbhtml-stop-chunking?>
   <title>Database</title>
diff --git a/doc/install-guide/section_basics-networking-neutron.xml b/doc/install-guide/section_basics-networking-neutron.xml
index 366ebe5bf7..3060891ae7 100644
--- a/doc/install-guide/section_basics-networking-neutron.xml
+++ b/doc/install-guide/section_basics-networking-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="basics-networking-neutron">
   <?dbhtml-stop-chunking?>
   <title>OpenStack Networking (neutron)</title>
diff --git a/doc/install-guide/section_basics-networking-nova.xml b/doc/install-guide/section_basics-networking-nova.xml
index 49f0fd6e2e..9bd634f068 100644
--- a/doc/install-guide/section_basics-networking-nova.xml
+++ b/doc/install-guide/section_basics-networking-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="basics-networking-nova">
   <?dbhtml-stop-chunking?>
   <title>Legacy networking (nova-network)</title>
diff --git a/doc/install-guide/section_basics-networking.xml b/doc/install-guide/section_basics-networking.xml
index e8725c0d53..c814eae2d2 100644
--- a/doc/install-guide/section_basics-networking.xml
+++ b/doc/install-guide/section_basics-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="basics-networking">
   <?dbhtml-stop-chunking?>
   <title>Networking</title>
diff --git a/doc/install-guide/section_basics-ntp.xml b/doc/install-guide/section_basics-ntp.xml
index d4d4289169..aeb99a418a 100644
--- a/doc/install-guide/section_basics-ntp.xml
+++ b/doc/install-guide/section_basics-ntp.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="basics-ntp">
   <?dbhtml-stop-chunking?>
   <title>Network Time Protocol (NTP)</title>
diff --git a/doc/install-guide/section_basics-packages.xml b/doc/install-guide/section_basics-packages.xml
index 58ed32013f..ac1902efa0 100644
--- a/doc/install-guide/section_basics-packages.xml
+++ b/doc/install-guide/section_basics-packages.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="basics-packages">
   <?dbhtml-stop-chunking?>
   <title>OpenStack packages</title>
diff --git a/doc/install-guide/section_basics-passwords.xml b/doc/install-guide/section_basics-passwords.xml
index 3be0bfcf6f..d985b582ec 100644
--- a/doc/install-guide/section_basics-passwords.xml
+++ b/doc/install-guide/section_basics-passwords.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="basics-passwords">
   <?dbhtml-stop-chunking?>
   <title>Passwords</title>
diff --git a/doc/install-guide/section_basics-prerequisites.xml b/doc/install-guide/section_basics-prerequisites.xml
index 3b0430f252..8109cc46a8 100644
--- a/doc/install-guide/section_basics-prerequisites.xml
+++ b/doc/install-guide/section_basics-prerequisites.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="basics-prerequisites">
   <?dbhtml-stop-chunking?>
   <title>Before you begin</title>
diff --git a/doc/install-guide/section_basics-queue.xml b/doc/install-guide/section_basics-queue.xml
index 0bec52b5d0..039691743f 100644
--- a/doc/install-guide/section_basics-queue.xml
+++ b/doc/install-guide/section_basics-queue.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="basics-queue">
   <?dbhtml-stop-chunking?>
   <title>Messaging server</title>
diff --git a/doc/install-guide/section_ceilometer-cinder.xml b/doc/install-guide/section_ceilometer-cinder.xml
index 0f5840860c..c898b4919f 100644
--- a/doc/install-guide/section_ceilometer-cinder.xml
+++ b/doc/install-guide/section_ceilometer-cinder.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="ceilometer-install-cinder"
-  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="ceilometer-install-cinder">
   <?dbhtml-stop-chunking?>
   <title>Add the Block Storage service agent for Telemetry</title>
   <procedure>
diff --git a/doc/install-guide/section_ceilometer-glance.xml b/doc/install-guide/section_ceilometer-glance.xml
index 1bf160fa24..2faddac057 100644
--- a/doc/install-guide/section_ceilometer-glance.xml
+++ b/doc/install-guide/section_ceilometer-glance.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="ceilometer-install-glance"
-  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="ceilometer-install-glance">
   <title>Configure the Image Service for Telemetry</title>
   <procedure>
     <step>
diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml
index 4efff84100..fe7a4cc56f 100644
--- a/doc/install-guide/section_ceilometer-install.xml
+++ b/doc/install-guide/section_ceilometer-install.xml
@@ -3,10 +3,11 @@
 <!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
 %openstack;
 ]>
-<section xml:id="ceilometer-install"
-  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="ceilometer-install">
   <title>Install the Telemetry module</title>
   <procedure>
     <para>Telemetry provides an API service that
diff --git a/doc/install-guide/section_ceilometer-nova.xml b/doc/install-guide/section_ceilometer-nova.xml
index e7b7b19cbb..0a00b79afb 100644
--- a/doc/install-guide/section_ceilometer-nova.xml
+++ b/doc/install-guide/section_ceilometer-nova.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="ceilometer-install-nova"
-  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="ceilometer-install-nova">
   <?dbhtml-stop-chunking?>
   <title>Install the Compute agent for Telemetry</title>
   <procedure>
diff --git a/doc/install-guide/section_ceilometer-swift.xml b/doc/install-guide/section_ceilometer-swift.xml
index ccdd1d6f31..ed5e83a9f3 100644
--- a/doc/install-guide/section_ceilometer-swift.xml
+++ b/doc/install-guide/section_ceilometer-swift.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="ceilometer-install-swift"
-  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="ceilometer-install-swift">
   <title>Configure the Object Storage service for Telemetry</title>
   <procedure>
     <step>
diff --git a/doc/install-guide/section_ceilometer-verify.xml b/doc/install-guide/section_ceilometer-verify.xml
index a91d1192f5..9e13088724 100644
--- a/doc/install-guide/section_ceilometer-verify.xml
+++ b/doc/install-guide/section_ceilometer-verify.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="ceilometer-verify" 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="ceilometer-verify">
   <title>Verify the Telemetry installation</title>
   <para>To test the Telemetry installation, download an image from the
     Image Service, and use the <command>ceilometer</command> command to display usage statistics.</para>
diff --git a/doc/install-guide/section_cinder-controller.xml b/doc/install-guide/section_cinder-controller.xml
index 10a515ad5f..7b1dc4dd1f 100644
--- a/doc/install-guide/section_cinder-controller.xml
+++ b/doc/install-guide/section_cinder-controller.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="cinder-controller">
   <title>Configure a Block Storage service controller</title>
   <note>
diff --git a/doc/install-guide/section_cinder-node.xml b/doc/install-guide/section_cinder-node.xml
index 48960b6347..90294f86cf 100644
--- a/doc/install-guide/section_cinder-node.xml
+++ b/doc/install-guide/section_cinder-node.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="cinder-node">
   <?dbhtml-stop-chunking?>
   <title>Configure a Block Storage service node</title>
diff --git a/doc/install-guide/section_cinder-verify.xml b/doc/install-guide/section_cinder-verify.xml
index 5d4c47c759..8c538a26bb 100644
--- a/doc/install-guide/section_cinder-verify.xml
+++ b/doc/install-guide/section_cinder-verify.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="cinder-verify" 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="cinder-verify">
   <title>Verify the Block Storage installation</title>
   <para>To verify that the Block Storage is installed and configured properly,
        create a new volume.</para>
diff --git a/doc/install-guide/section_dashboard-install.xml b/doc/install-guide/section_dashboard-install.xml
index 5c955c63ad..e1a77fa5a7 100644
--- a/doc/install-guide/section_dashboard-install.xml
+++ b/doc/install-guide/section_dashboard-install.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="install_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="install_dashboard">
     <?dbhtml stop-chunking?>
     <title>Install the dashboard</title>
     <para>Before you can install and configure the dashboard, meet the
diff --git a/doc/install-guide/section_dashboard-system-reqs.xml b/doc/install-guide/section_dashboard-system-reqs.xml
index f1fbc964dc..e52616f61d 100644
--- a/doc/install-guide/section_dashboard-system-reqs.xml
+++ b/doc/install-guide/section_dashboard-system-reqs.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="dashboard-system-requirements"
-    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-system-requirements">
     <title>System requirements</title>
     <para>Before you install the OpenStack dashboard, you must meet
         the following system requirements:</para>
diff --git a/doc/install-guide/section_debconf-api-endpoints.xml b/doc/install-guide/section_debconf-api-endpoints.xml
index a0fb94bfe2..60c0be0bad 100644
--- a/doc/install-guide/section_debconf-api-endpoints.xml
+++ b/doc/install-guide/section_debconf-api-endpoints.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="debconf-api-endpoints"
-  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="debconf-api-endpoints">
   <title>Register API endpoints</title>
   <para>All Debian packages for API services, except the
       <package>heat-api</package> package, register the service in the
diff --git a/doc/install-guide/section_debconf-concepts.xml b/doc/install-guide/section_debconf-concepts.xml
index d0f782d6aa..f43e0c4106 100644
--- a/doc/install-guide/section_debconf-concepts.xml
+++ b/doc/install-guide/section_debconf-concepts.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="debconf-general-principles"
-  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="debconf-general-principles">
   <?dbhtml-stop-chunking?>
   <title>debconf concepts</title>
   <para>This chapter explains how to use the Debian <systemitem
diff --git a/doc/install-guide/section_debconf-dbconfig-common.xml b/doc/install-guide/section_debconf-dbconfig-common.xml
index 0b2d1c3a00..2876e7f38d 100644
--- a/doc/install-guide/section_debconf-dbconfig-common.xml
+++ b/doc/install-guide/section_debconf-dbconfig-common.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="debconf-dbconfig-common"
-  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="debconf-dbconfig-common">
   <title>Configure the database with dbconfig-common</title>
   <para>Many of the OpenStack services need to be configured
     to access a database. These are configured through a DSN (Database
diff --git a/doc/install-guide/section_debconf-keystone_authtoken.xml b/doc/install-guide/section_debconf-keystone_authtoken.xml
index 5911a872a0..63df8c5126 100644
--- a/doc/install-guide/section_debconf-keystone_authtoken.xml
+++ b/doc/install-guide/section_debconf-keystone_authtoken.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="debconf-keystone_authtoken"
-  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="debconf-keystone_authtoken">
   <title>Services and the [keystone_authtoken]</title>
   <para>Because most OpenStack services must access the Identity
     Service, you must configure the IP address of the
diff --git a/doc/install-guide/section_debconf-preseeding.xml b/doc/install-guide/section_debconf-preseeding.xml
index aff526369e..b78f0dfa83 100644
--- a/doc/install-guide/section_debconf-preseeding.xml
+++ b/doc/install-guide/section_debconf-preseeding.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="debconf-preseeding"
-  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="debconf-preseeding">
   <title>Pre-seed debconf prompts</title>
   <para>You can pre-seed all <systemitem
       class="library">debconf</systemitem> prompts. To pre-seed means
diff --git a/doc/install-guide/section_debconf-rabbitmq.xml b/doc/install-guide/section_debconf-rabbitmq.xml
index 7ca1837532..dab4538053 100644
--- a/doc/install-guide/section_debconf-rabbitmq.xml
+++ b/doc/install-guide/section_debconf-rabbitmq.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="debconf-rabbitmq"
-  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="debconf-rabbitmq">
   <title>RabbitMQ credentials parameters</title>
   <para>For every package that must connect to a Messaging Server, the
     Debian package enables you to configure the IP address for that
diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml
index fb5d63c005..a53f19c007 100644
--- a/doc/install-guide/section_glance-install.xml
+++ b/doc/install-guide/section_glance-install.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="glance-install" 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="glance-install">
   <title>Install and configure</title>
   <para>This section describes how to install and configure the Image Service,
     code-named glance, on the controller node. For simplicity, this
diff --git a/doc/install-guide/section_glance-verify.xml b/doc/install-guide/section_glance-verify.xml
index 3921e0f0a8..68b0133712 100644
--- a/doc/install-guide/section_glance-verify.xml
+++ b/doc/install-guide/section_glance-verify.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="glance-verify" 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="glance-verify">
   <title>Verify operation</title>
   <para>This section describes how to verify operation of the Image
     Service using
diff --git a/doc/install-guide/section_heat-install.xml b/doc/install-guide/section_heat-install.xml
index 48477a5692..5c195c5cdc 100644
--- a/doc/install-guide/section_heat-install.xml
+++ b/doc/install-guide/section_heat-install.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="heat-install" 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="heat-install">
   <title>Install and configure Orchestration</title>
   <para>This section describes how to install and configure the
     Orchestration module (heat) on the controller node.</para>
diff --git a/doc/install-guide/section_heat-verify.xml b/doc/install-guide/section_heat-verify.xml
index b263128a9e..864c47bc6a 100644
--- a/doc/install-guide/section_heat-verify.xml
+++ b/doc/install-guide/section_heat-verify.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="heat-verify" 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="heat-verify">
   <title>Verify operation</title>
   <para>This section describes how to verify operation of the Orchestration
     module (heat).</para>
diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
index c4cb67639b..6cf3fd8083 100644
--- a/doc/install-guide/section_keystone-install.xml
+++ b/doc/install-guide/section_keystone-install.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="keystone-install"
-  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="keystone-install">
   <title>Install and configure</title>
   <para>This section describes how to install and configure the
     OpenStack Identity service on the controller node.</para>
diff --git a/doc/install-guide/section_keystone-services.xml b/doc/install-guide/section_keystone-services.xml
index b568f53152..01f83db1b0 100644
--- a/doc/install-guide/section_keystone-services.xml
+++ b/doc/install-guide/section_keystone-services.xml
@@ -3,7 +3,8 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="keystone-services" os="ubuntu;rhel;centos;fedora;sles;opensuse">
+  xml:id="keystone-services"
+  os="ubuntu;rhel;centos;fedora;sles;opensuse">
   <title>Create the service entity and API endpoint</title>
   <para>After you create tenants, users, and roles, you must create the
     <glossterm>service</glossterm> entity and
diff --git a/doc/install-guide/section_keystone-users.xml b/doc/install-guide/section_keystone-users.xml
index 26e1fbc112..8d97b8cfe6 100644
--- a/doc/install-guide/section_keystone-users.xml
+++ b/doc/install-guide/section_keystone-users.xml
@@ -3,7 +3,8 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="5.0"
-  xml:id="keystone-users" os="ubuntu;rhel;centos;fedora;sles;opensuse">
+  xml:id="keystone-users"
+  os="ubuntu;rhel;centos;fedora;sles;opensuse">
   <title>Create tenants, users, and roles</title>
   <para>After you install the Identity service, create
     <glossterm baseform="tenant">tenants</glossterm> (projects),
diff --git a/doc/install-guide/section_launch-instance-neutron.xml b/doc/install-guide/section_launch-instance-neutron.xml
index 70dd8bd1c3..a608e2ea73 100644
--- a/doc/install-guide/section_launch-instance-neutron.xml
+++ b/doc/install-guide/section_launch-instance-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="launch-instance-neutron">
   <title>Launch an instance with OpenStack Networking (neutron)</title>
   <procedure>
diff --git a/doc/install-guide/section_launch-instance-nova.xml b/doc/install-guide/section_launch-instance-nova.xml
index 9bb294d251..f90a0bac1f 100644
--- a/doc/install-guide/section_launch-instance-nova.xml
+++ b/doc/install-guide/section_launch-instance-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="launch-instance-nova">
   <title>Launch an instance with legacy networking (nova-network)</title>
   <procedure>
diff --git a/doc/install-guide/section_neutron-concepts.xml b/doc/install-guide/section_neutron-concepts.xml
index 232d7c0a92..01f1f9e753 100644
--- a/doc/install-guide/section_neutron-concepts.xml
+++ b/doc/install-guide/section_neutron-concepts.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="neutron-concepts"
-  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="neutron-concepts">
   <title>Networking concepts</title>
   <para>OpenStack Networking (neutron) manages all networking facets
     for the Virtual Networking Infrastructure (VNI) and the access
diff --git a/doc/install-guide/section_neutron-initial-networks.xml b/doc/install-guide/section_neutron-initial-networks.xml
index 3b3c81b59e..ba0031bc45 100644
--- a/doc/install-guide/section_neutron-initial-networks.xml
+++ b/doc/install-guide/section_neutron-initial-networks.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="neutron-initial-networks"
-  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="neutron-initial-networks">
   <title>Create initial networks</title>
   <para>Before launching your first instance, you must create the
     necessary virtual network infrastructure to which the instance will
diff --git a/doc/install-guide/section_neutron-ml2-compute-node.xml b/doc/install-guide/section_neutron-ml2-compute-node.xml
index f62aa81e1c..bb18bb3174 100644
--- a/doc/install-guide/section_neutron-ml2-compute-node.xml
+++ b/doc/install-guide/section_neutron-ml2-compute-node.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="neutron-ml2-compute-node"
-  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="neutron-ml2-compute-node">
   <title>Configure compute node</title>
   <para>Before you install and configure OpenStack Networking, you
     must enable certain kernel networking functions.</para>
diff --git a/doc/install-guide/section_neutron-ml2-controller-node.xml b/doc/install-guide/section_neutron-ml2-controller-node.xml
index 75bf7468b8..f6a562d838 100644
--- a/doc/install-guide/section_neutron-ml2-controller-node.xml
+++ b/doc/install-guide/section_neutron-ml2-controller-node.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="neutron-ml2-controller-node"
-  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="neutron-ml2-controller-node">
   <title>Configure controller node</title>
   <procedure os="ubuntu;rhel;centos;fedora;sles;opensuse">
     <title>Prerequisites</title>
diff --git a/doc/install-guide/section_neutron-ml2-network-node.xml b/doc/install-guide/section_neutron-ml2-network-node.xml
index e5ecf61146..84df468a39 100644
--- a/doc/install-guide/section_neutron-ml2-network-node.xml
+++ b/doc/install-guide/section_neutron-ml2-network-node.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="neutron-ml2-network-node"
-  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="neutron-ml2-network-node">
   <title>Configure network node</title>
   <para>Before you install and configure OpenStack Networking, you
     must enable certain kernel networking functions.</para>
diff --git a/doc/install-guide/section_neutron-ovs-compute-node.xml b/doc/install-guide/section_neutron-ovs-compute-node.xml
index 88c9536789..30d36cd236 100644
--- a/doc/install-guide/section_neutron-ovs-compute-node.xml
+++ b/doc/install-guide/section_neutron-ovs-compute-node.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="neutron-compute-node"
-  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="neutron-compute-node">
     <title>Configure compute node</title>
     <note>
       <para>This section details set up for any node that runs the
diff --git a/doc/install-guide/section_neutron-ovs-controller-node.xml b/doc/install-guide/section_neutron-ovs-controller-node.xml
index 21d631e024..436ebc0317 100644
--- a/doc/install-guide/section_neutron-ovs-controller-node.xml
+++ b/doc/install-guide/section_neutron-ovs-controller-node.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="neutron-controller-node"
-  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="neutron-controller-node">
     <title>Configure controller node</title>
     <warning os="rhel;centos">
       <para>By default, the <literal>system-config-firewall</literal>
diff --git a/doc/install-guide/section_neutron-ovs-network-node.xml b/doc/install-guide/section_neutron-ovs-network-node.xml
index 3b7173b964..008016df5e 100644
--- a/doc/install-guide/section_neutron-ovs-network-node.xml
+++ b/doc/install-guide/section_neutron-ovs-network-node.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="neutron-network-node"
-  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="neutron-network-node">
     <title>Configure network node</title>
     <note>
       <para>Before you start, set up a machine as a dedicated network
diff --git a/doc/install-guide/section_nova-compute-install.xml b/doc/install-guide/section_nova-compute-install.xml
index 88236d7964..f2aa5a2910 100644
--- a/doc/install-guide/section_nova-compute-install.xml
+++ b/doc/install-guide/section_nova-compute-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="nova-compute-install">
   <title>Install and configure a compute node</title>
   <para>This section describes how to install and configure the Compute
diff --git a/doc/install-guide/section_nova-controller-install.xml b/doc/install-guide/section_nova-controller-install.xml
index 14f1a3b1c1..649913dc33 100644
--- a/doc/install-guide/section_nova-controller-install.xml
+++ b/doc/install-guide/section_nova-controller-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="nova-controller-install">
   <title>Install and configure controller node</title>
   <para>This section describes how to install and configure the Compute
diff --git a/doc/install-guide/section_nova-networking-compute-node.xml b/doc/install-guide/section_nova-networking-compute-node.xml
index 388a0e3475..cdcea247ba 100644
--- a/doc/install-guide/section_nova-networking-compute-node.xml
+++ b/doc/install-guide/section_nova-networking-compute-node.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-networking-compute-node">
   <title>Configure compute node</title>
   <para>This section covers deployment of a simple
diff --git a/doc/install-guide/section_nova-networking-controller-node.xml b/doc/install-guide/section_nova-networking-controller-node.xml
index d23a3b59eb..30dd821d65 100644
--- a/doc/install-guide/section_nova-networking-controller-node.xml
+++ b/doc/install-guide/section_nova-networking-controller-node.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-networking-controller-node">
   <title>Configure controller node</title>
   <para>Legacy networking primarily involves compute nodes. However, you must
diff --git a/doc/install-guide/section_nova-networking-initial-network.xml b/doc/install-guide/section_nova-networking-initial-network.xml
index 229133ae23..23c7702bfd 100644
--- a/doc/install-guide/section_nova-networking-initial-network.xml
+++ b/doc/install-guide/section_nova-networking-initial-network.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-network-initial-network">
   <title>Create initial network</title>
   <para>Before launching your first instance, you must create the necessary
diff --git a/doc/install-guide/section_nova-verify.xml b/doc/install-guide/section_nova-verify.xml
index da44853a37..1c6ed7c6a5 100644
--- a/doc/install-guide/section_nova-verify.xml
+++ b/doc/install-guide/section_nova-verify.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-verify">
   <title>Verify operation</title>
   <para>This section describes how to verify operation of the Compute
diff --git a/doc/install-guide/section_trove-install.xml b/doc/install-guide/section_trove-install.xml
index 9d7a3336e2..d174c6845f 100644
--- a/doc/install-guide/section_trove-install.xml
+++ b/doc/install-guide/section_trove-install.xml
@@ -1,5 +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="trove-install" 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="trove-install">
   <title>Install the Database service</title>
   <para>This procedure installs the Database module on the controller
   node.</para>
diff --git a/doc/install-guide/section_trove-verify.xml b/doc/install-guide/section_trove-verify.xml
index 7db0b01ac3..7c40f016a6 100644
--- a/doc/install-guide/section_trove-verify.xml
+++ b/doc/install-guide/section_trove-verify.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="trove-verify" 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="trove-verify">
   <title>Verify the Database service installation</title>
   <para>To verify that the Database service is installed and
     configured correctly, try executing a Trove command:</para>