diff --git a/api-ref/src/wadls/compute-api/src/common.ent b/api-ref/src/wadls/compute-api/src/common.ent
index 079155324..4ea5126f8 100644
--- a/api-ref/src/wadls/compute-api/src/common.ent
+++ b/api-ref/src/wadls/compute-api/src/common.ent
@@ -85,13 +85,27 @@
 
      <!ENTITY imageListParameters
            '
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="changes-since" style="query" required="false" type="xsd:dateTime"><doc><p xmlns="http://www.w3.org/1999/xhtml">A time/date stamp for when the image last changed status.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="server" style="query" required="false" type="xsd:anyURI"><doc><p xmlns="http://www.w3.org/1999/xhtml">Name of the server in URL format.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="name"   style="query" required="false" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">Name of the image as a string.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="status" style="query" required="false" type="csapi:ImageStatus"><doc><p xmlns="http://www.w3.org/1999/xhtml">Value of the status of the image so that you can filter on "ACTIVE" for example.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="marker" style="query" required="false" type="csapi:UUID"><doc><p xmlns="http://www.w3.org/1999/xhtml">UUID of the image at which you want to set a marker.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="limit"  style="query" required="false" type="xsd:int"><doc><p xmlns="http://www.w3.org/1999/xhtml">Integer value for the limit of values to return.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="type" style="query" required="false" type="xsd:string" default="ALL"><doc><p xmlns="http://www.w3.org/1999/xhtml">Value of the type of image, such as BASE, SERVER, or ALL.</p></doc>
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="changes-since" style="query" required="false" type="xsd:dateTime"><wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="changes-since"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="server"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="name"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="status"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="marker"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="limit"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="type"><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"/>
@@ -103,58 +117,66 @@
 
 	<param name="server" style="plain" required="true"
                     type="csapi:ServerForCreate" path="/csapi:server">
-                    <doc xml:lang="EN" title="server">
-                        <p xmlns="http://www.w3.org/1999/xhtml"
-                            >server.</p>
-                    </doc>
+                    <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="server">
+                        <para>server.</para>
+                    </wadl:doc>
                 </param>
                 <param name="imageRef" style="plain" required="true"
                     type="csapi:string">
-                    <doc xml:lang="EN" title="imageRef">
-                        <p xmlns="http://www.w3.org/1999/xhtml">The
+                    <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="imageRef">
+                        <para>The
                             image reference for the desired image for
-                            your server instance.</p>
-                        <p xmlns="http://www.w3.org/1999/xhtml"
-                            >Specify as an ID or full URL.</p></doc>
+                            your server instance.</para>
+                        <para>Specify as an ID or full URL.</para></wadl:doc>
                 </param>
                 <param name="flavorRef" style="plain" required="true"
                     type="csapi:string">
-                    <doc xml:lang="EN" title="flavorRef">
-                        <p xmlns="http://www.w3.org/1999/xhtml">The
+                    <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="flavorRef">
+                        <para>The
                             flavor reference for the desired flavor
-                            for your server instance.</p>
-                        <p xmlns="http://www.w3.org/1999/xhtml"
-                            >Specify as an ID or full URL.</p></doc>
+                            for your server instance.</para>
+                        <para>Specify as an ID or full URL.</para></wadl:doc>
                 </param>
                 <param name="name" style="plain" required="true"
                     type="csapi:string">
-                    <doc xml:lang="EN" title="name">
-                        <p xmlns="http://www.w3.org/1999/xhtml">The
-                            name for your created server.</p></doc>
+                    <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="name">
+                        <para>The
+                            name for your created server.</para></wadl:doc>
                 </param>
                 <param name="metadata" style="plain" required="false"
                     type="csapi:string">
-                    <doc xml:lang="EN" title="metadata">
-                        <p xmlns="http://www.w3.org/1999/xhtml"
-                            >Metadata key and value pairs. The maximum
+                    <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="metadata">
+                        <para>Metadata key and value pairs. The maximum
                             size of the metadata key and value is 255
-                            bytes each.</p></doc>
+                            bytes each.</para></wadl:doc>
                 </param>
                 <param name="personality" style="plain"
                     required="false" type="csapi:string">
