diff --git a/doc/admin-guide-cloud/bk-admin-guide-cloud.xml b/doc/admin-guide-cloud/bk-admin-guide-cloud.xml
index 6b0f7a07a7..4d65c83682 100644
--- a/doc/admin-guide-cloud/bk-admin-guide-cloud.xml
+++ b/doc/admin-guide-cloud/bk-admin-guide-cloud.xml
@@ -1,9 +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-compute-admin-manual-grizzly">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="openstack-compute-admin-manual-grizzly">
     <title>OpenStack Cloud Administrator Guide</title>
     <?rax title.font.size="28px" subtitle.font.size="28px"?>
     <titleabbrev>Cloud Administrator Guide</titleabbrev>
diff --git a/doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml b/doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml
index 25fc710044..400265ca0e 100644
--- a/doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml
@@ -3,10 +3,11 @@
 <!ENTITY % openstack SYSTEM "../../common/entities/openstack.ent">
 %openstack;
 ]>
-<section xml:id="backup-block-storage-disks"
-    xmlns="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="backup-block-storage-disks">
     <title>Back up Block Storage service disks</title>
     <para>While you can use the LVM snapshot to create snapshots, you
         can also use it to back up your volumes. By using LVM
diff --git a/doc/admin-guide-cloud/blockstorage/section_glusterfs_backend.xml b/doc/admin-guide-cloud/blockstorage/section_glusterfs_backend.xml
index 02cce48a34..d490af79e1 100644
--- a/doc/admin-guide-cloud/blockstorage/section_glusterfs_backend.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_glusterfs_backend.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="glusterfs_backend" xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="glusterfs_backend">
     <title>Configure a GlusterFS back end</title>
     <para>
         This section explains how to configure OpenStack Block Storage
diff --git a/doc/admin-guide-cloud/blockstorage/section_glusterfs_removal.xml b/doc/admin-guide-cloud/blockstorage/section_glusterfs_removal.xml
index df51384f42..14db46ffef 100644
--- a/doc/admin-guide-cloud/blockstorage/section_glusterfs_removal.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_glusterfs_removal.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="section_gluster_removal_gracefully">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_gluster_removal_gracefully">
     <title>Gracefully remove a GlusterFS volume from usage</title>
         <para>Configuring the <systemitem>cinder</systemitem> volume
         service to use GlusterFS involves creating a shares file (for
diff --git a/doc/admin-guide-cloud/blockstorage/section_increase-api-throughput.xml b/doc/admin-guide-cloud/blockstorage/section_increase-api-throughput.xml
index edab5b9ab2..7c418001f8 100644
--- a/doc/admin-guide-cloud/blockstorage/section_increase-api-throughput.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_increase-api-throughput.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="cinder-api-throughput"
-    xmlns="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="cinder-api-throughput">
   <title>Increase Block Storage API service throughput</title>
   <para>By default, the Block Storage API service runs in one process.
     This limits the number of API requests that the Block Storage
diff --git a/doc/admin-guide-cloud/blockstorage/section_multi_backend.xml b/doc/admin-guide-cloud/blockstorage/section_multi_backend.xml
index 5d8ffc3a6f..9153864cc4 100644
--- a/doc/admin-guide-cloud/blockstorage/section_multi_backend.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_multi_backend.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="multi_backend" xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="multi_backend">
     <title>Configure multiple-storage back ends</title>
     <para>When you configure multiple-storage back ends, you can
         create several back-end storage solutions that serve the same
diff --git a/doc/admin-guide-cloud/blockstorage/section_nfs_backend.xml b/doc/admin-guide-cloud/blockstorage/section_nfs_backend.xml
index 0c3c37d82a..6228d91f15 100644
--- a/doc/admin-guide-cloud/blockstorage/section_nfs_backend.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_nfs_backend.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="nfs_backend" xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="nfs_backend">
     <title>Configure an NFS storage back end</title>
     <para>This section explains how to configure OpenStack Block
     Storage to use NFS storage. You must be able to access the NFS
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_HTTP_bad_req_in_cinder_vol_log.xml b/doc/admin-guide-cloud/blockstorage/section_ts_HTTP_bad_req_in_cinder_vol_log.xml
index c227803e4c..9586011596 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_HTTP_bad_req_in_cinder_vol_log.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_HTTP_bad_req_in_cinder_vol_log.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="section_ts_HTTP_bad_req_in_cinder_vol_log">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_ts_HTTP_bad_req_in_cinder_vol_log">
     <title>Failed to attach volume after detaching</title>
     <section
         xml:id="section_ts_HTTP_bad_req_in_cinder_vol_log_problem">
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_cinder_config.xml b/doc/admin-guide-cloud/blockstorage/section_ts_cinder_config.xml
index aecbfa6920..c3919510fe 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_cinder_config.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_cinder_config.xml
@@ -3,11 +3,11 @@
 <!ENTITY % openstack SYSTEM "../../common/entities/openstack.ent">
 %openstack;
 ]>
