From b0ce83d94544123da971c12f1fbc489b8550de0c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sat, 3 May 2014 05:01:40 +0200
Subject: [PATCH] Use common entities file

Instead of declaring entities separately for each file, include the file
common/entities/openstack.ent.

Change-Id: I99f905be679eab34059a30311f11189c17b5498c
---
 doc/admin-guide-cloud/ch_blockstorage.xml                    | 4 ++--
 doc/admin-guide-cloud/ch_compute.xml                         | 4 ++--
 .../compute/section_compute-configure-service-groups.xml     | 4 ++--
 doc/admin-guide-cloud/section_backup-block-storage-disks.xml | 4 ++--
 doc/admin-guide-cloud/section_ts_cinder_config.xml           | 4 ++--
 doc/cli-reference/ch_cli_glance_property_keys.xml            | 4 ++--
 doc/common/section_cli_cinder_manage_volumes.xml             | 3 ++-
 doc/common/section_cli_nova_boot_from_volume.xml             | 4 ++--
 doc/common/section_cli_nova_customize_flavors.xml            | 4 ++--
 doc/common/section_cli_nova_host_aggregates.xml              | 4 ++--
 doc/common/section_dashboard_access.xml                      | 4 ++--
 doc/common/section_objectstorage-arch.xml                    | 4 ++--
 doc/common/section_storage-concepts.xml                      | 4 ++--
 doc/common/section_support-compute.xml                       | 4 ++--
 .../block-storage/drivers/hds-hus-driver.xml                 | 4 ++--
 doc/config-reference/compute/section_compute-scheduler.xml   | 5 ++---
 doc/config-reference/compute/section_hypervisor_vmware.xml   | 4 ++--
 doc/glossary/glossary-terms.xml                              | 5 ++---
 doc/image-guide/ch_creating_images_manually.xml              | 4 ++--
 doc/image-guide/ch_modifying_images.xml                      | 4 ++--
 doc/image-guide/ch_openstack_images.xml                      | 4 ++--
 .../section_object-storage-sys-requirements.xml              | 4 ++--
 doc/install-guide/section_ceilometer-install.xml             | 4 ++--
 doc/training-guides/lab000-virtualbox-basics.xml             | 4 ++--
 doc/training-guides/module003-ch006-more-concepts.xml        | 4 ++--
 .../module003-ch007-swift-cluster-architecture.xml           | 4 ++--
 doc/user-guide-admin/section_cli_keystone_set_quotas.xml     | 4 ++--
 .../section_dashboard_admin_manage_instances.xml             | 4 ++--
 doc/user-guide-admin/section_dashboard_admin_set_quotas.xml  | 4 ++--
 doc/user-guide/section_cli_nova_config-drive.xml             | 4 ++--
 doc/user-guide/section_cli_nova_configure_instances.xml      | 4 ++--
 .../section_dashboard_launch_instances_from_image.xml        | 4 ++--
 32 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/doc/admin-guide-cloud/ch_blockstorage.xml b/doc/admin-guide-cloud/ch_blockstorage.xml
