diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index 851940e26..aa9851f39 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -738,24 +738,31 @@
          xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
    </section>
    <section xml:id="os-quota-class-sets-v2.1">
-      <title>Quota class (os-quota-class-sets)</title>
-      <para>
-         Provides quota classes management support.
-      </para>
-      <wadl:resources
-         href="../wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl"
-         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-   </section>
-   <section xml:id="os-quota-sets-v2.1">
-      <title>Quota sets (os-quota-sets)</title>
-      <para>
-         Permits administrators, depending on policy settings, to view quotas
-         for a project and view and update default quotas.
-      </para>
-      <wadl:resources
-         href="../wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl"
-         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-   </section>
+    <title>Quota class (os-quota-class-sets)</title>
+    <para>
+       Provides quota classes management support.
+    </para>
+    <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      href="../wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl"/>
+  </section>
+  <section xml:id="os-quota-sets-v2.1">
+    <title>Quota sets (os-quota-sets)</title>
+    <para>
+      Permits administrators, depending on policy settings, to view default
+      quotas, view details for quotas, revert quotas to defaults, and update the
+      quotas for a project or a project and user.
+    </para>
+    <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
+      <wadl:resource href="../wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl#tenant_id">
+        <wadl:method href="#updateQuota"/>
+        <wadl:method href="#revertQuotas"/>
+      </wadl:resource>
+      <wadl:resource href="../wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl#defaults">
+        <wadl:method href="#listDefaultQuotas"/>
+      </wadl:resource>
+      <wadl:resource href="../wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl#quotas_detail"/>
+    </wadl:resources>
+  </section>
    <section xml:id="os-security-groups-v2.1">
       <title>Security groups (os-security-groups)</title>
       <para>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
index 0de9c8436..106b3ea5e 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/common.ent
+++ b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
@@ -83,6 +83,17 @@
    </wadl:doc>
 </param>'>
 <!-- TEMPLATE PARAMETERS -->
+<!ENTITY admin_tenant_idTemplateParameter '
+<param name="admin_tenant_id" style="template" type="csapi:UUID"
+   xmlns="http://wadl.dev.java.net/2009/02">
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xml:lang="EN"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02">
+      <para>
+         The UUID of the administrative tenant.
+      </para>
+   </wadl:doc>
+</param>'>
 <!ENTITY agent-build_idTemplateParameter '
 <param name="id" style="template" type="csapi:UUID"
    xmlns="http://wadl.dev.java.net/2009/02">
@@ -2441,6 +2452,19 @@
   </para>
 </wadl:doc>
 </param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="force" style="plain" type="xsd:boolean"
+  required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      You can force the update even if the quota has already been used and the
+      reserved quota exceeds the new quota. To force the update, specify the
+      <code>"force": "True"</code>. Default is <code>False</code>.
+    </para>
+  </wadl:doc>
+</param>
 <param name="cores" style="plain" required="false"
   xmlns="http://wadl.dev.java.net/2009/02"
   type="xsd:int">
@@ -2622,168 +2646,204 @@
 <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 allowed instance cores for each tenant.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed instance cores 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 allowed fixed IP addresses for each tenant. Must be equal to
-    or greater than the number of allowed instances.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed fixed IP addresses 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 allowed floating IP addresses for each tenant.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed floating IP addresses 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 of the quota set.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+     The ID of 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 allowed bytes of content for each injected file.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed bytes of content 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 allowed bytes for each injected file path.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed bytes 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 allowed injected files for each tenant.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed injected files 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 allowed instances for each tenant.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed instances 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 allowed key pairs for each user.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed key pairs 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 allowed metadata items for each instance.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed metadata items 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 allowed instance RAM, in MB, for each tenant.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The amount of allowed instance RAM, in MB, 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 allowed rules for each security group.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed rules 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 allowed security groups for each tenant.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed security groups for each tenant.
+    </para>
+  </wadl:doc>
 </param>
 <param name="server_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 allowed server groups for each tenant.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed server groups for each tenant.
+    </para>
+  </wadl:doc>
 </param>
 <param name="server_group_members" 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 allowed members for each server group.
