diff --git a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
index 6b7b442b0..17d845731 100644
--- a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
+++ b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
@@ -63,27 +63,12 @@
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="backups-v2">
-        <title>Backups extension</title>
-        <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource
-                href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#backups">
-                <wadl:method href="#createBackup"/>
-                <wadl:method href="#listBackups"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#detail">
-                <wadl:method href="#listBackupsDetails"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#backup_id">
-                <wadl:method href="#showBackup"/>
-                <wadl:method href="#deleteBackup"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#restore">
-                <wadl:method href="#restoreBackup"/>
-            </wadl:resource>
-        </wadl:resources>
+    <section xml:id="ext-os-quota-sets-cinder">
+        <title>Quota sets extension (os-quota-sets)</title>
+        <para>Administrators only, depending on policy settings. View, update, and delete
+            quotas for a tenant.</para>
+        <wadl:resources
+            href="../wadls/volume-api/src/v2/os-quota-sets.wadl"
+            xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
 </chapter>
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 f6c83f5e2..8497dd2db 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
@@ -26,14 +26,16 @@
                                 xmlns="http://docbook.org/ns/docbook"
                                 xml:lang="EN" title="Project ID">
                                 <para>The ID for the tenant for which
-                                   you want to show quotas. This ID is
-                                   different from the first tenant ID
-                                   that you specify in the URI: That
-                                   ID is for the admin tenant.</para>
+                                   you want to show, update, or delete
+                                   quotas. This ID is different from
+                                   the first tenant ID that you
+                                   specify in the URI: That ID is for
+                                   the admin tenant.</para>
                             </wadl:doc>
                         </param>
                         <method href="#showQuota"/>
                         <method href="#updateQuota"/>
+                        <method href="#deleteQuotas"/>
                     </resource>
                     <resource path="defaults" id="defaults">
                         <method href="#getDefaults"/>
@@ -45,10 +47,11 @@
                                 xmlns="http://docbook.org/ns/docbook"
                                 xml:lang="EN" title="Project ID">
                                 <para>The ID for the tenant for which
-                                   you want to show quotas. This ID is
-                                   different from the first tenant ID
-                                   that you specify in the URI: That
-                                   ID is for the admin tenant.</para>
+                                   you want to show or update quotas.
+                                   This ID is different from the first
+                                   tenant ID that you specify in the
+                                   URI: That ID is for the admin
+                                   tenant.</para>
                             </wadl:doc>
                         </param>
                         <resource id="user_id" path="{user_id}">
@@ -64,6 +67,7 @@
                             </param>
                             <method href="#showQuotaUser"/>
                             <method href="#updateQuotaUser"/>
+                            <method href="#deleteQuotasUser"/>
                         </resource>
                         <resource id="detail" path="detail">
                             <resource id="user_id-detail"
@@ -137,7 +141,6 @@
             </representation>
         </response>
     </method>
-
     <method name="PUT" id="updateQuota">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Update quotas">
@@ -180,6 +183,14 @@
             </representation>
         </response>
     </method>
+    <method name="DELETE" id="deleteQuotas">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Delete quotas">
+            <para role="shortdesc">Deletes quotas for a tenant so the quotas
+                revert to default values.</para>
+        </wadl:doc>
+        <response status="200"/>
+    </method>
     <method name="GET" id="showQuotaUser">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Show quotas for user"><para role="shortdesc"
@@ -254,6 +265,14 @@
             </representation>
         </response>
     </method>