-                    <doc xml:lang="EN" title="personality">
-                        <p xmlns="http://www.w3.org/1999/xhtml">File
+                    <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" 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.</p></doc>
+                            data.</para></wadl:doc>
                 </param>
-    <param xmlns="http://wadl.dev.java.net/2009/02" name="security_group" style="plain" required="false" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">The name of the security group. If blank, the server is created in the "default" security group.</p></doc></param>
-	<param xmlns="http://wadl.dev.java.net/2009/02" name="user_data" style="plain" required="false" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">Use to pass configuration information or scripts upon launch. Must be Base64 encoded.</p></doc></param>
-	<param xmlns="http://wadl.dev.java.net/2009/02" name="availability_zone" style="plain" required="false" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">The availability zone in which to launch the server.</p></doc></param>
+    <param xmlns="http://wadl.dev.java.net/2009/02" name="security_group" style="plain" required="false" type="xsd:string"><wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_group"><para>The name of the security group. If blank, the server is created in the "default" security group.</para></wadl:doc></param>
+	<param xmlns="http://wadl.dev.java.net/2009/02" name="user_data" style="plain" required="false" type="xsd:string"><wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="user_data"><para>Use to pass configuration information or scripts upon launch. Must be Base64 encoded.</para></wadl:doc></param>
+	<param xmlns="http://wadl.dev.java.net/2009/02" name="availability_zone" style="plain" required="false" type="xsd:string"><wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="availability_zone"><para>The availability zone in which to launch the server.</para></wadl:doc></param>
 
 	'>
      
@@ -162,37 +184,53 @@
 
      <!ENTITY serverListParameters
            '
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="changes-since" style="query" required="false" type="xsd:dateTime"><doc><p xmlns="http://www.w3.org/1999/xhtml">A time/date stamp for when the server last changed status.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="image" style="query" required="false" type="xsd:anyURI"><doc><p xmlns="http://www.w3.org/1999/xhtml">Name of the image in URL format.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="flavor" style="query" required="false" type="xsd:anyURI"><doc><p xmlns="http://www.w3.org/1999/xhtml">Name of the flavor in URL format.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="name"   style="query" required="false" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">Name of the server as a string.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="marker" style="query" required="false" type="csapi:UUID"><doc><p xmlns="http://www.w3.org/1999/xhtml">UUID of the server at which you want to set a marker.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="limit"  style="query" required="false" type="xsd:int"><doc><p xmlns="http://www.w3.org/1999/xhtml">Integer value for the limit of values to return.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="status" style="query" required="false" type="csapi:ServerStatus"><doc><p xmlns="http://www.w3.org/1999/xhtml">Value of the status of the server so that you can filter on "ACTIVE" for example.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="host"   style="query" required="false" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">Name of the host as a string.</p></doc></param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="changes-since" style="query" required="false" type="xsd:dateTime"><wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="changes-since"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="image"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="flavor"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="name"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="marker"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="limit"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="status"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="host"><para>Name of the host as a string.</para></wadl:doc></param>
            '>
            
            <!ENTITY serverResponseParameters
            ' <param name="Location" style="header" required="true"
                 type="xsd:anyURI">
-                <doc xml:lang="EN" title="Location"><p
-                        xmlns="http://www.w3.org/1999/xhtml">Full URL
-                        to a server created by the service.</p></doc>
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="Location"><para>Full URL
+                        to a server created by the service.</para></wadl:doc>
             </param>
             <param name="adminPass" style="plain" required="true"
                 type="xsd:string">
-                <doc xml:lang="EN" title="adminPass"><p
-                        xmlns="http://www.w3.org/1999/xhtml">The administrative password.</p></doc>
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="adminPass"><para>The administrative password.</para></wadl:doc>
             </param>
              <param name="id" style="plain" required="true"
                 type="csapi:uuid">
-                <doc xml:lang="EN" title="id"><p
-                        xmlns="http://www.w3.org/1999/xhtml">The server ID.</p></doc>
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="id"><para>The server ID.</para></wadl:doc>
             </param>
             <param name="links" style="plain" required="true"
                 type="xsd:string">
-                <doc xml:lang="EN" title="id"><p
-                        xmlns="http://www.w3.org/1999/xhtml">Server href and rel links.</p></doc>
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook" title="id"><para>Server href and rel links.</para></wadl:doc>
             </param>
               '>
 