-<section xml:id="section_ts_cinder_config"
-    xmlns="http://docbook.org/ns/docbook"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0"
-    linkend="section_ts_cinder_config">
+<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_ts_cinder_config">
     <title xml:id="ts_block_config">Troubleshoot the Block Storage
         configuration</title>
     <para>Most Block Storage errors are caused by incorrect volume
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_duplicate_3par_host.xml b/doc/admin-guide-cloud/blockstorage/section_ts_duplicate_3par_host.xml
index ea04128159..8e6498aae8 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_duplicate_3par_host.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_duplicate_3par_host.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0" xml:id="section_ts_duplicate_3PAR_host">
+<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_ts_duplicate_3PAR_host">
     <title>Duplicate 3PAR host</title>
     <section xml:id="section_ts_duplicate_3PAR_host_problem">
         <title>Problem</title>
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_after_detach.xml b/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_after_detach.xml
index 025ebe39bb..c86176ad4d 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_after_detach.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_after_detach.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="section_ts_failed_attach_vol_after_detach">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_ts_failed_attach_vol_after_detach">
     <title>Failed to attach volume after detaching</title>
     <section
         xml:id="section_ts_failed_attach_vol_after_detach_problem">
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_no_sysfsutils.xml b/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_no_sysfsutils.xml
index cabea9621b..38af91de1c 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_no_sysfsutils.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_failed_attach_vol_no_sysfsutils.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0" xml:id="section_ts_failed_attach_vol_no_sysfsutils">
+<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_ts_failed_attach_vol_no_sysfsutils">
     <title>Failed to attach volume, systool is not installed</title>
     <section xml:id="section_ts_failed_attach_vol_no_sysfsutils_problem">
         <title>Problem</title>
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_failed_connect_vol_FC_SAN.xml b/doc/admin-guide-cloud/blockstorage/section_ts_failed_connect_vol_FC_SAN.xml
index 6e2ec22f46..4aa1d66989 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_failed_connect_vol_FC_SAN.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_failed_connect_vol_FC_SAN.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0" xml:id="section_ts_failed_connect_vol_FC_SAN">
+<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_ts_failed_connect_vol_FC_SAN">
     <title>Failed to connect volume in FC SAN</title>
     <section xml:id="section_ts_failed_connect_vol_FC_SAN_problem">
         <title>Problem</title>
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_multipath_warn.xml b/doc/admin-guide-cloud/blockstorage/section_ts_multipath_warn.xml
index 26625f8141..f300d4a84a 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_multipath_warn.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_multipath_warn.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-model href="http://docbook.org/xml/5.0/rng/docbook.rng" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <?xml-model href="http://docbook.org/xml/5.0/rng/docbook.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0" xml:id="section_ts_multipath_warn" linkend="section_ts_multipath_warn">
+<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_ts_multipath_warn">
     <title>Multipath Call Failed Exit</title>
     <section xml:id="section_ts_multipath_warn_problem">
         <title>Problem</title>
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_no_emulator_x86_64.xml b/doc/admin-guide-cloud/blockstorage/section_ts_no_emulator_x86_64.xml
index 736e4ae7d3..4f174c45c0 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_no_emulator_x86_64.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_no_emulator_x86_64.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0" xml:id="section_ts_no_emulator_x86_64">
+<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_ts_no_emulator_x86_64">
     <title>Cannot find suitable emulator for x86_64</title>
     <section xml:id="section_ts_no_emulator_x86_64_problem">
         <title>Problem</title>
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_host.xml b/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_host.xml
index 74f0afc6fe..36a02f9ff6 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_host.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_host.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0" xml:id="section_ts_non_existent_host">
+<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_ts_non_existent_host">
     <title>Non-existent host</title>
     <section xml:id="section_ts_non_existent_host_problem">
         <title>Problem</title>
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_vlun.xml b/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_vlun.xml
index 4654cd2d57..8596af27cc 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_vlun.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_non_existent_vlun.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="5.0" xml:id="section_ts_non_existent_vlun">
+<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_ts_non_existent_vlun">
     <title>Non-existent VLUN</title>
     <section xml:id="section_ts_non_existent_vlun_problem">
         <title>Problem</title>
