From 7837131f36c6ea30e59fdf3a6731d0abc999b5c5 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Sun, 9 Feb 2014 19:05:24 -0600
Subject: [PATCH] Change to allow read of service names from doc file

- Clouddocs-maven-plugin reads service names
  and links to related API ref pages
  from the api-ref/src/docbkx/preface.xml file
- Added an xml:id to the itemizedlist
  in the preface.xml file to identify it as
  the service names/links source
- Added preface to every API reference page
  so that each page can auto-generate the
  sidebar menu from the itemizedlist in
  the preface

Partial-Bug: #1267174

Change-Id: I8871c804c2c93f4f7625fc92ed0448de40ccb751
author: diane fleming
---
 api-ref/pom.xml                              | 11 ++--
 api-ref/src/docbkx/api-ref-blockstorage.xml  | 16 +----
 api-ref/src/docbkx/api-ref-compute-ext.xml   |  1 +
 api-ref/src/docbkx/api-ref-compute.xml       |  1 +
 api-ref/src/docbkx/api-ref-identity.xml      | 16 +----
 api-ref/src/docbkx/api-ref-image.xml         | 16 +----
 api-ref/src/docbkx/api-ref-networking.xml    |  1 +
 api-ref/src/docbkx/api-ref-objectstorage.xml | 16 +----
 api-ref/src/docbkx/api-ref-orchestration.xml | 16 +----
 api-ref/src/docbkx/api-ref-telemetry.xml     |  3 +-
 api-ref/src/docbkx/api-ref.xml               |  2 +-
 api-ref/src/docbkx/ch_blockstorage-api.xml   | 13 ----
 api-ref/src/docbkx/ch_compute-ext.xml        | 10 ----
 api-ref/src/docbkx/ch_identity-v2-ext.xml    | 10 ----
 api-ref/src/docbkx/ch_identity-v2.xml        | 13 ----
 api-ref/src/docbkx/ch_identity-v3-ext.xml    | 10 ----
 api-ref/src/docbkx/ch_identity-v3.xml        | 13 ----
 api-ref/src/docbkx/ch_images-v1.xml          | 13 ----
 api-ref/src/docbkx/ch_images-v2.xml          | 13 ----
 api-ref/src/docbkx/ch_netconn-ext-v2.xml     | 13 ----
 api-ref/src/docbkx/ch_netconn-v2.xml         | 13 ----
 api-ref/src/docbkx/ch_telemetry-v2.xml       | 13 ----
 api-ref/src/docbkx/preface.xml               | 62 ++++++++------------
 23 files changed, 46 insertions(+), 249 deletions(-)

diff --git a/api-ref/pom.xml b/api-ref/pom.xml
index 8d698f3ea..aa492a5d6 100644
--- a/api-ref/pom.xml
+++ b/api-ref/pom.xml
@@ -32,8 +32,8 @@
             </goals>
             <phase>generate-sources</phase>
             <configuration>
-              <includes> api-ref.xml, api-ref-identity.xml,
-                api-ref-compute.xml, api-ref-compute-ext.xml, api-ref-image.xml,
+              <includes> api-ref.xml, api-ref-compute-core.xml, api-ref-compute-ext.xml,
+                api-ref-identity.xml, api-ref-image.xml,
                 api-ref-networking.xml, api-ref-objectstorage.xml,
                 api-ref-blockstorage.xml, api-ref-orchestration.xml,
                 api-ref-telemetry.xml </includes>
@@ -44,7 +44,7 @@
             </configuration>
           </execution>
           <!-- Configuration for OpenStack API References (pdf) -->
-<!--          <execution>
+          <!--<execution>
             <id>os-api-ref</id>
             <goals>
               <goal>generate-webhelp</goal>
@@ -157,12 +157,13 @@
         </executions>
         <configuration>
           <!-- These parameters apply to pdf and webhelp -->
-          <generateToc> appendix toc,title
+          <generateToc> 
+            appendix toc,title
             article/appendix nop
             article toc,title
             book toc,title
             chapter toc,title
-            section toc, title
+            section toc,title
             part toc,title
             qandadiv toc
             qandaset toc
diff --git a/api-ref/src/docbkx/api-ref-blockstorage.xml b/api-ref/src/docbkx/api-ref-blockstorage.xml
index 38fe7e661..3349edce9 100644
--- a/api-ref/src/docbkx/api-ref-blockstorage.xml
+++ b/api-ref/src/docbkx/api-ref-blockstorage.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <book xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -23,11 +10,12 @@
   <info>
     <title>OpenStack Block Storage APIs</title>
     <copyright>
