From 53d298ad85a7a14580fabe1bd5cafb11d0119879 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Sun, 20 Apr 2014 10:45:44 -0500
Subject: [PATCH] Break Identity API into v2 and v3 pages

Add authenticate call to first page of api ref
Fix titles to match correct API versions
Added forward slash to beginning of all API calls
Added neutron to occurrences of OpenStack Networking
Other clean up

Change-Id: Ifcb51efa5996d083d9e6099c9b72b8faf39707b2
author: diane fleming
---
 api-guide/bk-api-guide.xml                    |   2 +-
 .../src/docbkx/api-quick-start-onepager.xml   |  35 ++-
 api-ref-guides/pom.xml                        |  16 -
 .../src/bk-api-ref-blockstorage.xml           |  10 +-
 .../src/bk-api-ref-compute-v2-ext.xml         |   2 +-
 api-ref-guides/src/bk-api-ref-compute-v2.xml  |   2 +-
 api-ref-guides/src/bk-api-ref-compute-v3.xml  |   3 +-
 api-ref-guides/src/bk-api-ref-databases.xml   |  10 +-
 api-ref-guides/src/bk-api-ref-identity-v2.xml |   3 +-
 api-ref-guides/src/bk-api-ref-identity-v3.xml |   2 +-
 api-ref-guides/src/bk-api-ref-image.xml       |   5 +-
 api-ref-guides/src/bk-api-ref-networking.xml  |   9 +-
 .../src/bk-api-ref-objectstorage.xml          |   6 +-
 .../src/bk-api-ref-orchestration.xml          |   8 +-
 api-ref-guides/src/bk-api-ref-telemetry.xml   |   9 +-
 api-ref-guides/src/bk-api-ref.xml             |   6 +-
 api-ref/pom.xml                               |  17 +-
 api-ref/src/docbkx/api-ref-blockstorage.xml   |   3 +-
 api-ref/src/docbkx/api-ref-databases.xml      |   2 +-
 ...f-identity.xml => api-ref-identity-v2.xml} |   6 +-
 api-ref/src/docbkx/api-ref-identity-v3.xml    |  26 ++
 api-ref/src/docbkx/api-ref-image.xml          |   2 +-
 api-ref/src/docbkx/api-ref-networking.xml     |   2 +-
 api-ref/src/docbkx/api-ref-objectstorage.xml  |   2 +-
 api-ref/src/docbkx/api-ref-orchestration.xml  |   2 +-
 api-ref/src/docbkx/api-ref-telemetry.xml      |   2 +-
 api-ref/src/docbkx/api-ref.xml                |  25 +-
 api-ref/src/docbkx/ch_blockstorage-api-v1.xml |  64 ++++
 ...age-api.xml => ch_blockstorage-api-v2.xml} |  10 +-
 api-ref/src/docbkx/ch_compute-v3.xml          |  12 +-
 api-ref/src/docbkx/ch_databases-v1.xml        | 110 ++-----
 api-ref/src/docbkx/ch_netconn-ext-v2.xml      |  15 +-
 api-ref/src/docbkx/ch_netconn-v2.xml          |  29 +-
 api-ref/src/docbkx/ch_orchestration-v1.xml    |   2 +-
 api-ref/src/docbkx/ch_telemetry-v2.xml        |   4 +-
 .../src/docbkx/itemizedlist-service-list.xml  |  16 +-
 api-ref/src/docbkx/preface.xml                |   9 +-
 .../src/v2/ext/os-admin-actions.wadl          |   2 +-
 .../compute-api/src/v2/ext/os-agents.wadl     |   2 +-
 .../compute-api/src/v2/ext/os-aggregates.wadl |   2 +-
 .../src/v2/ext/os-attach-interfaces.wadl      |   2 +-
 .../ext/os-block-device-mapping-v2-boot.wadl  |   2 +-
 .../src/v2/ext/os-certificates.wadl           |   2 +-
 .../compute-api/src/v2/ext/os-cloudpipe.wadl  |   2 +-
 .../src/v2/ext/os-console-output.wadl         |   2 +-
 .../compute-api/src/v2/ext/os-consoles.wadl   |   2 +-
 .../compute-api/src/v2/ext/os-coverage.wadl   |   2 +-
 .../src/v2/ext/os-createserverext.wadl        |   2 +-
 .../src/v2/ext/os-deferred-delete.wadl        |   2 +-
 .../src/v2/ext/os-diagnostics.wadl            |   2 +-
 .../src/v2/ext/os-disk-config.wadl            |   2 +-
 .../compute-api/src/v2/ext/os-ext-az.wadl     |   2 +-
 .../src/v2/ext/os-ext-img-size.wadl           |   2 +-
 .../compute-api/src/v2/ext/os-ext-ips.wadl    |   2 +-
 .../v2/ext/os-extended-server-attributes.wadl |   2 +-
 .../src/v2/ext/os-extended-status.wadl        |   2 +-
 .../compute-api/src/v2/ext/os-fixed-ips.wadl  |   2 +-
 .../src/v2/ext/os-flavor-access.wadl          |   2 +-
 .../src/v2/ext/os-flavor-extra-specs.wadl     |   2 +-
 .../src/v2/ext/os-flavor-rxtx.wadl            |   2 +-
 .../src/v2/ext/os-flavorextradata.wadl        |   2 +-
 .../src/v2/ext/os-flavormanage.wadl           |   4 +-
 .../src/v2/ext/os-floating-ip-dns.wadl        |   2 +-
 .../src/v2/ext/os-floating-ip-pools.wadl      |   2 +-
 .../src/v2/ext/os-floating-ips-bulk.wadl      |   2 +-
 .../src/v2/ext/os-floating-ips.wadl           |   2 +-
 .../src/v2/ext/os-flv-disabled.wadl           |   2 +-
 .../compute-api/src/v2/ext/os-hosts.wadl      |   2 +-
 .../src/v2/ext/os-hypervisors.wadl            |   2 +-
 .../src/v2/ext/os-instance-actions.wadl       |   2 +-
 .../v2/ext/os-instance_usage_audit_log.wadl   |   2 +-
 .../compute-api/src/v2/ext/os-keypairs.wadl   |   2 +-
 .../compute-api/src/v2/ext/os-migrations.wadl |   2 +-
 .../src/v2/ext/os-multi-server-create.wadl    |   2 +-
 .../compute-api/src/v2/ext/os-networks.wadl   |   4 +-
 .../compute-api/src/v2/ext/os-quota-sets.wadl |   2 +-
 .../compute-api/src/v2/ext/os-rescue.wadl     |   2 +-
 .../src/v2/ext/os-scheduler-hints.wadl        |   2 +-
 .../ext/os-security-group-default-rules.wadl  |   2 +-
 .../src/v2/ext/os-security-groups.wadl        |   2 +-
 .../src/v2/ext/os-server-OS-EXT-IPS-MAC.wadl  |   2 +-
 .../src/v2/ext/os-server-password.wadl        |   2 +-
 .../src/v2/ext/os-server-shelve.wadl          |   2 +-
 .../src/v2/ext/os-server-start-stop.wadl      |   2 +-
 .../compute-api/src/v2/ext/os-services.wadl   |   2 +-
 .../src/v2/ext/os-simple-tenant-usage.wadl    |   2 +-
 .../src/v2/ext/os-used-limits-for-admins.wadl |   2 +-
 .../src/v2/ext/os-used-limits.wadl            |   2 +-
 .../src/v2/ext/os-virtual-interfaces.wadl     |   2 +-
 .../compute-api/src/v2/ext/os-volume.wadl     |   2 +-
 .../src/v2/ext/os-volume_attachments.wadl     |   2 +-
 .../compute-api/src/v2/wadl/os-compute-2.wadl |   2 +-
 .../src/v3/wadl/os-admin-actions-v3.wadl      |  23 +-
 .../compute-api/src/v3/wadl/os-agents-v3.wadl |   2 +-
 .../src/v3/wadl/os-aggregates-v3.wadl         |   2 +-
 .../compute-api/src/v3/wadl/os-cells-v3.wadl  |   2 +-
 .../src/v3/wadl/os-certificates-v3.wadl       |   2 +-
 .../src/v3/wadl/os-config-drive-v3.wadl       |   2 +-
 .../src/v3/wadl/os-deferred-delete-v3.wadl    |   2 +-
 .../src/v3/wadl/os-evacuate-v3.wadl           |   2 +-
 .../os-extended-availability-zone-v3.wadl     |   2 +-
 .../os-extended-server-attributes-v3.wadl     |   2 +-
 .../src/v3/wadl/os-extended-status-v3.wadl    |   2 +-
 .../src/v3/wadl/os-flavor-access-v3.wadl      |   2 +-
 .../src/v3/wadl/os-flavor-manage-v3.wadl      |   2 +-
 .../src/v3/wadl/os-flavor-rxtx-v3.wadl        |   2 +-
 .../src/v3/wadl/os-flavors-v3.wadl            |   2 +-
 .../src/v3/wadl/os-flavorspecs-v3.wadl        |   2 +-
 .../compute-api/src/v3/wadl/os-hosts-v3.wadl  |   2 +-
 .../src/v3/wadl/os-hypervisors-v3.wadl        |   2 +-
 .../src/v3/wadl/os-instance-actions-v3.wadl   |   2 +-
 .../wadl/os-instance-usage-audit-log-v3.wadl  |   2 +-
 .../compute-api/src/v3/wadl/os-limits-v3.wadl |   2 +-
 .../src/v3/wadl/os-migrations-v3.wadl         |   2 +-
 .../src/v3/wadl/os-multinic-v3.wadl           |   2 +-
 .../src/v3/wadl/os-quota-class-sets-v3.wadl   |   2 +-
 .../src/v3/wadl/os-quota-sets-v3.wadl         |   2 +-
 .../src/v3/wadl/os-remote-consoles-v3.wadl    |   2 +-
 .../src/v3/wadl/os-server-usage-v3.wadl       |   2 +-
 .../v3/wadl/os-simple-tenant-usage-v3.wadl    |   2 +-
 .../src/v2.0/wadl/HP-IDM-admin.wadl           |   2 +-
 .../src/v2.0/wadl/OS-KSADM-admin.wadl         |   2 +-
 .../src/v2.0/wadl/OS-KSCATALOG-admin.wadl     |   4 +-
 .../src/v2.0/wadl/OS-KSEC2-admin.wadl         |   2 +-
 .../src/v2.0/wadl/OS-KSS3-admin.wadl          |   2 +-
 .../src/v2.0/wadl/OS-KSVALIDATE-admin.wadl    |   2 +-
 .../src/v2.0/wadl/RAX-GRPADM.wadl             |   2 +-
 .../src/v2.0/wadl/RAX-KSGRP-admin.wadl        |   2 +-
 .../src/v2.0/wadl/RAX-KSKEY-admin.wadl        |   2 +-
 .../src/v2.0/wadl/RAX-KSQA-admin.wadl         |   2 +-
 .../src/v2.0/wadl/identity-admin.wadl         |   2 +-
 .../identity-api/src/v2.0/wadl/identity.wadl  |   2 +-
 .../src/v3/wadl/OS-OAUTH1-v3.wadl             |   2 +-
 .../wadls/image-api/src/v1/os-image-1.0.wadl  |   2 +-
 .../image-api/src/v2.0/os-image-2.0.wadl      |   2 +-
 .../src/v2.0/os-image-schemas-2.0.wadl        |   2 +-
 .../image-api/src/v2/os-image-schemas-v2.wadl |   2 +-
 .../wadls/image-api/src/v2/os-image-v2.wadl   |   2 +-
 .../netconn-api/src/metering-labels.wadl      |   2 +-
 .../wadls/netconn-api/src/os-layer3-ext.wadl  |   2 +-
 .../wadls/netconn-api/src/os-lbaas-ext.wadl   |   2 +-
 .../src/os-networks-multi-provider-ext.wadl   |   2 +-
 .../src/os-networks-provider-ext.wadl         |   2 +-
 .../wadls/netconn-api/src/os-networks.wadl    |   2 +-
 .../netconn-api/src/os-ports-binding-ext.wadl |   2 +-
 .../src/wadls/netconn-api/src/os-ports.wadl   |   2 +-
 .../src/wadls/netconn-api/src/os-quotas.wadl  |   2 +-
 .../src/wadls/netconn-api/src/os-subnets.wadl |   2 +-
 .../netconn-api/src/security-groups.wadl      |   2 +-
 .../object-api/src/os-object-api-1.0.wadl     |   2 +-
 .../src/v1/orchestration-api.wadl             |   2 +-
 .../src/v2/os-telemetry-api-2.0.wadl          |   2 +-
 .../volume-api/src/v1/volume-api-v1.wadl      | 281 ++++++++++--------
 .../volume-api/src/v2/volume-api-v2.wadl      |   2 +-
 .../src/v2/volume-backups-api-v2.wadl         |   2 +-
 155 files changed, 525 insertions(+), 505 deletions(-)
 rename api-ref/src/docbkx/{api-ref-identity.xml => api-ref-identity-v2.xml} (80%)
 create mode 100644 api-ref/src/docbkx/api-ref-identity-v3.xml
 create mode 100644 api-ref/src/docbkx/ch_blockstorage-api-v1.xml
 rename api-ref/src/docbkx/{ch_blockstorage-api.xml => ch_blockstorage-api-v2.xml} (95%)