@@ -200,184 +238,252 @@
 
      <!ENTITY flavorListParameters
            '
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="changes-since" style="query" required="false" type="xsd:dateTime"><doc><p xmlns="http://www.w3.org/1999/xhtml">A time/date stamp for when the flavor last changed.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="minDisk" style="query" required="false" type="xsd:int"><doc><p xmlns="http://www.w3.org/1999/xhtml">Integer value for the minimum disk space in GB so you can filter results.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="minRam"  style="query" required="false" type="xsd:int"><doc><p xmlns="http://www.w3.org/1999/xhtml">Integer value for the minimum RAM so you can filter results.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="marker" style="query" required="false" type="csapi:UUID"><doc><p xmlns="http://www.w3.org/1999/xhtml">UUID of the flavor at which you want to set a marker.</p></doc></param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="limit"  style="query" required="false" type="xsd:int"><doc><p xmlns="http://www.w3.org/1999/xhtml">Integer value for the limit of values to return.</p></doc></param>
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="changes-since" style="query" required="false" type="xsd:dateTime"><wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="changes-since"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="minDisk"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="minRam"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="marker"><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 xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="limit"><para>Integer value for the limit of values to return.</para></wadl:doc></param>
            '>
 
       <!ENTITY quotaSetsReqParameters
            ' <param name="quota_set" style="plain" required="true"
                         type="xsd:string">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">A
-                            quota_set object.</p></doc>
+                         <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="false"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="cores"><para>The
                             number of instance cores allowed for each
-                            tenant.</p></doc>
+                            tenant.</para></wadl:doc>
                     </param>
                     <param name="fixed_ips " style="plain" required="false"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="fixed_ips"><para>The
                             number of fixed IP addresses allowed for each
                             tenant. Must be equal to or greater than the
-                            number of allowed instances.</p></doc>
+                            number of allowed instances.</para></wadl:doc>
                     </param>
                     <param name="floating_ips" style="plain" required="false"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="floating_ips"><para>The
                             number of floating IP addresses allowed for
-                            each tenant.</p></doc>
+                            each tenant.</para></wadl:doc>
                     </param>
                     <param name="id" style="plain" required="false"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
-                            ID for the quota set.</p></doc>
+                         <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="false" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="injected_file_content_bytes"><para>The
                             number of bytes of content allowed for each
-                            injected file.</p></doc>
+                            injected file.</para></wadl:doc>
                     </param>
                     <param name="injected_file_path_bytes " style="plain"
                         required="false" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="injected_file_path_bytes"><para>The
                             number of bytes allowed for each injected file
-                            path.</p></doc>
+                            path.</para></wadl:doc>
                     </param>
                     <param name="injected_files" style="plain"
                         required="false" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="injected_files"><para>The
                             number of injected files allowed for each
-                            tenant.</p></doc>
+                            tenant.</para></wadl:doc>
                     </param>
                     <param name="instances" style="plain" required="false"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="instances"><para>The
                             number of instances allowed for each
-                            tenant.</p></doc>
+                            tenant.</para></wadl:doc>
                     </param>
                     <param name="key_pairs" style="plain" required="false"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="key_pairs"><para>The
                             number of key pairs allowed for each
-                            user.</p></doc>
+                            user.</para></wadl:doc>
                     </param>
                     <param name="metadata_items" style="plain"
                         required="false" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="metadata_items"><para>The
                             number of metadata items allowed for each
-                            instance.</p></doc>
+                            instance.</para></wadl:doc>
                     </param> 
                     <param name="ram" style="plain" required="false"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="ram"><para>The
                             amount of instance RAM in megabytes allowed
-                            for each tenant.</p></doc>
+                            for each tenant.</para></wadl:doc>
                     </param> 
                     <param name="security_group_rules" style="plain"
                         required="false" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_group_rules"><para>The
                             number of rules allowed for each security
-                            group.</p></doc>
+                            group.</para></wadl:doc>
                     </param>
                     <param name="security_groups" style="plain"
                         required="false" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_groups"><para>The
                             number of security groups allowed for each