diff --git a/doc/admin-guide-cloud/blockstorage/section_ts_vol_attach_miss_sg_scan.xml b/doc/admin-guide-cloud/blockstorage/section_ts_vol_attach_miss_sg_scan.xml
index f5c2ed17af..56849fe432 100644
--- a/doc/admin-guide-cloud/blockstorage/section_ts_vol_attach_miss_sg_scan.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_ts_vol_attach_miss_sg_scan.xml
@@ -2,9 +2,10 @@
 <?xml-model href="http://docbook.org/xml/5.0/rng/docbook.rng" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <?xml-model href="http://docbook.org/xml/5.0/rng/docbook.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <section xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
-    xml:id="section_ts_vol_attach_miss_sg_scan"
-    linkend="section_ts_vol_attach_miss_sg_scan">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_ts_vol_attach_miss_sg_scan">
     <title>Failed to Attach Volume, Missing sg_scan</title>
     <section xml:id="section_ts_vol_attach_miss_sg_scan_problem">
         <title>Problem</title>
diff --git a/doc/admin-guide-cloud/blockstorage/section_volume-backups-export-import.xml b/doc/admin-guide-cloud/blockstorage/section_volume-backups-export-import.xml
index 4b2b7f9f7e..7a6f6f3dc6 100644
--- a/doc/admin-guide-cloud/blockstorage/section_volume-backups-export-import.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_volume-backups-export-import.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="volume-backup-restore-export-import">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="volume-backup-restore-export-import">
     <title>Export and import backup metadata</title>
     <para>A volume backup can only be restored on the same Block
     Storage service. This is because restoring a volume from a backup
diff --git a/doc/admin-guide-cloud/blockstorage/section_volume-backups.xml b/doc/admin-guide-cloud/blockstorage/section_volume-backups.xml
index 389f6d5471..62fa4096cb 100644
--- a/doc/admin-guide-cloud/blockstorage/section_volume-backups.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_volume-backups.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="volume-backup-restore">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="volume-backup-restore">
     <title>Back up and restore volumes</title>
     <para>The <command>cinder</command> command-line interface
     provides the tools for creating a volume backup. You can restore
diff --git a/doc/admin-guide-cloud/blockstorage/section_volume-migration.xml b/doc/admin-guide-cloud/blockstorage/section_volume-migration.xml
index 814f8cec91..d65a76c618 100644
--- a/doc/admin-guide-cloud/blockstorage/section_volume-migration.xml
+++ b/doc/admin-guide-cloud/blockstorage/section_volume-migration.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="volume-migration"
-    xmlns="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="volume-migration">
     <title>Migrate volumes</title>
     <para>OpenStack has the ability to
         migrate volumes between back-ends. Migrating a volume
diff --git a/doc/admin-guide-cloud/ch_blockstorage.xml b/doc/admin-guide-cloud/ch_blockstorage.xml
index cdc8a1abef..87e8ecfc41 100644
--- a/doc/admin-guide-cloud/ch_blockstorage.xml
+++ b/doc/admin-guide-cloud/ch_blockstorage.xml
@@ -4,9 +4,10 @@
 %openstack;
 ]>
 <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="managing-volumes">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="managing-volumes">
     <title>Block Storage</title>
     <para>The OpenStack Block Storage service works through the
         interaction of a series of daemon processes named <systemitem
diff --git a/doc/admin-guide-cloud/ch_compute.xml b/doc/admin-guide-cloud/ch_compute.xml
index 578023fb3d..f11a663501 100644
--- a/doc/admin-guide-cloud/ch_compute.xml
+++ b/doc/admin-guide-cloud/ch_compute.xml
@@ -4,10 +4,10 @@
 %openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    version="5.0"
-    xml:id="ch_introduction-to-openstack-compute">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_introduction-to-openstack-compute">
     <title>Compute</title>
     <para>The OpenStack Compute service allows you to control an
         Infrastructure-as-a-Service (IaaS) cloud computing platform.