diff --git a/api-guide/bk-api-guide.xml b/api-guide/bk-api-guide.xml
index cef47bbd4..495f2da5b 100644
--- a/api-guide/bk-api-guide.xml
+++ b/api-guide/bk-api-guide.xml
@@ -28,7 +28,7 @@
         <releaseinfo>local</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
diff --git a/api-quick-start/src/docbkx/api-quick-start-onepager.xml b/api-quick-start/src/docbkx/api-quick-start-onepager.xml
index 75f5e80a7..74f4ef3e4 100644
--- a/api-quick-start/src/docbkx/api-quick-start-onepager.xml
+++ b/api-quick-start/src/docbkx/api-quick-start-onepager.xml
@@ -9,16 +9,16 @@
     <?dbhtml stop-chunking?>
     <para>Although you install each OpenStack service separately, the
         OpenStack services work together to meet your cloud needs:
-        Identity, Compute, Image Service, Block Storage, Networking,
-        Object Storage, Orchestration, and Telemetry. With the <link
-            xlink:href="http://www.trystack.org/">TryStack</link>
-        OpenStack installation, these services work together in the
-        background of the installation.</para>
-    <para>After you authenticate through Identity, you can
-        use the other OpenStack APIs to create and manage resources in
-        your OpenStack cloud. You can launch instances from images and
+        Identity, Compute, Image Service, Block Storage, Networking
+        (neutron), Object Storage, Orchestration, and Telemetry. With
+        the <link xlink:href="http://www.trystack.org/"
+            >TryStack</link> OpenStack installation, these services
+        work together in the background of the installation.</para>
+    <para>After you authenticate through Identity, you can use the
+        other OpenStack APIs to create and manage resources in your
+        OpenStack cloud. You can launch instances from images and
         assign metadata to instances through the Compute API or the
-        nova command-line client.</para>
+            <command>nova</command> command-line client.</para>
     <para>To begin sending API requests, use one of the following
         methods:</para>
     <itemizedlist>
@@ -44,7 +44,22 @@
                     >RESTClient</link>. For Chrome, see <link
                     xlink:href="http://code.google.com/p/rest-client/"
                     >rest-client</link>.</para>
-
+        </listitem>
+        <listitem>
+            <para><emphasis role="bold">OpenStack Python Software
+                    Development Kit (SDK)</emphasis></para>
+            <para>Use this SDK to write Python automation scripts that
+                create and manage resources in your OpenStack cloud.
+                The SDK implements Python bindings to the OpenStack
+                API, which enables you to perform automation tasks in
+                Python by making calls on Python objects rather than
+                making REST calls directly. All OpenStack command-line
+                tools are implemented by using the Python SDK. See
+                    <link
+                    xlink:href="http://docs.openstack.org/user-guide/content/ch_sdk.html"
+                    >OpenStack Python SDK</link> in the
+                    <citetitle>OpenStack End User
+                Guide</citetitle>.</para>
         </listitem>
     </itemizedlist>
     <xi:include href="api-quick-start-intro.xml"/>
diff --git a/api-ref-guides/pom.xml b/api-ref-guides/pom.xml
index 928da7e3c..9d0ec6046 100644
--- a/api-ref-guides/pom.xml
+++ b/api-ref-guides/pom.xml
@@ -170,19 +170,6 @@
               <pdfFilenameBase>api-ref-telemetry</pdfFilenameBase>
             </configuration>
           </execution>
-         <!-- <execution>
-            <id>os-api-ref</id>
-            <goals>
-              <goal>generate-pdf</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <includes> bk-api-ref.xml </includes>
-              <pdfFilenameBase>api-ref</pdfFilenameBase>
-              <webhelpDirname>api-ref</webhelpDirname>
-              <pdfFilenameBase>api-ref</pdfFilenameBase>
-            </configuration>
-          </execution>-->
         </executions>
         <configuration>
           <webhelpDirname>api-ref-guides</webhelpDirname>
@@ -190,8 +177,6 @@
             article/appendix nop
             article toc,title
             book toc,title
-            <!--chapter toc,title
-            section toc,title-->
             part toc,title
             qandadiv toc
             qandaset to
@@ -202,7 +187,6 @@
           <branding>openstack</branding>
           <trimWadlUriCount>1</trimWadlUriCount>
           <showXslMessages>true</showXslMessages>
-          <!-- <targetDirectory>target/docbkx/webhelp</targetDirectory> -->
           <highlightSource>false</highlightSource>
           <security>external</security>
           <suppressFooterNavigation>0</suppressFooterNavigation>
diff --git a/api-ref-guides/src/bk-api-ref-blockstorage.xml b/api-ref-guides/src/bk-api-ref-blockstorage.xml
index 74d6f9ddf..52a5c3e79 100644
--- a/api-ref-guides/src/bk-api-ref-blockstorage.xml
+++ b/api-ref-guides/src/bk-api-ref-blockstorage.xml
@@ -21,7 +21,7 @@
     version="5.0-extension RackBook-2.0"
     xml:id="api.openstack.org-blockstorage-pdf">
     <info>
-        <title>OpenStack Block Storage API v2.0 Reference</title>
+        <title>OpenStack Block Storage API v2 and v1 Reference</title>
         <titleabbrev>API Reference</titleabbrev>
         <author>
             <personname>
@@ -38,13 +38,15 @@
         </copyright>
         <productname>OpenStack Block Storage</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
             </annotation>
         </legalnotice>
     </info>
-  <!--  <xi:include href="preface.xml"/>-->
-    <xi:include href="../../api-ref/src/docbkx/ch_blockstorage-api.xml"/>
+    <xi:include
+        href="../../api-ref/src/docbkx/ch_blockstorage-api-v2.xml"/>
+    <xi:include
+        href="../../api-ref/src/docbkx/ch_blockstorage-api-v1.xml"/>
 </book>
diff --git a/api-ref-guides/src/bk-api-ref-compute-v2-ext.xml b/api-ref-guides/src/bk-api-ref-compute-v2-ext.xml
index b24c1f4b6..bb18ee50f 100644
--- a/api-ref-guides/src/bk-api-ref-compute-v2-ext.xml
+++ b/api-ref-guides/src/bk-api-ref-compute-v2-ext.xml
@@ -25,7 +25,7 @@
         </copyright>
         <productname>OpenStack Compute</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
diff --git a/api-ref-guides/src/bk-api-ref-compute-v2.xml b/api-ref-guides/src/bk-api-ref-compute-v2.xml
index add2aab70..115d9b83d 100644
--- a/api-ref-guides/src/bk-api-ref-compute-v2.xml
+++ b/api-ref-guides/src/bk-api-ref-compute-v2.xml
@@ -38,7 +38,7 @@
         </copyright>
         <productname>OpenStack Compute</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
diff --git a/api-ref-guides/src/bk-api-ref-compute-v3.xml b/api-ref-guides/src/bk-api-ref-compute-v3.xml
index 37a0809a1..f7b15dc7e 100644
--- a/api-ref-guides/src/bk-api-ref-compute-v3.xml
+++ b/api-ref-guides/src/bk-api-ref-compute-v3.xml
@@ -25,13 +25,12 @@
         </copyright>
         <productname>OpenStack Compute</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
             </annotation>
         </legalnotice>
     </info>
-   <!-- <xi:include href="preface.xml"/>-->
     <xi:include href="../../api-ref/src/docbkx/ch_compute-v3.xml"/>
 </book>
diff --git a/api-ref-guides/src/bk-api-ref-databases.xml b/api-ref-guides/src/bk-api-ref-databases.xml
index 36587a40c..8c9694d04 100644
--- a/api-ref-guides/src/bk-api-ref-databases.xml
+++ b/api-ref-guides/src/bk-api-ref-databases.xml
@@ -8,14 +8,16 @@
   version="5.0-extension RackBook-2.0"
   xml:id="api.openstack.org-databases">
   <info>
-    <title>OpenStack Database Service API</title>
+    <title>OpenStack Database Service API v1.0</title>
     <copyright>
       <year>2010-2014</year>
     </copyright>
-    <legalnotice role="rs-api">
-      <para/>
+    <legalnotice role="apache2">
+      <annotation>
+        <remark>Copyright details are filled in by the
+          template.</remark>
+      </annotation>
     </legalnotice>
   </info>
-  <xi:include href="preface.xml"/>
   <xi:include href="../../api-ref/src/docbkx/ch_databases-v1.xml"/>
 </book>
diff --git a/api-ref-guides/src/bk-api-ref-identity-v2.xml b/api-ref-guides/src/bk-api-ref-identity-v2.xml
index 0c578001e..486734e56 100644
--- a/api-ref-guides/src/bk-api-ref-identity-v2.xml
+++ b/api-ref-guides/src/bk-api-ref-identity-v2.xml
@@ -37,14 +37,13 @@
         </copyright>
         <productname>OpenStack Identity</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
             </annotation>
         </legalnotice>
     </info>
-<!--  <xi:include href="preface.xml"/>-->
     <xi:include href="../../api-ref/src/docbkx/ch_identity-v2.xml"/>
     <xi:include href="../../api-ref/src/docbkx/ch_identity-admin-v2.xml"/>
     <xi:include href="../../api-ref/src/docbkx/ch_identity-v2-ext.xml"/>
diff --git a/api-ref-guides/src/bk-api-ref-identity-v3.xml b/api-ref-guides/src/bk-api-ref-identity-v3.xml
index c24d85bdd..808f4906f 100644
--- a/api-ref-guides/src/bk-api-ref-identity-v3.xml
+++ b/api-ref-guides/src/bk-api-ref-identity-v3.xml
@@ -37,7 +37,7 @@
         </copyright>
         <productname>OpenStack Identity</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
diff --git a/api-ref-guides/src/bk-api-ref-image.xml b/api-ref-guides/src/bk-api-ref-image.xml
index d20535c34..9244a94e9 100644
--- a/api-ref-guides/src/bk-api-ref-image.xml
+++ b/api-ref-guides/src/bk-api-ref-image.xml
@@ -8,7 +8,7 @@
     version="5.0-extension RackBook-2.0"
     xml:id="api.openstack.org-image-pdf">
     <info>
-        <title>OpenStack Image Service API v2 and API v1 Reference</title>
+        <title>OpenStack Image Service API v2 and v1 Reference</title>
         <titleabbrev>API Reference</titleabbrev>
         <author>
             <personname>
@@ -25,14 +25,13 @@
         </copyright>
         <productname>OpenStack Image Service</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
             </annotation>
         </legalnotice>
     </info>
- <!--   <xi:include href="preface.xml"/>-->
     <xi:include href="../../api-ref/src/docbkx/ch_images-v2.xml"/>
     <xi:include href="../../api-ref/src/docbkx/ch_images-v1.xml"/>
 </book>
diff --git a/api-ref-guides/src/bk-api-ref-networking.xml b/api-ref-guides/src/bk-api-ref-networking.xml
index 1b9a27c89..2e7bc0f86 100644
--- a/api-ref-guides/src/bk-api-ref-networking.xml
+++ b/api-ref-guides/src/bk-api-ref-networking.xml
@@ -8,11 +8,11 @@
     version="5.0-extension RackBook-2.0"
     xml:id="api.openstack.org-networking-pdf">
     <info>
-        <title>OpenStack Networking API v2.0 and Extensions
+        <title>OpenStack Networking (neutron) API v2.0 and Extensions
             Reference</title>
         <?rax title.font.size="32px"?>
         <?rax subtitle.font.size="32px"?>
-        <titleabbrev>Networking API Reference</titleabbrev>
+        <titleabbrev>Networking (neutron) API Reference</titleabbrev>
         <author>
             <personname>
                 <firstname/>
@@ -26,16 +26,15 @@
             <year>2010-2014</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <productname>OpenStack Networking</productname>
+        <productname>OpenStack Networking (neutron)</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
             </annotation>
         </legalnotice>
     </info>
-<!--    <xi:include href="preface.xml"/>-->
     <xi:include href="../../api-ref/src/docbkx/ch_netconn-v2.xml"/>
     <xi:include href="../../api-ref/src/docbkx/ch_netconn-ext-v2.xml"/>
 </book>