-      <year>2010-2013</year>
+      <year>2010-2014</year>
     </copyright>
     <legalnotice role="apache2">
       <para/>
     </legalnotice>
   </info>
+  <xi:include href="preface.xml"/>
   <xi:include href="ch_blockstorage-api.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref-compute-ext.xml b/api-ref/src/docbkx/api-ref-compute-ext.xml
index 60fe0e3bd..c4110415a 100644
--- a/api-ref/src/docbkx/api-ref-compute-ext.xml
+++ b/api-ref/src/docbkx/api-ref-compute-ext.xml
@@ -16,5 +16,6 @@
             <para/>
         </legalnotice>
     </info>
+    <xi:include href="preface.xml"/>
     <xi:include href="ch_compute-ext.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref-compute.xml b/api-ref/src/docbkx/api-ref-compute.xml
index ce862c858..bd6101419 100644
--- a/api-ref/src/docbkx/api-ref-compute.xml
+++ b/api-ref/src/docbkx/api-ref-compute.xml
@@ -16,5 +16,6 @@
             <para/>
         </legalnotice>
     </info>
+    <xi:include href="preface.xml"/>
     <xi:include href="ch_compute-core.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref-identity.xml b/api-ref/src/docbkx/api-ref-identity.xml
index 38b56d82f..2361c5360 100644
--- a/api-ref/src/docbkx/api-ref-identity.xml
+++ b/api-ref/src/docbkx/api-ref-identity.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <book xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -23,12 +10,13 @@
   <info>
     <title>OpenStack Identity Service APIs and extensions</title>
     <copyright>
-      <year>2010-2013</year>
+      <year>2010-2014</year>
     </copyright>
     <legalnotice role="apache2">
       <para/>
     </legalnotice>
   </info>
+  <xi:include href="preface.xml"/>
   <xi:include href="ch_identity-v3.xml"/>
   <xi:include href="ch_identity-v3-ext.xml"/>
   <xi:include href="ch_identity-v2.xml"/>
diff --git a/api-ref/src/docbkx/api-ref-image.xml b/api-ref/src/docbkx/api-ref-image.xml
index cb371377c..d26af33e9 100644
--- a/api-ref/src/docbkx/api-ref-image.xml
+++ b/api-ref/src/docbkx/api-ref-image.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <book xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -23,12 +10,13 @@
   <info>
     <title>OpenStack Image Service APIs</title>
     <copyright>
-      <year>2010-2013</year>
+      <year>2010-2014</year>
     </copyright>
     <legalnotice role="apache2">
       <para/>
     </legalnotice>
   </info>
+  <xi:include href="preface.xml"/>
   <xi:include href="ch_images-v2.xml"/>
   <xi:include href="ch_images-v1.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref-networking.xml b/api-ref/src/docbkx/api-ref-networking.xml
index 674453204..8c9919981 100644
--- a/api-ref/src/docbkx/api-ref-networking.xml
+++ b/api-ref/src/docbkx/api-ref-networking.xml
@@ -16,6 +16,7 @@
       <para/>
     </legalnotice>
   </info>
+  <xi:include href="preface.xml"/>
   <xi:include href="ch_netconn-v2.xml"/>
   <xi:include href="ch_netconn-ext-v2.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref-objectstorage.xml b/api-ref/src/docbkx/api-ref-objectstorage.xml
index df3c6b1d7..39c90e8da 100644
--- a/api-ref/src/docbkx/api-ref-objectstorage.xml
+++ b/api-ref/src/docbkx/api-ref-objectstorage.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <book xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -23,11 +10,12 @@
   <info>
     <title>OpenStack Object Storage API</title>
     <copyright>
-      <year>2010-2013</year>
+      <year>2010-2014</year>
     </copyright>
     <legalnotice role="apache2">
       <para/>
     </legalnotice>
   </info>
+  <xi:include href="preface.xml"/>
  <xi:include href="ch_objectstorage-v1.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref-orchestration.xml b/api-ref/src/docbkx/api-ref-orchestration.xml
index d8ea0aa96..e80aa58ba 100644
--- a/api-ref/src/docbkx/api-ref-orchestration.xml
+++ b/api-ref/src/docbkx/api-ref-orchestration.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <book xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -23,11 +10,12 @@
   <info>
     <title>OpenStack Orchestration API</title>
     <copyright>
-      <year>2010-2013</year>
+      <year>2010-2014</year>
     </copyright>
     <legalnotice role="apache2">
       <para/>
     </legalnotice>
   </info>
+  <xi:include href="preface.xml"/>
   <xi:include href="ch_orchestration-v1.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref-telemetry.xml b/api-ref/src/docbkx/api-ref-telemetry.xml