-                            tenant.</p></doc>
+                            tenant.</para></wadl:doc>
                     </param>
                      '>
                      
             <!ENTITY quotaSetsRespParameters
            '          <param name="quota_set" style="plain" required="true"
                         type="xsd:string">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">A
-                            quota_set object.</p></doc>
+                         <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:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="cores"><para>The
                             number of instance cores allowed for each
-                            tenant.</p></doc>
+                            tenant.</para></wadl:doc>
                     </param>
                     <param name="fixed_ips " style="plain" required="true"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="fixed_ips"><para>The
                             number of fixed IP addresses allowed for each
                             tenant. Must be equal to or greater than the
-                            number of allowed instances.</p></doc>
+                            number of allowed instances.</para></wadl:doc>
                     </param>
                     <param name="floating_ips" style="plain" required="true"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="floating_ips"><para>The
                             number of floating IP addresses allowed for
-                            each tenant.</p></doc>
+                            each tenant.</para></wadl:doc>
                     </param>
                     <param name="id" style="plain" required="true"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
-                            ID for the quota set.</p></doc>
+                         <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:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="injected_file_content_bytes"><para>The
                             number of bytes of content allowed for each
-                            injected file.</p></doc>
+                            injected file.</para></wadl:doc>
                     </param>
                     <param name="injected_file_path_bytes " style="plain"
                         required="true" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="injected_file_path_bytes"><para>The
                             number of bytes allowed for each injected file
-                            path.</p></doc>
+                            path.</para></wadl:doc>
                     </param>
                     <param name="injected_files" style="plain"
                         required="true" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="injected_files"><para>The
                             number of injected files allowed for each
-                            tenant.</p></doc>
+                            tenant.</para></wadl:doc>
                     </param>
                     <param name="instances" style="plain" required="true"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="instances"><para>The
                             number of instances allowed for each
-                            tenant.</p></doc>
+                            tenant.</para></wadl:doc>
                     </param>
                     <param name="key_pairs" style="plain" required="true"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="key_pairs"><para>The
                             number of key pairs allowed for each
-                            user.</p></doc>
+                            user.</para></wadl:doc>
                     </param>
                     <param name="metadata_items" style="plain"
                         required="true" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="metadata_items"><para>The
                             number of metadata items allowed for each
-                            instance.</p></doc>
+                            instance.</para></wadl:doc>
                     </param> 
                     <param name="ram" style="plain" required="true"
                         type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="ram"><para>The
                             amount of instance RAM in megabytes allowed
-                            for each tenant.</p></doc>
+                            for each tenant.</para></wadl:doc>
                     </param> 
                     <param name="security_group_rules" style="plain"
                         required="false" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_group_rules"><para>The
                             number of rules allowed for each security
-                            group.</p></doc>
+                            group.</para></wadl:doc>
                     </param>
                     <param name="security_groups" style="plain"
                         required="true" type="xsd:int">
-                        <doc><p xmlns="http://www.w3.org/1999/xhtml">The
+                         <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
+                    title="security_groups"><para>The
                             number of security groups allowed for each
-                            tenant.</p></doc>
+                            tenant.</para></wadl:doc>
                     </param> 
                   '>  
+                  
+
 
      <!-- Useful for describing APIs -->
 
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl b/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl
index bb95043fd..0e3557ae9 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-quota-sets.wadl
@@ -217,33 +217,136 @@
                 >Shows details for quotas for a specified tenant and
                 user.</para>
         </wadl:doc>
-        <response status="200"> &quotaSetsRespParameters; <param
-                name="in_use" style="plain" required="true"
-                type="xsd:int">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN" title="Show quota details for user">
+        <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">
-                <doc><p xmlns="http://www.w3.org/1999/xhtml">The
-                        number of items permitted for this
-                    tenant.</p></doc>
+                <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">
-                <doc xml:lang="EN">
-                    <p xmlns="http://www.w3.org/1999/xhtml">The number
-                        of reserved items.</p></doc>
+                <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">
-                <doc xml:lang="EN"
+                <wadl:doc xml:lang="EN"
+                    xmlns="http://docbook.org/ns/docbook"
                     title="Show quota details for user: JSON response">
                     <xsdxt:code
                         href="../api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json"
                     />
-                </doc>
+                </wadl:doc>
             </representation>
         </response>
     </method>