diff --git a/api-ref-guides/src/bk-api-ref-objectstorage.xml b/api-ref-guides/src/bk-api-ref-objectstorage.xml
index eaf66016b..08451f515 100644
--- a/api-ref-guides/src/bk-api-ref-objectstorage.xml
+++ b/api-ref-guides/src/bk-api-ref-objectstorage.xml
@@ -25,13 +25,13 @@
         </copyright>
         <productname>OpenStack Object Storage</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
             </annotation>
         </legalnotice>
     </info>
-<!--    <xi:include href="preface.xml"/>-->
-    <xi:include href="../../api-ref/src/docbkx/ch_objectstorage-v1.xml"/>
+    <xi:include
+        href="../../api-ref/src/docbkx/ch_objectstorage-v1.xml"/>
 </book>
diff --git a/api-ref-guides/src/bk-api-ref-orchestration.xml b/api-ref-guides/src/bk-api-ref-orchestration.xml
index 06c41f905..bcc5f8e7f 100644
--- a/api-ref-guides/src/bk-api-ref-orchestration.xml
+++ b/api-ref-guides/src/bk-api-ref-orchestration.xml
@@ -8,7 +8,7 @@
     version="5.0-extension RackBook-2.0"
     xml:id="api.openstack.org-orchestration-pdf">
     <info>
-        <title>OpenStack Orchestration API v1.0 Reference</title>
+        <title>OpenStack Orchestration API v1 Reference</title>
         <titleabbrev>Orchestration API Reference</titleabbrev>
         <author>
             <personname>
@@ -25,13 +25,13 @@
         </copyright>
         <productname>OpenStack Orchestration</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
             </annotation>
         </legalnotice>
     </info>
-<!--    <xi:include href="preface.xml"/>-->
-    <xi:include href="../../api-ref/src/docbkx/ch_orchestration-v1.xml"/>
+    <xi:include
+        href="../../api-ref/src/docbkx/ch_orchestration-v1.xml"/>
 </book>
diff --git a/api-ref-guides/src/bk-api-ref-telemetry.xml b/api-ref-guides/src/bk-api-ref-telemetry.xml
index 474a64475..a15c2e0c8 100644
--- a/api-ref-guides/src/bk-api-ref-telemetry.xml
+++ b/api-ref-guides/src/bk-api-ref-telemetry.xml
@@ -8,8 +8,8 @@
     version="5.0-extension RackBook-2.0"
     xml:id="api.openstack.org-telemetry-pdf">
     <info>
-        <title>OpenStack Metering API v2.0 Reference</title>
-        <titleabbrev>Metering API Reference</titleabbrev>
+        <title>OpenStack Telemetry API v2 Reference</title>
+        <titleabbrev>Telemetry API Reference</titleabbrev>
         <author>
             <personname>
                 <firstname/>
@@ -23,15 +23,14 @@
             <year>2010-2014</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <productname>OpenStack Metering</productname>
+        <productname>OpenStack Telemetry</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
             </annotation>
         </legalnotice>
     </info>
-<!--    <xi:include href="preface.xml"/>-->
     <xi:include href="../../api-ref/src/docbkx/ch_telemetry-v2.xml"/>
 </book>
diff --git a/api-ref-guides/src/bk-api-ref.xml b/api-ref-guides/src/bk-api-ref.xml
index 3a8d9afd7..2123e7d4a 100644
--- a/api-ref-guides/src/bk-api-ref.xml
+++ b/api-ref-guides/src/bk-api-ref.xml
@@ -25,7 +25,7 @@
         </copyright>
         <productname>OpenStack</productname>
         <pubdate/>
-        <legalnotice role="cc-by">
+        <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the
                     template.</remark>
@@ -34,7 +34,9 @@
     </info>
     <!--    <xi:include href="preface.xml"/>-->
     <xi:include
-        href="../../api-ref/src/docbkx/ch_blockstorage-api.xml"/>
+        href="../../api-ref/src/docbkx/ch_blockstorage-api-v2.xml"/>
+    <xi:include
+        href="../../api-ref/src/docbkx/ch_blockstorage-api-v1.xml"/>
     <xi:include href="../../api-ref/src/docbkx/ch_compute-v2.xml"/>
     <xi:include href="../../api-ref/src/docbkx/ch_compute-v2-ext.xml"/>
     <xi:include href="../../api-ref/src/docbkx/ch_compute-v3.xml"/>
diff --git a/api-ref/pom.xml b/api-ref/pom.xml
index 725cf0020..2d376f09c 100644
--- a/api-ref/pom.xml
+++ b/api-ref/pom.xml
@@ -37,14 +37,25 @@
             </configuration>
           </execution>
           <execution>
-            <id>os-api-ref-identity</id>
+            <id>os-api-ref-identity-v3</id>
             <goals>
               <goal>generate-html</goal>
             </goals>
             <phase>generate-sources</phase>
             <configuration>
-              <includes>api-ref-identity.xml</includes>
-              <pdfFilename>bk-api-ref-identity</pdfFilename>
+              <includes>api-ref-identity-v3.xml</includes>
+              <pdfFilename>bk-api-ref-identity-v3</pdfFilename>
+            </configuration>
+          </execution>
+          <execution>
+            <id>os-api-ref-identity-v2</id>
+            <goals>
+              <goal>generate-html</goal>
+            </goals>
+            <phase>generate-sources</phase>
+            <configuration>
+              <includes>api-ref-identity-v2.xml</includes>
+              <pdfFilename>bk-api-ref-identity-v2</pdfFilename>
             </configuration>
           </execution>
           <execution>
diff --git a/api-ref/src/docbkx/api-ref-blockstorage.xml b/api-ref/src/docbkx/api-ref-blockstorage.xml
index bce149ea2..52412eed9 100644
--- a/api-ref/src/docbkx/api-ref-blockstorage.xml
+++ b/api-ref/src/docbkx/api-ref-blockstorage.xml
@@ -19,5 +19,6 @@
       <xi:include href="itemizedlist-service-list.xml"/>
     </annotation>
   </info>
-  <xi:include href="ch_blockstorage-api.xml"/>
+  <xi:include href="ch_blockstorage-api-v2.xml"/>
+  <xi:include href="ch_blockstorage-api-v1.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/api-ref-databases.xml b/api-ref/src/docbkx/api-ref-databases.xml
index e77c257f5..87146b854 100644
--- a/api-ref/src/docbkx/api-ref-databases.xml
+++ b/api-ref/src/docbkx/api-ref-databases.xml
@@ -8,7 +8,7 @@
   version="5.0-extension RackBook-2.0"
   xml:id="api.openstack.org-databases">
   <info xreflabel="api-ref-databases.html">
-    <title>OpenStack Database Service API</title>
+    <title>OpenStack Database Service API v1.0</title>
     <copyright>
       <year>2010-2014</year>
     </copyright>
diff --git a/api-ref/src/docbkx/api-ref-identity.xml b/api-ref/src/docbkx/api-ref-identity-v2.xml
similarity index 80%
rename from api-ref/src/docbkx/api-ref-identity.xml
rename to api-ref/src/docbkx/api-ref-identity-v2.xml
index 031c0c77f..62667a9cd 100644
--- a/api-ref/src/docbkx/api-ref-identity.xml
+++ b/api-ref/src/docbkx/api-ref-identity-v2.xml
@@ -7,8 +7,8 @@
   xmlns:wadl="http://wadl.dev.java.net/2009/02"
   version="5.0-extension RackBook-2.0"
   xml:id="api.openstack.org-identity-v2">
-  <info xreflabel="api-ref-identity.html">
-    <title>OpenStack Identity APIs and extensions</title>
+  <info xreflabel="api-ref-identity-v2.html">
+    <title>OpenStack Identity API v2 and extensions</title>
     <copyright>
       <year>2010-2014</year>
     </copyright>
@@ -19,8 +19,6 @@
       <xi:include href="itemizedlist-service-list.xml"/>
     </annotation>
   </info>
-  <xi:include href="ch_identity-v3.xml"/>
-  <xi:include href="ch_identity-v3-ext.xml"/>
   <xi:include href="ch_identity-v2.xml"/>
   <xi:include href="ch_identity-admin-v2.xml"/>
   <xi:include href="ch_identity-v2-ext.xml"/>
diff --git a/api-ref/src/docbkx/api-ref-identity-v3.xml b/api-ref/src/docbkx/api-ref-identity-v3.xml
new file mode 100644
index 000000000..31953ea41
--- /dev/null
+++ b/api-ref/src/docbkx/api-ref-identity-v3.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<book xmlns="http://docbook.org/ns/docbook"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:linkend="http://www.w3.org/1999/linkend"
+    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="api.openstack.org-identity-v3">
+    <info xreflabel="api-ref-identity-v3.html">
+        <title>OpenStack Identity API v3 and extensions</title>
+        <copyright>
+            <year>2010-2014</year>
+        </copyright>
+        <legalnotice role="apache2">
+            <para/>
+        </legalnotice>
+        <annotation>
+            <xi:include href="itemizedlist-service-list.xml"/>
+        </annotation>
+    </info>
+    <xi:include href="ch_identity-v3.xml"/>
+    <xi:include href="ch_identity-v3-ext.xml"/>
+</book>
+
+
diff --git a/api-ref/src/docbkx/api-ref-image.xml b/api-ref/src/docbkx/api-ref-image.xml
index bff3907a9..3a95843b7 100644
--- a/api-ref/src/docbkx/api-ref-image.xml
+++ b/api-ref/src/docbkx/api-ref-image.xml
@@ -8,7 +8,7 @@
   version="5.0-extension RackBook-2.0"
   xml:id="api.openstack.org-image">
   <info xreflabel="api-ref-image.html">
-    <title>OpenStack Image Service APIs</title>
+    <title>OpenStack Image Service API v2 and v1</title>
     <copyright>
       <year>2010-2014</year>
     </copyright>
diff --git a/api-ref/src/docbkx/api-ref-networking.xml b/api-ref/src/docbkx/api-ref-networking.xml
index e893f88f1..9446578f6 100644
--- a/api-ref/src/docbkx/api-ref-networking.xml
+++ b/api-ref/src/docbkx/api-ref-networking.xml
@@ -8,7 +8,7 @@
   version="5.0-extension RackBook-2.0"
   xml:id="api.openstack.org-networking">
   <info xreflabel="api-ref-networking.html">
-    <title>OpenStack Networking APIs and extensions</title>
+    <title>OpenStack Networking (neutron) API v2.0 and extensions</title>
     <copyright>
       <year>2010-2014</year>
     </copyright>
diff --git a/api-ref/src/docbkx/api-ref-objectstorage.xml b/api-ref/src/docbkx/api-ref-objectstorage.xml
index 863cf3a0c..55588ffc2 100644
--- a/api-ref/src/docbkx/api-ref-objectstorage.xml
+++ b/api-ref/src/docbkx/api-ref-objectstorage.xml
@@ -8,7 +8,7 @@
   version="5.0-extension RackBook-2.0"
   xml:id="api.openstack.org-objectstorage">
   <info xreflabel="api-ref-objectstorage.html">
-    <title>OpenStack Object Storage API</title>
+    <title>OpenStack Object Storage API v1</title>
     <copyright>
       <year>2010-2014</year>
     </copyright>
diff --git a/api-ref/src/docbkx/api-ref-orchestration.xml b/api-ref/src/docbkx/api-ref-orchestration.xml
index 092a0888c..f6927d98a 100644
--- a/api-ref/src/docbkx/api-ref-orchestration.xml
+++ b/api-ref/src/docbkx/api-ref-orchestration.xml
@@ -8,7 +8,7 @@
   version="5.0-extension RackBook-2.0"
   xml:id="api.openstack.org-orchestration">
   <info xreflabel="api-ref-orchestration.html">
-    <title>OpenStack Orchestration API</title>
+    <title>OpenStack Orchestration API v1</title>
     <copyright>
       <year>2010-2014</year>
     </copyright>
diff --git a/api-ref/src/docbkx/api-ref-telemetry.xml b/api-ref/src/docbkx/api-ref-telemetry.xml
index ab3e7e50e..0645e4f89 100644
--- a/api-ref/src/docbkx/api-ref-telemetry.xml
+++ b/api-ref/src/docbkx/api-ref-telemetry.xml
@@ -8,7 +8,7 @@
   version="5.0-extension RackBook-2.0"
   xml:id="api.openstack.org-telemetry">
   <info xreflabel="api-ref-telemetry">
-    <title>OpenStack Telemetry API</title>
+    <title>OpenStack Telemetry API v2</title>
     <copyright>
       <year>2010-2014</year>
     </copyright>