diff --git a/doc/admin-guide-cloud/ch_dashboard.xml b/doc/admin-guide-cloud/ch_dashboard.xml
index a6db1b12eb..b578be3b30 100644
--- a/doc/admin-guide-cloud/ch_dashboard.xml
+++ b/doc/admin-guide-cloud/ch_dashboard.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_install-dashboard">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_install-dashboard">
     <title>Dashboard</title>
     <para>The
         OpenStack dashboard is a web-based interface that allows you to manage
diff --git a/doc/admin-guide-cloud/ch_identity_mgmt.xml b/doc/admin-guide-cloud/ch_identity_mgmt.xml
index 75b69c1ecc..cf183e8857 100644
--- a/doc/admin-guide-cloud/ch_identity_mgmt.xml
+++ b/doc/admin-guide-cloud/ch_identity_mgmt.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-identity-mgmt-config">
   <title>Identity management</title>
   <para>OpenStack Identity, code-named keystone, is the
diff --git a/doc/admin-guide-cloud/ch_networking.xml b/doc/admin-guide-cloud/ch_networking.xml
index cb27933467..fe69eb274c 100644
--- a/doc/admin-guide-cloud/ch_networking.xml
+++ b/doc/admin-guide-cloud/ch_networking.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_networking">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_networking">
     <title>Networking</title>
     <para>Learn OpenStack Networking concepts, architecture, and basic and advanced
             <command>neutron</command> and <command>nova</command> command-line interface (CLI)
diff --git a/doc/admin-guide-cloud/ch_objectstorage.xml b/doc/admin-guide-cloud/ch_objectstorage.xml
index 3c82984f73..3539543e5b 100644
--- a/doc/admin-guide-cloud/ch_objectstorage.xml
+++ b/doc/admin-guide-cloud/ch_objectstorage.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_admin-openstack-object-storage">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_admin-openstack-object-storage">
     <title>Object Storage</title>
     <xi:include href="../common/section_objectstorage-intro.xml"/>
     <xi:include href="../common/section_objectstorage-features.xml"/>
diff --git a/doc/admin-guide-cloud/compute/section_compute-configure-ipv6.xml b/doc/admin-guide-cloud/compute/section_compute-configure-ipv6.xml
index 8cba5d031b..463a5b5198 100644
--- a/doc/admin-guide-cloud/compute/section_compute-configure-ipv6.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-configure-ipv6.xml
@@ -1,8 +1,8 @@
-<section xml:id="section_configuring-compute-to-use-ipv6-addresses"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0">
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_configuring-compute-to-use-ipv6-addresses">
   <title>Configure Compute to use IPv6 addresses</title>
   <para>If you are using OpenStack Compute with <systemitem>nova-network</systemitem>, you can put
     Compute into IPv4/IPv6 dual-stack mode, so that it uses both IPv4 and IPv6 addresses for
diff --git a/doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml b/doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml
index 138fb67701..8cb604f787 100644
--- a/doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml
@@ -1,8 +1,8 @@
-<section xml:id="section_configuring-compute-migrations"
-  xmlns="http://docbook.org/ns/docbook"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
+<section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_configuring-compute-migrations">
   <?dbhtml stop-chunking?>
   <title>Configure migrations</title>
   <note>
diff --git a/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml b/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml
index cea71024c8..ebe1be607a 100644
--- a/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-configure-service-groups.xml
@@ -1,11 +1,11 @@
 <!DOCTYPE section [
 <!ENTITY % openstack SYSTEM "../../common/entities/openstack.ent">
 %openstack;
-]><section xml:id="configuring-compute-service-groups"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0">
+]><section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="configuring-compute-service-groups">
   <title>Configure Compute service groups</title>
   <para>To effectively manage and utilize compute nodes, the Compute service must know their
         statuses. For example, when a user launches a new VM, the Compute scheduler sends the
diff --git a/doc/admin-guide-cloud/compute/section_compute-image-mgt.xml b/doc/admin-guide-cloud/compute/section_compute-image-mgt.xml
index a6efcd9eaf..fc997ea1b4 100644
--- a/doc/admin-guide-cloud/compute/section_compute-image-mgt.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-image-mgt.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_image-mgmt"
-    xmlns="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="section_image-mgmt">
     <title>Image management</title>
     <para>The OpenStack Image Service discovers, registers, and
         retrieves virtual machine images. The service also includes a