index 543a1ea15..ac2d7d2ec 100644
--- a/api-ref/src/docbkx/api-ref-telemetry.xml
+++ b/api-ref/src/docbkx/api-ref-telemetry.xml
@@ -10,11 +10,12 @@
   <info>
     <title>OpenStack Telemetry API</title>
     <copyright>
-      <year>2010-2013</year>
+      <year>2010-2014</year>
     </copyright>
     <legalnotice role="apache2">
       <para/>
     </legalnotice>
   </info>
+  <xi:include href="preface.xml"/>
   <xi:include href="ch_telemetry-v2.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref.xml b/api-ref/src/docbkx/api-ref.xml
index b6a8ed508..2dd8171db 100644
--- a/api-ref/src/docbkx/api-ref.xml
+++ b/api-ref/src/docbkx/api-ref.xml
@@ -20,7 +20,7 @@ xml:id="api.openstack.org">
       </affiliation>
     </author>
     <copyright>
-      <year>2010-2013</year>
+      <year>2010-2014</year>
       <holder>OpenStack Foundation</holder>
     </copyright>
     <productname>OpenStack</productname>
diff --git a/api-ref/src/docbkx/ch_blockstorage-api.xml b/api-ref/src/docbkx/ch_blockstorage-api.xml
index daf5e928e..4f2064d14 100644
--- a/api-ref/src/docbkx/ch_blockstorage-api.xml
+++ b/api-ref/src/docbkx/ch_blockstorage-api.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/api-ref/src/docbkx/ch_compute-ext.xml b/api-ref/src/docbkx/ch_compute-ext.xml
index 25b31bf43..4709e644a 100644
--- a/api-ref/src/docbkx/ch_compute-ext.xml
+++ b/api-ref/src/docbkx/ch_compute-ext.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
 <!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/api-ref/src/docbkx/ch_identity-v2-ext.xml b/api-ref/src/docbkx/ch_identity-v2-ext.xml
index 756f378fd..204fad321 100644
--- a/api-ref/src/docbkx/ch_identity-v2-ext.xml
+++ b/api-ref/src/docbkx/ch_identity-v2-ext.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
 <!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/api-ref/src/docbkx/ch_identity-v2.xml b/api-ref/src/docbkx/ch_identity-v2.xml
index a0f4ed8de..1f62cb66b 100644
--- a/api-ref/src/docbkx/ch_identity-v2.xml
+++ b/api-ref/src/docbkx/ch_identity-v2.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/api-ref/src/docbkx/ch_identity-v3-ext.xml b/api-ref/src/docbkx/ch_identity-v3-ext.xml
index 160c27c5c..dee6bd485 100644
--- a/api-ref/src/docbkx/ch_identity-v3-ext.xml
+++ b/api-ref/src/docbkx/ch_identity-v3-ext.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
 <!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/api-ref/src/docbkx/ch_identity-v3.xml b/api-ref/src/docbkx/ch_identity-v3.xml
index f25617aec..7ecefea63 100644
--- a/api-ref/src/docbkx/ch_identity-v3.xml
+++ b/api-ref/src/docbkx/ch_identity-v3.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter [
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/api-ref/src/docbkx/ch_images-v1.xml b/api-ref/src/docbkx/ch_images-v1.xml
index 826ccf049..d8e9e0c00 100644
--- a/api-ref/src/docbkx/ch_images-v1.xml
+++ b/api-ref/src/docbkx/ch_images-v1.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/api-ref/src/docbkx/ch_images-v2.xml b/api-ref/src/docbkx/ch_images-v2.xml
index d7551f790..ff17ed701 100644
--- a/api-ref/src/docbkx/ch_images-v2.xml
+++ b/api-ref/src/docbkx/ch_images-v2.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/api-ref/src/docbkx/ch_netconn-ext-v2.xml b/api-ref/src/docbkx/ch_netconn-ext-v2.xml
index d5ef7dee1..777daa0f2 100644
--- a/api-ref/src/docbkx/ch_netconn-ext-v2.xml
+++ b/api-ref/src/docbkx/ch_netconn-ext-v2.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/api-ref/src/docbkx/ch_netconn-v2.xml b/api-ref/src/docbkx/ch_netconn-v2.xml
index bc08ff9e5..d9949081b 100644
--- a/api-ref/src/docbkx/ch_netconn-v2.xml
+++ b/api-ref/src/docbkx/ch_netconn-v2.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/api-ref/src/docbkx/ch_telemetry-v2.xml b/api-ref/src/docbkx/ch_telemetry-v2.xml
index d4483863b..af2d4cb79 100644
--- a/api-ref/src/docbkx/ch_telemetry-v2.xml
+++ b/api-ref/src/docbkx/ch_telemetry-v2.xml
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter[
-<!-- Some useful entities borrowed from HTML -->
-<!ENTITY ndash  "&#x2013;">
-<!ENTITY mdash  "&#x2014;">
-<!ENTITY hellip "&#x2026;">
-<!ENTITY plusmn "&#xB1;">
-<!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
-]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/api-ref/src/docbkx/preface.xml b/api-ref/src/docbkx/preface.xml
index d7f9b6c8e..4d8c41a68 100644
--- a/api-ref/src/docbkx/preface.xml
+++ b/api-ref/src/docbkx/preface.xml
@@ -5,11 +5,6 @@
 <!ENTITY hellip "&#x2026;">
 <!ENTITY plusmn "&#xB1;">
 <!ENTITY nbsp "&#160;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
 ]>
 <preface xmlns="http://docbook.org/ns/docbook"
     xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -18,38 +13,32 @@
     xmlns:xref="http://www.w3.org/1999/xref"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     version="5.0-extension RackBook-2.0" xml:id="Overview">