diff --git a/api-ref/src/docbkx/api-ref.xml b/api-ref/src/docbkx/api-ref.xml
index 2dd8171db..6daa400dc 100644
--- a/api-ref/src/docbkx/api-ref.xml
+++ b/api-ref/src/docbkx/api-ref.xml
@@ -7,30 +7,17 @@
   xmlns:wadl="http://wadl.dev.java.net/2009/02"
 xml:id="api.openstack.org">
   <!--  version="5.0-extension RackBook-2.0" -->
-  <info>
+  <info xreflabel="api-ref-identity-v2.html">
     <title>OpenStack API Reference</title>
-    <titleabbrev>API Reference</titleabbrev>
-    <author>
-      <personname>
-        <firstname/>
-        <surname/>
-      </personname>
-      <affiliation>
-        <orgname>OpenStack Foundation</orgname>
-      </affiliation>
-    </author>
     <copyright>
       <year>2010-2014</year>
-      <holder>OpenStack Foundation</holder>
     </copyright>
-    <productname>OpenStack</productname>
-    <pubdate/>
-    <legalnotice role="cc-by">
-      <annotation>
-        <remark>Copyright details are filled in by the
-          template.</remark>
-      </annotation>
+    <legalnotice role="apache2">
+      <para/>
     </legalnotice>
+    <annotation>
+      <xi:include href="itemizedlist-service-list.xml"/>
+    </annotation>
   </info>
   <xi:include href="preface.xml"/>
 </book>
diff --git a/api-ref/src/docbkx/ch_blockstorage-api-v1.xml b/api-ref/src/docbkx/ch_blockstorage-api-v1.xml
new file mode 100644
index 000000000..25f3afac3
--- /dev/null
+++ b/api-ref/src/docbkx/ch_blockstorage-api-v1.xml
@@ -0,0 +1,64 @@
+<?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"
+    xmlns:linkend="http://www.w3.org/1999/linkend"
+    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="blockstorage-v1"
+    role="api-reference">
+    <title>Block Storage API v1</title>
+    <para>Manage volumes and snapshots for use with the Block Storage
+        API, also known as cinder services.</para>
+    <section xml:id="volumes-v1">
+        <title>Volumes</title>
+        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
+            <wadl:resource
+                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#volumes">
+                <wadl:method href="#createVolume"/>
+                <wadl:method href="#getVolumesSimple"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#detail-volume">
+                <wadl:method href="#getVolumesDetail"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#volume_id">
+                <wadl:method href="#getVolume"/>
+                <wadl:method href="#deleteVolume"/>
+            </wadl:resource>
+        </wadl:resources>
+    </section>
+    <section xml:id="volume_types-v1">
+        <title>Volume types</title>
+        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
+            <wadl:resource
+                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#types">
+                <wadl:method href="#getVolumeTypes"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#volume_type_id">
+                <wadl:method href="#getVolumeType"/>
+            </wadl:resource>
+        </wadl:resources>
+    </section>
+    <section xml:id="snapshots-v1">
+        <title>Snapshots</title>
+        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
+            <wadl:resource
+                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#snapshots">
+                <wadl:method href="#createSnapshot"/>
+                <wadl:method href="#getSnapshotsSimple"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#detail-snapshots">
+                <wadl:method href="#getSnapshotsDetail"/>
+            </wadl:resource>
+            <wadl:resource
+                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#snapshot_id">
+                <wadl:method href="#getSnapshot"/>
+                <wadl:method href="#deleteSnapshot"/>
+            </wadl:resource>
+        </wadl:resources>
+    </section>
+</chapter>
diff --git a/api-ref/src/docbkx/ch_blockstorage-api.xml b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
similarity index 95%
rename from api-ref/src/docbkx/ch_blockstorage-api.xml
rename to api-ref/src/docbkx/ch_blockstorage-api-v2.xml
index 186e8c20a..6b7b442b0 100644
--- a/api-ref/src/docbkx/ch_blockstorage-api.xml
+++ b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
@@ -7,10 +7,10 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     version="5.0-extension RackBook-2.0" xml:id="blockstorage-v2"
     role="api-reference">
-    <title>Block Storage API v2.0</title>
+    <title>Block Storage API v2</title>
     <para>Manage volumes and snapshots for use with the Block Storage
         API, also known as cinder services.</para>
-    <section xml:id="volumes">
+    <section xml:id="volumes-v2">
         <title>Volumes</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
@@ -30,7 +30,7 @@
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="volume_types">
+    <section xml:id="volume_types-v2">
         <title>Volume types</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
@@ -43,7 +43,7 @@
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="snapshots">
+    <section xml:id="snapshots-v2">
         <title>Snapshots</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
@@ -63,7 +63,7 @@
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="backups">
+    <section xml:id="backups-v2">
         <title>Backups extension</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
diff --git a/api-ref/src/docbkx/ch_compute-v3.xml b/api-ref/src/docbkx/ch_compute-v3.xml
index aaa5f564d..8767a9689 100755
--- a/api-ref/src/docbkx/ch_compute-v3.xml
+++ b/api-ref/src/docbkx/ch_compute-v3.xml
@@ -1,16 +1,7 @@
 <?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"
@@ -18,7 +9,8 @@
   xmlns:linkend="http://www.w3.org/1999/linkend"
   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="compute-ext-v3" role="api-reference">
+  version="5.0-extension RackBook-2.0" xml:id="compute-ext-v3"
+  role="api-reference">
   <title>Compute API v3 (EXPERIMENTAL)</title>
   <para>Query the Compute API to list available extensions with a
     &GET; request to <code>v3/extensions</code>.</para>
diff --git a/api-ref/src/docbkx/ch_databases-v1.xml b/api-ref/src/docbkx/ch_databases-v1.xml
index 005f4e583..9cf458eff 100644
--- a/api-ref/src/docbkx/ch_databases-v1.xml
+++ b/api-ref/src/docbkx/ch_databases-v1.xml
@@ -1,15 +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;">
-<!-- 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"
@@ -21,8 +10,10 @@
     <section xml:id="API_Versions">
         <title>API versions</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#versions"/>
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#version">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#versions"/>
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#version">
                 <wadl:method href="#getVersionInfo"/>
             </wadl:resource>
         </wadl:resources>
@@ -31,15 +22,18 @@
     <section xml:id="Database_Instances">
         <title>Database instances</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#instances">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#instances">
                 <wadl:method href="#createInstance"/>
                 <wadl:method href="#getInstance"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#instanceId">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#instanceId">
                 <wadl:method href="#getInstanceById"/>
                 <wadl:method href="#deleteInstance"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#root">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#root">
                 <wadl:method href="#createRoot"/>
                 <wadl:method href="#isRootEnabled"/>
             </wadl:resource>
@@ -48,7 +42,8 @@
     <section xml:id="Database_Instances_Actions">
         <title>Database instance actions</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#instanceAction">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#instanceAction">
                 <wadl:method href="#restartInstance"/>
                 <wadl:method href="#resizeInstance"/>
                 <wadl:method href="#resizeVolume"/>
@@ -58,11 +53,13 @@
     <section xml:id="databases">
         <title>Databases</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#databases">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#databases">
                 <wadl:method href="#createDatabase"/>
                 <wadl:method href="#getDatabases"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#databaseName">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#databaseName">
                 <wadl:method href="#deleteDatabase"/>
             </wadl:resource>
         </wadl:resources>
@@ -70,11 +67,13 @@
     <section xml:id="user_management">
         <title>Users</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#users">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#users">
                 <wadl:method href="#createUser"/>
                 <wadl:method href="#getUsers"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#userId">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#userId">
                 <wadl:method href="#deleteUser"/>
             </wadl:resource>
         </wadl:resources>
@@ -82,75 +81,14 @@
     <section xml:id="flavors">
         <title>Flavors</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#flavors">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#flavors">
                 <wadl:method href="#getFlavors"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/dbaas.wadl#flavorId">
+            <wadl:resource
+                href="../wadls/databases-api/xsd/dbaas.wadl#flavorId">
                 <wadl:method href="#getFlavorById"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <!--<section xml:id="Database_Instance_Management">
-        <title>Database instance management</title>
-        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#instances">
-                <wadl:method href="#getIndex"/>
-            </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#instanceId">
-                <wadl:method href="#showinstances"/>
-            </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#diagnostics">
-                <wadl:method href="#getdiagnosticdetails"/>
-            </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#rootdetails">
-                <wadl:method href="#getrootdetails"/>
-            </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#hwInfo">
-                <wadl:method href="#getHwInfo"/>
-            </wadl:resource>
-        </wadl:resources>
-    </section>-->
-    <!--<section xml:id="Host_Information">
-        <title>Host information</title>
-        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#hosts">
-                <wadl:method href="#gethosts"/>
-            </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#hostid">
-                <wadl:method href="#gethostbyid"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/databases-api/xsd/management.wadl#instanceAction-hostId">
-                <wadl:method href="#updateHostInstances"/>
-            </wadl:resource>
-        </wadl:resources>
-    </section>-->
-    <!--<section xml:id="Management_Instances_Actions">
-        <title>Management instance actions</title>
-        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource
-                href="../wadls/databases-api/xsd/management.wadl#instanceAction">
-                <wadl:method href="#rebootInstance"/>
-            </wadl:resource>
-        </wadl:resources>
-    </section>-->
-    <!--<section xml:id="Storage_Management">
-        <title>Storage management</title>
-        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#storage">
-                <wadl:method href="#indexstorage"/>
-            </wadl:resource>
-        </wadl:resources>
-    </section>-->
-    <!--<section xml:id="Account_Information">
-        <title>Account information</title>
-        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#accounts">
-                <wadl:method href="#getaccounts"/>
-            </wadl:resource>
-            <wadl:resource href="../wadls/databases-api/xsd/management.wadl#accountid">
-                <wadl:method href="#getaccountbyid"/>
-            </wadl:resource>
-        </wadl:resources>
-    </section>-->
 </chapter>
diff --git a/api-ref/src/docbkx/ch_netconn-ext-v2.xml b/api-ref/src/docbkx/ch_netconn-ext-v2.xml
index 75df6f1fa..6c6e1686f 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"
@@ -19,7 +6,7 @@
     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="netconn-v2-ext">
-    <title>Networking API v2.0 extensions</title>
+    <title>Networking (neutron) API v2.0 extensions</title>
     <section xml:id="quotas-ext">
         <title>Quotas extension (quotas)</title>
         <para>List, show information for, update, and reset
diff --git a/api-ref/src/docbkx/ch_netconn-v2.xml b/api-ref/src/docbkx/ch_netconn-v2.xml
index afc102579..b28d15d14 100644
--- a/api-ref/src/docbkx/ch_netconn-v2.xml
+++ b/api-ref/src/docbkx/ch_netconn-v2.xml
@@ -6,35 +6,36 @@
     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="netconn-v2">
-    <title>Networking API v2.0</title>
+    <title>Networking (neutron) API v2.0</title>
     <para>Use virtual networking services among devices that are
-        managed by the OpenStack Compute service. The Networking API
-        v2.0 combines the API v1.1 functionality with some essential
-        Internet Protocol Address Management (IPAM) functionality.
-        Enables users to associate IP address blocks and other network
-        configuration settings with a neutron network. You can choose
-        a specific IP address from the block or let neutron choose the
-        first available IP address.</para>
+        managed by the OpenStack Compute service. The Networking
+        (neutron) API v2.0 combines the API v1.1 functionality with
+        some essential Internet Protocol Address Management (IPAM)
+        functionality. Enables users to associate IP address blocks
+        and other network configuration settings with an OpenStack
+        Networking network. You can choose a specific IP address from
+        the block or let OpenStack Networking choose the first
+        available IP address.</para>
     <section xml:id="networks">
         <title>Networks</title>
-        <para>Lists, shows information for, creates, updates, and
-            deletes networks.</para>
+        <para>List, show information for, create, update, and delete
+            networks.</para>
         <wadl:resources
             href="../wadls/netconn-api/src/os-networks.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
     <section xml:id="subnets">
         <title>Subnets</title>
-        <para>Lists, shows information for, creates, updates, and
-            deletes subnet resources.</para>
+        <para>List, show information for, create, update, and delete
+            subnet resources.</para>
         <wadl:resources
             href="../wadls/netconn-api/src/os-subnets.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
     <section xml:id="ports">
         <title>Ports</title>
-        <para>Lists, shows information for, creates, updates, and
-            deletes ports.</para>
+        <para>List, show information for, create, update, and delete
+            ports.</para>
         <wadl:resources href="../wadls/netconn-api/src/os-ports.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
diff --git a/api-ref/src/docbkx/ch_orchestration-v1.xml b/api-ref/src/docbkx/ch_orchestration-v1.xml
index 441d613c2..203581ffd 100644
--- a/api-ref/src/docbkx/ch_orchestration-v1.xml
+++ b/api-ref/src/docbkx/ch_orchestration-v1.xml
@@ -6,7 +6,7 @@
     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="orchestration-v1">