diff --git a/doc/admin-guide-cloud/compute/section_compute-images-instances.xml b/doc/admin-guide-cloud/compute/section_compute-images-instances.xml
index ec9118f262..bb9f40cfe2 100644
--- a/doc/admin-guide-cloud/compute/section_compute-images-instances.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-images-instances.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_compute-images-and-instances"
-    xmlns="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="section_compute-images-and-instances">
     <title>Images and instances</title>
     <para>Disk images provide templates for virtual machine file
             systems. The Image Service manages storage and management
diff --git a/doc/admin-guide-cloud/compute/section_compute-instance-building-blocks.xml b/doc/admin-guide-cloud/compute/section_compute-instance-building-blocks.xml
index 945697441c..d7facbff2b 100644
--- a/doc/admin-guide-cloud/compute/section_compute-instance-building-blocks.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-instance-building-blocks.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_compute-instance-building-blocks"
-    xmlns="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="section_compute-instance-building-blocks">
     <title>Instance building blocks</title>
     <para>In OpenStack, the base operating system is usually copied from an image stored in the
         OpenStack Image Service. This is the most common case and results in an ephemeral instance
diff --git a/doc/admin-guide-cloud/compute/section_compute-instance-mgt-tools.xml b/doc/admin-guide-cloud/compute/section_compute-instance-mgt-tools.xml
index f5118851b1..0b35c33922 100644
--- a/doc/admin-guide-cloud/compute/section_compute-instance-mgt-tools.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-instance-mgt-tools.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_instance-mgmt"
-    xmlns="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="section_instance-mgmt">
     <title>Instance management tools</title>
     <para>OpenStack provides command-line, web-based, and
             API-based instance management tools. Additionally, a
diff --git a/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml b/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml
index 4a35eae662..4bac0a0f1e 100644
--- a/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-networking-nova.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_networking-nova"
-    xmlns="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="section_networking-nova">
     <title>Networking with nova-network</title>
         <para>Understanding the networking configuration options helps
             you design the best configuration for your Compute
diff --git a/doc/admin-guide-cloud/compute/section_compute-recover-nodes.xml b/doc/admin-guide-cloud/compute/section_compute-recover-nodes.xml
index 2cc8757a02..41ebd6b8ea 100644
--- a/doc/admin-guide-cloud/compute/section_compute-recover-nodes.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-recover-nodes.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_nova-compute-node-down"
-    xmlns="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="section_nova-compute-node-down">
     <title>Recover from a failed compute node</title>
     <para>If you deployed Compute with a shared file system, you can quickly recover from a failed
         compute node. Of the two methods covered in these sections, evacuating is the preferred
diff --git a/doc/admin-guide-cloud/compute/section_compute-rootwrap.xml b/doc/admin-guide-cloud/compute/section_compute-rootwrap.xml
index 56e74f5382..707b462879 100644
--- a/doc/admin-guide-cloud/compute/section_compute-rootwrap.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-rootwrap.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="root-wrap-reference"
-    xmlns="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="root-wrap-reference">
     <title>Secure with root wrappers</title>
     <para>The root wrapper enables an unprivileged user to run a number of Compute actions as the
         root user in the safest manner possible. Historically, Compute used a specific
diff --git a/doc/admin-guide-cloud/compute/section_compute-security.xml b/doc/admin-guide-cloud/compute/section_compute-security.xml
index 7ec868e188..fd13addee3 100644
--- a/doc/admin-guide-cloud/compute/section_compute-security.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-security.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="section-compute-security"
-  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"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
+  version="5.0"
+  xml:id="section-compute-security">
   <title>Security hardening</title>
   <para>OpenStack Compute can be integrated with various third-party
     technologies to increase security. For more information, see the
diff --git a/doc/admin-guide-cloud/compute/section_compute-system-admin.xml b/doc/admin-guide-cloud/compute/section_compute-system-admin.xml
index cc27b35470..a2e787507d 100644
--- a/doc/admin-guide-cloud/compute/section_compute-system-admin.xml
+++ b/doc/admin-guide-cloud/compute/section_compute-system-admin.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_compute-system-admin"
-    xmlns="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="section_compute-system-admin">
     <title>System administration</title>
     <para>By understanding how the different installed nodes
             interact with each other, you can administer the Compute