-    <title>Preface</title>
-    <para>Use these OpenStack APIs and extensions in your OpenStack
-        cloud:</para>
-    <itemizedlist role="compact">
+    <title>OpenStack API Complete Reference</title>
+    <para>Use the OpenStack APIs and extensions in your OpenStack
+        cloud.</para>
+    <itemizedlist xml:id="service-list">
         <listitem>
-            <para><link
-                    xlink:href="http://api.openstack.org/api-ref-blockstorage.html"
-                    >Block Storage Service API</link></para>
+            <para><link xlink:href="api-ref-blockstorage.html">Block
+                    Storage Service API</link></para>
         </listitem>
         <listitem>
-            <para><link
-                    xlink:href="http://api.openstack.org/api-ref-compute.html"
-                    >Compute API</link></para>
+            <para><link xlink:href="api-ref-compute.html">Compute
+                    API</link></para>
         </listitem>
         <listitem>
-            <para><link
-                xlink:href="http://api.openstack.org/api-ref-compute-ext.html"
-                >Compute API extensions</link></para>
+            <para><link xlink:href="api-ref-compute-ext.html">Compute
+                    API extensions</link></para>
         </listitem>
         <listitem>
-            <para><link
-                    xlink:href="http://api.openstack.org/api-ref-identity.html"
-                    >Identity Service API and extensions</link></para>
+            <para><link xlink:href="api-ref-identity.html">Identity
+                    Service API and extensions</link></para>
         </listitem>
         <listitem>
-            <para><link
-                    xlink:href="http://api.openstack.org/api-ref-image.html"
-                    >Image Service API</link></para>
+            <para><link xlink:href="api-ref-image.html">Image Service
+                    API</link></para>
         </listitem>
         <listitem>
-            <para><link
-                    xlink:href="http://api.openstack.org/api-ref-networking.html"
+            <para><link xlink:href="api-ref-networking.html"
                     >Networking API and extensions</link></para>
         </listitem>
         <listitem>
@@ -57,25 +46,22 @@
                     Storage API</link></para>
         </listitem>
         <listitem>
-            <para><link
-                    xlink:href="http://api.openstack.org/api-ref-orchestration.html"
+            <para><link xlink:href="api-ref-orchestration.html"
                     >Orchestration API</link></para>
         </listitem>
         <listitem>
-            <para><link
-                    xlink:href="http://api.openstack.org/api-ref-telemetry.html"
-                    >Telemetry API</link></para>
+            <para><link xlink:href="api-ref-telemetry.html">Telemetry
+                    API</link></para>
         </listitem>
     </itemizedlist>
     <para>You must install the packages for each API separately. After
         you authenticate through the <link
-            xlink:href="http://api.openstack.org/api-ref-identity.html"
-            >Identity Service API</link>, you can use the other APIs
-        and extensions to launch server instances, create images,
-        assign metadata to instances and images, create containers and
-        objects, and complete other actions in your OpenStack
-        cloud.</para>
-    <para>To get started with the APIs, see the <link
+            xlink:href="api-ref-identity.html">Identity Service
+            API</link>, you can use the other APIs and extensions to
+        launch server instances, create images, assign metadata to
+        instances and images, create containers and objects, and
+        complete other actions in your OpenStack cloud. To get started
+        with the APIs, see the <link
             xlink:href="http://docs.openstack.org/api/quick-start/content/"
             >OpenStack API Quick Start</link>.</para>
     <para>&nbsp;</para>