index 9e9bea0428..070d9c4286 100644
--- a/doc/admin-guide-cloud/ch_blockstorage.xml
+++ b/doc/admin-guide-cloud/ch_blockstorage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/admin-guide-cloud/ch_compute.xml b/doc/admin-guide-cloud/ch_compute.xml
index 5191ea1800..a89a4ab4fc 100644
--- a/doc/admin-guide-cloud/ch_compute.xml
+++ b/doc/admin-guide-cloud/ch_compute.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xlink="http://www.w3.org/1999/xlink"
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 25826ec683..67c0c4fa05 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,6 +1,6 @@
 <!DOCTYPE section [
- <!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
+<!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"
diff --git a/doc/admin-guide-cloud/section_backup-block-storage-disks.xml b/doc/admin-guide-cloud/section_backup-block-storage-disks.xml
index 0f720e6110..4afd217b36 100644
--- a/doc/admin-guide-cloud/section_backup-block-storage-disks.xml
+++ b/doc/admin-guide-cloud/section_backup-block-storage-disks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xml:id="backup-block-storage-disks"
     xmlns="http://docbook.org/ns/docbook"
diff --git a/doc/admin-guide-cloud/section_ts_cinder_config.xml b/doc/admin-guide-cloud/section_ts_cinder_config.xml
index 73a4ebb6e6..3a00bde54f 100644
--- a/doc/admin-guide-cloud/section_ts_cinder_config.xml
+++ b/doc/admin-guide-cloud/section_ts_cinder_config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xml:id="section_ts_cinder_config"
     xmlns="http://docbook.org/ns/docbook"
diff --git a/doc/cli-reference/ch_cli_glance_property_keys.xml b/doc/cli-reference/ch_cli_glance_property_keys.xml
index 999155dd5f..c2dc5c6d74 100644
--- a/doc/cli-reference/ch_cli_glance_property_keys.xml
+++ b/doc/cli-reference/ch_cli_glance_property_keys.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter [
- <!-- Some useful entities borrowed from HTML -->
-<!ENTITY mdash  "&#x2014;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/common/section_cli_cinder_manage_volumes.xml b/doc/common/section_cli_cinder_manage_volumes.xml
index 31a889dee8..d0544c3674 100644
--- a/doc/common/section_cli_cinder_manage_volumes.xml
+++ b/doc/common/section_cli_cinder_manage_volumes.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/common/section_cli_nova_boot_from_volume.xml b/doc/common/section_cli_nova_boot_from_volume.xml
index 6625749e79..881feef2d7 100644
--- a/doc/common/section_cli_nova_boot_from_volume.xml
+++ b/doc/common/section_cli_nova_boot_from_volume.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/common/section_cli_nova_customize_flavors.xml b/doc/common/section_cli_nova_customize_flavors.xml
index 96640ab743..9020a0fb7d 100644
--- a/doc/common/section_cli_nova_customize_flavors.xml
+++ b/doc/common/section_cli_nova_customize_flavors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section[
- <!-- Some useful entities borrowed from HTML -->
-<!ENTITY mdash  "&#x2014;">
+<!ENTITY % openstack SYSTEM "entities/openstack.ent">
+%openstack;
 ]>
 <section xml:id="customize-flavors" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
     <title>Flavors</title>
diff --git a/doc/common/section_cli_nova_host_aggregates.xml b/doc/common/section_cli_nova_host_aggregates.xml
index 77ef335117..87554e5ff8 100644
--- a/doc/common/section_cli_nova_host_aggregates.xml
+++ b/doc/common/section_cli_nova_host_aggregates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/common/section_dashboard_access.xml b/doc/common/section_dashboard_access.xml
index b5106e3ed2..708f7c1d2f 100644
--- a/doc/common/section_dashboard_access.xml
+++ b/doc/common/section_dashboard_access.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
- <!-- Some useful entities borrowed from HTML -->
-<!ENTITY mdash  "&#x2014;">
+<!ENTITY % openstack SYSTEM "entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/common/section_objectstorage-arch.xml b/doc/common/section_objectstorage-arch.xml
index d17bf414ab..b071268d9f 100644
--- a/doc/common/section_objectstorage-arch.xml
+++ b/doc/common/section_objectstorage-arch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/common/section_storage-concepts.xml b/doc/common/section_storage-concepts.xml
index 13249b7cca..37c836a241 100644
--- a/doc/common/section_storage-concepts.xml
+++ b/doc/common/section_storage-concepts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/common/section_support-compute.xml b/doc/common/section_support-compute.xml
index e9e589b2e0..0e94ccf3e6 100644
--- a/doc/common/section_support-compute.xml
+++ b/doc/common/section_support-compute.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE section [
- <!-- Some useful entities borrowed from HTML -->
-<!ENTITY mdash  "&#x2014;">
+<!ENTITY % openstack SYSTEM "entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/config-reference/block-storage/drivers/hds-hus-driver.xml b/doc/config-reference/block-storage/drivers/hds-hus-driver.xml
index 94ad84eae1..6847fc1a90 100644
--- a/doc/config-reference/block-storage/drivers/hds-hus-driver.xml
+++ b/doc/config-reference/block-storage/drivers/hds-hus-driver.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE section [
- <!-- Some useful entities borrowed from HTML -->
-<!ENTITY mdash  "&#x2014;">
+<!ENTITY % openstack SYSTEM "../../../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xml:id="hds-volume-driver"
          xmlns="http://docbook.org/ns/docbook"
diff --git a/doc/config-reference/compute/section_compute-scheduler.xml b/doc/config-reference/compute/section_compute-scheduler.xml
index 673df80bb9..42c6040163 100644
--- a/doc/config-reference/compute/section_compute-scheduler.xml
+++ b/doc/config-reference/compute/section_compute-scheduler.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
-<!ENTITY mdash "&#x2014;">
+<!ENTITY % openstack SYSTEM "../../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xml:id="section_compute-scheduler"
     xmlns="http://docbook.org/ns/docbook"
diff --git a/doc/config-reference/compute/section_hypervisor_vmware.xml b/doc/config-reference/compute/section_hypervisor_vmware.xml
index a81692096b..d49f63f703 100644
--- a/doc/config-reference/compute/section_hypervisor_vmware.xml
+++ b/doc/config-reference/compute/section_hypervisor_vmware.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index 1fb315b982..1b98636497 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 
 <glossary xmlns="http://docbook.org/ns/docbook"
diff --git a/doc/image-guide/ch_creating_images_manually.xml b/doc/image-guide/ch_creating_images_manually.xml
index 1224aeeec8..f5ce48a6e7 100644
--- a/doc/image-guide/ch_creating_images_manually.xml
+++ b/doc/image-guide/ch_creating_images_manually.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/image-guide/ch_modifying_images.xml b/doc/image-guide/ch_modifying_images.xml
index 7abeea32dc..9f139c6449 100644
--- a/doc/image-guide/ch_modifying_images.xml
+++ b/doc/image-guide/ch_modifying_images.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/image-guide/ch_openstack_images.xml b/doc/image-guide/ch_openstack_images.xml
index 06c81fbfca..78d694c1ba 100644
--- a/doc/image-guide/ch_openstack_images.xml
+++ b/doc/image-guide/ch_openstack_images.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
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 9876105059..062eeb895a 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xml:id="object-storage-system-requirements"
     xmlns="http://docbook.org/ns/docbook"
diff --git a/doc/install-guide/section_ceilometer-install.xml b/doc/install-guide/section_ceilometer-install.xml
index 4ba81c3f19..7715874e53 100644
--- a/doc/install-guide/section_ceilometer-install.xml
+++ b/doc/install-guide/section_ceilometer-install.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xml:id="ceilometer-install"
   xmlns="http://docbook.org/ns/docbook"
diff --git a/doc/training-guides/lab000-virtualbox-basics.xml b/doc/training-guides/lab000-virtualbox-basics.xml
index 4c954b3ae0..92e9fd9f7a 100644
--- a/doc/training-guides/lab000-virtualbox-basics.xml
+++ b/doc/training-guides/lab000-virtualbox-basics.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/training-guides/module003-ch006-more-concepts.xml b/doc/training-guides/module003-ch006-more-concepts.xml
index d3ded816b7..03e6b20ec5 100644
--- a/doc/training-guides/module003-ch006-more-concepts.xml
+++ b/doc/training-guides/module003-ch006-more-concepts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/training-guides/module003-ch007-swift-cluster-architecture.xml b/doc/training-guides/module003-ch007-swift-cluster-architecture.xml
index c2381d6f7a..0469cb6d6a 100644
--- a/doc/training-guides/module003-ch007-swift-cluster-architecture.xml
+++ b/doc/training-guides/module003-ch007-swift-cluster-architecture.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/user-guide-admin/section_cli_keystone_set_quotas.xml b/doc/user-guide-admin/section_cli_keystone_set_quotas.xml
index 1c94f2d99f..ab74393f17 100644
--- a/doc/user-guide-admin/section_cli_keystone_set_quotas.xml
+++ b/doc/user-guide-admin/section_cli_keystone_set_quotas.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml b/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
index f3a5e07551..682972c95d 100644
--- a/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_manage_instances.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY mdash  "&#x2014;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml b/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml
index b168a17868..a900627b5a 100644
--- a/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml
+++ b/doc/user-guide-admin/section_dashboard_admin_set_quotas.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook" version="5.0"
   xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/user-guide/section_cli_nova_config-drive.xml b/doc/user-guide/section_cli_nova_config-drive.xml
index a7ccd3ca01..a9ee085800 100644
--- a/doc/user-guide/section_cli_nova_config-drive.xml
+++ b/doc/user-guide/section_cli_nova_config-drive.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY nbsp "&#160;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/user-guide/section_cli_nova_configure_instances.xml b/doc/user-guide/section_cli_nova_configure_instances.xml
index ccd40b83d1..756c6e579f 100644
--- a/doc/user-guide/section_cli_nova_configure_instances.xml
+++ b/doc/user-guide/section_cli_nova_configure_instances.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
-        <!-- Some useful entities borrowed from HTML -->
-        <!ENTITY mdash  "&#x2014;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/doc/user-guide/section_dashboard_launch_instances_from_image.xml b/doc/user-guide/section_dashboard_launch_instances_from_image.xml
index 10f9aff21e..70ba1ac894 100644
--- a/doc/user-guide/section_dashboard_launch_instances_from_image.xml
+++ b/doc/user-guide/section_dashboard_launch_instances_from_image.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section [
- <!-- Some useful entities borrowed from HTML -->
-<!ENTITY mdash  "&#x2014;">
+<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+%openstack;
 ]>
 <section xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"