diff --git a/doc/admin-guide-cloud/identity/section_keystone-token-binding.xml b/doc/admin-guide-cloud/identity/section_keystone-token-binding.xml
index eb6585598e..70caee9e01 100644
--- a/doc/admin-guide-cloud/identity/section_keystone-token-binding.xml
+++ b/doc/admin-guide-cloud/identity/section_keystone-token-binding.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="keystone-token-binding">
   <title>Configure Identity service for token binding</title>
   <para>Token binding embeds information from an external
diff --git a/doc/admin-guide-cloud/image/section_glance-property-protection.xml b/doc/admin-guide-cloud/image/section_glance-property-protection.xml
index b551da8ff4..82bd8333f1 100644
--- a/doc/admin-guide-cloud/image/section_glance-property-protection.xml
+++ b/doc/admin-guide-cloud/image/section_glance-property-protection.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="glance-property-protection">
   <title>Image properties and property protection</title>
   <para>An image property is a key and value pair that the cloud
diff --git a/doc/admin-guide-cloud/networking/section_networking-adv-config.xml b/doc/admin-guide-cloud/networking/section_networking-adv-config.xml
index 9d3ba5ba58..8ae55801f1 100644
--- a/doc/admin-guide-cloud/networking/section_networking-adv-config.xml
+++ b/doc/admin-guide-cloud/networking/section_networking-adv-config.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_networking-advanced-config"
-    xmlns="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="section_networking-advanced-config">
     <title>Advanced configuration options</title>
     <para>This section describes advanced configuration options for
         various system components. For example, configuration options
diff --git a/doc/admin-guide-cloud/networking/section_networking-config-identity.xml b/doc/admin-guide-cloud/networking/section_networking-config-identity.xml
index 77a104ebe2..bb28a12ebe 100644
--- a/doc/admin-guide-cloud/networking/section_networking-config-identity.xml
+++ b/doc/admin-guide-cloud/networking/section_networking-config-identity.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_networking-config-identity"
-  xmlns="http://docbook.org/ns/docbook"
+<section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_networking-config-identity">
   <title>Configure Identity Service for Networking</title>
   <procedure>
     <title>To configure the Identity Service for use with
diff --git a/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml b/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml
index 68b2741b3f..085d18904d 100644
--- a/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml
+++ b/doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.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="app_demo_multi_dhcp_agents">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="app_demo_multi_dhcp_agents">
     <title>Scalable and highly available DHCP agents</title>
     <para>This section describes how to use the agent management
         (alias agent) and scheduler (alias agent_scheduler) extensions
diff --git a/doc/admin-guide-cloud/networking/section_networking-scenarios.xml b/doc/admin-guide-cloud/networking/section_networking-scenarios.xml
index 8bd967c714..685ce17ee3 100644
--- a/doc/admin-guide-cloud/networking/section_networking-scenarios.xml
+++ b/doc/admin-guide-cloud/networking/section_networking-scenarios.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_networking-scenarios"
-    xmlns="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="section_networking-scenarios">
     <title>Networking scenarios</title>
     <para>This chapter describes two networking scenarios and how the
     Open vSwitch plug-in and the Linux Bridge plug-in implement these
diff --git a/doc/admin-guide-cloud/networking/section_networking-use.xml b/doc/admin-guide-cloud/networking/section_networking-use.xml
index 8cd503d354..fbe2cd3918 100644
--- a/doc/admin-guide-cloud/networking/section_networking-use.xml
+++ b/doc/admin-guide-cloud/networking/section_networking-use.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_networking-use"
-    xmlns="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="section_networking-use">
     <title>Use Networking</title>
     <para>You can manage OpenStack Networking services by using the
             <systemitem>service</systemitem> command. For
diff --git a/doc/admin-guide-cloud/networking/section_networking_adv_features.xml b/doc/admin-guide-cloud/networking/section_networking_adv_features.xml
index 1219861a69..297606c036 100644
--- a/doc/admin-guide-cloud/networking/section_networking_adv_features.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_adv_features.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_networking-adv-features">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_networking-adv-features">
     <title>Advanced features through API extensions</title>
     <para>Several plug-ins implement API extensions that provide capabilities similar to what was
         available in nova-network: These plug-ins are likely to be of interest to the OpenStack