+    <method name="DELETE" id="deleteQuotasUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Delete quotas for user">
+            <para role="shortdesc">Deletes quotas for a user so that the quotas
+                revert to default values.</para>
+        </wadl:doc>
+        <response status="200"/>
+    </method>
     <method name="GET" id="showQuotaDetailUser">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Show quota details for user"><para role="shortdesc"
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
new file mode 100644
index 000000000..239c64d23
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
@@ -0,0 +1,17 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "fixed_ips": -1,
+        "floating_ips": 10,
+        "id": "fake_tenant",
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
new file mode 100644
index 000000000..76a9292c1
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <cores>20</cores>
+  <fixed_ips>-1</fixed_ips>
+  <floating_ips>10</floating_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>10</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json
new file mode 100644
index 000000000..239c64d23
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json
@@ -0,0 +1,17 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "fixed_ips": -1,
+        "floating_ips": 10,
+        "id": "fake_tenant",
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.xml
new file mode 100644
index 000000000..76a9292c1
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <cores>20</cores>
+  <fixed_ips>-1</fixed_ips>
+  <floating_ips>10</floating_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>10</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json
new file mode 100644
index 000000000..1f12caa04
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json
@@ -0,0 +1,5 @@
+{
+    "quota_set": {
+        "security_groups": 45
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml
new file mode 100644
index 000000000..4bb7b3a47
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <security_groups>45</security_groups>
+</quota_set>
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json
new file mode 100644
index 000000000..2be76d472
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "fixed_ips": -1,
+        "floating_ips": 10,
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 45
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.xml
new file mode 100644
index 000000000..e03a0bf5e
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set>
+  <cores>20</cores>
+  <fixed_ips>-1</fixed_ips>
+  <floating_ips>10</floating_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>10</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>45</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json
new file mode 100644
index 000000000..9877fc459
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json
@@ -0,0 +1,64 @@
+{
+   "quota_set":{
+      "cores":{
+         "in_use":0,
+         "limit":20,
+         "reserved":0
+      },
+      "fixed_ips":{
+         "in_use":0,
+         "limit":-1,
+         "reserved":0
+      },
+      "floating_ips":{
+         "in_use":0,
+         "limit":10,
+         "reserved":0
+      },
+      "injected_files":{
+         "in_use":0,
+         "limit":5,
+         "reserved":0
+      },
+      "instances":{
+         "in_use":0,
+         "limit":10,
+         "reserved":0
+      },
+      "key_pairs":{
+         "in_use":0,
+         "limit":100,
+         "reserved":0
+      },
+      "metadata_items":{
+         "in_use":0,
+         "limit":128,
+         "reserved":0
+      },
+      "ram":{
+         "in_use":0,
+         "limit":51200,
+         "reserved":0
+      },
+      "security_groups":{
+         "in_use":0,
+         "limit":10,
+         "reserved":0
+      },
+      "injected_file_content_bytes":{
+         "in_use":0,
+         "limit":10240,
+         "reserved":0
+      },
+      "injected_file_path_bytes":{
+         "in_use":0,
+         "limit":255,
+         "reserved":0
+      },
+      "security_group_rules":{
+         "in_use":0,
+         "limit":20,
+         "reserved":0
+      }
+   }
+}
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json
new file mode 100644
index 000000000..70d4b66eb
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json
@@ -0,0 +1,16 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "floating_ips": 10,
+        "id": "fake_tenant",
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml
new file mode 100644
index 000000000..ef52457e0
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<quota_set id="fake_tenant">
+    <cores>20</cores>
+    <floating_ips>10</floating_ips>
+    <injected_file_content_bytes>10240</injected_file_content_bytes>
+    <injected_file_path_bytes>255</injected_file_path_bytes>
+    <injected_files>5</injected_files>
+    <instances>10</instances>
+    <key_pairs>100</key_pairs>
+    <metadata_items>128</metadata_items>
+    <ram>51200</ram>
+    <security_group_rules>20</security_group_rules>
+    <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json
new file mode 100644
index 000000000..239c64d23
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json
@@ -0,0 +1,17 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "fixed_ips": -1,
+        "floating_ips": 10,
+        "id": "fake_tenant",
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml
new file mode 100644
index 000000000..76a9292c1
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <cores>20</cores>
+  <fixed_ips>-1</fixed_ips>
+  <floating_ips>10</floating_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>10</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json
new file mode 100644
index 000000000..b322b2a87
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json
@@ -0,0 +1,6 @@
+{
+    "quota_set": {
+        "force": "True",
+        "instances": 9
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.xml
new file mode 100644
index 000000000..c5084d44e
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <force>True</force>
+  <instances>9</instances>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json
new file mode 100644
index 000000000..553933292
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "floating_ips": 10,
+        "fixed_ips": -1,
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 9,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml
new file mode 100644
index 000000000..43c36c7da
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set>
+  <cores>20</cores>
+  <floating_ips>10</floating_ips>
+  <fixed_ips>-1</fixed_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>9</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/snapshot_create.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/snapshot_create.json
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/snapshot_create.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/snapshot_create.xml
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/snapshot_list_simple.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/snapshot_list_simple.json
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/snapshot_list_simple.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/snapshot_list_simple.xml
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/snapshot_show.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/snapshot_show.json
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/snapshot_show.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/snapshot_show.xml
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_create.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_create.json
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_create.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_create.xml
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_list_simple.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_list_simple.json
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_list_simple.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_list_simple.xml
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_show.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_show.json
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_show.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_show.xml
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_type_list.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_type_list.json
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_type_list.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_type_list.xml
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_type_show.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_type_show.json
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/volume_type_show.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/samples/volume_type_show.xml
rename to api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/common.ent b/api-ref/src/wadls/volume-api/src/v1/common.ent
new file mode 100644
index 000000000..93f99143d
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/common.ent
@@ -0,0 +1,782 @@
+
+     <!--
+         A collection of common faults, these are pretty much expected
+         in every request.
+     -->
+     <!ENTITY commonFaults
+           '
+        <response xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:computeFault"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="503" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:serviceUnavailable"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="400" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:badRequest"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="401" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:unauthorized"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="403" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:forbidden"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="405" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:badMethod"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="413" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:overLimit"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+      <!--
+          Faults on GET
+      -->
+     <!ENTITY getFaults
+           '
+        <response status="404" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:itemNotFound"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+      <!--
+          Faults on POST/PUT
+      -->
+     <!ENTITY postPutFaults
+           '
+        <response status="415" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:badMediaType"/>
+            <representation mediaType="application/json"/>
+        </response>'>
+         <!ENTITY rebootFaults
+           '<response status="422" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:HTTPUnprocessableEntity"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+      <!--
+          Faults that can occur when we are building servers or images.
+      -->
+     <!ENTITY buildFaults
+           '
+        <response status="503" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:serverCapacityUnavailable"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+      <!--
+          Holds build in progress which occurs when an operation fails
+          because the server is in the process of being built.
+      -->
+     <!ENTITY inProgressFault
+           '
+        <response status="409" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:buildInProgress"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+
+     <!-- Image List Parameters -->
+
+     <!ENTITY imageListParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="changes-since" style="query" required="false"
+                type="xsd:dateTime">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>A time/date stamp for when the image last
+                        changed status.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="server" style="query" required="false"
+                type="xsd:anyURI">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Name of the server in URL
+                    format.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="name" style="query" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Name of the image as a
+                    string.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="status" style="query" required="false"
+                type="csapi:ImageStatus">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Value of the status of the image so that you
+                        can filter on "ACTIVE" for
+                    example.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="marker" style="query" required="false"
+                type="csapi:UUID">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>UUID of the image at which you want to set a
+                        marker.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="limit" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Integer value for the limit of values to
+                        return.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="type" style="query" required="false"
+                type="xsd:string" default="ALL">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Value of the type of image, such as BASE,
+                        SERVER, or ALL.</para></wadl:doc>
+                <option value="BASE"/>
+                <option value="SERVER"/>
+                <option value="ALL"/>
+            </param>'>
+    <!-- Server Create Parameters -->
+
+<!ENTITY serverCreateParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="security_group" style="query" required="true"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN"><para>The name of the security
+                        group. If blank, the server is created in the
+                            <code>default</code> security
+                        group.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="user_data" style="query" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN"><para>Configuration information or
+                        scripts to use upon launch. Must be Base64
+                        encoded.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="availability_zone" style="query"
+                required="false" type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN"><para>The availability zone in which
+                        to launch the server.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="server" style="plain" required="true"
+                type="csapi:ServerForCreate" path="/csapi:server">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="server">
+                    <para>server.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="imageRef" style="plain" required="true"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="imageRef">
+                    <para>The image reference for the desired image
+                        for your server instance.</para>
+                    <para>Specify as an ID or full
+                    URL.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="flavorRef" style="plain" required="true"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="flavorRef">
+                    <para>The flavor reference for the desired flavor
+                        for your server instance.</para>
+                    <para>Specify as an ID or full
+                    URL.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="networks" style="plain" type="xsd:string"
+                required="false">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>A <code>networks</code> object. By default,
+                        the server instance is provisioned with all
+                        isolated networks for the tenant.</para>
+                    <para>Optionally, you can create one or more NICs
+                        on the server.</para>
+                    <para>To provision the server instance with a NIC
+                        for a <code>nova-network</code> network,
+                        specify the UUID in the <code>uuid</code>
+                        attribute in a <code>networks</code>
+                        object.</para>
+                    <para>To provision the server instance with a NIC
+                        for a <code>neutron</code> network, specify
+                        the UUID in the <code>port</code> attribute in
+                        a <code>networks</code> object.</para>
+                    <para>You can specify multiple NICs on the
+                        server.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="uuid" style="plain" type="xsd:string"
+                required="false">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>To provision the server instance with a NIC
+                        for a <code>nova-network</code> network,
+                        specify the UUID in the <code>uuid</code>
+                        attribute in a <code>networks</code> object.
+                        Required if you omit the <code>port</code>
+                        attribute.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="port" style="plain" type="xsd:string"
+                required="false">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>To provision the server instance with a NIC
+                        for a <code>neutron</code> network, specify
+                        the UUID in the <code>port</code> attribute in
+                        a <code>networks</code> object. Required if
+                        you omit the <code>uuid</code>
+                        attribute.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="fixed_ip" style="plain" type="xsd:string"
+                required="false">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>A fixed IPv4 address for the NIC. Valid with
+                        a <code>neutron</code> or
+                            <code>nova-networks</code> network.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="name" style="plain" required="true"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="name">
+                    <para>The server name.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="metadata" style="plain" required="false"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="metadata">
+                    <para>Metadata key and value pairs. The maximum
+                        size of the metadata key and value is 255
+                        bytes each.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="personality" style="plain" required="false"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="personality">
+                    <para>File path and contents (text only) to inject
+                        into the server at launch. The maximum size of
+                        the file path data is 255 bytes. The maximum
+                        limit refers to the number of bytes in the
+                        decoded data and not the number of characters
+                        in the encoded data.</para></wadl:doc>
+            </param>'>
+
+        <!-- Server List Parameters -->
+<!ENTITY serverListParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="changes-since" style="query" required="false"
+                type="xsd:dateTime">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>A time/date stamp for when the server last
+                        changed status.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="image" style="query" required="false"
+                type="xsd:anyURI">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Name of the image in URL
+                    format.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="flavor" style="query" required="false"
+                type="xsd:anyURI">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Name of the flavor in URL
+                    format.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="name" style="query" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN"><para>Name of the server as a
+                        string.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="marker" style="query" required="false"
+                type="csapi:UUID">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>UUID of the server at which you want to set
+                        a marker.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="limit" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Integer value for the limit of values to
+                        return.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="status" style="query" required="false"
+                type="csapi:ServerStatus">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Value of the status of the server so that
+                        you can filter on "ACTIVE" for
+                    example.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="host" style="query" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Name of the host as a
+                    string.</para></wadl:doc>
+            </param>'>
+     <!-- Flavor List Parameters -->
+
+<!ENTITY flavorListParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="changes-since" style="query" required="false"
+                type="xsd:dateTime">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>A time/date stamp for when the flavor last
+                        changed.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="minDisk" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Integer value for the minimum disk space in
+                        GB so you can filter
+                    results.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="minRam" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Integer value for the minimum RAM so you can
+                        filter results.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="marker" style="query" required="false"
+                type="csapi:UUID">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>UUID of the flavor at which you want to set
+                        a marker.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="limit" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Integer value for the limit of values to
+                        return.</para></wadl:doc>
+            </param>'>
+<!ENTITY flavorReqParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="disk" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Integer value for the minimum disk space
+                            in GB.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="id" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The flavor ID.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="name" style="plain" required="true"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The flavor name.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="ram" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Amount of RAM.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="vcpus" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Number of VCPUs.</para></wadl:doc>
+                </param>'>
+<!ENTITY flavorRespParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="disk" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Integer value for the minimum disk space
+                            in GB.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="id" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The flavor ID.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="links" style="plain" required="true"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Flavor links.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="name" style="plain" required="true"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The flavor name.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="ram" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Amount of RAM.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="vcpus" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Number of VCPUs.</para></wadl:doc>
+                </param>'>
+<!ENTITY quotaSetsReqParameters '
+<param name="quota_set" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>A quota_set object.</para></wadl:doc>
+                </param>
+                <param name="cores" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of instance cores allowed for
+                            each tenant.</para></wadl:doc>
+                </param>
+                <param name="fixed_ips " style="plain"
+                    required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of fixed IP addresses allowed
+                            for each tenant. Must be equal to or
+                            greater than the number of allowed
+                            instances.</para></wadl:doc>
+                </param>
+                <param name="floating_ips" style="plain"
+                    required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of floating IP addresses
+                            allowed for each tenant.</para></wadl:doc>
+                </param>
+                <param name="id" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The ID for the quota
+                        set.</para></wadl:doc>
+                </param>
+                <param name="injected_file_content_bytes"
+                    style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of bytes of content allowed
+                            for each injected file.</para></wadl:doc>
+                </param>
+                <param name="injected_file_path_bytes " style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of bytes allowed for each
+                            injected file path.</para></wadl:doc>
+                </param>
+                <param name="injected_files" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of injected files allowed for
+                            each tenant.</para></wadl:doc>
+                </param>
+                <param name="instances" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of instances allowed for each
+                            tenant.</para></wadl:doc>
+                </param>
+                <param name="key_pairs" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of key pairs allowed for each
+                            user.</para></wadl:doc>
+                </param>
+                <param name="metadata_items" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of metadata items allowed for
+                            each instance.</para></wadl:doc>
+                </param>
+                <param name="ram" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The amount of instance RAM in megabytes
+                            allowed for each tenant.</para></wadl:doc>
+                </param>
+                <param name="security_group_rules" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of rules allowed for each
+                            security group.</para></wadl:doc>
+                </param>
+                <param name="security_groups" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of security groups allowed
+                            for each tenant.</para></wadl:doc>
+                </param>'>
+<!ENTITY quotaSetsRespParameters '<param name="quota_set" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>A quota_set object.</para></wadl:doc>
+                </param>
+                <param name="cores" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of instance cores allowed for
+                            each tenant.</para></wadl:doc>
+                </param>
+                <param name="fixed_ips " style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of fixed IP addresses allowed
+                            for each tenant. Must be equal to or
+                            greater than the number of allowed
+                            instances.</para></wadl:doc>
+                </param>
+                <param name="floating_ips" style="plain"
+                    required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of floating IP addresses
+                            allowed for each tenant.</para></wadl:doc>
+                </param>
+                <param name="id" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The ID for the quota
+                        set.</para></wadl:doc>
+                </param>
+                <param name="injected_file_content_bytes"
+                    style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of bytes of content allowed
+                            for each injected file.</para></wadl:doc>
+                </param>
+                <param name="injected_file_path_bytes " style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of bytes allowed for each
+                            injected file path.</para></wadl:doc>
+                </param>
+                <param name="injected_files" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of injected files allowed for
+                            each tenant.</para></wadl:doc>
+                </param>
+                <param name="instances" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of instances allowed for each
+                            tenant.</para></wadl:doc>
+                </param>
+                <param name="key_pairs" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of key pairs allowed for each
+                            user.</para></wadl:doc>
+                </param>
+                <param name="metadata_items" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of metadata items allowed for
+                            each instance.</para></wadl:doc>
+                </param>
+                <param name="ram" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The amount of instance RAM in megabytes
+                            allowed for each tenant.</para></wadl:doc>
+                </param>
+                <param name="security_group_rules" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of rules allowed for each
+                            security group.</para></wadl:doc>
+                </param>
+                <param name="security_groups" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of security groups allowed
+                            for each tenant.</para></wadl:doc>
+                </param>'>
+     <!-- 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>'>
diff --git a/api-ref/src/wadls/volume-api/src/v1/os-quota-sets.wadl b/api-ref/src/wadls/volume-api/src/v1/os-quota-sets.wadl
new file mode 100644
index 000000000..230d676b4
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v1/os-quota-sets.wadl
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2013-2014 OpenStack Foundation, All Rights Reserved -->
+<!DOCTYPE application [<!ENTITY % common  SYSTEM "common.ent">
+%common;]>
+<application xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/2.0"
+    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="os-quota-sets-cinder-v1">
+        <resource id="version-cinder-v1" type="#VersionDetails" path="v1/">
+            <resource id="tenant_id-cinder-v1" path="{tenant_id}">
+                <param name="tenant_id" style="template"
+                    type="xsd:string" required="true">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN" title="Tenant ID">
+                        <para>The ID for the tenant or project in a
+                            multi-tenancy cloud.</para></wadl:doc>
+                </param>
+                <resource id="os-quota-sets-cinder-for-v1" path="os-quota-sets">
+                    <resource path="{tenant_id}" id="tenant_id-quotas-cinder-v1">
+                        <param name="tenant_id" style="template"
+                            type="xsd:string" required="true">
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN" title="Project ID">
+                                <para>The ID for the tenant for which
+                                   you want to show, update, or delete
+                                   quotas. This ID is different from
+                                   the first tenant ID that you
+                                   specify in the URI: That ID is for
+                                   the admin tenant.</para>
+                            </wadl:doc>
+                        </param>
+                        <method href="#showQuota"/>
+                        <method href="#updateQuota"/>
+                        <method href="#deleteQuotas"/>
+                    </resource>
+                    <resource path="defaults" id="defaults-cinder-v1">
+                        <method href="#getDefaults"/>
+                    </resource>
+                    <resource path="{tenant_id}" id="tenantID-cinder-v1">
+                        <param name="tenant_id" style="template"
+                            type="xsd:string" required="true">
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN" title="Project ID">
+                                <para>The ID for the tenant for which
+                                   you want to show or update quotas.
+                                   This ID is different from the first
+                                   tenant ID that you specify in the
+                                   URI: That ID is for the admin
+                                   tenant.</para>
+                            </wadl:doc>
+                        </param>
+                        <resource id="user_id-cinder-v1" path="{user_id}">
+                            <param name="user_id" style="template"
+                                type="xsd:string" required="true">
+                                <wadl:doc
+                                   xmlns="http://docbook.org/ns/docbook"
+                                   xml:lang="EN" title="User ID">
+                                   <para>The user ID. Specify in the
+                                   URI as a query string:
+                                   <code>user_id={user_id}</code>.</para>
+                                </wadl:doc>
+                            </param>
+                            <method href="#showQuotaUser"/>
+                            <method href="#updateQuotaUser"/>
+                            <method href="#deleteQuotasUser"/>
+                        </resource>
+                        <resource id="detail-cinder-v1" path="detail">
+                            <resource id="user_id-detail-cinder-v1"
+                                path="{user_id}">
+                                <param name="user_id" style="template"
+                                   type="xsd:string" required="true">
+                                   <wadl:doc
+                                   xmlns="http://docbook.org/ns/docbook"
+                                   xml:lang="EN" title="User ID">
+                                   <para>The user ID. Specify in the
+                                   URI as a query string:
+                                   <code>user_id={user_id}</code>.</para>
+                                   </wadl:doc>
+                                </param>
+                                <method href="#showQuotaDetailUser"/>
+                            </resource>
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+    <method name="GET" id="getDefaults">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Get default quotas">
+            <para role="shortdesc">Gets default quotas for a
+                tenant.</para>
+        </wadl:doc>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Get default quotas response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-show-defaults-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Get default quotas response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="GET" id="showQuota">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Show quotas">
+            <para role="shortdesc">Shows quotas for a tenant.</para>
+        </wadl:doc>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Show quotas response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-show-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Show quotas response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-show-get-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="PUT" id="updateQuota">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Update quotas">
+            <para role="shortdesc">Updates quotas for a tenant.</para>
+        </wadl:doc>
+        <request> &quotaSetsReqParameters; <representation
+                mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Update quotas response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-update-post-req.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Show quotas response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-update-post-req.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Update quota response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-update-post-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Update quota response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-update-post-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="DELETE" id="deleteQuotas">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Delete quotas">
+            <para role="shortdesc">Deletes quotas for a tenant so the quotas
+                revert to default values.</para>
+        </wadl:doc>
+        <response status="200"/>
+    </method>
+    <method name="GET" id="showQuotaUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Show quotas for user"><para role="shortdesc"
+                >Enables an admin user to show quotas for a specified
+                tenant and user.</para>
+        </wadl:doc>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Show quotas for user response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-show-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Show quotas for user response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-show-get-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="POST" id="updateQuotaUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Update quotas for user">
+            <para role="shortdesc">Updates quotas for a specified
+                tenant/project and user.</para>
+        </wadl:doc>
+        <request> &quotaSetsReqParameters; <representation
+                mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Update quotas for user request: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-update-post-req.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Update quotas for user request: XML">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-update-post-req.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Update quotas for user response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-update-post-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Show quotas for user response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-update-post-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="DELETE" id="deleteQuotasUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Delete quotas for user">
+            <para role="shortdesc">Deletes quotas for a user so that the quotas
+                revert to default values.</para>
+        </wadl:doc>
+        <response status="200"/>
+    </method>
+    <method name="GET" id="showQuotaDetailUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Show quota details for user"><para role="shortdesc"
+                >Shows details for quotas for a specified tenant and
+                user.</para>
+        </wadl:doc>
+        <response status="200">
+            <param name="quota_set" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="quota_set"><para>A quota_set
+                    object.</para></wadl:doc>
+            </param>
+            <param name="cores" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="cores"><para>A cores
+                    object.</para></wadl:doc>
+            </param>
+            <param name="fixed_ips " style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="fixed_ips"><para>A fixed_ips
+                    object.</para></wadl:doc>
+            </param>
+            <param name="floating_ips" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="floating_ips"><para>A floating_ips
+                        object.</para></wadl:doc>
+            </param>
+            <param name="id" style="plain" required="true"
+                type="csapi:UUID">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="id"
+                        ><para>The ID for the quota
+                    set.</para></wadl:doc>
+            </param>
+            <param name="injected_file_content_bytes" style="plain"
+                required="true" type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>An
+                        injected_file_content_bytes
+                    object.</para></wadl:doc>
+            </param>
+            <param name="injected_file_path_bytes " style="plain"
+                required="true" type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="Show Quota Details for User"><para>An
+                        injected_file_path_bytes
+                    object.</para></wadl:doc>
+            </param>
+            <param name="injected_files" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="injected_files"><para>An injected_files
+                        object.</para></wadl:doc>
+            </param>
+            <param name="instances" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="instances"><para>An instances
+                        object.</para></wadl:doc>
+            </param>
+            <param name="key_pairs" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="key_pairs"><para>A key_pairs
+                    object.</para></wadl:doc>
+            </param>
+            <param name="metadata_items" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="metadata_items"><para>A metadata_items
+                        object.</para></wadl:doc>
+            </param>
+            <param name="ram" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="ram"
+                        ><para>A ram object.</para></wadl:doc>
+            </param>
+            <param name="security_group_rules" style="plain"
+                required="true" type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_group_rules"><para>A
+                        security_group_rules object.</para></wadl:doc>
+            </param>
+            <param name="security_groups" style="plain"
+                required="true" type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_groups"><para>A security_groups
+                        object.</para></wadl:doc>
+            </param>
+            <param name="in_use" style="plain" type="xsd:int"
+                required="true">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="in_use">
+                    <para>The number of items in
+                    use.</para></wadl:doc>
+            </param>
+            <param name="limit" style="plain" required="true"
+                type="xsd:int">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="limit"><para>The number of items permitted
+                        for this tenant.</para></wadl:doc>
+            </param>
+            <param name="reserved" style="plain" required="true"
+                type="xsd:int">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="reserved">
+                    <para>The number of reserved
+                    items.</para></wadl:doc>
+            </param>
+            <representation mediaType="application/json">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="Show quota details for user response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+</application>
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 b01c66f3d..b5651523a 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
@@ -89,13 +89,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_create.xml"/>
+                    <xsdxt:code href="api_samples/volume_create.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_create.json"/>
+                    <xsdxt:code href="api_samples/volume_create.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -103,13 +103,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_show.xml"/>
+                    <xsdxt:code href="api_samples/volume_show.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_show.json"/>
+                    <xsdxt:code href="api_samples/volume_show.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -124,14 +124,14 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_list_simple.xml"
+                    <xsdxt:code href="api_samples/volume_list_simple.xml"
                     />
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_list_simple.json"
+                    <xsdxt:code href="api_samples/volume_list_simple.json"
                     />
                 </wadl:doc>
             </representation>
@@ -147,14 +147,14 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_list_simple.xml"
+                    <xsdxt:code href="api_samples/volume_list_simple.xml"
                     />
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_list_simple.json"
+                    <xsdxt:code href="api_samples/volume_list_simple.json"
                     />
                 </wadl:doc>
             </representation>
@@ -170,13 +170,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_show.xml"/>
+                    <xsdxt:code href="api_samples/volume_show.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_show.json"/>
+                    <xsdxt:code href="api_samples/volume_show.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -198,13 +198,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_type_list.xml"/>
+                    <xsdxt:code href="api_samples/volume_type_list.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_type_list.json"/>
+                    <xsdxt:code href="api_samples/volume_type_list.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -219,13 +219,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_type_show.xml"/>
+                    <xsdxt:code href="api_samples/volume_type_show.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/volume_type_show.json"/>
+                    <xsdxt:code href="api_samples/volume_type_show.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -246,13 +246,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/snapshot_create.xml"/>
+                    <xsdxt:code href="api_samples/snapshot_create.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/snapshot_create.json"/>
+                    <xsdxt:code href="api_samples/snapshot_create.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -260,13 +260,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/snapshot_show.xml"/>
+                    <xsdxt:code href="api_samples/snapshot_show.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/snapshot_show.json"/>
+                    <xsdxt:code href="api_samples/snapshot_show.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -282,14 +282,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_list_simple.xml"/>
+                        href="api_samples/snapshot_list_simple.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_list_simple.json"/>
+                        href="api_samples/snapshot_list_simple.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -305,14 +305,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_list_simple.xml"/>
+                        href="api_samples/snapshot_list_simple.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_list_simple.json"/>
+                        href="api_samples/snapshot_list_simple.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -327,13 +327,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/snapshot_show.xml"/>
+                    <xsdxt:code href="api_samples/snapshot_show.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/snapshot_show.json"/>
+                    <xsdxt:code href="api_samples/snapshot_show.json"/>
                 </wadl:doc>
             </representation>
         </response>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
new file mode 100644
index 000000000..239c64d23
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
@@ -0,0 +1,17 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "fixed_ips": -1,
+        "floating_ips": 10,
+        "id": "fake_tenant",
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
new file mode 100644
index 000000000..76a9292c1
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <cores>20</cores>
+  <fixed_ips>-1</fixed_ips>
+  <floating_ips>10</floating_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>10</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.json
new file mode 100644
index 000000000..239c64d23
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.json
@@ -0,0 +1,17 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "fixed_ips": -1,
+        "floating_ips": 10,
+        "id": "fake_tenant",
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.xml
new file mode 100644
index 000000000..76a9292c1
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <cores>20</cores>
+  <fixed_ips>-1</fixed_ips>
+  <floating_ips>10</floating_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>10</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.json
new file mode 100644
index 000000000..1f12caa04
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.json
@@ -0,0 +1,5 @@
+{
+    "quota_set": {
+        "security_groups": 45
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.xml
new file mode 100644
index 000000000..4bb7b3a47
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <security_groups>45</security_groups>
+</quota_set>
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.json
new file mode 100644
index 000000000..2be76d472
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "fixed_ips": -1,
+        "floating_ips": 10,
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 45
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.xml
new file mode 100644
index 000000000..e03a0bf5e
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set>
+  <cores>20</cores>
+  <fixed_ips>-1</fixed_ips>
+  <floating_ips>10</floating_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>10</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>45</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json
new file mode 100644
index 000000000..9877fc459
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json
@@ -0,0 +1,64 @@
+{
+   "quota_set":{
+      "cores":{
+         "in_use":0,
+         "limit":20,
+         "reserved":0
+      },
+      "fixed_ips":{
+         "in_use":0,
+         "limit":-1,
+         "reserved":0
+      },
+      "floating_ips":{
+         "in_use":0,
+         "limit":10,
+         "reserved":0
+      },
+      "injected_files":{
+         "in_use":0,
+         "limit":5,
+         "reserved":0
+      },
+      "instances":{
+         "in_use":0,
+         "limit":10,
+         "reserved":0
+      },
+      "key_pairs":{
+         "in_use":0,
+         "limit":100,
+         "reserved":0
+      },
+      "metadata_items":{
+         "in_use":0,
+         "limit":128,
+         "reserved":0
+      },
+      "ram":{
+         "in_use":0,
+         "limit":51200,
+         "reserved":0
+      },
+      "security_groups":{
+         "in_use":0,
+         "limit":10,
+         "reserved":0
+      },
+      "injected_file_content_bytes":{
+         "in_use":0,
+         "limit":10240,
+         "reserved":0
+      },
+      "injected_file_path_bytes":{
+         "in_use":0,
+         "limit":255,
+         "reserved":0
+      },
+      "security_group_rules":{
+         "in_use":0,
+         "limit":20,
+         "reserved":0
+      }
+   }
+}
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.json
new file mode 100644
index 000000000..70d4b66eb
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.json
@@ -0,0 +1,16 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "floating_ips": 10,
+        "id": "fake_tenant",
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.xml
new file mode 100644
index 000000000..ef52457e0
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<quota_set id="fake_tenant">
+    <cores>20</cores>
+    <floating_ips>10</floating_ips>
+    <injected_file_content_bytes>10240</injected_file_content_bytes>
+    <injected_file_path_bytes>255</injected_file_path_bytes>
+    <injected_files>5</injected_files>
+    <instances>10</instances>
+    <key_pairs>100</key_pairs>
+    <metadata_items>128</metadata_items>
+    <ram>51200</ram>
+    <security_group_rules>20</security_group_rules>
+    <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json
new file mode 100644
index 000000000..239c64d23
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json
@@ -0,0 +1,17 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "fixed_ips": -1,
+        "floating_ips": 10,
+        "id": "fake_tenant",
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 10,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.xml
new file mode 100644
index 000000000..76a9292c1
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <cores>20</cores>
+  <fixed_ips>-1</fixed_ips>
+  <floating_ips>10</floating_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>10</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json
new file mode 100644
index 000000000..b322b2a87
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json
@@ -0,0 +1,6 @@
+{
+    "quota_set": {
+        "force": "True",
+        "instances": 9
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.xml
new file mode 100644
index 000000000..c5084d44e
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set id="fake_tenant">
+  <force>True</force>
+  <instances>9</instances>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json
new file mode 100644
index 000000000..553933292
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "quota_set": {
+        "cores": 20,
+        "floating_ips": 10,
+        "fixed_ips": -1,
+        "injected_file_content_bytes": 10240,
+        "injected_file_path_bytes": 255,
+        "injected_files": 5,
+        "instances": 9,
+        "key_pairs": 100,
+        "metadata_items": 128,
+        "ram": 51200,
+        "security_group_rules": 20,
+        "security_groups": 10
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.xml
new file mode 100644
index 000000000..43c36c7da
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<quota_set>
+  <cores>20</cores>
+  <floating_ips>10</floating_ips>
+  <fixed_ips>-1</fixed_ips>
+  <injected_file_content_bytes>10240</injected_file_content_bytes>
+  <injected_file_path_bytes>255</injected_file_path_bytes>
+  <injected_files>5</injected_files>
+  <instances>9</instances>
+  <key_pairs>100</key_pairs>
+  <metadata_items>128</metadata_items>
+  <ram>51200</ram>
+  <security_group_rules>20</security_group_rules>
+  <security_groups>10</security_groups>
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_create_request.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_create_request.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_create_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_create_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_create_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_create_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_list_detail_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_list_detail_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_list_detail_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_list_detail_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_list_simple_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_list_simple_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_list_simple_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_list_simple_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_show_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_show_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_show_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_update_request.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_update_request.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_update_request.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_update_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_update_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_update_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/snapshot_update_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/snapshot_update_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_create_request.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_create_request.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_create_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_create_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_create_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_create_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_list_detail_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_list_detail_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_list_detail_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_list_detail_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_list_simple_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_list_simple_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_list_simple_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_list_simple_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_show_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_show_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_show_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_type_list_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_type_list_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_type_list_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_type_list_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_type_show_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_type_show_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_type_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_type_show_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_update_request.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_update_request.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_update_request.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_update_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_update_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_update_response.json
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volume_update_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/volume_update_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/common.ent b/api-ref/src/wadls/volume-api/src/v2/common.ent
new file mode 100644
index 000000000..93f99143d
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/common.ent
@@ -0,0 +1,782 @@
+
+     <!--
+         A collection of common faults, these are pretty much expected
+         in every request.
+     -->
+     <!ENTITY commonFaults
+           '
+        <response xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:computeFault"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="503" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:serviceUnavailable"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="400" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:badRequest"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="401" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:unauthorized"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="403" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:forbidden"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="405" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:badMethod"/>
+            <representation mediaType="application/json"/>
+        </response>
+        <response status="413" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:overLimit"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+      <!--
+          Faults on GET
+      -->
+     <!ENTITY getFaults
+           '
+        <response status="404" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:itemNotFound"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+      <!--
+          Faults on POST/PUT
+      -->
+     <!ENTITY postPutFaults
+           '
+        <response status="415" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:badMediaType"/>
+            <representation mediaType="application/json"/>
+        </response>'>
+         <!ENTITY rebootFaults
+           '<response status="422" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:HTTPUnprocessableEntity"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+      <!--
+          Faults that can occur when we are building servers or images.
+      -->
+     <!ENTITY buildFaults
+           '
+        <response status="503" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:serverCapacityUnavailable"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+      <!--
+          Holds build in progress which occurs when an operation fails
+          because the server is in the process of being built.
+      -->
+     <!ENTITY inProgressFault
+           '
+        <response status="409" xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml" element="csapi:buildInProgress"/>
+            <representation mediaType="application/json"/>
+        </response>
+           '>
+
+     <!-- Image List Parameters -->
+
+     <!ENTITY imageListParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="changes-since" style="query" required="false"
+                type="xsd:dateTime">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>A time/date stamp for when the image last
+                        changed status.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="server" style="query" required="false"
+                type="xsd:anyURI">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Name of the server in URL
+                    format.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="name" style="query" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Name of the image as a
+                    string.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="status" style="query" required="false"
+                type="csapi:ImageStatus">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Value of the status of the image so that you
+                        can filter on "ACTIVE" for
+                    example.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="marker" style="query" required="false"
+                type="csapi:UUID">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>UUID of the image at which you want to set a
+                        marker.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="limit" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Integer value for the limit of values to
+                        return.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="type" style="query" required="false"
+                type="xsd:string" default="ALL">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Value of the type of image, such as BASE,
+                        SERVER, or ALL.</para></wadl:doc>
+                <option value="BASE"/>
+                <option value="SERVER"/>
+                <option value="ALL"/>
+            </param>'>
+    <!-- Server Create Parameters -->
+
+<!ENTITY serverCreateParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="security_group" style="query" required="true"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN"><para>The name of the security
+                        group. If blank, the server is created in the
+                            <code>default</code> security
+                        group.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="user_data" style="query" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN"><para>Configuration information or
+                        scripts to use upon launch. Must be Base64
+                        encoded.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="availability_zone" style="query"
+                required="false" type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN"><para>The availability zone in which
+                        to launch the server.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="server" style="plain" required="true"
+                type="csapi:ServerForCreate" path="/csapi:server">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="server">
+                    <para>server.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="imageRef" style="plain" required="true"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="imageRef">
+                    <para>The image reference for the desired image
+                        for your server instance.</para>
+                    <para>Specify as an ID or full
+                    URL.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="flavorRef" style="plain" required="true"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="flavorRef">
+                    <para>The flavor reference for the desired flavor
+                        for your server instance.</para>
+                    <para>Specify as an ID or full
+                    URL.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="networks" style="plain" type="xsd:string"
+                required="false">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>A <code>networks</code> object. By default,
+                        the server instance is provisioned with all
+                        isolated networks for the tenant.</para>
+                    <para>Optionally, you can create one or more NICs
+                        on the server.</para>
+                    <para>To provision the server instance with a NIC
+                        for a <code>nova-network</code> network,
+                        specify the UUID in the <code>uuid</code>
+                        attribute in a <code>networks</code>
+                        object.</para>
+                    <para>To provision the server instance with a NIC
+                        for a <code>neutron</code> network, specify
+                        the UUID in the <code>port</code> attribute in
+                        a <code>networks</code> object.</para>
+                    <para>You can specify multiple NICs on the
+                        server.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="uuid" style="plain" type="xsd:string"
+                required="false">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>To provision the server instance with a NIC
+                        for a <code>nova-network</code> network,
+                        specify the UUID in the <code>uuid</code>
+                        attribute in a <code>networks</code> object.
+                        Required if you omit the <code>port</code>
+                        attribute.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="port" style="plain" type="xsd:string"
+                required="false">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>To provision the server instance with a NIC
+                        for a <code>neutron</code> network, specify
+                        the UUID in the <code>port</code> attribute in
+                        a <code>networks</code> object. Required if
+                        you omit the <code>uuid</code>
+                        attribute.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="fixed_ip" style="plain" type="xsd:string"
+                required="false">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>A fixed IPv4 address for the NIC. Valid with
+                        a <code>neutron</code> or
+                            <code>nova-networks</code> network.</para>
+                </wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="name" style="plain" required="true"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="name">
+                    <para>The server name.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="metadata" style="plain" required="false"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="metadata">
+                    <para>Metadata key and value pairs. The maximum
+                        size of the metadata key and value is 255
+                        bytes each.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="personality" style="plain" required="false"
+                type="csapi:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN" title="personality">
+                    <para>File path and contents (text only) to inject
+                        into the server at launch. The maximum size of
+                        the file path data is 255 bytes. The maximum
+                        limit refers to the number of bytes in the
+                        decoded data and not the number of characters
+                        in the encoded data.</para></wadl:doc>
+            </param>'>
+
+        <!-- Server List Parameters -->
+<!ENTITY serverListParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="changes-since" style="query" required="false"
+                type="xsd:dateTime">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>A time/date stamp for when the server last
+                        changed status.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="image" style="query" required="false"
+                type="xsd:anyURI">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Name of the image in URL
+                    format.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="flavor" style="query" required="false"
+                type="xsd:anyURI">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Name of the flavor in URL
+                    format.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="name" style="query" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN"><para>Name of the server as a
+                        string.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="marker" style="query" required="false"
+                type="csapi:UUID">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>UUID of the server at which you want to set
+                        a marker.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="limit" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Integer value for the limit of values to
+                        return.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="status" style="query" required="false"
+                type="csapi:ServerStatus">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Value of the status of the server so that
+                        you can filter on "ACTIVE" for
+                    example.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="host" style="query" required="false"
+                type="xsd:string">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                    <para>Name of the host as a
+                    string.</para></wadl:doc>
+            </param>'>
+     <!-- Flavor List Parameters -->
+
+<!ENTITY flavorListParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                name="changes-since" style="query" required="false"
+                type="xsd:dateTime">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>A time/date stamp for when the flavor last
+                        changed.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="minDisk" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Integer value for the minimum disk space in
+                        GB so you can filter
+                    results.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="minRam" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Integer value for the minimum RAM so you can
+                        filter results.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="marker" style="query" required="false"
+                type="csapi:UUID">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>UUID of the flavor at which you want to set
+                        a marker.</para></wadl:doc>
+            </param>
+            <param xmlns="http://wadl.dev.java.net/2009/02"
+                name="limit" style="query" required="false"
+                type="xsd:int">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                    xml:lang="EN">
+                    <para>Integer value for the limit of values to
+                        return.</para></wadl:doc>
+            </param>'>
+<!ENTITY flavorReqParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="disk" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Integer value for the minimum disk space
+                            in GB.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="id" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The flavor ID.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="name" style="plain" required="true"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The flavor name.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="ram" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Amount of RAM.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="vcpus" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Number of VCPUs.</para></wadl:doc>
+                </param>'>
+<!ENTITY flavorRespParameters '<param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="disk" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Integer value for the minimum disk space
+                            in GB.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="id" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The flavor ID.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="links" style="plain" required="true"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Flavor links.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="name" style="plain" required="true"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The flavor name.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="ram" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Amount of RAM.</para></wadl:doc>
+                </param>
+                <param xmlns="http://wadl.dev.java.net/2009/02"
+                    name="vcpus" style="plain" required="true"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>Number of VCPUs.</para></wadl:doc>
+                </param>'>
+<!ENTITY quotaSetsReqParameters '
+<param name="quota_set" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>A quota_set object.</para></wadl:doc>
+                </param>
+                <param name="cores" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of instance cores allowed for
+                            each tenant.</para></wadl:doc>
+                </param>
+                <param name="fixed_ips " style="plain"
+                    required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of fixed IP addresses allowed
+                            for each tenant. Must be equal to or
+                            greater than the number of allowed
+                            instances.</para></wadl:doc>
+                </param>
+                <param name="floating_ips" style="plain"
+                    required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of floating IP addresses
+                            allowed for each tenant.</para></wadl:doc>
+                </param>
+                <param name="id" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The ID for the quota
+                        set.</para></wadl:doc>
+                </param>
+                <param name="injected_file_content_bytes"
+                    style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of bytes of content allowed
+                            for each injected file.</para></wadl:doc>
+                </param>
+                <param name="injected_file_path_bytes " style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of bytes allowed for each
+                            injected file path.</para></wadl:doc>
+                </param>
+                <param name="injected_files" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of injected files allowed for
+                            each tenant.</para></wadl:doc>
+                </param>
+                <param name="instances" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of instances allowed for each
+                            tenant.</para></wadl:doc>
+                </param>
+                <param name="key_pairs" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of key pairs allowed for each
+                            user.</para></wadl:doc>
+                </param>
+                <param name="metadata_items" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of metadata items allowed for
+                            each instance.</para></wadl:doc>
+                </param>
+                <param name="ram" style="plain" required="false"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The amount of instance RAM in megabytes
+                            allowed for each tenant.</para></wadl:doc>
+                </param>
+                <param name="security_group_rules" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of rules allowed for each
+                            security group.</para></wadl:doc>
+                </param>
+                <param name="security_groups" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of security groups allowed
+                            for each tenant.</para></wadl:doc>
+                </param>'>
+<!ENTITY quotaSetsRespParameters '<param name="quota_set" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:string">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>A quota_set object.</para></wadl:doc>
+                </param>
+                <param name="cores" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of instance cores allowed for
+                            each tenant.</para></wadl:doc>
+                </param>
+                <param name="fixed_ips " style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of fixed IP addresses allowed
+                            for each tenant. Must be equal to or
+                            greater than the number of allowed
+                            instances.</para></wadl:doc>
+                </param>
+                <param name="floating_ips" style="plain"
+                    required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of floating IP addresses
+                            allowed for each tenant.</para></wadl:doc>
+                </param>
+                <param name="id" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The ID for the quota
+                        set.</para></wadl:doc>
+                </param>
+                <param name="injected_file_content_bytes"
+                    style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of bytes of content allowed
+                            for each injected file.</para></wadl:doc>
+                </param>
+                <param name="injected_file_path_bytes " style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of bytes allowed for each
+                            injected file path.</para></wadl:doc>
+                </param>
+                <param name="injected_files" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of injected files allowed for
+                            each tenant.</para></wadl:doc>
+                </param>
+                <param name="instances" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of instances allowed for each
+                            tenant.</para></wadl:doc>
+                </param>
+                <param name="key_pairs" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of key pairs allowed for each
+                            user.</para></wadl:doc>
+                </param>
+                <param name="metadata_items" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of metadata items allowed for
+                            each instance.</para></wadl:doc>
+                </param>
+                <param name="ram" style="plain" required="true"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The amount of instance RAM in megabytes
+                            allowed for each tenant.</para></wadl:doc>
+                </param>
+                <param name="security_group_rules" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="false" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of rules allowed for each
+                            security group.</para></wadl:doc>
+                </param>
+                <param name="security_groups" style="plain"
+                    xmlns="http://wadl.dev.java.net/2009/02"
+                    required="true" type="xsd:int">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+                        xml:lang="EN">
+                        <para>The number of security groups allowed
+                            for each tenant.</para></wadl:doc>
+                </param>'>
+     <!-- 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>'>
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-quota-sets.wadl b/api-ref/src/wadls/volume-api/src/v2/os-quota-sets.wadl
new file mode 100644
index 000000000..5779d18ac
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/os-quota-sets.wadl
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2013-2014 OpenStack Foundation, All Rights Reserved -->
+<!DOCTYPE application [<!ENTITY % common  SYSTEM "common.ent">
+%common;]>
+<application xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/2.0"
+    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="os-quota-sets-cinder-v2">
+        <resource id="version-cinder-v2" type="#VersionDetails" path="v2/">
+            <resource id="tenant_id-cinder-v2" path="{tenant_id}">
+                <param name="tenant_id" style="template"
+                    type="xsd:string" required="true">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN" title="Tenant ID">
+                        <para>The ID for the tenant or project in a
+                            multi-tenancy cloud.</para></wadl:doc>
+                </param>
+                <resource id="os-quota-sets-for-cinder-v2" path="os-quota-sets">
+                    <resource path="{tenant_id}" id="tenant_id_cinder_v2">
+                        <param name="tenant_id" style="template"
+                            type="xsd:string" required="true">
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN" title="Project ID">
+                                <para>The ID for the tenant for which
+                                   you want to show, update, or delete
+                                   quotas. This ID is different from
+                                   the first tenant ID that you
+                                   specify in the URI: That ID is for
+                                   the admin tenant.</para>
+                            </wadl:doc>
+                        </param>
+                        <method href="#showQuota"/>
+                        <method href="#updateQuota"/>
+                        <method href="#deleteQuotas"/>
+                    </resource>
+                    <resource path="defaults" id="defaults-cinder-v2">
+                        <method href="#getDefaults"/>
+                    </resource>
+                    <resource path="{tenant_id}" id="tenantID-cinder-v2">
+                        <param name="tenant_id" style="template"
+                            type="xsd:string" required="true">
+                            <wadl:doc
+                                xmlns="http://docbook.org/ns/docbook"
+                                xml:lang="EN" title="Project ID">
+                                <para>The ID for the tenant for which
+                                   you want to show or update quotas.
+                                   This ID is different from the first
+                                   tenant ID that you specify in the
+                                   URI: That ID is for the admin
+                                   tenant.</para>
+                            </wadl:doc>
+                        </param>
+                        <resource id="user_id-cinder-v2" path="{user_id}">
+                            <param name="user_id" style="template"
+                                type="xsd:string" required="true">
+                                <wadl:doc
+                                   xmlns="http://docbook.org/ns/docbook"
+                                   xml:lang="EN" title="User ID">
+                                   <para>The user ID. Specify in the
+                                   URI as a query string:
+                                   <code>user_id={user_id}</code>.</para>
+                                </wadl:doc>
+                            </param>
+                            <method href="#showQuotaUser"/>
+                            <method href="#updateQuotaUser"/>
+                            <method href="#deleteQuotasUser"/>
+                        </resource>
+                        <resource id="detail-cinder-v2" path="detail">
+                            <resource id="user_id-detail-cinder-v2"
+                                path="{user_id}">
+                                <param name="user_id" style="template"
+                                   type="xsd:string" required="true">
+                                   <wadl:doc
+                                   xmlns="http://docbook.org/ns/docbook"
+                                   xml:lang="EN" title="User ID">
+                                   <para>The user ID. Specify in the
+                                   URI as a query string:
+                                   <code>user_id={user_id}</code>.</para>
+                                   </wadl:doc>
+                                </param>
+                                <method href="#showQuotaDetailUser"/>
+                            </resource>
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+    <method name="GET" id="getDefaults">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Get default quotas">
+            <para role="shortdesc">Gets default quotas for a
+                tenant.</para>
+        </wadl:doc>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Get default quotas response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-show-defaults-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Get default quotas response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="GET" id="showQuota">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Show quotas">
+            <para role="shortdesc">Shows quotas for a tenant.</para>
+        </wadl:doc>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Show quotas response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-show-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Show quotas response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-show-get-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="PUT" id="updateQuota">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Update quotas">
+            <para role="shortdesc">Updates quotas for a tenant.</para>
+        </wadl:doc>
+        <request> &quotaSetsReqParameters; <representation
+                mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Update quotas response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-update-post-req.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Show quotas response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-update-post-req.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Update quota response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-update-post-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN" title="Update quota response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-update-post-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="DELETE" id="deleteQuotas">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Delete quotas">
+            <para role="shortdesc">Deletes quotas for a tenant so the quotas
+                revert to default values.</para>
+        </wadl:doc>
+        <response status="200"/>
+    </method>
+    <method name="GET" id="showQuotaUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Show quotas for user"><para role="shortdesc"
+                >Enables an admin user to show quotas for a specified
+                tenant and user.</para>
+        </wadl:doc>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Show quotas for user response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-show-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Show quotas for user response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-show-get-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="POST" id="updateQuotaUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Update quotas for user">
+            <para role="shortdesc">Updates quotas for a specified
+                tenant/project and user.</para>
+        </wadl:doc>
+        <request> &quotaSetsReqParameters; <representation
+                mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Update quotas for user request: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-update-post-req.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Update quotas for user request: XML">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-update-post-req.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </request>
+        <response status="200"> &quotaSetsRespParameters;
+                <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Update quotas for user response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-update-post-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN"
+                    title="Show quotas for user response: XML">
+                    <xsdxt:code
+                        href="api_samples/os-user-quotas/user-quotas-update-post-resp.xml"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+    <method name="DELETE" id="deleteQuotasUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Delete quotas for user">
+            <para role="shortdesc">Deletes quotas for a user so that the quotas
+                revert to default values.</para>
+        </wadl:doc>
+        <response status="200"/>
+    </method>
+    <method name="GET" id="showQuotaDetailUser">
+        <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
+            title="Show quota details for user"><para role="shortdesc"
+                >Shows details for quotas for a specified tenant and
+                user.</para>
+        </wadl:doc>
+        <response status="200">
+            <param name="quota_set" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="quota_set"><para>A quota_set
+                    object.</para></wadl:doc>
+            </param>
+            <param name="cores" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="cores"><para>A cores
+                    object.</para></wadl:doc>
+            </param>
+            <param name="fixed_ips " style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="fixed_ips"><para>A fixed_ips
+                    object.</para></wadl:doc>
+            </param>
+            <param name="floating_ips" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="floating_ips"><para>A floating_ips
+                        object.</para></wadl:doc>
+            </param>
+            <param name="id" style="plain" required="true"
+                type="csapi:UUID">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="id"
+                        ><para>The ID for the quota
+                    set.</para></wadl:doc>
+            </param>
+            <param name="injected_file_content_bytes" style="plain"
+                required="true" type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"><para>An
+                        injected_file_content_bytes
+                    object.</para></wadl:doc>
+            </param>
+            <param name="injected_file_path_bytes " style="plain"
+                required="true" type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="Show Quota Details for User"><para>An
+                        injected_file_path_bytes
+                    object.</para></wadl:doc>
+            </param>
+            <param name="injected_files" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="injected_files"><para>An injected_files
+                        object.</para></wadl:doc>
+            </param>
+            <param name="instances" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="instances"><para>An instances
+                        object.</para></wadl:doc>
+            </param>
+            <param name="key_pairs" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="key_pairs"><para>A key_pairs
+                    object.</para></wadl:doc>
+            </param>
+            <param name="metadata_items" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="metadata_items"><para>A metadata_items
+                        object.</para></wadl:doc>
+            </param>
+            <param name="ram" style="plain" required="true"
+                type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="ram"
+                        ><para>A ram object.</para></wadl:doc>
+            </param>
+            <param name="security_group_rules" style="plain"
+                required="true" type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_group_rules"><para>A
+                        security_group_rules object.</para></wadl:doc>
+            </param>
+            <param name="security_groups" style="plain"
+                required="true" type="xsd:string">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_groups"><para>A security_groups
+                        object.</para></wadl:doc>
+            </param>
+            <param name="in_use" style="plain" type="xsd:int"
+                required="true">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="in_use">
+                    <para>The number of items in
+                    use.</para></wadl:doc>
+            </param>
+            <param name="limit" style="plain" required="true"
+                type="xsd:int">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="limit"><para>The number of items permitted
+                        for this tenant.</para></wadl:doc>
+            </param>
+            <param name="reserved" style="plain" required="true"
+                type="xsd:int">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="reserved">
+                    <para>The number of reserved
+                    items.</para></wadl:doc>
+            </param>
+            <representation mediaType="application/json">
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="Show quota details for user response: JSON">
+                    <xsdxt:code
+                        href="api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json"
+                    />
+                </wadl:doc>
+            </representation>
+        </response>
+    </method>
+</application>
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 8db2652f3..b52af7d89 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
@@ -157,7 +157,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_create_request.json"/>
+                        href="api_samples/volume_create_request.json"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
@@ -165,7 +165,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_create_request.xml"/>
+                        href="api_samples/volume_create_request.xml"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -263,14 +263,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_create_response.json"/>
+                        href="api_samples/volume_create_response.json"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_create_response.xml"/>
+                        href="api_samples/volume_create_response.xml"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -287,7 +287,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_list_simple_response.xml"
+                        href="api_samples/volume_list_simple_response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -295,7 +295,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_list_simple_response.json"
+                        href="api_samples/volume_list_simple_response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -313,7 +313,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_list_detail_response.xml"
+                        href="api_samples/volume_list_detail_response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -321,7 +321,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_list_detail_response.json"
+                        href="api_samples/volume_list_detail_response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -338,14 +338,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_show_response.xml"/>
+                        href="api_samples/volume_show_response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_show_response.json"/>
+                        href="api_samples/volume_show_response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -372,14 +372,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_update_request.xml"/>
+                        href="api_samples/volume_update_request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_update_request.json"/>
+                        href="api_samples/volume_update_request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -388,14 +388,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_update_response.xml"/>
+                        href="api_samples/volume_update_response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_update_response.json"/>
+                        href="api_samples/volume_update_response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -417,14 +417,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_type_list_response.xml"/>
+                        href="api_samples/volume_type_list_response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_type_list_response.json"
+                        href="api_samples/volume_type_list_response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -441,7 +441,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_type_show_response.json"
+                        href="api_samples/volume_type_show_response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -449,7 +449,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/volume_type_show_response.xml"/>
+                        href="api_samples/volume_type_show_response.xml"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -504,14 +504,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_create_request.xml"/>
+                        href="api_samples/snapshot_create_request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_create_request.json"/>
+                        href="api_samples/snapshot_create_request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -520,14 +520,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_create_response.xml"/>
+                        href="api_samples/snapshot_create_response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_create_response.json"/>
+                        href="api_samples/snapshot_create_response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -544,7 +544,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_list_simple_response.xml"
+                        href="api_samples/snapshot_list_simple_response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -553,7 +553,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_list_simple_response.json"
+                        href="api_samples/snapshot_list_simple_response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -571,7 +571,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_list_detail_response.xml"
+                        href="api_samples/snapshot_list_detail_response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -579,7 +579,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_list_detail_response.json"
+                        href="api_samples/snapshot_list_detail_response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -596,14 +596,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_show_response.xml"/>
+                        href="api_samples/snapshot_show_response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_show_response.json"/>
+                        href="api_samples/snapshot_show_response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -632,14 +632,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_update_request.xml"/>
+                        href="api_samples/snapshot_update_request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_update_request.json"/>
+                        href="api_samples/snapshot_update_request.json"/>
                 </wadl:doc>
             </representation>
         </request>
@@ -648,14 +648,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_update_response.xml"/>
+                        href="api_samples/snapshot_update_response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/snapshot_update_response.json"/>
+                        href="api_samples/snapshot_update_response.json"/>
                 </wadl:doc>
             </representation>
         </response>