-    <title>Orchestration API v1.0</title>
+    <title>Orchestration API v1</title>
     <para>Use a template language to orchestrate OpenStack
         services.</para>
     <section xml:id="stacks">
diff --git a/api-ref/src/docbkx/ch_telemetry-v2.xml b/api-ref/src/docbkx/ch_telemetry-v2.xml
index e51294a7e..83c58633f 100644
--- a/api-ref/src/docbkx/ch_telemetry-v2.xml
+++ b/api-ref/src/docbkx/ch_telemetry-v2.xml
@@ -6,11 +6,11 @@
     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="telemetry-v2">
-    <title>Telemetry API v2.0</title>
+    <title>Telemetry API v2</title>
     <para>Manage telemetry operations.</para>
     <section xml:id="alarms">
         <title>Alarms</title>
-        <para>Lists, creates, gets details for, updates, and deletes
+        <para>List, create, gets details for, update, and delete
             alarms.</para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
diff --git a/api-ref/src/docbkx/itemizedlist-service-list.xml b/api-ref/src/docbkx/itemizedlist-service-list.xml
index 26afd7a3d..6e83f406c 100644
--- a/api-ref/src/docbkx/itemizedlist-service-list.xml
+++ b/api-ref/src/docbkx/itemizedlist-service-list.xml
@@ -13,12 +13,12 @@
                 Storage API</link></para>
     </listitem>
     <listitem>
-        <para><link xlink:href="api-ref-compute-v2.html">Compute
-                API</link></para>
+        <para><link xlink:href="api-ref-compute-v2.html">Compute API
+                v2</link></para>
     </listitem>
     <listitem>
         <para><link xlink:href="api-ref-compute-v2-ext.html">Compute
-                API extensions</link></para>
+                API v2 extensions</link></para>
     </listitem>
     <listitem>
         <para><link xlink:href="api-ref-compute-v3.html">Compute API
@@ -29,8 +29,12 @@
                 Service API</link></para>
     </listitem>
     <listitem>
-        <para><link xlink:href="api-ref-identity.html">Identity API
-                and extensions</link></para>
+        <para><link xlink:href="api-ref-identity-v3.html">Identity API
+                v3 and extensions</link></para>
+    </listitem>
+    <listitem>
+        <para><link xlink:href="api-ref-identity-v2.html">Identity API
+                v2.0 and extensions</link></para>
     </listitem>
     <listitem>
         <para><link xlink:href="api-ref-image.html">Image Service
@@ -38,7 +42,7 @@
     </listitem>
     <listitem>
         <para><link xlink:href="api-ref-networking.html">Networking
-                API and extensions</link></para>
+                (neutron) API and extensions</link></para>
     </listitem>
     <listitem>
         <para><link xlink:href="api-ref-objectstorage.html">Object
diff --git a/api-ref/src/docbkx/preface.xml b/api-ref/src/docbkx/preface.xml
index 49ba7c29b..dc91359fb 100644
--- a/api-ref/src/docbkx/preface.xml
+++ b/api-ref/src/docbkx/preface.xml
@@ -13,8 +13,7 @@
     <title>OpenStack API Complete Reference</title>
     <para>Use the OpenStack APIs and extensions in your OpenStack
         cloud.</para>
-    <xi:include
-        href="itemizedlist-service-list.xml"/>
+    <!--  <xi:include href="itemizedlist-service-list.xml"/>-->
     <para>You must install the packages for each API separately. After
         you authenticate through the <link
             xlink:href="api-ref-identity.html">Identity API</link>,
@@ -25,5 +24,9 @@
         see the <link
             xlink:href="http://docs.openstack.org/api/quick-start/content/"
             >OpenStack API Quick Start</link>.</para>
-    <para>&nbsp;</para>
+    <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
+        <wadl:resource
+            href="../wadls/identity-api/src/v2.0/wadl/identity.wadl#tokens"
+        />
+    </wadl:resources>
 </preface>
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-admin-actions.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-admin-actions.wadl
index ab4c249ef..617418e16 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-admin-actions.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-admin-actions.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-admin-actions-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-agents.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-agents.wadl
index 8b3c5de8b..8cd16f182 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-agents.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-agents.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-agents-v2">
-        <resource id="version" type="#VersionDetails" path="v2">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-aggregates.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-aggregates.wadl
index ab5b1d7fc..f67f087f6 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-aggregates.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-aggregates.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-aggregates-v2">
-        <resource id="version" path="v2/">
+        <resource id="version" path="//v2">
             <resource id="tenantID" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-attach-interfaces.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-attach-interfaces.wadl
index c0a53a745..49c23819b 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-attach-interfaces.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-attach-interfaces.wadl
@@ -11,7 +11,7 @@
     xmlns:atom="http://www.w3.org/2005/Atom">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-attach-interfaces-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenantID" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-block-device-mapping-v2-boot.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-block-device-mapping-v2-boot.wadl
index 93eb95554..c4a505eb3 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-block-device-mapping-v2-boot.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-block-device-mapping-v2-boot.wadl
@@ -23,7 +23,7 @@
     <!--*******************************************************-->
     <resources base="https://servers.api.openstack.com"
         xml:id="block_device_mapping_v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenantID" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-certificates.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-certificates.wadl
index ec0b457f4..a74d536c4 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-certificates.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-certificates.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v2">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-certificates-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-cloudpipe.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-cloudpipe.wadl
index 23520f639..9116d7730 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-cloudpipe.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-cloudpipe.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-cloudpipe-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-console-output.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-console-output.wadl
index 35a0c3d2d..88359cbee 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-console-output.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-console-output.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-console-output-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-consoles.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-consoles.wadl
index b03a5bffb..2341bfee9 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-consoles.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-consoles.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-consoles-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-coverage.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-coverage.wadl
index e0f5d9a9a..d33b6a269 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-coverage.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-coverage.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v2">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-coverage-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-createserverext.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-createserverext.wadl
index 81544804e..cb220edad 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-createserverext.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-createserverext.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="config-drive-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-deferred-delete.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-deferred-delete.wadl
index 579aa4c3d..25a2b375a 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-deferred-delete.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-deferred-delete.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-deferred-delete-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-diagnostics.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-diagnostics.wadl
index 35f4f791d..d08348ada 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-diagnostics.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-diagnostics.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-diagnostics-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-disk-config.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-disk-config.wadl
index 208a61301..fdb1e57ed 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-disk-config.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-disk-config.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="disk-config">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-az.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-az.wadl
index 899ad730d..7316670a8 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-az.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-az.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-ext-az-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-img-size.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-img-size.wadl
index 432003a60..e20d4d0af 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-img-size.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-img-size.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://glance.example.com/"
         xml:id="os-ext-img-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-ips.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-ips.wadl
index 43aefd79f..7a3c17b40 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-ips.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-ext-ips.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-ext-ips-v2">
-        <resource id="version" type="#VersionDetails" path="v2">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-extended-server-attributes.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-extended-server-attributes.wadl
index f1675504d..d65dde041 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-extended-server-attributes.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-extended-server-attributes.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-extended-server-attributes-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="Servers" path="servers">
                 <method href="#extended_server_attributes_detail"/>
                 <resource path="{server_id}" id="server_id">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-extended-status.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-extended-status.wadl
index 085fbac72..ced37e173 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-extended-status.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-extended-status.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-extended-status-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-fixed-ips.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-fixed-ips.wadl
index b90c123a8..0cc732b1b 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-fixed-ips.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-fixed-ips.wadl
@@ -8,7 +8,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-fixed-ips-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-access.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-access.wadl
index 629a4fc21..340cd2f2d 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-access.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-access.wadl
@@ -12,7 +12,7 @@
         xml:id="os-flavor-access-v2">
         <wadl:doc xmlns="http://docbook.org/ns/docbook"
             title="Flavor access" xml:lang="EN"/>
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-extra-specs.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-extra-specs.wadl
index aabc55d2c..1aa9d5da3 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-extra-specs.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-extra-specs.wadl
@@ -8,7 +8,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-flavor-extra-specs-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-rxtx.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-rxtx.wadl
index 65618a51d..1cdb74142 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-rxtx.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavor-rxtx.wadl
@@ -10,7 +10,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-flavor-rxtx-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavorextradata.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavorextradata.wadl
index 76ab39fb3..b4608ff8d 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavorextradata.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavorextradata.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-flavorextradata-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavormanage.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavormanage.wadl
index bcdded2b1..01df6c5b0 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-flavormanage.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-flavormanage.wadl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- (C) 2012-2013 OpenStack Foundation, All Rights Reserved -->
-
 <!DOCTYPE application [<!ENTITY % common  SYSTEM "../common.ent">
 %common;]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -12,7 +10,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-flavormanage-v2">
-        <resource id="version" path="v2">
+        <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ip-dns.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ip-dns.wadl
index 3da76f66a..88a342cee 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ip-dns.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ip-dns.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v2">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-floating-ip-dns-v2">
-        <resource id="version" type="#VersionDetails" path="v2">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ip-pools.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ip-pools.wadl
index b4b1aa8b3..3e8147f6f 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ip-pools.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ip-pools.wadl
@@ -9,7 +9,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v2">
     <resources base="https://floatingippools.example.com/"
         xml:id="os-floating-ip-pools-v2">
-        <resource id="version" path="v2">
+        <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ips-bulk.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ips-bulk.wadl
index 633cb2b71..36263ba90 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ips-bulk.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ips-bulk.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
                xml:id="os-floating-ips-bulk-v2">
-        <resource id="version" type="#VersionDetails" path="v2">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ips.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ips.wadl
index f01c54ab5..23b19b6be 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ips.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-floating-ips.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
                xml:id="os-floating-ips-v2">
-        <resource id="version" type="#VersionDetails" path="v2">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-flv-disabled.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-flv-disabled.wadl
index 2a63f2f64..6582456d8 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-flv-disabled.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-flv-disabled.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-flv-disabled-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-hosts.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-hosts.wadl
index 4d609bf88..b1b3e7817 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-hosts.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-hosts.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-hosts-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-hypervisors.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-hypervisors.wadl
index 16f59c46b..aa95f977e 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-hypervisors.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-hypervisors.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v2">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-hypervisors-v2">
-        <resource id="version" path="v2">
+        <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-instance-actions.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-instance-actions.wadl
index b9f15a18c..4a5e04ef8 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-instance-actions.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-instance-actions.wadl
@@ -19,7 +19,7 @@
     </grammars>
     <resources base="https://servers.api.openstack.com"
         xml:id="os-instance-actions-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-instance_usage_audit_log.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-instance_usage_audit_log.wadl
index e5804b5ae..a9121c521 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-instance_usage_audit_log.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-instance_usage_audit_log.wadl
@@ -11,7 +11,7 @@
     xmlns:atom="http://www.w3.org/2005/Atom">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-instance-usage-audit-log-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-keypairs.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-keypairs.wadl
index 2e628cb02..b156c3678 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-keypairs.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-keypairs.wadl
@@ -8,7 +8,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-keypairs-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-migrations.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-migrations.wadl
index 82ec03123..ab7351e64 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-migrations.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-migrations.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-migrations-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-multi-server-create.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-multi-server-create.wadl
index 3103ad6a3..f8027c98d 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-multi-server-create.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-multi-server-create.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="multiple-create-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-networks.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-networks.wadl
index 02071555b..4cd006cf3 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-networks.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-networks.wadl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- (C) 2013 OpenStack Foundation, All Rights Reserved -->
-
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -9,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-networks-v2">
-        <resource id="version" type="#VersionDetails" path="v2">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-quota-sets.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-quota-sets.wadl
index 76cd8f412..f6c83f5e2 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-quota-sets.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-quota-sets.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-quota-sets-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string" required="true">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-rescue.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-rescue.wadl
index 1edc83345..ae439b650 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-rescue.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-rescue.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-rescue-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-scheduler-hints.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-scheduler-hints.wadl
index 6a687cde4..e050e4872 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-scheduler-hints.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-scheduler-hints.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-scheduler-hints-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-group-default-rules.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-group-default-rules.wadl
index 7fb85fd7a..8c3afabdc 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-group-default-rules.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-group-default-rules.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com/"
         xml:id="os-security-group-default-rules-v2">
-        <resource id="version" path="v2">
+        <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
index 7b171c8be..30f3411cb 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-security-groups.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com/"
         xml:id="os-security-groups-v2">