-  </para>
-</wadl:doc>
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The number of allowed members for each server group.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY reservedResponseParameter '
+<param name="reserved" 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 reserved quota value.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY limitResponseParameter '
+<param name="limit" 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 maximum limit for the quota.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY in_useResponseParameter '
+<param name="in_use" 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 in-use quota value.
+    </para>
+  </wadl:doc>
 </param>'>
 <!-- Security group parameters -->
 <!ENTITY securityGroupParameters '
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-force-update-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-force-update-request.json
deleted file mode 100644
index a58a17912..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-force-update-request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "quota_set": {
-        "force": "True",
-        "instances": 45
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-force-update-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-force-update-response.json
deleted file mode 100644
index 66bbd00f4..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-force-update-response.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "quota_set": {
-        "cores": 20,
-        "fixed_ips": -1,
-        "floating_ips": 10,
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
-        "instances": 45,
-        "key_pairs": 100,
-        "metadata_items": 128,
-        "ram": 51200,
-        "security_group_rules": 20,
-        "security_groups": 10,
-        "server_groups": 10,
-        "server_group_members": 10
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-update-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-update-request.json
index 1f12caa04..9691f606c 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-update-request.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-update-request.json
@@ -1,5 +1,6 @@
 {
     "quota_set": {
-        "security_groups": 45
+        "force": true,
+        "key_pairs": 120
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-update-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-update-response.json
index a0f3b1a77..01a6affb6 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-update-response.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-update-response.json
@@ -1,18 +1,18 @@
 {
     "quota_set": {
+        "injected_file_content_bytes": 10240,
+        "metadata_items": 128,
+        "server_group_members": 10,
+        "server_groups": 10,
+        "ram": 51200,
+        "floating_ips": 10,
+        "key_pairs": 120,
+        "instances": 10,
+        "security_group_rules": 20,
+        "injected_files": 5,
         "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,
-        "server_groups": 10,
-        "server_group_members": 10
+        "security_groups": 10
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-update-request.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-update-request.json
deleted file mode 100644
index b322b2a87..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-update-request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "quota_set": {
-        "force": "True",
-        "instances": 9
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-update-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-update-response.json
deleted file mode 100644
index cf4e8c3d6..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-update-response.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "quota_set": {
-        "cores": 20,
-        "fixed_ips": -1,
-        "floating_ips": 10,
-        "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,
-        "server_groups": 10,
-        "server_group_members": 10
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-show-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-default-list-response.json
similarity index 76%
rename from api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-show-response.json
rename to api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-default-list-response.json
index c93f809d5..8528c1659 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quota-user-show-response.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-default-list-response.json
@@ -1,19 +1,19 @@
 {
     "quota_set": {
+        "injected_file_content_bytes": 10240,
+        "metadata_items": 128,
+        "server_group_members": 10,
+        "server_groups": 10,
+        "ram": 51200,
+        "floating_ips": 10,
+        "key_pairs": 100,
+        "id": "91a3c6da787643c78f2a7c7428fa54f2",
+        "instances": 10,
+        "security_group_rules": 20,
+        "injected_files": 5,
         "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,
-        "server_groups": 10,
-        "server_group_members": 10
+        "security_groups": 10
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-default-show-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-default-show-response.json
deleted file mode 100644
index c93f809d5..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-default-show-response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "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,
-        "server_groups": 10,
-        "server_group_members": 10
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-list-details-response.json b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-list-details-response.json
index c93f809d5..a7ce89712 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-list-details-response.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/samples/os-quota-sets/quotas-list-details-response.json
@@ -1,19 +1,75 @@
 {
     "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,
-        "server_groups": 10,
-        "server_group_members": 10
+        "injected_file_content_bytes": {
+            "reserved": 0,
+            "limit": 10240,
+            "in_use": 0
+        },
+        "metadata_items": {
+            "reserved": 0,
+            "limit": 128,
+            "in_use": 0
+        },
+        "server_group_members": {
+            "reserved": 0,
+            "limit": 10,
+            "in_use": 0
+        },
+        "server_groups": {
+            "reserved": 0,
+            "limit": 10,
+            "in_use": 0
+        },
+        "ram": {
+            "reserved": 0,
+            "limit": 51200,
+            "in_use": 0
+        },
+        "floating_ips": {
+            "reserved": 0,
+            "limit": 10,
+            "in_use": 0
+        },
+        "key_pairs": {
+            "reserved": 0,
+            "limit": 120,
+            "in_use": 0
+        },
+        "id": "91a3c6da787643c78f2a7c7428fa54f2",
+        "instances": {
+            "reserved": 0,
+            "limit": 10,
+            "in_use": 0
+        },
+        "security_group_rules": {
+            "reserved": 0,
+            "limit": 20,
+            "in_use": 0
+        },
+        "injected_files": {
+            "reserved": 0,
+            "limit": 5,
+            "in_use": 0
+        },
+        "cores": {
+            "reserved": 0,
+            "limit": 20,
+            "in_use": 0
+        },
+        "fixed_ips": {
+            "reserved": 0,
+            "limit": -1,
+            "in_use": 0
+        },
+        "injected_file_path_bytes": {
+            "reserved": 0,
+            "limit": 255,
+            "in_use": 0
+        },
+        "security_groups": {
+            "reserved": 0,
+            "limit": 10,
+            "in_use": 0
+        }
     }
 }
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl
index dbe0ecf2d..238202e80 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl
@@ -11,49 +11,48 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:csapi="http://docs.openstack.org/identity/api/v3">
-    <resources base="https://servers.api.openstack.com"
-        xml:id="os-quota-sets-v2.1">
+    <resources base="https://servers.api.openstack.com" xml:id="os-quota-sets-v2.1">
         <resource id="v2.1" path="//v2.1">
-            <resource id="tenant_id" path="{tenant_id}">
-                &tenant_idTemplateParameter;
+            <resource id="admin_tenant_id" path="{admin_tenant_id}">
+                &admin_tenant_idTemplateParameter;
                 <resource id="os-quota-sets" path="os-quota-sets">
-                    <method href="#deletequota"/>
-                    <method href="#forceUpdateQuota"/>
-                    <method href="#updateQuota"/>
-                    <resource id="defaults" path="defaults">
-                        <method href="#showDefaultQuotas"/>
-                    </resource>
-                    <resource id="quotas_detail" path="detail" type="#DetailQuotasList"/>
-                    <resource id="user_id">
-                        &user_idQueryParameter;
-                        <method href="#updateQuotaUser"/>
-                        <method href="#deleteQuotaUser"/>
+                    <resource id="tenant_id" path="{tenant_id}">
+                        &tenant_idTemplateParameter;
+                        <method href="#updateQuota"/>
+                        <method href="#revertQuotas"/>
+                        <resource id="defaults" path="defaults">
+                            <method href="#listDefaultQuotas"/>
+                        </resource>
+                        <resource id="quotas_detail"
+                            path="detail" type="#DetailQuotasList"/>
                     </resource>
                 </resource>
             </resource>
         </resource>
     </resources>
     <resource_type id="DetailQuotasList">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Detail quotas list">
-            <para>A detailed quotas list.</para>
+        <wadl:doc xmlns="http://docbook.org/ns/docbook"
+            xml:lang="EN" title="Detail quotas list">
+            <para>
+                Lists quotas with reserved, limit, and in-use value details.
+            </para>
         </wadl:doc>
         <method href="#listDetailQuotas"/>
     </resource_type>
     <!-- *******************************************************-->
     <!--      OS Quota sets            -->
     <!--*******************************************************-->
-    <method name="DELETE" id="deletequota">
-        <wadl:doc xml:lang="EN" title="Delete quota for tenant"
-            xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Deletes a quota for tenant.</para>
-        </wadl:doc>
-        <response status="202"/>
-    </method>
-    <method name="GET" id="showDefaultQuotas">
-        <wadl:doc xml:lang="EN" title="Show default quotas"
+    <method name="GET" id="listDefaultQuotas">
+        <wadl:doc xml:lang="EN" title="List default quotas for tenant"
             xmlns="http://docbook.org/ns/docbook">
             <para role="shortdesc">
-                Shows default quotas for tenant.
+                Lists the default quotas for a project or a project and a user.
+            </para>
+            <para>
+                In the request URI, you specify both the ID of the
+                administrative project and the ID of the project for
+                which you want to show default quotas. These project IDs can
+                match.
             </para>
         </wadl:doc>
         <response status="200">
@@ -61,16 +60,19 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../samples/os-quota-sets/quotas-default-show-response.json"
+                        href="../samples/os-quota-sets/quotas-default-list-response.json"
                     />
                 </wadl:doc>
+                &quotaSetsResponseParameters;
             </representation>
         </response>
     </method>
     <method name="GET" id="listDetailQuotas">
-        <wadl:doc xml:lang="EN" title="Show quotas (detailed)"
+        <wadl:doc xml:lang="EN" title="List quotas with details"
             xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Lists quotas with details for a tenant.</para>
+            <para role="shortdesc">
+                Lists quotas with details for a project or a project and a user.
+            </para>
         </wadl:doc>
         <response status="200">
             <representation mediaType="application/json">
@@ -79,43 +81,34 @@
                     <xsdxt:code
                         href="../samples/os-quota-sets/quotas-list-details-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
-            </representation>
-        </response>
-    </method>
-    <method name="PUT" id="forceUpdateQuota">
-        <wadl:doc xml:lang="EN" title="Force-update quota"
-            xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">
-                Force-updates quota for tenant.
-            </para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../samples/os-quota-sets/quota-force-update-request.json"
-                    />
-                </wadl:doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../samples/os-quota-sets/quota-force-update-response.json"
-                    />
                 </wadl:doc>
+                &x-openstack-request-idHeader;
+                &quotaSetsResponseParameters;
+                &reservedResponseParameter;
+                &limitResponseParameter;
+                &in_useResponseParameter;
             </representation>
         </response>
     </method>
     <method name="PUT" id="updateQuota">
-        <wadl:doc xml:lang="EN" title="Update quota"
+        <wadl:doc xml:lang="EN" title="Update quotas"
             xmlns="http://docbook.org/ns/docbook">
             <para role="shortdesc">
-                Updates quota for tenant.
+                Update the quotas for a project or a project and a user.
+            </para>
+            <para>
+                You can force the update even if the quota has already been
+                used and the reserved quota exceeds the new quota.
+            </para>
+            <para>
+                To force the update, specify the <code>"force": "True"</code>
+                attribute in the request body. Default is <code>False</code>.
+                The following example request shows the optional
+                <code>force</code> attribute.
+            </para>
+            <para>
+                To update a quota for a project and a user, specify the <code>user</code>
+                query parameter.
             </para>
         </wadl:doc>
         <request>
@@ -126,6 +119,8 @@
                         href="../samples/os-quota-sets/quota-update-request.json"
                     />
                 </wadl:doc>
+                &user_idQueryParameter;
+                &quotaSetsRequestParameters;
             </representation>
         </request>
         <response status="200">
@@ -136,44 +131,24 @@
                         href="../samples/os-quota-sets/quota-update-response.json"
                     />
                 </wadl:doc>
+                &quotaSetsResponseParameters;
             </representation>
         </response>
     </method>
-    <method name="DELETE" id="deleteQuotaUser">
-        <wadl:doc xml:lang="EN" title="Delete quota for user"
+    <method name="DELETE" id="revertQuotas">
+        <wadl:doc xml:lang="EN" title="Revert quotas to defaults"
             xmlns="http://docbook.org/ns/docbook">
             <para role="shortdesc">
-                Deletes quota for a user.
+                Reverts the quotas to default values for a project or a project and a user.
             </para>
-        </wadl:doc>
-        <response status="202"/>
-    </method>
-    <method name="PUT" id="updateQuotaUser">
-        <wadl:doc xml:lang="EN" title="Update quota for user"
-            xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">
-                Updates quota for user.
+            <para>
+                To revert quotas for a project and a user, specify the <code>user</code>
+                query parameter.
             </para>
         </wadl:doc>
         <request>
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../samples/os-quota-sets/quota-user-update-request.json"
-                    />
-                </wadl:doc>
-            </representation>
+            &user_idQueryParameter;
         </request>
-        <response status="200">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="../samples/os-quota-sets/quota-user-update-response.json"
-                    />
-                </wadl:doc>
-            </representation>
-        </response>
+        <response status="202"/>
     </method>
 </application>