diff --git a/doc/admin-guide-cloud/networking/section_networking_adv_operational_features.xml b/doc/admin-guide-cloud/networking/section_networking_adv_operational_features.xml
index 1877f2c968..1cc6b6c4c9 100644
--- a/doc/admin-guide-cloud/networking/section_networking_adv_operational_features.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_adv_operational_features.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_networking-adv-operational_features">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_networking-adv-operational_features">
     <title>Advanced operational features</title>
     <section xml:id="section_adv_logging">
         <title>Logging settings</title>
diff --git a/doc/admin-guide-cloud/networking/section_networking_arch.xml b/doc/admin-guide-cloud/networking/section_networking_arch.xml
index 7e23826dc9..7e0af5db55 100644
--- a/doc/admin-guide-cloud/networking/section_networking_arch.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_arch.xml
@@ -1,7 +1,8 @@
-<section xml:id="section_networking-arch"
-         xmlns="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="section_networking-arch">
   <title>Networking architecture</title>
   <para>Before you deploy Networking, it's useful to understand the
       Networking services and how they interact with the OpenStack
diff --git a/doc/admin-guide-cloud/networking/section_networking_auth.xml b/doc/admin-guide-cloud/networking/section_networking_auth.xml
index 39abc31e7e..25ac35347d 100644
--- a/doc/admin-guide-cloud/networking/section_networking_auth.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_auth.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_networking_auth">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_networking_auth">
     <title>Authentication and authorization</title>
     <para>Networking uses the Identity Service as the default
         authentication service. When the Identity Service is enabled,
diff --git a/doc/admin-guide-cloud/networking/section_networking_high_avail.xml b/doc/admin-guide-cloud/networking/section_networking_high_avail.xml
index 79c39e3b33..71a8fb3b4f 100644
--- a/doc/admin-guide-cloud/networking/section_networking_high_avail.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_high_avail.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_high_avail">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_high_avail">
         <title>High availability</title>
         <para>The use of high availability in a Networking deployment
             helps mitigate the impact of individual node failures. In general, you
diff --git a/doc/admin-guide-cloud/networking/section_networking_introduction.xml b/doc/admin-guide-cloud/networking/section_networking_introduction.xml
index e88bdf8789..c02c3b68db 100644
--- a/doc/admin-guide-cloud/networking/section_networking_introduction.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_introduction.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="section_networking-intro"
-    xmlns="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="section_networking-intro">
     <title>Introduction to Networking</title>
     <para>The Networking service, code-named neutron, provides an API
         that lets you define network connectivity and addressing in
diff --git a/doc/admin-guide-cloud/networking/section_networking_pagination_and_sorting_support.xml b/doc/admin-guide-cloud/networking/section_networking_pagination_and_sorting_support.xml
index 08594b6c9e..b508afce99 100644
--- a/doc/admin-guide-cloud/networking/section_networking_pagination_and_sorting_support.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_pagination_and_sorting_support.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_pagination_and_sorting_support">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="section_pagination_and_sorting_support">
         <title>Plug-in pagination and sorting support</title>
         <table rules="all">
             <caption>Plug-ins that support native pagination and
diff --git a/doc/admin-guide-cloud/section_object-storage-admin.xml b/doc/admin-guide-cloud/section_object-storage-admin.xml
index 15b6077570..3995dbc7a9 100644
--- a/doc/admin-guide-cloud/section_object-storage-admin.xml
+++ b/doc/admin-guide-cloud/section_object-storage-admin.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="ch_running-openstack-object-storage">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_running-openstack-object-storage">
     <title>System administration for Object Storage</title>
     <para>By understanding Object Storage concepts, you can better
         monitor and administer your storage solution. The majority of
diff --git a/doc/admin-guide-cloud/section_object-storage-monitoring.xml b/doc/admin-guide-cloud/section_object-storage-monitoring.xml
index 8845895419..736bf7ce04 100644
--- a/doc/admin-guide-cloud/section_object-storage-monitoring.xml
+++ b/doc/admin-guide-cloud/section_object-storage-monitoring.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="ch_introduction-to-openstack-object-storage-monitoring">
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  version="5.0"
+  xml:id="ch_introduction-to-openstack-object-storage-monitoring">
     <!-- ... Based on a blog, should be replaced with original material... -->
     <title>Object Storage monitoring</title>
     <?dbhtml stop-chunking?>