-        <resource id="version" path="v2">
+        <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-OS-EXT-IPS-MAC.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-OS-EXT-IPS-MAC.wadl
index 81184f60b..787ad8b3c 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-OS-EXT-IPS-MAC.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-OS-EXT-IPS-MAC.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="OS-EXT-IPS-MAC-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-password.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-password.wadl
index 256d7a809..7207c4be9 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-password.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-password.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-server-password-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="Servers" path="servers">
                 <resource path="{server_id}" id="server_id">
                     <param name="server_id" style="template"
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-shelve.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-shelve.wadl
index ca9bc8ba8..50d9d5f99 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-shelve.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-shelve.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-server-shelve-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-start-stop.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-start-stop.wadl
index 789cd3e86..e908ef75a 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-server-start-stop.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-server-start-stop.wadl
@@ -7,7 +7,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-server-start-stop-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-services.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-services.wadl
index 0de86fdd4..415d5ee39 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-services.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-services.wadl
@@ -9,7 +9,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v2">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-services-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-simple-tenant-usage.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-simple-tenant-usage.wadl
index 9179dc6bf..38e21ee40 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-simple-tenant-usage.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-simple-tenant-usage.wadl
@@ -6,7 +6,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-simple-tenant-usage-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenantID" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-used-limits-for-admins.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-used-limits-for-admins.wadl
index 419627ada..760ef455b 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-used-limits-for-admins.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-used-limits-for-admins.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-used-limits-for-admins-v2">
-        <resource id="version" path="v2/">
+        <resource id="version" path="//v2">
             <resource id="tenantID" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-used-limits.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-used-limits.wadl
index 7a629bca9..9349433f2 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-used-limits.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-used-limits.wadl
@@ -9,7 +9,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-used-limits-v2">
-        <resource id="version" path="v2/">
+        <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-virtual-interfaces.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-virtual-interfaces.wadl
index 005e5574a..df4075816 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-virtual-interfaces.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-virtual-interfaces.wadl
@@ -11,7 +11,7 @@
     xmlns:atom="http://www.w3.org/2005/Atom">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-virtual-interfaces-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-volume.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-volume.wadl
index bcf04a3ff..d2259a2d6 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-volume.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-volume.wadl
@@ -11,7 +11,7 @@
     xmlns:atom="http://www.w3.org/2005/Atom">
     <resources base="https://volume.example.com/"
         xml:id="os-volume-v2">
-        <resource id="version" path="v1.1">
+        <resource id="version" path="//v1.1">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-volume_attachments.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-volume_attachments.wadl
index 96854cec4..359c8b31f 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-volume_attachments.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-volume_attachments.wadl
@@ -22,7 +22,7 @@
     </grammars>
     <resources base="https://servers.api.openstack.com"
         xml:id="os-volume-attachments-v2">
-        <resource id="version" type="#VersionDetails" path="v2/">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl b/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
index 7e2c66474..9ac5525c2 100644
--- a/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/wadl/os-compute-2.wadl
@@ -25,7 +25,7 @@
     <!--*******************************************************-->
     <resources base="https://servers.api.openstack.com"
         xml:id="os-compute-v2">
-        <resource id="version" type="#VersionDetails" path="v2">
+        <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="csapi:UUID">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-admin-actions-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-admin-actions-v3.wadl
index 70385f392..1ad58cfe1 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-admin-actions-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-admin-actions-v3.wadl
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2014 OpenStack Foundation, All Rights Reserved -->
-<!DOCTYPE application [<!ENTITY % common  SYSTEM "../common.ent">
-%common;]>
+<?xml version="1.0" encoding="UTF-8"?><!-- (C) 2014 OpenStack Foundation, All Rights Reserved --><!DOCTYPE application [<!ENTITY % common  SYSTEM "../common.ent">%common;]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
-    <resources base="https://servers.api.openstack.com" xml:id="os-admin-actions-v3">
-        <resource id="v3" path="v3">
+    <resources base="https://servers.api.openstack.com"
+        xml:id="os-admin-actions-v3">
+        <resource id="v3" path="//v3">
             <resource id="server_id_action"
                 path="servers/{server_id}/action">
                 <resource id="server_id" path="{server_id}">
@@ -54,8 +52,6 @@
         </request>
         <response status="202"/>
     </method>
-
-
     <method name="POST" id="adminservernetwork">
         <wadl:doc xml:lang="EN" title="Inject network information"
             xmlns="http://docbook.org/ns/docbook">
@@ -80,7 +76,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="livemigrate">
         <wadl:doc xml:lang="EN" title="Live migrate to new host"
             xmlns="http://docbook.org/ns/docbook">
@@ -105,7 +100,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="lockserver">
         <wadl:doc xml:lang="EN" title="Lock server"
             xmlns="http://docbook.org/ns/docbook">
@@ -129,7 +123,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="migrateserver">
         <wadl:doc xml:lang="EN" title="Migrate server"
             xmlns="http://docbook.org/ns/docbook">
@@ -154,7 +147,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="pauseserver">
         <wadl:doc xml:lang="EN" title="Pause server"
             xmlns="http://docbook.org/ns/docbook">
@@ -179,7 +171,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="resetnetwork">
         <wadl:doc xml:lang="EN" title="Reset server networking"
             xmlns="http://docbook.org/ns/docbook">
@@ -204,7 +195,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="resetserver">
         <wadl:doc xml:lang="EN" title="Reset server state"
             xmlns="http://docbook.org/ns/docbook">
@@ -229,7 +219,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="resumeserver">
         <wadl:doc xml:lang="EN" title="Resume server"
             xmlns="http://docbook.org/ns/docbook">
@@ -254,7 +243,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="suspendserver">
         <wadl:doc xml:lang="EN" title="Suspend server"
             xmlns="http://docbook.org/ns/docbook">
@@ -279,7 +267,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="unlockserver">
         <wadl:doc xml:lang="EN" title="Unlock server"
             xmlns="http://docbook.org/ns/docbook">
@@ -303,7 +290,6 @@
         </request>
         <response status="202"/>
     </method>
-
     <method name="POST" id="unpauseserver">
         <wadl:doc xml:lang="EN" title="Unpause server"
             xmlns="http://docbook.org/ns/docbook">
@@ -328,5 +314,4 @@
         </request>
         <response status="202"/>
     </method>
-
 </application>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-agents-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-agents-v3.wadl
index ee8dd8dc8..781403280 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-agents-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-agents-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-agents-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-agents" path="os-agents">
                 <method href="#agentbuild"/>
                 <method href="#listbuilds"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-aggregates-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-aggregates-v3.wadl
index a2f106ace..7565ed037 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-aggregates-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-aggregates-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-aggregates-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-aggregates" path="os-aggregates">
                 <method href="#createaggregate"/>
                 <method href="#listaggregate"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-cells-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-cells-v3.wadl
index 37ac06e83..43893fe97 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-cells-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-cells-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-cell-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-cells" path="os-cells">
                 <method href="#listcell"/>
                 <method href="#returnallcell"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-certificates-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-certificates-v3.wadl
index e9e73110f..4449263bc 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-certificates-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-certificates-v3.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com" xml:id="os-certificate-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-certificates" path="os-certificates">
                 <method href="#createcertificate"/>
                 <resource id="root" path="root">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-config-drive-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-config-drive-v3.wadl
index 0c952c49d..3a6632037 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-config-drive-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-config-drive-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-config-drive-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}">
                     <method href="#returnserver"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-deferred-delete-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-deferred-delete-v3.wadl
index 15904ccbb..06804e347 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-deferred-delete-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-deferred-delete-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-deferred-delete-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}">
                     <resource id="action" path="action">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-evacuate-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-evacuate-v3.wadl
index 087b33846..614071107 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-evacuate-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-evacuate-v3.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com" xml:id="os-evacuate-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}">
                     <resource id="action" path="action">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-availability-zone-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-availability-zone-v3.wadl
index 3aa7efdcc..9b0210603 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-availability-zone-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-availability-zone-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-extended-availability-zone-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}">
                     <method href="#returndetails"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-server-attributes-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-server-attributes-v3.wadl
index 013a1ef30..de1d561aa 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-server-attributes-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-server-attributes-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-extended-server-attributes-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}"> </resource>
                 <method href="#returnserverdetails"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-status-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-status-v3.wadl
index e0544f4e8..efe75d2c9 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-status-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-status-v3.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com" xml:id="os-extended-status-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}">
                     <method href="#returnserverdetails"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-access-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-access-v3.wadl
index f7e0ec10d..2a1e23792 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-access-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-access-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-flavor-access-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="flavors" path="flavors">
                 <method href="#extendflavor"/>
                 <resource id="detail" path="detail">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-manage-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-manage-v3.wadl
index 0745704ba..d3a5866bf 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-manage-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-manage-v3.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="http://www.example.com" xml:id="flavor-manage-v3">
-        <resource path="v3">
+        <resource path="//v3">
             <resource path="flavors">
                 <method href="#create-flavors"/>
                 <resource path="{flavor_id}">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-rxtx-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-rxtx-v3.wadl
index 99e86ab04..3a4cc5624 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-rxtx-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-rxtx-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-flavor-rxtx-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="flavors" path="flavors">
                 <method href="#createflavor"/>
                 <resource id="details" path="detail">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavors-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavors-v3.wadl
index f30f51ef0..ad2a26d7b 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavors-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavors-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="flavors_v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="flavors" path="flavors">
                 <method href="#getflavorbrief"/>
                 <resource id="flavor_id" path="{flavor_id}">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavorspecs-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavorspecs-v3.wadl
index 5c5af043a..4e95e4287 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavorspecs-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavorspecs-v3.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com" xml:id="flavorsspecs-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="flavors" path="flavors">
                 <resource id="flavor_id" path="{flavor_id}">
                     <resource id="flavor-extra-specs"
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-hosts-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-hosts-v3.wadl
index 520def2f5..498c321e5 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-hosts-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-hosts-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-hosts-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-hosts" path="os-hosts">
                 <method href="#listallhosts"/>
                 <resource id="host_name" path="{host_name}">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-hypervisors-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-hypervisors-v3.wadl
index 1b70f5895..f7d45257d 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-hypervisors-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-hypervisors-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-hypervisors-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-hypervisors" path="os-hypervisors">
                 <method href="#listhypervisors"/>
                 <resource id="statistics" path="statistics">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-actions-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-actions-v3.wadl
index 94d4e90d5..b29f341e7 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-actions-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-actions-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-instance-actions-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}">
                     <resource id="os-instance-actions"
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-usage-audit-log-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-usage-audit-log-v3.wadl
index c8d00de3d..27f40c607 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-usage-audit-log-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-usage-audit-log-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-instance-usage-audit-log-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-instance-usage-audit-log"
                 path="os-instance-usage-audit-log">
                 <method href="#listusageaudits"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-limits-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-limits-v3.wadl
index c7c14069d..c4e4dffbc 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-limits-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-limits-v3.wadl
@@ -5,7 +5,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com" xml:id="limits-v3">
-        <resource id="Limits" path="v3">
+        <resource id="Limits" path="//v3">
             <resource id="limits" path="limits">
                 <method href="#getlimits"/>
             </resource>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-migrations-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-migrations-v3.wadl
index 0665f67b9..7a60d1031 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-migrations-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-migrations-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-migrations-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-migrations" path="os-migrations">
                 <method href="#returnmigrations"/>
             </resource>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-multinic-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-multinic-v3.wadl
index 7297200a3..fa3ed0dd5 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-multinic-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-multinic-v3.wadl
@@ -6,7 +6,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-multinic-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <method href="#removeip"/>
                 <resource id="action" path="action">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-class-sets-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-class-sets-v3.wadl
index e0a563ef8..ff8e4652f 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-class-sets-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-class-sets-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-quota-class-sets-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-quota-class-sets"
                 path="os-quota-class-sets">
                 <resource id="class_id" path="{class_id}">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-sets-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-sets-v3.wadl
index e5716f70a..9440005d0 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-sets-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-sets-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-quota-sets-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-quota-sets" path="os-quota-sets">
                 <resource id="tenant_id " path="{tenant_id}">
                     <method href="#deletequota"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-remote-consoles-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-remote-consoles-v3.wadl
index c0f813195..498d6fd2a 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-remote-consoles-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-remote-consoles-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-remote-consoles-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}">
                     <resource id="actions" path="actions">
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-server-usage-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-server-usage-v3.wadl
index bea8505e7..83fa9202a 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-server-usage-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-server-usage-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-server-usage-v3">
-        <resource id="v3 " path="v3">
+        <resource id="v3 " path="//v3">
             <resource id="servers" path="servers">
                 <resource id="detail" path="detail">
                     <method href="#returnserveruser"/>
diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-simple-tenant-usage-v3.wadl b/api-ref/src/wadls/compute-api/src/v3/wadl/os-simple-tenant-usage-v3.wadl
index 8635a8eef..9064cfe99 100755
--- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-simple-tenant-usage-v3.wadl
+++ b/api-ref/src/wadls/compute-api/src/v3/wadl/os-simple-tenant-usage-v3.wadl
@@ -8,7 +8,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-simple-tenant-usage-v3">
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="os-simple-tenant-usage"
                 path="os-simple-tenant-usage">
                 <method href="#retrievetenantusage"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/HP-IDM-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/HP-IDM-admin.wadl
index e9aeabf11..85cf483e2 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/HP-IDM-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/HP-IDM-admin.wadl
@@ -31,7 +31,7 @@
 
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="HP-IDM-admin-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <resource id="tokens" path="tokens">
                 <resource id="tokenById" path="{tokenId}">
                     <param name="X-Auth-Token" style="header"
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
index be5fc87e9..0b26df2a7 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
@@ -30,7 +30,7 @@
 
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="OS-KSADM-admin-v2.0">
-        <resource id="version-v2.0" path="v2.0">
+        <resource id="version-v2.0" path="//v2.0">
             <param name="X-Auth-Token" style="header"
                 type="xsd:string" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSCATALOG-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSCATALOG-admin.wadl
index 53f73b94d..6ebf5864b 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSCATALOG-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSCATALOG-admin.wadl
@@ -31,8 +31,7 @@
 
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="OS-KSCATALOG-admin-v2.0">
-        <resource id="version" path="v2.0">
-
+        <resource id="version" path="//v2.0">
             <resource id="tenants" path="tenants">
                 <param name="X-Auth-Token" style="header" type="xsd:string" required="true"><doc>A valid authentication token for an administrative user.</doc></param>
                 <resource id="tenantId" path="{tenantId}">
@@ -50,7 +49,6 @@
                      </resource>
                 </resource>
             </resource>
-
             <resource id="role-service-OS-KSCATALOG" path="OS-KSCATALOG">
                 <resource id="endpointTemplates" path="endpointTemplates">
                     <param name="X-Auth-Token" style="header" type="xsd:string" required="true"><doc>A valid authentication token for an administrative user.</doc></param>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSEC2-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSEC2-admin.wadl
index da1c17ca6..1fa75ddf3 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSEC2-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSEC2-admin.wadl
@@ -32,7 +32,7 @@
 
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="OS-KSEC2-admin-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <param name="X-Auth-Token" style="header"
                 type="xsd:string" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl
index c40bf2a7e..8f0472187 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSS3-admin.wadl
@@ -31,7 +31,7 @@
 
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="OS-KSS3-admin-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <param name="X-Auth-Token" style="header"
                 type="xsd:string" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl
index e0b7d9cae..2db8a54df 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSVALIDATE-admin.wadl
@@ -30,7 +30,7 @@
 
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="OS-KSVALIDATE-admin-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <resource id="extension" path="OS-KSVALIDATE">
                 <resource id="token" path="token">
                     <resource id="validate" path="validate">
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-GRPADM.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-GRPADM.wadl
index 849866ef4..0313973cd 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-GRPADM.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-GRPADM.wadl
@@ -23,7 +23,7 @@
     </grammars>
 
     <resources base="http://localhost:35357" xml:id="RAX-GRPADM-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <resource id="RAX-GRPADM" path="RAX-GRPADM">
                 <resource id="groups" path="groups" type="#GroupList">
                     <param name="X-Auth-Token" style="header" type="xsd:string" required="true">
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSGRP-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSGRP-admin.wadl
index 815ad5f0b..310bff942 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSGRP-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSGRP-admin.wadl
@@ -30,7 +30,7 @@
 
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="RAX-KSGRP-admin-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <param name="X-Auth-Token" style="header" type="xsd:string" required="true">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook">A valid authentication token for an administrative user.</wadl:doc>
             </param>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSKEY-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSKEY-admin.wadl
index 678457ece..7b1de24e4 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSKEY-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSKEY-admin.wadl
@@ -29,7 +29,7 @@
     <!--*******************************************************-->
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="RAX-KSKEY-admin-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <param name="X-Auth-Token" style="header"
                 type="xsd:string" required="true">
                 <doc>A valid authentication token for an
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSQA-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSQA-admin.wadl
index 4f4dd5d35..36ec42020 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSQA-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/RAX-KSQA-admin.wadl
@@ -31,7 +31,7 @@
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357"
         xml:id="RAX-KSQA-admin-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <param name="X-Auth-Token" style="header"
                 type="xsd:string" required="true">
                 <doc>A valid authentication token for an
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
index 99f2cd19a..78d77defa 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
@@ -28,7 +28,7 @@
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357"
         xml:id="identity-admin-v2.0">
-        <resource id="version" path="v2.0">
+        <resource id="version" path="//v2.0">
             <method href="#getVersionInfo"/>
             <resource id="extensions" path="extensions">
                 <method href="#listExtensions"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
index f9d129a4c..d86ad7758 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
@@ -27,7 +27,7 @@
     <!--             All Resources                             -->
     <!--*******************************************************-->
     <resources base="http://localhost:5000" xml:id="identity-v2.0">
-        <resource id="version" type="#VersionDetails" path="v2.0/">
+        <resource id="version" type="#VersionDetails" path="//v2.0">
             <resource id="extensions" type="#ExtensionList"
                 path="extensions">
                 <resource id="extension" path="{alias}">
diff --git a/api-ref/src/wadls/identity-api/src/v3/wadl/OS-OAUTH1-v3.wadl b/api-ref/src/wadls/identity-api/src/v3/wadl/OS-OAUTH1-v3.wadl
index 353a316c9..5caf6cf15 100644
--- a/api-ref/src/wadls/identity-api/src/v3/wadl/OS-OAUTH1-v3.wadl
+++ b/api-ref/src/wadls/identity-api/src/v3/wadl/OS-OAUTH1-v3.wadl
@@ -35,7 +35,7 @@
     <!-- We should use SSL in production -->
     <resources base="http://localhost:35357" xml:id="OS-OAUTH1-v3">
         <!-- FYI: double slash needed in path to get a single slash to display -->
-        <resource id="v3" path="v3">
+        <resource id="v3" path="//v3">
             <resource id="oauth1" path="OS-OAUTH1">
                 <resource id="consumers" path="consumers">
                     <param name="description" style="plain"
diff --git a/api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl b/api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl
index 6fa5ee0ac..dfc02997e 100644
--- a/api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl
+++ b/api-ref/src/wadls/image-api/src/v1/os-image-1.0.wadl
@@ -30,7 +30,7 @@
 
     <resources base="https://glance.example.com/"
         xml:id="os-image-v1.0">
-        <resource id="info" path="v1">
+        <resource id="info" path="//v1">
             <resource id="Images" type="#ImageList" path="images">
                 <method href="#createImage"/>
                 <resource path="detail" type="#DetailImageList"
diff --git a/api-ref/src/wadls/image-api/src/v2.0/os-image-2.0.wadl b/api-ref/src/wadls/image-api/src/v2.0/os-image-2.0.wadl
index 956bd9adb..f90af554d 100644
--- a/api-ref/src/wadls/image-api/src/v2.0/os-image-2.0.wadl
+++ b/api-ref/src/wadls/image-api/src/v2.0/os-image-2.0.wadl
@@ -29,7 +29,7 @@
     <!--*******************************************************-->
     <resources base="https://glance.example.com/"
         xml:id="os-image-v2.0">
-        <resource id="info" path="v2">
+        <resource id="info" path="//v2">
             <resource id="images" path="images">
                 <method href="#createImage"/>
                 <method href="#listImages"/>
diff --git a/api-ref/src/wadls/image-api/src/v2.0/os-image-schemas-2.0.wadl b/api-ref/src/wadls/image-api/src/v2.0/os-image-schemas-2.0.wadl
index 76eebe1ff..014c04262 100644
--- a/api-ref/src/wadls/image-api/src/v2.0/os-image-schemas-2.0.wadl
+++ b/api-ref/src/wadls/image-api/src/v2.0/os-image-schemas-2.0.wadl
@@ -32,7 +32,7 @@
 
     <resources base="https://glance.example.com/"
         xml:id="os-image-schemas-v2.0">
-        <resource id="info" path="v2">
+        <resource id="info" path="//v2">
             <resource id="schemas" path="schemas">
                 <resource id="Image-schemas" type="#SchemasList"
                     path="images">
diff --git a/api-ref/src/wadls/image-api/src/v2/os-image-schemas-v2.wadl b/api-ref/src/wadls/image-api/src/v2/os-image-schemas-v2.wadl
index b32b698c2..b2e7c35dd 100644
--- a/api-ref/src/wadls/image-api/src/v2/os-image-schemas-v2.wadl
+++ b/api-ref/src/wadls/image-api/src/v2/os-image-schemas-v2.wadl
@@ -30,7 +30,7 @@
 
     <resources base="https://glance.example.com/"
         xml:id="os-image-schemas-v2">
-        <resource id="info" path="v2">
+        <resource id="info" path="//v2">
             <resource id="schemas" path="schemas">
                 <resource id="Image-schemas" type="#SchemasList"
                     path="images">
diff --git a/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl b/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl
index daed5c7fc..4c783a4ab 100644
--- a/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl
+++ b/api-ref/src/wadls/image-api/src/v2/os-image-v2.wadl
@@ -26,7 +26,7 @@
     <!--             All Resources                             -->
     <!--*******************************************************-->
     <resources base="https://glance.example.com/" xml:id="os-image-v2">
-        <resource id="info" path="v2">
+        <resource id="info" path="//v2">
             <resource id="Images" type="#ImageList"
                 path="images">
                 <method href="#createImage"/>
diff --git a/api-ref/src/wadls/netconn-api/src/metering-labels.wadl b/api-ref/src/wadls/netconn-api/src/metering-labels.wadl
index 46b3cfc14..1e90097ce 100644
--- a/api-ref/src/wadls/netconn-api/src/metering-labels.wadl
+++ b/api-ref/src/wadls/netconn-api/src/metering-labels.wadl
@@ -13,7 +13,7 @@
     </grammars>
     <resources base="https://servers.api.openstack.com/"
         xml:id="metering-labels-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="metering_labels" path="metering-labels">
                 <method href="#listMeteringLabels"/>
                 <method href="#createMeteringLabel"/>
diff --git a/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
index d436165b2..407c9eb0a 100644
--- a/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-layer3-ext.wadl
@@ -21,7 +21,7 @@
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/"
         xml:id="os-layer3-ext-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="Routers" type="#RouterList" path="routers">
                 <method href="#createRouter"/>
                 <resource path="{router_id}" id="router_id">
diff --git a/api-ref/src/wadls/netconn-api/src/os-lbaas-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-lbaas-ext.wadl
index 0cc3c03c7..50e787240 100644
--- a/api-ref/src/wadls/netconn-api/src/os-lbaas-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-lbaas-ext.wadl
@@ -21,7 +21,7 @@
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/"
         xml:id="os-lbaas-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="lb-vips" path="lb/vips">
                 <method href="#listVIPs"/>
                 <method href="#createVIP"/>
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
index 155e6b3b9..962f703ca 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-networks-multi-provider-ext.wadl
@@ -21,7 +21,7 @@
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/"
         xml:id="os-networks-multi-provider-ext-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="Networks" path="networks">
                 <method href="#listMultiNetworks"/>
                 <method href="#createMultiNetwork"/>
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl
index 5fcc3e358..0e38b8754 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-networks-provider-ext.wadl
@@ -21,7 +21,7 @@
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/"
         xml:id="os-networks-provider-ext-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="Networks" path="networks">
                 <method href="#listNetworks"/>
                 <method href="#createNetwork"/>
diff --git a/api-ref/src/wadls/netconn-api/src/os-networks.wadl b/api-ref/src/wadls/netconn-api/src/os-networks.wadl
index 9d5e13aad..62ace1822 100644
--- a/api-ref/src/wadls/netconn-api/src/os-networks.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-networks.wadl
@@ -21,7 +21,7 @@
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/"
         xml:id="os-networks-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="Networks" type="#NetworkList"
                 path="networks">
                 <method href="#createNetwork"/>
diff --git a/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl b/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl
index 623452be1..c4f836ad1 100644
--- a/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-ports-binding-ext.wadl
@@ -20,7 +20,7 @@
     <!--             All Resources                             -->
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/" xml:id="os-ports-binding-ext-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="Ports" path="ports">
                 <method href="#listPorts"/>
                 <method href="#createPort"/>
diff --git a/api-ref/src/wadls/netconn-api/src/os-ports.wadl b/api-ref/src/wadls/netconn-api/src/os-ports.wadl
index e84649c74..2bbca3e24 100644
--- a/api-ref/src/wadls/netconn-api/src/os-ports.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-ports.wadl
@@ -21,7 +21,7 @@
     <!--             All Resources                             -->
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/" xml:id="os-ports-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="Ports" path="ports">
                 <method href="#listPorts"/>
                 <method href="#createPort"/>
diff --git a/api-ref/src/wadls/netconn-api/src/os-quotas.wadl b/api-ref/src/wadls/netconn-api/src/os-quotas.wadl
index 78c533cfe..276cf7c24 100644
--- a/api-ref/src/wadls/netconn-api/src/os-quotas.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-quotas.wadl
@@ -21,7 +21,7 @@
     <!--             All Resources                             -->
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/" xml:id="os-quotas-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="Quotas" path="quotas">
                 <method href="#listQuotas"/>
                 <resource path="{tenant_id}" id="tenant_id">
diff --git a/api-ref/src/wadls/netconn-api/src/os-subnets.wadl b/api-ref/src/wadls/netconn-api/src/os-subnets.wadl
index b98d33151..f8a2573c8 100644
--- a/api-ref/src/wadls/netconn-api/src/os-subnets.wadl
+++ b/api-ref/src/wadls/netconn-api/src/os-subnets.wadl
@@ -22,7 +22,7 @@
     <!--*******************************************************-->
     <resources base="https://neutron.example.com/"
         xml:id="os-subnets-v2">
-        <resource id="version" type="#VersionDetails" path="v2.0/">
+        <resource id="version" type="#VersionDetails" path="//v2.0">
             <resource id="Subnets" type="#SubnetList" path="subnets">
                 <method href="#listSubnets"/>
                 <method href="#createSubnet"/>
diff --git a/api-ref/src/wadls/netconn-api/src/security-groups.wadl b/api-ref/src/wadls/netconn-api/src/security-groups.wadl
index 4957182f5..ad494c0b0 100644
--- a/api-ref/src/wadls/netconn-api/src/security-groups.wadl
+++ b/api-ref/src/wadls/netconn-api/src/security-groups.wadl
@@ -13,7 +13,7 @@
     </grammars>
     <resources base="https://servers.api.openstack.com/"
         xml:id="security-groups-v2.0">
-        <resource id="version" path="v2.0/">
+        <resource id="version" path="//v2.0">
             <resource id="security_groups" path="security-groups">
                 <method href="#listSecGroups"/>
                 <method href="#createSecGroup"/>
diff --git a/api-ref/src/wadls/object-api/src/os-object-api-1.0.wadl b/api-ref/src/wadls/object-api/src/os-object-api-1.0.wadl
index fb56a9dc2..7d1065e06 100644
--- a/api-ref/src/wadls/object-api/src/os-object-api-1.0.wadl
+++ b/api-ref/src/wadls/object-api/src/os-object-api-1.0.wadl
@@ -12,7 +12,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://storage.swiftdrive.com/"
         xml:id="object-v1">
-        <resource id="version" path="v1">
+        <resource id="version" path="//v1">
             <resource id="account" path="{account}"
                 type="#AccountDetails">
                 <param name="account" style="template"
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
index d2a9da6ba..b90206eaa 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
+++ b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
@@ -13,7 +13,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://heat.example.com/"
         xml:id="orchestration-api-v1.0">
-        <resource id="version" path="v1">
+        <resource id="version" path="//v1">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
diff --git a/api-ref/src/wadls/telemetry-api/src/v2/os-telemetry-api-2.0.wadl b/api-ref/src/wadls/telemetry-api/src/v2/os-telemetry-api-2.0.wadl
index 52b609107..3058e0f3b 100644
--- a/api-ref/src/wadls/telemetry-api/src/v2/os-telemetry-api-2.0.wadl
+++ b/api-ref/src/wadls/telemetry-api/src/v2/os-telemetry-api-2.0.wadl
@@ -13,7 +13,7 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:Enum="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="http://www.example.com" xml:id="os-telemetry-api-v2.0">
-        <resource path="v2" id="v2">
+        <resource path="//v2" id="v2">
             <resource path="alarms" id="alarms">
                 <method href="#listAlarms"/>
                 <method href="#createAlarm"/>
diff --git a/api-ref/src/wadls/volume-api/src/v1/volume-api-v1.wadl b/api-ref/src/wadls/volume-api/src/v1/volume-api-v1.wadl
index 1446f40d5..b01c66f3d 100644
--- a/api-ref/src/wadls/volume-api/src/v1/volume-api-v1.wadl
+++ b/api-ref/src/wadls/volume-api/src/v1/volume-api-v1.wadl
@@ -4,30 +4,31 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/1.0"
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
-    <resources base="https://volume.example.com/" xml:id="volume-api-v1.0">
-        <resource id="version" path="v1">
+    <resources base="https://volume.example.com/"
+        xml:id="volume-api-v1.0">
+        <resource id="version" path="//v1">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="csapi:UUID">
-                    <doc>
-                        <p xmlns="http://www.w3.org/1999/xhtml">The
-                            unique identifier of the tenant or
-                            account.</p>
-                    </doc>
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN">
+                        <para>The unique identifier of the tenant or
+                            account.</para></wadl:doc>
                 </param>
                 <resource id="volumes" path="volumes">
                     <method href="#createVolume"/>
                     <method href="#getVolumesSimple"/>
-                    <resource path="detail">
+                    <resource path="detail" id="detail-volume">
                         <method href="#getVolumesDetail"/>
                     </resource>
-                    <resource path="{volume_id}">
+                    <resource path="{volume_id}" id="volume_id">
                         <param name="volume_id" style="template"
                             required="true" type="csapi:UUID">
-                            <doc><p
-                                   xmlns="http://www.w3.org/1999/xhtml"
-                                   > The unique identifier of an
-                                   existing Volume.</p></doc>
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN">
+                                <para>The unique identifier of an
+                                   existing volume.</para></wadl:doc>
                         </param>
                         <method href="#getVolume"/>
                         <method href="#deleteVolume"/>
@@ -35,13 +36,16 @@
                 </resource>
                 <resource id="types" path="types">
                     <method href="#getVolumeTypes"/>
-                    <resource path="{volume_type_id}">
+                    <resource path="{volume_type_id}"
+                        id="volume_type_id">
                         <param name="volume_type_id" style="template"
                             required="true" type="csapi:UUID">
-                            <doc><p
-                                   xmlns="http://www.w3.org/1999/xhtml"
-                                   >The unique identifier of an
-                                   existing volume type.</p></doc>
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN">
+                                <para>The unique identifier of an
+                                   existing volume
+                                type.</para></wadl:doc>
                         </param>
                         <method href="#getVolumeType"/>
                     </resource>
@@ -49,16 +53,18 @@
                 <resource id="snapshots" path="snapshots">
                     <method href="#createSnapshot"/>
                     <method href="#getSnapshotsSimple"/>
-                    <resource path="detail">
+                    <resource path="detail" id="detail-snapshots">
                         <method href="#getSnapshotsDetail"/>
                     </resource>
-                    <resource path="{snapshot_id}">
+                    <resource path="{snapshot_id}" id="snapshot_id">
                         <param name="snapshot_id" style="template"
                             required="true" type="csapi:UUID">
-                            <doc><p
-                                   xmlns="http://www.w3.org/1999/xhtml"
-                                   >The unique identifier of an
-                                   existing snapshot.</p></doc>
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN">
+                                <para>The unique identifier of an
+                                   existing
+                                snapshot.</para></wadl:doc>
                         </param>
                         <method href="#getSnapshot"/>
                         <method href="#deleteSnapshot"/>
@@ -68,252 +74,275 @@
         </resource>
     </resources>
     <method name="POST" id="createVolume">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="Create Volume">
-            <p xmlns="http://www.w3.org/1999/xhtml">Creates a
-                volume.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Create volume">
+            <para role="shortdesc">Creates a volume.</para>
         </wadl:doc>
         <request>
             <param name="volume" style="plain" required="true"
                 type="csapi:string">
-                <doc><p xmlns="http://www.w3.org/1999/xhtml">A
-                        partial representation of a volume used in the
-                        creation process.</p></doc>
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <para>A partial representation of a volume used in
+                        the creation process.</para></wadl:doc>
             </param>
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_create.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_create.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </request>
         <response status="201">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_show.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_show.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="GET" id="getVolumesSimple">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="List Volumes">
-            <p xmlns="http://www.w3.org/1999/xhtml">Lists
-                simple volume entities.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List volumes">
+            <para role="shortdesc">Lists simple volume
+                entities.</para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_list_simple.xml"
                     />
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_list_simple.json"
                     />
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="GET" id="getVolumesDetail">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="List Volumes (Detailed)">
-            <p xmlns="http://www.w3.org/1999/xhtml">Lists
-                details for volume entities.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List volumes (detailed)">
+            <para role="shortdesc">Lists details for volume
+                entities.</para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_list_simple.xml"
                     />
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_list_simple.json"
                     />
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="GET" id="getVolume">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="Describe Volume">
-            <p xmlns="http://www.w3.org/1999/xhtml">Shows
-                information about a specified volume.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Describe volume">
+            <para role="shortdesc">Shows information about a specified
+                volume.</para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_show.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_show.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="DELETE" id="deleteVolume">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="Delete Volume">
-            <p xmlns="http://www.w3.org/1999/xhtml">Deletes a specified
-                volume.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Delete volume">
+            <para role="shortdesc">Deletes a specified volume.</para>
         </wadl:doc>
         <response status="202"/>
     </method>
     <method name="GET" id="getVolumeTypes">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="List Volume Types">
-            <p xmlns="http://www.w3.org/1999/xhtml">Request a list of
-                Volume Types.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List volume types">
+            <para role="shortdesc">Request a list of volume
+                types.</para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_type_list.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_type_list.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="GET" id="getVolumeType">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="Describe Volume Type">
-            <p xmlns="http://www.w3.org/1999/xhtml">Shows information about a specified
-                volume type.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Describe volume type">
+            <para role="shortdesc">Shows information about a specified
+                volume type.</para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_type_show.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/volume_type_show.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="POST" id="createSnapshot">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="Create Snapshot">
-            <p xmlns="http://www.w3.org/1999/xhtml">Creates a
-                snapshot.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Create snapshot">
+            <para role="shortdesc">Creates a snapshot.</para>
         </wadl:doc>
         <request>
             <param name="snapshot" style="plain" required="true"
                 type="csapi:string">
-                <doc><p xmlns="http://www.w3.org/1999/xhtml">A
-                        partial representation of a snapshot used in
-                        the creation process.</p></doc>
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <para>A partial representation of a snapshot used
+                        in the creation process.</para></wadl:doc>
             </param>
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/snapshot_create.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/snapshot_create.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </request>
         <response status="201">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/snapshot_show.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/snapshot_show.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="GET" id="getSnapshotsSimple">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="List Snapshots">
-            <p xmlns="http://www.w3.org/1999/xhtml">Lists
-                simple snapshot entities. </p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List snapshots">
+            <para role="shortdesc">Lists simple snapshot entities.
+            </para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code
                         href="samples/snapshot_list_simple.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code
                         href="samples/snapshot_list_simple.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="GET" id="getSnapshotsDetail">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="List Snapshots (Detailed)">
-            <p xmlns="http://www.w3.org/1999/xhtml">Lists
-                details for snapshot entities.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="List snapshots (detailed)">
+            <para role="shortdesc">Lists details for snapshot
+                entities.</para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code
                         href="samples/snapshot_list_simple.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code
                         href="samples/snapshot_list_simple.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="GET" id="getSnapshot">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="Describe Snapshot">
-            <p xmlns="http://www.w3.org/1999/xhtml">Shows
-                information about a specified snapshot.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Describe snapshot">
+            <para role="shortdesc">Shows information about a specified
+                snapshot.</para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/xml">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/snapshot_show.xml"/>
-                </doc>
+                </wadl:doc>
             </representation>
             <representation mediaType="application/json">
-                <doc xml:lang="EN">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
                     <xsdxt:code href="samples/snapshot_show.json"/>
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>
     <method name="DELETE" id="deleteSnapshot">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN"
-            title="Delete Snapshot">
-            <p xmlns="http://www.w3.org/1999/xhtml">Deletes a specified
-                snapshot.</p>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Delete snapshot">
+            <para role="shortdesc">Deletes a specified
+                snapshot.</para>
         </wadl:doc>
         <response status="202"/>
     </method>
diff --git a/api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl
index 760c67a06..8db2652f3 100644
--- a/api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl
@@ -6,7 +6,7 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://volume.example.com/" xml:id="volume-v2">
-        <resource id="version" path="v2">
+        <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">
diff --git a/api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl
index 90fa78663..3e8951f3b 100644
--- a/api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl
@@ -7,7 +7,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://volume.example.com/"
         xml:id="volume-backups-v2">
-        <resource id="version" path="v2">
+        <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
                     type="xsd:string">