Merge lp:~jorgew/openstack-manuals/coreUpdates into lp:~annegentle/openstack-manuals/trunk

[Anne Gentle]

I've pushed a branch

lp:~jorgew/openstack-manuals/coreUpdates

I've not been able to build locally and I had so many conflicts that I may have undone some of your edits. Can you review. I'd like to get this out there sooner rather than later -- but what else is new :-) There's a minor fix I have to do tomorrow morning but wouldn't mind publishing before hand.

Thanks for all your help,

jOrGe W.

[lp:~jorgew/openstack-manuals/coreUpdates]

117. By Anne Gentle on 2011-06-24

Merged OpenStack API 1.1 updates from JorgeW

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/os-compute-devguide.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/os-compute-devguide.xml	2011-06-06 19:39:45 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/os-compute-devguide.xml	2011-06-24 02:29:39 +0000
@@ -4,6 +4,7 @@
         <!ENTITY ndash  "&#x2013;">
         <!ENTITY mdash  "&#x2014;">
         <!ENTITY hellip "&#x2026;">
+        <!ENTITY plusmn "&#xB1;">
 
         <!-- Useful for describing APIs -->
         <!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
@@ -61,7 +62,7 @@
         </copyright>
         <releaseinfo>API v1.1</releaseinfo>
         <productname>OpenStack Compute</productname>
-        <pubdate>2011-04-25</pubdate>
+        <pubdate>2011-06-23</pubdate>
         <legalnotice role="apache2">
             <annotation>
                 <remark>Copyright details are filled in by the template.</remark>
@@ -69,7 +70,7 @@
         </legalnotice>
         <abstract>
             <para>This document is intended for software developers interested in developing
-                applications using the OpenStack™ Compute Application Programming Interface
+                applications using the OpenStack Compute Application Programming Interface
                     (<abbrev>API</abbrev>). </para>
         </abstract>
     </info>
@@ -122,13 +123,117 @@
                     </thead>
                     <tbody>
                         <tr>
+                            <td colspan="1" align="center">June 23, 2011</td>
+                            <td colspan="4">
+                                 <itemizedlist spacing="compact">
+                                     <listitem>
+                                         <para>
+                                             Many minor updates based
+                                             on community feedback.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Removed sections on
+                                             Content Compression,
+                                             Persistent Connections,
+                                             and Caching -- these are
+                                             operator specific. Added
+                                             section on HTTP.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             A Location header is
+                                             returned when creating
+                                             servers/images.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Added filters to
+                                             collection of Image,
+                                             Servers, and Flavors.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Added asynchronous faults.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Updates to links and
+                                             references.  Remove
+                                             serverRef, imageRef, and
+                                             flavorRef and instead
+                                             embed one entity in
+                                             another to provide links.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Added primary IP addresses.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Added forbidden fault.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             We now use a single bookmark link per entity regardless of mimetype.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Collections are now sorted by create time.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Previous links are no longer required.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Added the ability to create or update multiple metadata items simultaneously.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Minor cleanups to server and image state machine.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Update to JSON collection format.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Replace integer IDs with UUIDs.
+                                         </para>
+                                    </listitem>
+                                     <listitem>
+                                         <para>
+                                             Removed affinityID, this
+                                             will likely come in as an
+                                             extension.
+                                         </para>
+                                    </listitem>
+                                 </itemizedlist>
+                            </td>
+                        </tr>
+                        <tr>
                             <td colspan="1" align="center">April 25, 2011</td>
                             <td colspan="4">
                                  <itemizedlist spacing="compact">
                                      <listitem>
                                          <para>
                                              Some minor cleanups in
-                                             preperation for OpenStack
+                                             preparation for OpenStack
                                              Summit discussion.
                                          </para>
                                     </listitem>
@@ -199,22 +304,28 @@
                     </tbody>
             </informaltable>
         </section>
-        <section><?dbhtml filename="additional-resources.html" ?>
+        <!-- Again, don't know what to do with the additional resources section -->
+        <!--
+        <section>
             <title>Additional Resources</title>
-            <para>You can download the most current version of this document from the OpenStack Docs
-                website at <link
-                    xlink:href="http://docs.openstack.org">
-                    http://docs.openstack.org</link>. </para>
-            <para> For more details about the Cloud Servers service that this API is based upon, please refer to <link
-                xlink:href="http://www.rackspacecloud.com/cloud_hosting_products/servers"
-                >http://www.rackspacecloud.com/cloud_hosting_products/servers</link>. Related
+            <para> You can download the most current version of this document from the Rackspace
+                Cloud website at <link xlink:href="http://docs.openstack.org/servers/api/cs-devguide-latest.pdf">
+                http://docs.openstack.org/servers/api/cs-devguide-latest.pdf</link>.
+            </para>
+            <para> For more details about the Cloud Servers service, please refer to <link
+                    xlink:href="http://www.openstack.org/cloud_hosting_products/servers"
+                    >http://www.openstack.org/cloud_hosting_products/servers</link>. Related
                 documents, including an <link
-                    xlink:href="http://docs.rackspacecloud.com/servers/api/cs-bindguide-latest.pdf"
+                    xlink:href="http://docs.openstack.org/servers/api/cs-bindguide-latest.pdf"
                     >API Language Binding Guide</link>, are available at the same site, as are links
                 to Rackspace's official support channels, including knowledge base articles, forums,
                 phone, chat, and email.</para>
+            <para> You can also follow updates and announcements via twitter at <link
+                    xlink:href="http://www.twitter.com/rackcloud"
+                    >http://www.twitter.com/rackcloud</link>
+            </para>
         </section>
-        
+        -->
     </chapter>
     <chapter>
         <?dbhtml stop-chunking?>
@@ -282,21 +393,38 @@
     </chapter>
     <chapter>
         <title>General API Information</title>
-        <para> The OpenStack Compute API is implemented using a ReSTful web service interface.</para>
-        <note>
-            <para>
-                All requests to authenticate and operate against Cloud
-                Servers are performed using SSL over HTTP (HTTPS) on
-                TCP port 443.
-            </para>
-        </note>
+        <para>
+            The OpenStack Compute API is defined as a ReSTful HTTP
+            service. The API takes advantage of all aspects of the
+            HTTP protocol (methods, URIs, media types, response codes,
+            etc.) and providers are free to use existing features of
+            the protocol such as caching, persistent connections, and
+            content compression among others.  For example, providers
+            who employ a caching layer may respond with a 203 when a
+            request is served from the cache instead of a 200.
+            Additionally, providers may offer support for conditional
+            &GET; requests using ETags, or they may send a redirect in
+            response to a &GET; request.  Clients should be written to
+            account for these differences.
+        </para>
         <section>
             <title>Authentication</title>
-            <para> Each HTTP request against the OpenStack Compute system requires the inclusion of
-                specific authentication credentials. A single deployment may support multiple
-                authentication schemes (OAuth, Basic Auth, Token). The authentication scheme used is
-                determined by the provider of the OpenStack Compute system. Please contact your
-                provider to determine the best way to authenticate against this API. </para>
+            <para>
+                Each HTTP request against the OpenStack Compute system
+                requires the inclusion of specific authentication
+                credentials. A single deployment may support multiple
+                authentication schemes (OAuth, Basic Auth, Token). The
+                authentication scheme used is determined by the
+                provider of the OpenStack Compute system. Please contact
+                contact your provider to determine the best way to
+                authenticate against this API.
+            </para>
+            <note>
+                <para>
+                    Some authentication schemes may require that the
+                    API operate using SSL over HTTP (HTTPS).
+                </para>
+            </note>
         </section>
         <section>
             <title>Request/Response Types</title>
@@ -350,13 +478,7 @@
 Accept: application/xml
 X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
                 </literallayout>
-                <programlisting language="javascript">
-{
-    "image" : {
-        "serverRef" : "http://servers.api.openstack.org/v1.1/1234/servers/12",
-        "name" : "Just in case"}
-}
-                </programlisting>
+                <programlisting language="javascript"><xi:include href="samples/image-create.json" parse="text"/></programlisting>
             </example>
             <example>
                 <title>Response with Headers: XML</title>
@@ -365,35 +487,18 @@
 Date: Mon, 12 Nov 2007 15:55:01 GMT
 Server: Apache
 Content-Length: 185
-                </literallayout>
-                <programlisting language="xml">
 Content-Type: application/xml; charset=UTF-8
-&lt;image xmlns="http://docs.openstack.org/compute/api/v1.1"
-       id="22" name="Just in case"
-       serverRef="http://servers.api.openstack.org/v1.1/1234/servers/12"
-       created="2010-10-10T12:00:00Z"
-       status="SAVING" progress="0"&gt;
-     &lt;atom:link 
-        rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/22"/&gt;
-    &lt;atom:link 
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/images/22"/&gt;
-    &lt;atom:link 
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/images/22"/&gt;
-&lt;/image&gt;
-                </programlisting>
+                </literallayout>
+                <programlisting language="xml"><xi:include href="samples/image-create-response.xml" parse="text"/></programlisting>
             </example>
             <para>
                 Notice, in the above example, that the content type is
-                set to application/json but application/xml is
-                requested via the <code>Accept</code> header.  An alternative
-                method of achieving the same result is illustrated
-                below – this time we utilize a URI extension instead
-                of an <code>Accept</code> header.
+                set to application/json but it asks for an
+                application/xml response with the <code>Accept</code>
+                header.  An alternative method of achieving the same
+                result is illustrated below – this time we utilize a
+                URI extension instead of an <code>Accept</code>
+                header.
             </para>
             <example>
                 <title>Request with Extension: JSON</title>
@@ -403,133 +508,60 @@
 Content-Type: application/json
 X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
                 </literallayout>
-                <programlisting language="javascript">
-{
-    "image" : {
-        "serverRef" : "http://servers.api.openstack.org/v1.1/1234/servers/12",
-        "name" : "Just in case"}
-}
-                </programlisting>
+                <programlisting language="javascript"><xi:include href="samples/image-create.json" parse="text"/></programlisting>
             </example>
         </section>
         <?hard-pagebreak?>
-        <section>
-            <title>Content Compression</title>
-            <para>
-                Request and response body data may be encoded with
-                gzip compression in order to accelerate interactive
-                performance of API calls and responses. This is
-                controlled using the <code>Accept-Encoding</code>
-                header on the request from the client and indicated by
-                the <code>Content-Encoding</code> header in the server
-                response. Unless the header is explicitly set,
-                encoding defaults to disabled.
-            </para>
-            <table rules="all">
-                <caption>Encoding Headers</caption>
-                <thead>
-                    <tr>
-                        <td>Header Type</td>
-                        <td>Name</td>
-                        <td>Value</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>HTTP/1.1 Request</td>
-                        <td><code>Accept-Encoding</code></td>
-                        <td>gzip</td>
-                    </tr>
-                    <tr>
-                        <td>HTTP/1.1 Response</td>
-                        <td><code>Content-Encoding</code></td>
-                        <td>gzip</td>
-                    </tr>
-                </tbody>
-            </table>
-        </section>
-        <section>
-            <title>Persistent Connections</title>
-            <para>
-                By default, the API supports persistent connections
-                via HTTP/1.1 keepalives.  All connections will be kept
-                alive unless the connection header is set to close.
-            </para>
-            <para>
-                To prevent abuse, HTTP sessions have a timeout of 20
-                seconds before being closed.
-            </para>
-            <note>
-                <para>
-                    The server may close the connection at any time
-                    and clients should not rely on this behavior.
-                </para>
-            </note>
-        </section>
+
         <?hard-pagebreak?>
-        <section>
+        <section xml:id="LinksReferences">
             <title>Links and References</title>
             <para>
                 Often resources need to refer to other resources.  For
                 example, when creating an image, you must specify the
                 server from which to build the image from. You can
-                specify the server by providing an ID to the server
-                resource as shown in the following example. When
+                specify the server by embedding a server in the image
+                request. The server need not be specified in its
+                entirety, providing an ID to the server resource as
+                shown in the following example will suffice. When
                 providing an ID, it is assumed that the resource
-                exists in the current OpenStack deployment. Notice
-                that, in JSON, the ID is specified as an integer.
+                exists in the current OpenStack deployment.
             </para>
             <example>
                 <title>ID Server Reference: XML</title>
-                <programlisting language="xml">
-&lt;image xmlns="http://docs.openstack.org/compute/api/v1.1"
-  name="Just in case" serverRef="12" /&gt;
-                </programlisting>
+                <programlisting language="xml"><xi:include href="samples/image-create.xml" parse="text"/></programlisting>
             </example>
             <example>
                 <title>ID Server Reference: JSON</title>
-                <programlisting language="javascript">
-{
-      "image" : {
-          "serverRef" : 12,
-          "name" : "Just in case"
-      }
-}
-                </programlisting>
+                <programlisting language="javascript"><xi:include href="samples/image-create.json" parse="text"/></programlisting>
             </example>
             <para>
                 There are times, however, when you may wish to refer
                 to resources in other deployments. In these cases you
-                should refer to the resource via its full URI as
-                illustrated below.
+                should refer to the resource via its full URI a simple
+                way of doing this is to retrieve the resource via a
+                &GET; call and embed it as part of the request.  This
+                is illustrated below. Note that although the full
+                server is provided only the links are necessary for
+                the image to build.
             </para>
             <example>
                 <title>Full Server Reference: XML</title>
-                <programlisting language="xml">
-&lt;image xmlns="http://docs.openstack.org/compute/api/v1.1"
-  name="Just in case" serverRef="http://servers.api.openstack.org/v1.1/1234/servers/12" /&gt;
-                </programlisting>
+                <programlisting language="xml"><xi:include href="samples/image-create-full.xml" parse="text"/></programlisting>
             </example>
             <example>
                 <title>Full Server Reference: JSON</title>
-                <programlisting language="javascript">
-{
-      "image" : {
-          "serverRef" : "http://servers.api.openstack.org/v1.1/1234/servers/12",
-          "name" : "Just in case"
-      }
-}
-                </programlisting>
+                <programlisting language="javascript"><xi:include href="samples/image-create-full.json" parse="text"/></programlisting>
             </example>
             <para>
                 For convenience, resources contain links to
                 themselves. This allows a client to easily obtain a
                 resource URIs rather than to construct them.  There
                 are two kinds of link relations associated with
-                resources.  A <code>self</code> link contains the link
-                to the resource exactly as it was retrieved. That is,
-                the URI that was obtained via a &GET; is simply
-                returned. A <code>bookmark</code> link provides a
+                resources.  A <code>self</code> link contains a
+                versioned link to the resource. These links should be
+                used in cases where the link will be followed
+                immediately.  A <code>bookmark</code> link provides a
                 permanent link to a resource that is appropriate for
                 long term storage.
             </para>
@@ -555,12 +587,12 @@
                 (e.g.?<parameter>limit</parameter>=100&amp;<parameter>marker</parameter>=1234).
                 The <parameter>marker</parameter> parameter is the ID
                 of the last item in the previous list. Items are
-                sorted by update time. When an update time is not
-                available they are sorted by ID.  The
-                <parameter>limit</parameter> parameter sets the page
-                size.  Both parameters are optional.  If the client
-                requests a <parameter>limit</parameter> beyond that
-                which is supported by the deployment an overLimit
+                sorted by create time in descending order. When a
+                create time is not available they are sorted by ID.
+                The <parameter>limit</parameter> parameter sets the
+                page size.  Both parameters are optional.  If the
+                client requests a <parameter>limit</parameter> beyond
+                that which is supported by the deployment an overLimit
                 (<errorcode>413</errorcode>) fault may be thrown. A
                 marker with an invalid ID will return an itemNotFound
                 (<errorcode>404</errorcode>) fault.
@@ -574,19 +606,19 @@
                 </para>
             </note>
             <para>
-                For convenience, collections contain atom "next" and
-                "previous" links. The first page in the list will not
-                contain a "previous" link, the last page in the list
-                will not contain a "next" link. The following examples
+                For convenience, collections are required to contain
+                atom "next" links. They may optionally also contain
+                "previous" links. The last page in the list will not
+                contain a "next" link. The following examples
                 illustrate three pages in a collection of images.  The
                 first page was retrieved via a &GET; to
                 http://servers.api.openstack.org/v1.1/1234/images?limit=1.
                 In these examples, the <parameter>limit</parameter>
                 parameter sets the page size to a single item.
-                Subsequent "next" and "previous" links will honor the
-                initial page size.  Thus, a client may follow links to
-                traverse a paginated collection without having to
-                input the <parameter>marker</parameter> parameter.
+                Subsequent links will honor the initial page size.
+                Thus, a client may follow links to traverse a
+                paginated collection without having to input the
+                <parameter>marker</parameter> parameter.
             </para>
             <?hard-pagebreak?>
             <example>
@@ -625,17 +657,23 @@
                 href="samples/images-page3.json" parse="text"/></programlisting>
             </example>
             <para>
-                In the JSON representation, paginated collections
-                contain a <property>values</property> property that
-                contains the items in the collections.  Links are
-                accessed via the <property>links</property>
-                property. The approach allows for extensibility of
-                both the collection members and of the paginated
-                collection itself. It also allows collections to be
-                embedded in other objects as illustrated below. Here, a
-                subset of metadata items are presented within the
-                image. Clients must follow the "next" link to retrieve
-                the full set of metadata.
+                In JSON, members in a paginated collection are stored
+                in a JSON array named after the collection. A JSON
+                object may also be used to hold members in cases where
+                using an associative array is more practical.
+                Properties about the collection itself, including
+                links, are contained in an array with the name of the
+                entity an underscore (_) and <code>links</code>.  The
+                combination of the objects and arrays that start with
+                the name of the collection and an underscore
+                represent the collection in JSON. The approach allows
+                for extensibility of paginated collections by allowing
+                them to be associated with arbitrary properties. It
+                also allows collections to be embedded in other
+                objects as illustrated below. Here, a subset of
+                metadata items are presented within the image. Clients
+                must follow the "next" link to retrieve the full set
+                of metadata.
             </para>
             <example>
                 <title>Paginated Metadata in an Image: XML</title>
@@ -649,35 +687,7 @@
                 href="samples/image-meta-page1.json" parse="text"/></programlisting>
             </example>
         </section>
-        <section>
-            <title>Caching</title>
-            <para>
-                The OpenStack Compute API makes extensive use of
-                caching layers at various tiers of the system. Purging
-                mechanisms exist to ensure that objects served out of
-                cache are accurate and up to date. &GET;s returning a
-                cached entity return a <returnvalue>203
-                (Cached)</returnvalue> to signal users that the value
-                is being served out of cache. Additionally, cached
-                entities have the following header set:
-            </para>
-            <table rules="all">
-                <caption>Last Modified Header</caption>
-                <thead>
-                    <tr>
-                        <td colspan="1">Header</td>
-                        <td colspan="3">Description</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td colspan="1"><code>Last-Modified</code></td>
-                        <td colspan="3">Date and time when the entity was last updated in cache.</td>
-                    </tr>
-                </tbody>
-            </table>
-        </section>
-        <section>
+        <section xml:id="ChangesSince">
             <title>Efficient Polling with the
             <parameter>Changes-Since</parameter> Parameter</title>
             <para> The ReST API allows you to poll for the status of
@@ -689,22 +699,23 @@
             <parameter>changes-since</parameter> time is specified as
             an <link
             xlink:href="http://en.wikipedia.org/wiki/ISO_8601">ISO
-            8601</link> dateTime (2011-01-24T17:08Z).  You may also
-            specify a date without a timestamp (2011-01-24), in this
-            case the UTC timezone will be assumed. The time zone should 
-            be specified as +hh:mm or -hh:mm and Z (Zulu) stands for UTC. 
-            If nothing has
-            changed since the <parameter>changes-since</parameter>
-            time, a <returnvalue>304 (Not Modified)</returnvalue>
-            response will be returned. If data has changed, only the
-            items changed since the specified time will be returned in
-            the response. For example, performing a &GET; against
+            8601</link> dateTime (2011-01-24T17:08Z).  The form for
+            the timestamp is CCYY-MM-DDThh:mm:ss. An optional time
+            zone may be written in by appending the form &plusmn;hh:mm
+            which describes the timezone as an offset from UTC. When
+            the timezone is not specified (2011-01-24T17:08), the UTC
+            timezone will be assumed.  If nothing has changed since
+            the <parameter>changes-since</parameter> time, a
+            <returnvalue>304 (Not Modified)</returnvalue> response
+            will be returned. If data has changed, only the items
+            changed since the specified time will be returned in the
+            response. For example, performing a &GET; against
             https://api.servers.openstack.org/v1.1/224532/servers?<parameter>changes-since</parameter>=2011-01-24T17:08Z
             would list all servers that have changed since Mon, 24 Jan
             2011 17:08:00 UTC. </para>
         </section>
         <?hard-pagebreak?>
-        <section><?dbhtml stop-chunking?>
+        <section>
             <title>Limits</title>
             <para>
                 Accounts may be pre-configured with a set of thresholds
@@ -798,7 +809,7 @@
                     In the event a request exceed the thresholds
                     established for your account, a
                     <errorcode>413</errorcode> HTTP response will be
-                    returned with a <code>Retry-After</code> header to
+                    returned with a <code>Reply-After</code> header to
                     notify the client when they can attempt to try
                     again.
                 </para>
@@ -893,6 +904,7 @@
                     Error Response Code(s):
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>), unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
@@ -1070,6 +1082,7 @@
                computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                serviceUnavailable (<errorcode>503</errorcode>),
                unauthorized (<errorcode>401</errorcode>),
+               forbidden (<errorcode>403</errorcode>),
                badRequest (<errorcode>400</errorcode>),
                overLimit(<errorcode>413</errorcode>)
             </simpara>
@@ -1271,155 +1284,206 @@
         <?hard-pagebreak?>
         <section>
             <title>Faults</title>
-            <para> When an error occurs, the system will return an HTTP error response code denoting
-                the type of error. The system will also return additional information about the
-                fault in the body of the response. </para>
-            <example>
-                <title>Fault Response: XML</title>
-                <programlisting language="xml">
+            <section>
+                <title>Synchronous Faults</title>
+                <para>
+                    When an error occurs at request time, the system
+                    will return an HTTP error response code denoting
+                    the type of error. The system will also return
+                    additional information about the fault in the body
+                    of the response.
+                </para>
+                <example>
+                    <title>Fault Response: XML</title>
+                    <programlisting language="xml">
 <xi:include href="samples/fault.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>Fault Response: JSON</title>
-                <programlisting language="javascript">
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Fault Response: JSON</title>
+                    <programlisting language="javascript">
 <xi:include href="samples/fault.json" parse="text"/>
-                </programlisting>
-            </example>
-            <para> The error code is returned in the body of the response for convenience. The
+                    </programlisting>
+                </example>
+                <para> The error code is returned in the body of the response for convenience. The
                 message section returns a human-readable message that is appropriate for display to
                 the end user. The details section is optional and may contain information&mdash;for example, a stack trace&mdash;to 
                 assist in tracking down an error. The detail section may or may not be
                 appropriate for display to an end user. </para>
-            <para>
-                The root element of the fault (e.g. computeFault)
-                may change depending on the type of error. The
-                following is a list of possible elements along with
-                their associated error codes.
-            </para>
-            <?hard-pagebreak?>
-            <table rules="all">
-                <caption>Fault Elements and Error Codes</caption>
-                <thead>
-                    <tr>
-                        <td>Fault Element</td>
-                        <td>Associated Error Codes</td>
-                        <td>Expected in All Requests?</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>computeFault</td>
-                        <td>500, 400, other codes possible</td>
-                        <td align="center">&CHECK;</td>
-                    </tr>
-                    <tr>
-                        <td>serviceUnavailable</td>
-                        <td>503</td>
-                        <td align="center">&CHECK;</td>
-                    </tr>
-                    <tr>
-                        <td>unauthorized</td>
-                        <td>401</td>
-                        <td align="center">&CHECK;</td>
-                    </tr>
-                    <tr>
-                        <td>badRequest</td>
-                        <td>400</td>
-                        <td align="center">&CHECK;</td>
-                    </tr>
-                    <tr>
-                        <td>overLimit</td>
-                        <td>413</td>
-                        <td align="center">&CHECK;</td>
-                    </tr>
-                    <tr>
-                        <td>badMediaType</td>
-                        <td>415</td>
-                        <td/>
-                    </tr>
-                    <tr>
-                        <td>badMethod</td>
-                        <td>405</td>
-                        <td/>
-                    </tr>
-                    <tr>
-                        <td>itemNotFound</td>
-                        <td>404</td>
-                        <td/>
-                    </tr>
-                    <tr>
-                        <td>buildInProgress</td>
-                        <td>409</td>
-                        <td/>
-                    </tr>
-                    <tr>
-                        <td>serverCapacityUnavailable</td>
-                        <td>503</td>
-                        <td/>
-                    </tr>
-                    <tr>
-                        <td>backupOrResizeInProgress</td>
-                        <td>409</td>
-                        <td/>
-                    </tr>
-                    <tr>
-                        <td>resizeNotAllowed</td>
-                        <td>403</td>
-                        <td/>
-                    </tr>
-                    <tr>
-                        <td>notImplemented</td>
-                        <td>501</td>
-                        <td/>
-                    </tr>
-                </tbody>
-            </table>
-            <example>
-                <title>Fault Response, Item Not Found: XML</title>
-                <programlisting language="xml">
+                <para>
+                    The root element of the fault (e.g. computeFault)
+                    may change depending on the type of error. The
+                    following is a list of possible elements along with
+                    their associated error codes.
+                </para>
+                <?hard-pagebreak?>
+                <table rules="all">
+                    <caption>Fault Elements and Error Codes</caption>
+                    <thead>
+                        <tr>
+                            <td>Fault Element</td>
+                            <td>Associated Error Codes</td>
+                            <td>Expected in All Requests?</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>computeFault</td>
+                            <td>500, 400, other codes possible</td>
+                            <td align="center">&CHECK;</td>
+                        </tr>
+                        <tr>
+                            <td>serviceUnavailable</td>
+                            <td>503</td>
+                            <td align="center">&CHECK;</td>
+                        </tr>
+                        <tr>
+                            <td>unauthorized</td>
+                            <td>401</td>
+                            <td align="center">&CHECK;</td>
+                        </tr>
+                        <tr>
+                            <td>forbidden</td>
+                            <td>403</td>
+                            <td align="center">&CHECK;</td>
+                        </tr>
+                        <tr>
+                            <td>badRequest</td>
+                            <td>400</td>
+                            <td align="center">&CHECK;</td>
+                        </tr>
+                        <tr>
+                            <td>overLimit</td>
+                            <td>413</td>
+                            <td align="center">&CHECK;</td>
+                        </tr>
+                        <tr>
+                            <td>badMediaType</td>
+                            <td>415</td>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>badMethod</td>
+                            <td>405</td>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>itemNotFound</td>
+                            <td>404</td>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>buildInProgress</td>
+                            <td>409</td>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>serverCapacityUnavailable</td>
+                            <td>503</td>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>backupOrResizeInProgress</td>
+                            <td>409</td>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>resizeNotAllowed</td>
+                            <td>403</td>
+                            <td/>
+                        </tr>
+                        <tr>
+                            <td>notImplemented</td>
+                            <td>501</td>
+                            <td/>
+                        </tr>
+                    </tbody>
+                </table>
+                <example>
+                    <title>Fault Response, Item Not Found: XML</title>
+                    <programlisting language="xml">
 <xi:include href="samples/notfound.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>Fault Response, Item Not Found: JSON</title>
-                <programlisting language="javascript">
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Fault Response, Item Not Found: JSON</title>
+                    <programlisting language="javascript">
 <xi:include href="samples/notfound.json" parse="text"/>
-                </programlisting>
-            </example>
-            <para>
-                From an XML schema perspective, all API faults are
-                extensions of the base fault type ComputeAPIFault.
-                When working with a system that binds XML to actual
-                classes (such as JAXB), one should be capable of using
-                ComputeAPIFault as a “catch-all” if there's no
-                interest in distinguishing between individual fault
-                types.
-            </para>
-            <para>
-                The OverLimit fault is generated when a rate limit
-                threshold is exceeded.  For convenience, the fault
-                adds a <property>retryAt</property> attribute that
-                contains the content of the Retry-After header in XML
-                Schema 1.0 date/time format.
-            </para>
-            <example>
-                <title>Fault Response, Over Limit: XML</title>
-                <programlisting language="xml">
+                    </programlisting>
+                </example>
+                <para>
+                    From an XML schema perspective, all API faults are
+                    extensions of the base fault type ComputeAPIFault.
+                    When working with a system that binds XML to actual
+                    classes (such as JAXB), one should be capable of using
+                    ComputeAPIFault as a “catch-all” if there's no
+                    interest in distinguishing between individual fault
+                    types.
+                </para>
+                <para>
+                    The OverLimit fault is generated when a rate limit
+                    threshold is exceeded.  For convenience, the fault
+                    adds a <property>retryAt</property> attribute that
+                    contains the content of the Retry-After header in XML
+                    Schema 1.0 date/time format.
+                </para>
+                <example>
+                    <title>Fault Response, Over Limit: XML</title>
+                    <programlisting language="xml">
 <xi:include href="samples/overlimit.xml" parse="text"/>
-                </programlisting>
-            </example>
-            <example>
-                <title>Fault Response, Over Limit: JSON</title>
-                <programlisting language="javascript">
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Fault Response, Over Limit: JSON</title>
+                    <programlisting language="javascript">
 <xi:include href="samples/overlimit.json" parse="text"/>
-                </programlisting>
-            </example>
+                    </programlisting>
+                </example>
+            </section>
+            <section>
+                <title>Asynchronous Faults</title>
+                <para>
+                    An error may occur in the background while a
+                    server or image is being built or while a server
+                    is executing an action.  In these cases, the
+                    server or image is placed in an <code>ERROR</code>
+                    state and the fault is embedded in the offending
+                    server or image. Note that these asynchronous
+                    faults follow the same format as the synchronous
+                    ones. The fault contains an error code, a human
+                    readable message, and optional details about the
+                    error.
+                </para>
+                <example>
+                    <title>Server In Error Sate: XML</title>
+                    <programlisting language="xml">
+<xi:include href="samples/server-fault.xml" parse="text"/>
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Server In Error Sate: JSON</title>
+                    <programlisting language="javascript">
+<xi:include href="samples/server-fault.json" parse="text"/>
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Image In Error Sate: XML</title>
+                    <programlisting language="xml">
+<xi:include href="samples/image-fault.xml" parse="text"/>
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Image In Error Sate: JSON</title>
+                    <programlisting language="javascript">
+<xi:include href="samples/image-fault.json" parse="text"/>
+                    </programlisting>
+                </example>
+            </section>
         </section>
     </chapter>
     <chapter>
         <title>API Operations</title>
-        <section><?dbhtml stop-chunking?>
+        <section>
             <title>Servers</title>
             <section>
                 <title>List Servers</title>
@@ -1434,12 +1498,22 @@
                     <tbody>
                         <tr>
                             <td colspan="1">&GET;</td>
-                            <td colspan="2">/servers</td>
+                            <td colspan="2">/servers?<parameter>image</parameter>=<literal>imageRef</literal>&amp;
+                            <parameter>flavor</parameter>=<literal>flavorRef</literal>&amp;
+                            <parameter>name</parameter>=<literal>serverName</literal>&amp;
+                            <parameter>status</parameter>=<literal>serverStatus</literal>&amp;
+                            <parameter>changes-since</parameter>=<literal>dateTime</literal>
+                            </td>
                             <td colspan="3">List all servers (IDs, names, self links)</td>
                         </tr>
                         <tr>
                             <td colspan="1">&GET;</td>
-                            <td colspan="2">/servers/detail</td>
+                            <td colspan="2">/servers/detail?<parameter>image</parameter>=<literal>imageRef</literal>&amp;
+                            <parameter>flavor</parameter>=<literal>flavorRef</literal>&amp;
+                            <parameter>name</parameter>=<literal>serverName</literal>&amp;
+                            <parameter>status</parameter>=<literal>serverStatus</literal>&amp;
+                            <parameter>changes-since</parameter>=<literal>dateTime</literal>
+                            </td>
                             <td colspan="3">List all servers (all details)</td>
                         </tr>
                     </tbody>
@@ -1454,6 +1528,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
@@ -1468,7 +1543,7 @@
                         <date>2009-06-26T14:30:46</date>
                     </info>
                     <para>
-                        We'll need to revisit.  List all status even
+                        Well need to revisit.  List all status even
                         the ones that don't enter into our state
                         transitions along with descriptions of each.
                     </para>
@@ -1483,18 +1558,19 @@
                     available for use. Other possible values for the
                     status attribute include: <code>BUILD</code>,
                     <code>REBUILD</code>, <code>SUSPENDED</code>,
-                    <code>QUEUE_RESIZE</code>,
-                    <code>PREP_RESIZE</code>, <code>RESIZE</code>,
-                    <code>VERIFY_RESIZE</code>, <code>PASSWORD</code>,
-                    <code>RESCUE</code>, <code>REBOOT</code>,
-                    <code>HARD_REBOOT</code>, <code>DELETE_IP</code>,
-                    and <code>UNKNOWN</code>.
+                    <code>RESIZE</code>, <code>VERIFY_RESIZE</code>,
+                    <code>PASSWORD</code>, <code>REBOOT</code>,
+                    <code>HARD_REBOOT</code>, <code>DELETED</code>,
+                    <code>UNKNOWN</code>, and <code>ERROR</code>.
                 </para>
                 <para>
-                    When retrieving a list of servers via the
-                    changes-since parameter (see Efficient Polling
-                    with the Changes-Since Parameter), the list will
-                    contain servers that have been deleted since the
+                    The list of servers may be filtered by image,
+                    flavor, name, and status via the respective query
+                    parameters. Image and flavor references may be IDs
+                    or full URLs.  When retrieving a list of servers
+                    via the changes-since parameter (see <xref
+                    linkend="ChangesSince"/>), the list will contain
+                    servers that have been deleted since the
                     changes-since time.
                 </para>
                 <para>
@@ -1556,6 +1632,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
@@ -1587,9 +1664,15 @@
                     be checked by performing a &GET; on
                     /servers/<parameter>id</parameter>, which will
                     return a progress attribute (0-100% completion).
-                    Note that when creating a server only the server
-                    ID and the admin password are guaranteed to be
-                    returned in the request object.  Additional
+                    The full URL to the newly created server is
+                    returned via the <code>Location</code> header and
+                    is available as a <code>self</code> and
+                    <code>bookmark</code> link in the server
+                    representation (See <xref
+                    linkend="LinksReferences"/>).  Note that when
+                    creating a server only the server ID, its links,
+                    and the admin password are guaranteed to be
+                    returned in the request.  Additional
                     attributes may be retrieved by performing
                     subsequent &GET;s on the server.
                 </para>
@@ -1610,29 +1693,6 @@
                     <programlisting language="javascript"><?db-font-size 90%?><xi:include href="samples/server-post-resp.json" parse="text"/></programlisting>
                 </example>
                 <section>
-                    <title>Server Affinity</title>
-                    <para>
-                        As stated previously, the compute service has an
-                        anti-affinity property that attempts to spread out
-                        VMs across hosts.  There may be cases where
-                        affinity matters however.  For example, VMs may
-                        need to be placed near one another in order to
-                        effectively share resources. The
-                        <property>affinityId</property> attribute
-                        represents the lowest level zone that allows
-                        clients to specify placement of VMs.  Note that
-                        VMs with the same <property>affinityId</property>
-                        may not necessarily share the same
-                        <property>hostId</property>. That said, hosts with
-                        the same <property>affinityId</property> are
-                        guaranteed to be in proximity of one another.  To
-                        launch a server with affinity to an existing
-                        server, include the
-                        <property>affinityId</property> of the existing
-                        server in the server create request.
-                    </para>
-                </section>
-                <section>
                     <title>Server Passwords</title>
                     <para>
                         A password may be specified when creating the
@@ -1656,16 +1716,17 @@
                 </section>
                 <section>
                     <title>Server Metadata</title>
-                    <para>Custom server metadata can also be supplied at launch time. See <xref
-                            linkend="MetadataSection"/> for details on working with metadata. The
-                        maximum size of the metadata key and value is 255 bytes each. The maximum
-                        number of key-value pairs that can be supplied per server is determined by
-                        the compute provider and may be queried via the maxServerMeta absolute
-                        limit. </para>
-                    <db:para>Keys that start with the prefix 'aws:' are reserved for use by the
-                        system. To avoid confusion, avoid specifying keys that start with this
-                        reserved prefix value. You may find in the future that metadata with the
-                        reserved key prefix could cause unexpected behavior of API operations. </db:para>
+                    <para>
+                        Custom server metadata can also be supplied at
+                        launch time.  See <xref
+                        linkend="MetadataSection"/> for details on
+                        working with metadata.  The maximum size of
+                        the metadata key and value is 255 bytes each.
+                        The maximum number of key-value pairs that can
+                        be supplied per server is determined by the
+                        compute provider and may be queried via the
+                        maxServerMeta absolute limit.
+                    </para>
                 </section>
                 <section>
                     <title>Server Personality</title>
@@ -1711,6 +1772,63 @@
                         <code>-r--r-----</code> ).
                     </para>
                 </section>
+                <section>
+                    <title>Server Primary Addresses</title>
+                    <para>
+                        In a hybrid environment, the IP address of a
+                        server may not be controlled by the underling
+                        implementation. Instead, the primary IP
+                        address may be part of the dedicated hardware;
+                        for example, a router/NAT device. In this
+                        case, the addresses provided by the
+                        implementation cannot actually be used to
+                        access the server (from outside the local
+                        LAN). Here, a <firstterm>primary
+                        address</firstterm> may be assigned at
+                        creation time to provide access to the server.
+                        This address may not be directly bound to a
+                        network interface on the server and may not
+                        not necessarily appear when a server's
+                        addresses are queried (see <xref
+                        linkend="ServerAddresses"/>).  Nonetheless,
+                        clients which need to access the server
+                        directly are encouraged to do so via a
+                        primary address.  In the example below, an
+                        IPv4 address is assigned at creation time.
+                    </para>
+                    <example>
+                        <title>Creating a Server with a Primary IP: XML</title>
+                        <programlisting language="xml">
+<xi:include href="samples/server-post-req-pip.xml" parse="text"/>
+                        </programlisting>
+                    </example>
+                    <example>
+                        <title>Creating a Server with a Primary IP: JSON</title>
+                        <programlisting language="javascript">
+<xi:include href="samples/server-post-req-pip.json" parse="text"/>
+                        </programlisting>
+                    </example>
+                    <para>
+                        Note that both IPv4 and IPv6 addresses may be
+                        used as primary addresses and both addresses
+                        may be assigned simultaneously as illustrated
+                        below. Primary addresses may be updated after
+                        a server has been created. See <xref
+                        linkend="ServerUpdate"/> for more details.
+                    </para>
+                    <example>
+                        <title>Creating a Server with Multiple Primary IPs: XML</title>
+                        <programlisting language="xml">
+<xi:include href="samples/server-post-req-pip2.xml" parse="text"/>
+                        </programlisting>
+                    </example>
+                    <example>
+                        <title>Creating a Server with Multiple Primary IPs: JSON</title>
+                        <programlisting language="javascript">
+<xi:include href="samples/server-post-req-pip2.json" parse="text"/>
+                        </programlisting>
+                    </example>
+                </section>
             </section>
             <section>
                 <title>Get Server Details</title>
@@ -1740,6 +1858,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
@@ -1758,8 +1877,8 @@
                     <programlisting language="javascript"><?db-font-size 90%?><xi:include href="samples/server.json" parse="text"/></programlisting>
                 </example>
             </section>
-            <section>
-                <title>Update Server Name</title>
+            <section xml:id="ServerUpdate">
+                <title>Update Server</title>
                 <informaltable rules="all">
                     <thead>
                         <tr>
@@ -1772,7 +1891,8 @@
                         <tr>
                             <td colspan="1">&PUT;</td>
                             <td colspan="2">/servers/<parameter>id</parameter></td>
-                            <td colspan="3">Update the specified server's name</td>
+                            <td colspan="3">Update the specified
+                            server's name and primary addresses</td>
                         </tr>
                     </tbody>
                 </informaltable>
@@ -1785,6 +1905,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
@@ -1803,24 +1924,42 @@
                     </tbody>
                 </informaltable>
                 <para>
-                    This operation changes the name of the server in
-                    the Compute system.  The operation does not change
-                    the server host name. Note that server names are
-                    not guaranteed to be unique.
+                    This operation updates the editable attributes of
+                    a server: the name of the server, the server
+                    metadata, and the IPv4 and IPv6 primary address.
+                    Note that while the server name is editable, the
+                    operation does not change the server host
+                    name. Note also that server names are not
+                    guaranteed to be unique.
                 </para>
                 <example>
-                    <title>Server Update Request: XML</title>
+                    <title>Server Update Name Request: XML</title>
                     <programlisting language="xml">
 <xi:include href="samples/server-put-req.xml" parse="text"/>
                     </programlisting>
                 </example>
                 <example>
-                    <title>Server Update Request: JSON</title>
+                    <title>Server Update Name Request: JSON</title>
                     <programlisting language="javascript">
 <xi:include href="samples/server-put-req.json" parse="text"/>
                     </programlisting>
                 </example>
-                <para>This operation does not contain a response body.</para>
+                <para>
+                    Primary addresses may simultaneously be updated as
+                    illustrated below.
+                </para>
+                <example>
+                    <title>Server Update Primary Address Request: XML</title>
+                    <programlisting language="xml">
+<xi:include href="samples/server-put-req-ad.xml" parse="text"/>
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Server Update Primary Address Request: JSON</title>
+                    <programlisting language="javascript">
+<xi:include href="samples/server-put-req-ad.json" parse="text"/>
+                    </programlisting>
+                </example>
             </section>
             <?hard-pagebreak?>
             <section>
@@ -1849,8 +1988,8 @@
                     Error Response Code(s):
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>), unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
-                    unauthorized (<errorcode>401</errorcode>),
                     buildInProgress (<errorcode>409</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
@@ -1866,7 +2005,7 @@
                         <tr>
                             <td colspan="1" />
                             <td colspan="3">
-                                <code>SUSPENDED</code> &ARROW;
+                                <code>ERROR</code> &ARROW;
                                 <code>DELETED</code>
                             </td>
                         </tr>
@@ -1883,7 +2022,7 @@
             </section>
         </section>
         <?hard-pagebreak?>
-        <section><?dbhtml stop-chunking?>
+        <section xml:id="ServerAddresses">
             <title>Server Addresses</title>
             <section>
                 <title>List Addresses</title>
@@ -1913,6 +2052,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
@@ -1931,7 +2071,6 @@
                     </programlisting>
                 </example>
             </section>
-            <?hard-pagebreak?>
             <section>
                 <title>List Addresses by Network</title>
                 <informaltable rules="all">
@@ -1960,6 +2099,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
@@ -1980,7 +2120,7 @@
             </section>
         </section>
         <?hard-pagebreak?>
-        <section><?dbhtml stop-chunking?>
+        <section>
             <title>Server Actions</title>
             <section>
                 <title>Change Password</title>
@@ -2009,6 +2149,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
@@ -2072,6 +2213,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
@@ -2148,6 +2290,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
@@ -2231,6 +2374,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
@@ -2245,8 +2389,6 @@
                             <td colspan="1">Status Transition:</td>
                             <td colspan="3">
                                 <code>ACTIVE</code> &ARROW;
-                                <code>QUEUE_RESIZE</code> &ARROW;
-                                <code>PREP_RESIZE</code> &ARROW;
                                 <code>RESIZE</code> &ARROW;
                                 <code>VERIFY_RESIZE</code>
                             </td>
@@ -2255,7 +2397,7 @@
                             <td colspan="1" />
                             <td colspan="3">
                                 <code>ACTIVE</code> &ARROW;
-                                <code>QUEUE_RESIZE</code> &ARROW;
+                                <code>RESIZE</code> &ARROW;
                                 <code>ACTIVE</code> (on error)
                             </td>
                         </tr>
@@ -2314,6 +2456,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
@@ -2331,6 +2474,13 @@
                                 <code>ACTIVE</code>
                             </td>
                         </tr>
+                        <tr>
+                            <td colspan="1" />
+                            <td colspan="3">
+                                <code>VERIFY_RESIZE</code> &ARROW;
+                                <code>ERROR</code> (on error)
+                            </td>
+                        </tr>
                     </tbody>
                 </informaltable>
                 <para>
@@ -2386,6 +2536,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
@@ -2403,6 +2554,13 @@
                                 <code>ACTIVE</code>
                             </td>
                         </tr>
+                        <tr>
+                            <td colspan="1" />
+                            <td colspan="3">
+                                <code>VERIFY_RESIZE</code> &ARROW;
+                                <code>ERROR</code> (on error)
+                            </td>
+                        </tr>
                     </tbody>
                 </informaltable>
                 <para>
@@ -2431,7 +2589,7 @@
             </section>
         </section>
         <?hard-pagebreak?>
-        <section><?dbhtml stop-chunking?>
+        <section>
             <title>Flavors</title>
             <para>
                 A flavor is an available hardware configuration for a
@@ -2451,12 +2609,12 @@
                     <tbody>
                         <tr>
                             <td colspan="1">&GET;</td>
-                            <td colspan="2">/flavors</td>
+                            <td colspan="2">/flavors?<parameter>image</parameter>=<literal>imageRef</literal></td>
                             <td colspan="3">List available flavors (IDs, names, self links)</td>
                         </tr>
                         <tr>
                             <td colspan="1">&GET;</td>
-                            <td colspan="2">/flavors/detail</td>
+                            <td colspan="2">/flavors/detail?<parameter>image</parameter>=<literal>imageRef</literal></td>
                             <td colspan="3">List available flavors (all details)</td>
                         </tr>
                     </tbody>
@@ -2471,12 +2629,17 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
                 <para>
-                    This operation will list all available flavors
-                    with details.
+                    This operation will list all available flavors.
+                    The <parameter>image</parameter> parameter can
+                    narrow the list of flavors to those acceptable for
+                    a particular image. The value of the
+                    <parameter>image</parameter> parameter may be an
+                    ID or a full URL.
                 </para>
                 <para>
                     This operation does not require a request body.
@@ -2520,6 +2683,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
@@ -2541,7 +2705,7 @@
             </section>
         </section>
         <?hard-pagebreak?>
-        <section><?dbhtml stop-chunking?>
+        <section>
             <title>Images</title>
             <para>
                 An image is a collection of files you use to create or
@@ -2561,12 +2725,22 @@
                     <tbody>
                         <tr>
                             <td colspan="1">&GET;</td>
-                            <td colspan="2">/images</td>
+                            <td colspan="2">/images?<parameter>server</parameter>=<literal>serverRef</literal>&amp;
+                            <parameter>name</parameter>=<literal>imageName</literal>&amp;
+                            <parameter>status</parameter>=<literal>imageStatus</literal>&amp;
+                            <parameter>changes-since</parameter>=<literal>dateTime</literal>&amp;
+                            <parameter>type</parameter>=(<constant>BASE</constant>|<constant>SERVER</constant>)
+                            </td>
                             <td colspan="3">List available images (IDs, names, self links)</td>
                         </tr>
                         <tr>
                             <td colspan="1">&GET;</td>
-                            <td colspan="2">/images/detail</td>
+                            <td colspan="2">/images/detail?<parameter>server</parameter>=<literal>serverRef</literal>&amp;
+                            <parameter>name</parameter>=<literal>imageName</literal>&amp;
+                            <parameter>status</parameter>=<literal>imageStatus</literal>&amp;
+                            <parameter>changes-since</parameter>=<literal>dateTime</literal>&amp;
+                            <parameter>type</parameter>=(<constant>BASE</constant>|<constant>SERVER</constant>)
+                            </td>
                             <td colspan="3">List available images (all details)</td>
                         </tr>
                     </tbody>
@@ -2581,6 +2755,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
@@ -2594,11 +2769,25 @@
                     progress element (0-100% completion) will also be
                     returned.  Other possible values for the status
                     attribute include: <code>UNKNOWN</code>,
-                    <code>PREPARING</code>, <code>ACTIVE</code>,
-                    <code>QUEUED</code>, <code>FAILED</code>. Images
+                    <code>ACTIVE</code>,
+                    <code>SAVING</code>, <code>ERROR</code>. Images
                     with an <code>ACTIVE</code> status are available
                     for install.
                 </para>
+                <para>
+                    The list of images may be filtered by server,
+                    name, and status via the respective query
+                    parameters. A server reference may be specified by
+                    ID or with a full URL. The
+                    <parameter>type</parameter> parameter will select
+                    only base images (<constant>BASE</constant>) or
+                    server backups (<constant>SERVER</constant>). See
+                    <xref linkend="ChangesSince"/> for a description
+                    of the <parameter>changes-since</parameter>
+                    parameter. Note that, when using this parameter
+                    the list of images will contain images that have
+                    been deleted since the changes-since time.
+                </para>
                 <para>This operation does not require a request body.</para>
                 <example>
                     <title>Images List Response: XML (detail)</title>
@@ -2638,6 +2827,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badMediaType(<errorcode>415</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
@@ -2652,33 +2842,46 @@
                             <tr>
                                 <td colspan="1">Status Transition:</td>
                                 <td colspan="3">
-                                    <code>QUEUED</code> &ARROW; <code>PREPARING</code> &ARROW;
                                     <code>SAVING</code> &ARROW; <code>ACTIVE</code>
                                 </td>
                             </tr>
                             <tr>
                                 <td colspan="1" />
                                 <td colspan="3">
-                                    <code>QUEUED</code> &ARROW; <code>PREPARING</code> &ARROW;
-                                    <code>SAVING</code> &ARROW; <code>FAILED</code> (on error)
+                                    <code>SAVING</code> &ARROW; <code>ERROR</code> (on error)
                                 </td>
                             </tr>
                         </tbody>
                 </informaltable>
                 <para>
                     This operation creates a new image for the given
-                    server ID. Once complete, a new image will be
+                    server. Once complete, a new image will be
                     available that can be used to rebuild or create
                     servers. The image creation status can be queried
                     by performing a &GET; on
                     /images/<parameter>id</parameter> and examining
-                    the status and progress attributes.
-                </para>
-                <para> Custom image metadata can also be supplied at launch time. See <xref
-                        linkend="MetadataSection"/> for details on working with metadata. The
-                    maximum size of the metadata key and value is 255 bytes each. The maximum number
-                    of key-value pairs that can be supplied per image is determined by the compute
-                    provider and may be queried via the maxImageMeta absolute limit. </para>
+                    the status and progress attributes.  The full URL
+                    to the newly created image is returned via the
+                    <code>Location</code> header and is available as a
+                    <code>self</code> and <code>bookmark</code> link
+                    in the image representation (See <xref
+                    linkend="LinksReferences"/>). Note that when
+                    creating an image only the image's ID and its
+                    links are guaranteed to be returned in the
+                    request.  Additional attributes may be retrieved
+                    by performing subsequent &GET;s on the image.
+                </para>
+                <para>
+                    Custom image metadata can also be supplied at
+                    launch time.  See <xref
+                    linkend="MetadataSection"/> for details on working
+                    with metadata.  The maximum size of the metadata
+                    key and value is 255 bytes each.  The maximum
+                    number of key-value pairs that can be supplied per
+                    image is determined by the compute provider and
+                    may be queried via the maxImageMeta absolute
+                    limit.
+                </para>
                 <note>
                     <para>
                         At present, image creation is an asynchronous
@@ -2689,75 +2892,19 @@
                 </note>
                 <example>
                     <title>Image Create Request: XML</title>
-                    <programlisting language="xml">
-&lt;image xmlns="http://docs.openstack.org/compute/api/v1.1"
-  name="Just in case" serverRef="12" /&gt;
-                    </programlisting>
+                    <programlisting language="xml"><xi:include href="samples/image-create.xml" parse="text"/></programlisting>
                 </example>
                 <example>
                     <title>Image Create Request: JSON</title>
-                    <programlisting language="javascript">
-{
-      "image" : {
-          "serverRef" : 12,
-          "name" : "Just in case"
-      }
-}
-                    </programlisting>
+                    <programlisting language="javascript"><xi:include href="samples/image-create.json" parse="text"/></programlisting>
                 </example>
                 <example>
                     <title>Image Create Response: XML</title>
-                    <programlisting language="xml">
-&lt;image xmlns="http://docs.openstack.org/compute/api/v1.1"
-          xmlns:atom="http://www.w3.org/2005/Atom"
-         id="22" name="Just in case"
-         created="2010-10-10T12:00:00Z"
-         status="SAVING" progress="0" 
-         serverRef="http://servers.api.openstack.org/v1.1/1234/servers/12"&gt;
-    &lt;atom:link 
-        rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/22"/&gt;
-    &lt;atom:link 
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/images/22"/&gt;
-    &lt;atom:link 
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/images/22"/&gt;
-&lt;/image&gt;
-                    </programlisting>
+                    <programlisting language="xml"><xi:include href="samples/image-create-response.xml" parse="text"/></programlisting>
                 </example>
                 <example>
                     <title>Image Create Response: JSON</title>
-                    <programlisting language="javascript">
-{
-      "image" : {
-          "id" : 22,
-          "serverRef" : "http://servers.api.openstack.org/v1.1/1234/servers/12",
-          "name" : "Just in case",
-          "created" : "2010-10-10T12:00:00Z",
-          "status" : "SAVING",
-          "progress" : 0,
-          "links": [
-            {
-              "rel" : "self",
-              "href" : "http://servers.api.openstack.org/v1.1/1234/images/22"
-            },
-            {
-              "rel" : "bookmark",
-              "type" : "application/vnd.openstack.compute-v1.1+xml",
-              "href" : "http://servers.api.openstack.org/1234/images/22"
-            },
-            {
-              "rel" : "bookmark",
-              "type" : "application/vnd.openstack.compute-v1.1+json",
-              "href" : "http://servers.api.openstack.org/1234/images/22"
-            }
-        ]
-      }
-}
-                    </programlisting>
+                    <programlisting language="javascript"><xi:include href="samples/image-create-response.json" parse="text"/></programlisting>
                 </example>
             </section>
             <?hard-pagebreak?>
@@ -2789,6 +2936,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
@@ -2836,9 +2984,26 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
+                <informaltable frame="void">
+                        <tbody>
+                            <tr>
+                                <td colspan="1">Status Transition:</td>
+                                <td colspan="3">
+                                    <code>ACTIVE</code> &ARROW; <code>DELETED</code>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="1"/>
+                                <td colspan="3">
+                                    <code>ERROR</code> &ARROW; <code>DELETED</code>
+                                </td>
+                            </tr>
+                        </tbody>
+                </informaltable>
                 <para>This operation deletes an image from the system.</para>
                 <para>
                     Images are immediately removed.  Currently, there
@@ -2850,7 +3015,7 @@
             </section>
         </section>
         <?hard-pagebreak?>
-        <section xml:id="MetadataSection"><?dbhtml stop-chunking?>
+        <section xml:id="MetadataSection">
             <title>Metadata</title>
             <para>
                 The following operations allow access to metadata
@@ -2891,6 +3056,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
@@ -2944,9 +3110,10 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     buildInProgress (<errorcode>409</errorcode>),
-                    badMediaType(<errorcode>415</errorcode>)
+                    badMediaType(<errorcode>415</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
                 </simpara>
                 <para>
@@ -2955,7 +3122,12 @@
                    not be modified.  An overlimit
                    (<errorcode>413</errorcode>) fault may be thrown if
                    the operation causes the maximum number of metadata
-                   items to be exceeded.
+                   items to be exceeded.  The maximum number of
+                   key-value pairs that can be supplied per server is
+                   determined by the compute provider and may be
+                   queried via the maxServerMeta absolute limit. The
+                   maximum number of key-value pairs for an image may
+                   be queried via the maxImageMeta absolute limit.
                 </para>
                 <example>
                     <title>Metadata Update Request: XML </title>
@@ -2985,6 +3157,84 @@
             </section>
             <?hard-pagebreak?>
             <section>
+                <title>Create or Replace Metadata</title>
+                <informaltable rules="all">
+                    <thead>
+                        <tr>
+                            <td colspan="1">Verb</td>
+                            <td colspan="2">URI</td>
+                            <td colspan="3">Description</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td colspan="1">&PUT;</td>
+                            <td colspan="2">/servers/<parameter>id</parameter>/meta</td>
+                            <td colspan="3">Create or replace metadata</td>
+                        </tr>
+                        <tr>
+                            <td colspan="1">&PUT;</td>
+                            <td colspan="2">/images/<parameter>id</parameter>/meta</td>
+                            <td colspan="3">Create or replace metadata</td>
+                        </tr>
+                    </tbody>
+                </informaltable>
+                <simpara>
+                    Normal Response Code(s):
+                    <returnvalue>201</returnvalue>
+                </simpara>
+                <simpara>
+                    Error Response Code(s):
+                    computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
+                    serviceUnavailable (<errorcode>503</errorcode>),
+                    unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
+                    badRequest (<errorcode>400</errorcode>),
+                    buildInProgress (<errorcode>409</errorcode>),
+                    badMediaType(<errorcode>415</errorcode>),
+                    overLimit (<errorcode>413</errorcode>)
+                </simpara>
+                <para>
+                   Creates a number of metadata items simultaneously
+                   replacing all existing metadata items.  An
+                   overlimit (<errorcode>413</errorcode>) fault may be
+                   thrown if the operation causes the maximum number
+                   of metadata items to be exceeded. The maximum
+                   number of key-value pairs that can be supplied per
+                   server is determined by the compute provider and
+                   may be queried via the maxServerMeta absolute
+                   limit. The maximum number of key-value pairs for an
+                   image may be queried via the maxImageMeta absolute
+                   limit.
+                </para>
+                <example>
+                    <title>Metadata Update Request: XML </title>
+                    <programlisting language="xml">
+<xi:include href="samples/metadata.xml" parse="text"/>
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Metadata Update Request: JSON </title>
+                    <programlisting language="javascript">
+<xi:include href="samples/metadata.json" parse="text"/>
+                    </programlisting>
+                </example>
+                <?hard-pagebreak?>
+                <example>
+                    <title>Metadata Update Response: XML </title>
+                    <programlisting language="xml">
+<xi:include href="samples/metadata.xml" parse="text"/>
+                    </programlisting>
+                </example>
+                <example>
+                    <title>Metadata Update Response: JSON </title>
+                    <programlisting language="javascript">
+<xi:include href="samples/metadata.json" parse="text"/>
+                    </programlisting>
+                </example>
+            </section>
+            <?hard-pagebreak?>
+            <section>
                 <title>Get Metadata Item</title>
                 <informaltable rules="all">
                     <thead>
@@ -3021,6 +3271,7 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     overLimit (<errorcode>413</errorcode>)
@@ -3075,17 +3326,24 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     buildInProgress (<errorcode>409</errorcode>),
-                    badMediaType(<errorcode>415</errorcode>)
+                    badMediaType(<errorcode>415</errorcode>),
                     overLimit (<errorcode>413</errorcode>),
                 </simpara>
                 <para>
-                    Updates or creates a new metadata item by key.
-                    An overlimit (<errorcode>413</errorcode>) fault
-                    may be thrown if the operation causes the maximum
-                    number of metadata items to be exceeded.
+                    Updates or creates a new metadata item by key.  An
+                    overlimit (<errorcode>413</errorcode>) fault may
+                    be thrown if the operation causes the maximum
+                    number of metadata items to be exceeded. The
+                    maximum number of key-value pairs that can be
+                    supplied per server is determined by the compute
+                    provider and may be queried via the maxServerMeta
+                    absolute limit. The maximum number of key-value
+                    pairs for an image may be queried via the
+                    maxImageMeta absolute limit.
                 </para>
                 <example>
                     <title>Metadata Item Update Request: XML </title>
@@ -3146,10 +3404,11 @@
                     computeFault (<errorcode>400</errorcode>, <errorcode>500</errorcode>),
                     serviceUnavailable (<errorcode>503</errorcode>),
                     unauthorized (<errorcode>401</errorcode>),
+                    forbidden (<errorcode>403</errorcode>),
                     itemNotFound (<errorcode>404</errorcode>),
                     badRequest (<errorcode>400</errorcode>),
                     buildInProgress (<errorcode>409</errorcode>),
-                    badMediaType(<errorcode>415</errorcode>)
+                    badMediaType(<errorcode>415</errorcode>),
                     overLimit (<errorcode>413</errorcode>),
                 </simpara>
                 <para>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/addresses.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/addresses.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/addresses.json	2011-06-24 02:29:39 +0000
@@ -1,22 +1,32 @@
 {
-    "addresses" : {
-        "values" : [
-            {
-                "id" : "public",
-                "values" : [
-                    {"version" : 4, "addr" : "67.23.10.132"},
-                    {"version" : 6, "addr" : "::babe:67.23.10.132"},
-                    {"version" : 4, "addr" : "67.23.10.131"},
-                    {"version" : 6, "addr" : "::babe:4317:0A83"}
-                ]
-            },
-            {
-                "id" : "private",
-                "values" : [
-                    {"version" : 4, "addr" : "10.176.42.16"},
-                    {"version" : 6, "addr" : "::babe:10.176.42.16"}
-                ]
-            }
-        ]
-    }
+  "addresses": {
+      "public" : [
+          {
+              "version": 4,
+              "addr": "67.23.10.132"
+          },
+          {
+              "version": 6,
+              "addr": "::babe:67.23.10.132"
+          },
+          {
+              "version": 4,
+              "addr": "67.23.10.131"
+          },
+          {
+              "version": 6,
+              "addr": "::babe:4317:0A83"
+          }
+      ],
+      "private" : [
+          {
+              "version": 4,
+              "addr": "10.176.42.16"
+          },
+          {
+              "version": 6,
+              "addr": "::babe:10.176.42.16"
+          }
+      ]
+  }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/choices.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/choices.json	2011-04-26 03:49:47 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/choices.json	2011-06-24 02:29:39 +0000
@@ -1,50 +1,44 @@
 {
-    "choices" : {
-        "values" : [
-            {
-                "id" : "v1.0",
-                "status" : "DEPRECATED",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.0/1234/servers/12"
-                    }
-                ],
-                "media-types": {
-                    "values" : [
-                        {
-                            "base" : "application/xml",
-                            "type" : "application/vnd.openstack.compute-v1.0+xml"
-                        },
-                        {
-                            "base" : "application/json",
-                            "type" : "application/vnd.openstack.compute-v1.0+json"
-                        }
-                    ]
-                }
-            },
-            {
-                "id" : "v1.1",
-                "status" : "CURRENT",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/servers/12"
-                    }
-                ],
-                "media-types": {
-                    "values" : [
-                        {
-                            "base" : "application/xml",
-                            "type" : "application/vnd.openstack.compute-v1.1+xml"
-                        },
-                        {
-                            "base" : "application/json",
-                            "type" : "application/vnd.openstack.compute-v1.1+json"
-                        }
-                    ]
-                }
-            }
-        ]
-    }
+    "choices": [
+        {
+            "id": "v1.0",
+            "status": "DEPRECATED",
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.0/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"
+                }
+            ],
+            "media-types": [
+                {
+                    "base": "application/xml",
+                    "type": "application/vnd.openstack.compute-v1.0+xml"
+                },
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.compute-v1.0+json"
+                }
+            ]
+        },
+        {
+            "id": "v1.1",
+            "status": "CURRENT",
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"
+                }
+            ],
+            "media-types": [
+                {
+                    "base": "application/xml",
+                    "type": "application/vnd.openstack.compute-v1.1+xml"
+                },
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.compute-v1.1+json"
+                }
+            ]
+        }
+    ]
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/choices.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/choices.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/choices.xml	2011-06-24 02:29:39 +0000
@@ -11,7 +11,7 @@
      </media-types>
         
      <atom:link rel="self"
-                href="http://servers.api.openstack.org/v1.0/1234/servers/12"/>
+                href="http://servers.api.openstack.org/v1.0/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
     </version>
     
     <version id="v1.1" status="CURRENT">
@@ -23,6 +23,6 @@
      </media-types>
         
      <atom:link rel="self"
-                href="http://servers.api.openstack.org/v1.1/1234/servers/12"/>
+                href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
     </version>
 </choices>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.json	2011-04-26 03:49:47 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.json	2011-06-24 02:29:39 +0000
@@ -1,56 +1,97 @@
 {
-    "servers" : {
-        "values" : [
-            {
-                "id" : 1234,
-                "name" : "sample-server",
-                "imageRef" : "https://servers.api.rackspacecloud.com/v1.1/32278/images/1234",
-                "flavorId" : 1,
-                "updated" : "2010-10-10T12:00:00Z",
-                "created" : "2010-08-10T12:00:00Z",
-                "hostId" : "e4d909c290d0fb1ca068ffaddf22cbd0",
-                "affinityId" : "fc88bcf8394db9c8d0564e08ca6a9724188a84d1",
-                "status" : "BUILD",
-                "progress" : 60,
-                "addresses" : {
-                    "public" : [
-                        {"version" : 4, "addr" : "67.23.10.132"},
-                        {"version" : 6, "addr" : "::babe:67.23.10.132"},
-                        {"version" : 4, "addr" : "67.23.10.131"},
-                    {"version" : 6, "addr" : "::babe:4317:0A83"}
+    "servers": [
+        {
+            "id": "52415800-8b69-11e0-9b19-734f6af67565",
+            "name": "sample-server",
+            "updated": "2010-10-10T12:00:00Z",
+            "created": "2010-08-10T12:00:00Z",
+            "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
+            "status": "BUILD",
+            "progress": 60,
+            "primaryIPv4" : "67.23.10.132",
+            "primaryIPv6" : "::babe:67.23.10.132",
+            "image" : {
+                "id": "52415800-8b69-11e0-9b19-734f6f006e54",
+                "name": "CentOS 5.2",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+                    }
+                ]
+            },
+            "flavor" : {
+                "id": "52415800-8b69-11e0-9b19-734f216543fd",
+                "name": "512 MB Server",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+                    }
+                ]
+            },
+            "addresses": {
+                "public" : [
+                    {
+                        "version": 4,
+                        "addr": "67.23.10.132"
+                    },
+                    {
+                        "version": 6,
+                        "addr": "::babe:67.23.10.132"
+                    },
+                    {
+                        "version": 4,
+                        "addr": "67.23.10.131"
+                    },
+                    {
+                        "version": 6,
+                        "addr": "::babe:4317:0A83"
+                    }
                 ],
                 "private" : [
-                    {"version" : 4, "addr" : "10.176.42.16"},
-                    {"version" : 6, "addr" : "::babe:10.176.42.16"}
+                    {
+                        "version": 4,
+                        "addr": "10.176.42.16"
+                    },
+                    {
+                        "version": 6,
+                        "addr": "::babe:10.176.42.16"
+                    }
                 ]
             },
-            "metadata" : {
-                "Server Label" : "Web Head 1",
-                "Image Version" : "2.1"
+            "metadata": {
+                "Server Label": "Web Head 1",
+                "Image Version": "2.1"
             },
             "links": [
                 {
-                    "rel" : "self",
-                    "href" : "http://servers.api.openstack.org/v1.1/1234/servers/1234"
-                },
-                {
-                    "rel" : "bookmark",
-                    "type" : "application/vnd.openstack.compute-v1.1+xml",
-                    "href" : "http://servers.api.openstack.org/1234/servers/1234"
-                },
-                {
-                    "rel" : "bookmark",
-                    "type" : "application/vnd.openstack.compute-v1.1+json",
-                    "href" : "http://servers.api.openstack.org/1234/servers/1234"
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"
                 }
             ],
-            "RS-CBS:volumes" : [
-                { "name" : "OS",
-                  "href" : "https://cbs.api.rackspacecloud.com/12934/volumes/19"},
-                { "name" : "Work",
-                  "href" : "https://cbs.api.rackspacecloud.com/12934/volumes/23"}
+            "RS-CBS:volumes": [
+                {
+                    "name": "OS",
+                    "href": "https://cbs.api.rackspacecloud.com/12934/volumes/19"
+                },
+                {
+                    "name": "Work",
+                    "href": "https://cbs.api.rackspacecloud.com/12934/volumes/23"
+                }
             ]
         }
     ]
-    }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ext-servers.xml	2011-06-24 02:29:39 +0000
@@ -1,41 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <servers xmlns="http://docs.openstack.org/compute/api/v1.1"
          xmlns:atom="http://www.w3.org/2005/Atom">
-  <server id="1234" 
-          name="sample-server" flavorId="1"
-          status="BUILD" progress="60"
-          hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
-          affinityId="fc88bcf8394db9c8d0564e08ca6a9724188a84d1"
+  <server id="52415800-8b69-11e0-9b19-734f6af67565"
+          name="sample-server" status="BUILD" 
+          progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
           updated="2010-10-10T12:00:00Z"
           created="2010-08-10T12:00:00Z"
-          imageRef="https://servers.api.rackspacecloud.com/v1.1/32278/images/1234">
+          primaryIPv4="67.23.10.132"
+          primaryIPv6="::babe:67.23.10.132">
+    <image id="52415800-8b69-11e0-9b19-734f6f006e54"
+           name="CentOS 5.2">
+        <atom:link
+            rel="self"
+            href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
+        <atom:link
+            rel="bookmark"
+            href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
+    </image>
+    <flavor id="52415800-8b69-11e0-9b19-734f216543fd"
+            name="512 MB Server">
+        <atom:link
+            rel="self"
+            href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
+        <atom:link
+            rel="bookmark"
+            href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
+    </flavor>
     <metadata>
       <meta key="Server Label">Web Head 1</meta>
       <meta key="Image Version">2.1</meta>
     </metadata>
     <addresses>
-        <public>
+        <network id="public">
             <ip version="4" addr="67.23.10.132"/>
             <ip version="6" addr="::babe:67.23.10.132"/>
             <ip version="4" addr="67.23.10.131"/>
             <ip version="6" addr="::babe:4317:0A83"/>
-        </public>
-        <private>
+        </network>
+        <network id="private">
             <ip version="4" addr="10.176.42.16"/>
             <ip version="6" addr="::babe:10.176.42.16"/>
-        </private>
+        </network>
     </addresses>
     <atom:link
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/servers/1234"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/servers/1234"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/servers/1234"/>
+        href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
+    <atom:link
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
     <volumes
         xmlns="http://docs.rackspacecloud.com/servers/api/ext/cbs/v1.0">
         <volume name="OS"

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/extensions.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/extensions.json	2011-04-26 03:49:47 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/extensions.json	2011-06-24 02:29:39 +0000
@@ -1,44 +1,42 @@
 {
-    "extensions" : {
-        "values" : [
-            {
-                "name" : "Public Image Extension",
-                "namespace" : "http://docs.rackspacecloud.com/servers/api/ext/pie/v1.0",
-                "alias" : "RS-PIE",
-                "updated" : "2011-01-22T13:25:27-06:00",
-                "description" : "Adds the capability to share an image with other users.",
-                "links" : [
-                    {
-                        "rel" : "describedby",
-                        "type" : "application/pdf",
-                        "href" : "http://docs.rackspacecloud.com/servers/api/ext/cs-pie-20111111.pdf"
-                    },
-                    {
-                        "rel" : "describedby",
-                        "type" : "application/vnd.sun.wadl+xml",
-                        "href" : "http://docs.rackspacecloud.com/servers/api/ext/cs-pie.wadl"
-                    }
-                ]
-            },
-            {
-                "name" : "Cloud Block Storage",
-                "namespace" : "http://docs.rackspacecloud.com/servers/api/ext/cbs/v1.0",
-                "alias" : "RS-CBS",
-                "updated" : "2011-01-12T11:22:33-06:00",
-                "description" : "Allows mounting cloud block storage volumes.",
-                "links" : [
-                    {
-                        "rel" : "describedby",
-                        "type" : "application/pdf",
-                        "href" : "http://docs.rackspacecloud.com/servers/api/ext/cs-cbs-20111201.pdf"
-                    },
-                    {
-                        "rel" : "describedby",
-                        "type" : "application/vnd.sun.wadl+xml",
-                        "href" : "http://docs.rackspacecloud.com/servers/api/ext/cs-cbs.wadl"
-                    }
-                ]
-            }
-        ]
-    }
+    "extensions": [
+        {
+            "name": "Public Image Extension",
+            "namespace": "http://docs.rackspacecloud.com/servers/api/ext/pie/v1.0",
+            "alias": "RS-PIE",
+            "updated": "2011-01-22T13:25:27-06:00",
+            "description": "Adds the capability to share an image with other users.",
+            "links": [
+                {
+                    "rel": "describedby",
+                    "type": "application/pdf",
+                    "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-pie-20111111.pdf"
+                },
+                {
+                    "rel": "describedby",
+                    "type": "application/vnd.sun.wadl+xml",
+                    "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-pie.wadl"
+                }
+            ]
+        },
+        {
+            "name": "Cloud Block Storage",
+            "namespace": "http://docs.rackspacecloud.com/servers/api/ext/cbs/v1.0",
+            "alias": "RS-CBS",
+            "updated": "2011-01-12T11:22:33-06:00",
+            "description": "Allows mounting cloud block storage volumes.",
+            "links": [
+                {
+                    "rel": "describedby",
+                    "type": "application/pdf",
+                    "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-cbs-20111201.pdf"
+                },
+                {
+                    "rel": "describedby",
+                    "type": "application/vnd.sun.wadl+xml",
+                    "href": "http://docs.rackspacecloud.com/servers/api/ext/cs-cbs.wadl"
+                }
+            ]
+        }
+    ]
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/flavor.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/flavor.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/flavor.json	2011-06-24 02:29:39 +0000
@@ -1,23 +1,17 @@
 {
     "flavor" : {
-        "id" : 1,
+        "id" : "52415800-8b69-11e0-9b19-734f1195ff37",
         "name" : "256 MB Server",
         "ram" : 256,
         "disk" : 10,
         "links": [
             {
                 "rel" : "self",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/flavors/1"
-            },
-            {
-                "rel" : "bookmark",
-                "type" : "application/vnd.openstack.compute-v1.1+xml",
-                "href" : "http://servers.api.openstack.org/1234/flavors/1"
-            },
-            {
-                "rel" : "bookmark",
-                "type" : "application/vnd.openstack.compute-v1.1+json",
-                "href" : "http://servers.api.openstack.org/1234/flavors/1"
+                "href" : "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
+            },
+            {
+                "rel" : "bookmark",
+                "href" : "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
             }
         ]
     }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/flavor.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/flavor.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/flavor.xml	2011-06-24 02:29:39 +0000
@@ -2,16 +2,12 @@
 <flavor
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     xmlns:atom="http://www.w3.org/2005/Atom"
-    id="1" name="256 MB Server" ram="256" disk="10">
+    id="52415800-8b69-11e0-9b19-734f1195ff37"
+    name="256 MB Server" ram="256" disk="10">
     <atom:link
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/flavors/1"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/flavors/1"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/flavors/1"/>
+        href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
+    <atom:link
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
 </flavor>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/flavors-page1.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/flavors-page1.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/flavors-page1.json	2011-06-24 02:29:39 +0000
@@ -1,55 +1,43 @@
 {
-    "flavors" : {
-        "values" : [
-            {
-                "id" : 1,
-                "name" : "256 MB Server",
-                "ram"  : 256,
-                "disk" : 10,
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/flavors/1"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/flavors/1"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/flavors/1"
-                    }
-                ]
-            },
-            {
-                "id" : 2,
-                "name" : "512 MB Server",
-                "ram"  : 512,
-                "disk" : 20,
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/flavors/2"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/flavors/2"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/flavors/2"
-                    }
-                ]
-            }
-        ],
-        "links" : [
-            {
-                "rel" : "next",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/flavors?limit=2&marker=2"
+    "flavors": [
+        {
+            "id": "52415800-8b69-11e0-9b19-734f1195ff37",
+            "name": "256 MB Server",
+            "ram": 256,
+            "disk": 10,
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
+                }
+            ]
+        },
+        {
+            "id": "52415800-8b69-11e0-9b19-734f216543fd",
+            "name": "512 MB Server",
+            "ram": 512,
+            "disk": 20,
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+                },
+                {
+                    "rel": "bookmark",
+                    "type": "application/vnd.openstack.compute-v1.1+xml",
+                }
+            ]
+        }
+    ],
+    "flavors_": {
+        "links": [
+            {
+                "rel": "next",
+                "href": "http://servers.api.openstack.org/v1.1/1234/flavors?limit=2&marker=52415800-8b69-11e0-9b19-734f216543fd"
             }
         ]
     }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/flavors-page1.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/flavors-page1.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/flavors-page1.xml	2011-06-24 02:29:39 +0000
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flavors xmlns="http://docs.openstack.org/compute/api/v1.1"
          xmlns:atom="http://www.w3.org/2005/Atom">
-  <flavor id="1" name="256 MB Server" ram="256" disk="10">
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37"
+          name="256 MB Server" ram="256" disk="10">
       <atom:link
           rel="self"
-          href="http://servers.api.openstack.org/v1.1/1234/flavors/1"/>
-      <atom:link
-          rel="bookmark"
-          type="application/vnd.openstack.compute-v1.1+xml"
-          href="http://servers.api.openstack.org/1234/flavors/1"/>
-      <atom:link
-          rel="bookmark"
-          type="application/vnd.openstack.compute-v1.1+json"
-          href="http://servers.api.openstack.org/1234/flavors/1"/>
+          href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
+      <atom:link
+          rel="bookmark"
+          href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
   </flavor>
-  <flavor id="2" name="512 MB Server" ram="512" disk="20">
+  <flavor id="52415800-8b69-11e0-9b19-734f216543fd"
+          name="512 MB Server" ram="512" disk="20">
       <atom:link
           rel="self"
-          href="http://servers.api.openstack.org/v1.1/1234/flavors/2"/>
-      <atom:link
-          rel="bookmark"
-          type="application/vnd.openstack.compute-v1.1+xml"
-          href="http://servers.api.openstack.org/1234/flavors/2"/>
-      <atom:link
-          rel="bookmark"
-          type="application/vnd.openstack.compute-v1.1+json"
-          href="http://servers.api.openstack.org/1234/flavors/2"/>
+          href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
+      <atom:link
+          rel="bookmark"
+          href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
   </flavor>
   <atom:link
       rel="next"
-      href="http://servers.api.openstack.org/v1.1/1234/flavors?limit=2&amp;marker=2"/>
+      href="http://servers.api.openstack.org/v1.1/1234/flavors?limit=2&amp;marker=52415800-8b69-11e0-9b19-734f216543fd"/>
 </flavors>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/flavors.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/flavors.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/flavors.json	2011-06-24 02:29:39 +0000
@@ -1,50 +1,36 @@
 {
-    "flavors" :  {
-        "values" : [
-            {
-                "id" : 1,
-                "name" : "256 MB Server",
-                "ram"  : 256,
-                "disk" : 10,
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/flavors/1"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/flavors/1"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/flavors/1"
-                    }
-                ]
-            },
-            {
-                "id" : 2,
-                "name" : "512 MB Server",
-                "ram"  : 512,
-                "disk" : 20,
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/flavors/2"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/flavors/2"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/flavors/2"
-                    }
-                ]
-            }
-        ]
-    }
+    "flavors": [
+        {
+            "id": "52415800-8b69-11e0-9b19-734f1195ff37",
+            "name": "256 MB Server",
+            "ram": 256,
+            "disk": 10,
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
+                }
+            ]
+        },
+        {
+            "id": "52415800-8b69-11e0-9b19-734f216543fd",
+            "name": "512 MB Server",
+            "ram": 512,
+            "disk": 20,
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
+                }
+            ]
+        }
+    ]
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/flavors.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/flavors.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/flavors.xml	2011-06-24 02:29:39 +0000
@@ -1,30 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flavors xmlns="http://docs.openstack.org/compute/api/v1.1"
          xmlns:atom="http://www.w3.org/2005/Atom">
-  <flavor id="1" name="256 MB Server" ram="256" disk="10">
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37"
+          name="256 MB Server" ram="256" disk="10">
       <atom:link
           rel="self"
-          href="http://servers.api.openstack.org/v1.1/1234/flavors/1"/>
-      <atom:link
-          rel="bookmark"
-          type="application/vnd.openstack.compute-v1.1+xml"
-          href="http://servers.api.openstack.org/1234/flavors/1"/>
-      <atom:link
-          rel="bookmark"
-          type="application/vnd.openstack.compute-v1.1+json"
-          href="http://servers.api.openstack.org/1234/flavors/1"/>
+          href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
+      <atom:link
+          rel="bookmark"
+          href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
   </flavor>
-  <flavor id="2" name="512 MB Server" ram="512" disk="20">
+  <flavor id="52415800-8b69-11e0-9b19-734f216543fd"
+          name="512 MB Server" ram="512" disk="20">
       <atom:link
           rel="self"
-          href="http://servers.api.openstack.org/v1.1/1234/flavors/2"/>
-      <atom:link
-          rel="bookmark"
-          type="application/vnd.openstack.compute-v1.1+xml"
-          href="http://servers.api.openstack.org/1234/flavors/2"/>
-      <atom:link
-          rel="bookmark"
-          type="application/vnd.openstack.compute-v1.1+json"
-          href="http://servers.api.openstack.org/1234/flavors/2"/>
+          href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
+      <atom:link
+          rel="bookmark"
+          href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
   </flavor>
 </flavors>

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/forbidden.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/forbidden.json	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/forbidden.json	2011-06-24 02:29:39 +0000
@@ -0,0 +1,7 @@
+{
+    "forbidden" : {
+        "code" : 403,
+        "message" : "You are not allowed to perform the operation.",
+        "details" : "Error Details..." 
+    }
+}

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/forbidden.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/forbidden.xml	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/forbidden.xml	2011-06-24 02:29:39 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<forbidden xmlns="http://docs.openstack.org/compute/api/v1.1" code="403">
+  <message>You are not allowed to perform the operation.</message>
+  <details>Error Details...</details>
+</forbidden>

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.json	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.json	2011-06-24 02:29:39 +0000
@@ -0,0 +1,47 @@
+{
+    "image": {
+        "name": "Just in case",
+        "server": {
+            "id": "52415800-8b69-11e0-9b19-734f7247a38b",
+            "name": "Backup Server",
+            "updated": "2010-10-10T12:00:00Z",
+            "created": "2010-08-10T12:00:00Z",
+            "hostId": "9e107d9d372bb6826bd81d3542a419d6",
+            "status": "ACTIVE",
+            "primaryIPv4" : "67.23.10.133",
+            "primaryIPv6" : "::babe:67.23.10.133",
+            "addresses": {
+                "public" : [
+                    {
+                        "version": 4,
+                        "addr": "67.23.10.133"
+                    },
+                    {
+                        "version": 6,
+                        "addr": "::babe:67.23.10.133"
+                    }
+                ],
+                "private" : [
+                    {
+                        "version": 4,
+                        "addr": "10.176.42.17"
+                    },
+                    {
+                        "version": 6,
+                        "addr": "::babe:10.176.42.17"
+                    }
+                ]
+            },
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f7247a38b"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f7247a38b"
+                }
+            ]
+        }
+    }
+}

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.xml	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-full.xml	2011-06-24 02:29:39 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<image xmlns="http://docs.openstack.org/compute/api/v1.1"
+       xmlns:atom="http://www.w3.org/2005/Atom"
+       name="Just in case">
+    <server id="52415800-8b69-11e0-9b19-734f7247a38b"
+          name="Backup Server"
+          status="ACTIVE" hostId="9e107d9d372bb6826bd81d3542a419d6"
+          updated="2010-10-10T12:00:00Z"
+          created="2010-08-10T12:00:00Z"
+          primaryIPv4="67.23.10.133"
+          primaryIPv6="::babe:67.23.10.133"
+          >
+        <addresses>
+            <network id="public">
+                <ip version="4" addr="67.23.10.133"/>
+                <ip version="6" addr="::babe:67.23.10.133"/>
+            </network>
+            <network id="private">
+                <ip version="4" addr="10.176.42.17"/>
+                <ip version="6" addr="::babe:10.176.42.17"/>
+            </network>
+        </addresses>
+        <atom:link
+            rel="self"
+            href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f7247a38b"/>
+        <atom:link
+            rel="bookmark"
+            href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f7247a38b"/>
+    </server>
+</image>

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-response.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-response.json	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-response.json	2011-06-24 02:29:39 +0000
@@ -0,0 +1,33 @@
+{
+    "image" : {
+        "id" : "52415800-8b69-11e0-9b19-734f7542c639",
+        "name" : "Just in case",
+        "created" : "2010-10-10T12:00:00Z",
+        "status" : "SAVING",
+        "progress" : 0,
+        "server" : {
+            "id": "52415800-8b69-11e0-9b19-734f7247a38b",
+            "name": "My Server",
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f7247a38b"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f7247a38b"
+                }
+            ]
+        },
+        "links": [
+            {
+                "rel" : "self",
+                "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f7542c639"
+            },
+            {
+                "rel" : "bookmark",
+                "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f7542c639"
+            }
+        ]
+    }
+}

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-response.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-response.xml	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-create-response.xml	2011-06-24 02:29:39 +0000
@@ -0,0 +1,21 @@
+<image xmlns="http://docs.openstack.org/compute/api/v1.1"
+       xmlns:atom="http://www.w3.org/2005/Atom"
+       id="52415800-8b69-11e0-9b19-734f7542c639"
+       name="Just in case"
+       created="2010-10-10T12:00:00Z"
+       status="SAVING" progress="0">
+    <server name="My Server" id="52415800-8b69-11e0-9b19-734f7247a38b">
+        <atom:link
+            rel="self"
+            href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f7247a38b"/>
+        <atom:link
+            rel="bookmark"
+            href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f7247a38b"/>
+    </server>
+    <atom:link 
+        rel="self"
+        href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f7542c639"/>
+    <atom:link 
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f7542c639"/>
+</image>

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-create.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-create.json	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-create.json	2011-06-24 02:29:39 +0000
@@ -0,0 +1,8 @@
+{
+    "image": {
+        "name": "Just in case",
+        "server": {
+            "id": "52415800-8b69-11e0-9b19-734f7247a38b"
+        }
+    }
+}

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-create.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-create.xml	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-create.xml	2011-06-24 02:29:39 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<image xmlns="http://docs.openstack.org/compute/api/v1.1"
+       name="Just in case">
+    <server id="52415800-8b69-11e0-9b19-734f7247a38b" />
+</image>

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-fault.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-fault.json	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-fault.json	2011-06-24 02:29:39 +0000
@@ -0,0 +1,27 @@
+{
+    "image" : {
+        "id" : "52415800-8b69-11e0-9b19-734f5736d2a2",
+        "name" : "My Server Backup",
+        "created" : "2010-08-10T12:00:00Z",
+        "status" : "SAVING",
+        "progress" : 89,
+        "server" : {
+            "id": "52415800-8b69-11e0-9b19-734f335aa7b3"
+        },
+        "fault" : {
+            "code" : 500,
+            "message" : "An internal error occured",
+            "details" : "Error details"
+        },
+        "links": [
+            {
+                "rel" : "self",
+                "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+            },
+            {
+                "rel" : "bookmark",
+                "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+            }
+        ]
+    }
+}

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-fault.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-fault.xml	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-fault.xml	2011-06-24 02:29:39 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<image
+    xmlns="http://docs.openstack.org/compute/api/v1.1"
+    xmlns:atom="http://www.w3.org/2005/Atom"
+    id="52415800-8b69-11e0-9b19-734f5736d2a2"
+    name="My Server Backup"
+    created="2010-08-10T12:00:00Z"
+    status="ERROR" progress="89">
+    <server id="52415800-8b69-11e0-9b19-734f335aa7b3" />
+    <fault code="500">
+        <message>An internal error occured</message>
+        <details>Error details</details>
+    </fault>
+    <atom:link 
+        rel="self"
+        href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
+    <atom:link 
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
+</image>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-meta-page1.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-meta-page1.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-meta-page1.json	2011-06-24 02:29:39 +0000
@@ -1,23 +1,21 @@
 {
-    "image" : {
-        "id" : 1,
-        "name" : "CentOS 5.2",
-        "metadata" : {
-            "values" : {
-                "ImageVersion" : "1.5",
-                "ImageType" : "Gold"
-            },
-            "links" : [
-                {
-                    "rel" : "next",
-                    "href" : "http://servers.api.openstack.org/v1.1/1234/images/1/meta?marker=ImageType"
-                }
-            ]
+    "image": {
+        "id": "52415800-8b69-11e0-9b19-734f6f006e54",
+        "name": "CentOS 5.2",
+        "metadata": {
+            "ImageVersion": "1.5",
+            "ImageType": "Gold"
         },
+        "metadata_links": [
+            {
+                "rel": "next",
+                "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54/meta?marker=ImageType"
+            }
+        ],
         "links": [
             {
-                "rel" : "self",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/images/1"
+                "rel": "self",
+                "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
             }
         ]
     }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image-meta-page1.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image-meta-page1.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image-meta-page1.xml	2011-06-24 02:29:39 +0000
@@ -2,15 +2,16 @@
 <image
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     xmlns:atom="http://www.w3.org/2005/Atom"
-    id="1" name="CentOS 5.2">
+    id="52415800-8b69-11e0-9b19-734f6f006e54"
+    name="CentOS 5.2">
     <metadata>
         <meta key="ImageVersion">1.5</meta>
         <meta key="ImageType">Gold</meta>
         <atom:link 
             rel="next"
-            href="http://servers.api.openstack.org/v1.1/1234/images/1/meta?marker=ImageType"/>
+            href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54/meta?marker=ImageType"/>
     </metadata>
     <atom:link 
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/1"/>
+        href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
 </image>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image.json	2011-06-24 02:29:39 +0000
@@ -1,32 +1,33 @@
 {
     "image" : {
-        "id" : 1,
-        "name" : "CentOS 5.2",
-        "serverRef" : "http://servers.api.openstack.org/v1.1/1234/servers/12",
+        "id" : "52415800-8b69-11e0-9b19-734f5736d2a2",
+        "name" : "My Server Backup",
         "updated" : "2010-10-10T12:00:00Z",
         "created" : "2010-08-10T12:00:00Z",
         "status" : "SAVING",
         "progress" : 80,
-        "metadata" : {
-            "values" : {
-                "ImageVersion" : "1.5",
-                "ImageType" : "Gold"
-            }
+        "server" : {
+            "id": "52415800-8b69-11e0-9b19-734f335aa7b3",
+            "name": "test-server",
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
+                }
+            ]
         },
         "links": [
             {
                 "rel" : "self",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/images/1"
-            },
-            {
-                "rel" : "bookmark",
-                "type" : "application/vnd.openstack.compute-v1.1+xml",
-                "href" : "http://servers.api.openstack.org/1234/images/1"
-            },
-            {
-                "rel" : "bookmark",
-                "type" : "application/vnd.openstack.compute-v1.1+json",
-                "href" : "http://servers.api.openstack.org/1234/images/1"
+                "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+            },
+            {
+                "rel" : "bookmark",
+                "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
             }
         ]
     }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/image.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/image.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/image.xml	2011-06-24 02:29:39 +0000
@@ -2,24 +2,23 @@
 <image
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     xmlns:atom="http://www.w3.org/2005/Atom"
-    id="1" name="CentOS 5.2"
-    serverRef="http://servers.api.openstack.org/v1.1/1234/servers/12"
+    id="52415800-8b69-11e0-9b19-734f5736d2a2"
+    name="My Server Backup"
     updated="2010-10-10T12:00:00Z"
     created="2010-08-10T12:00:00Z"
     status="SAVING" progress="80">
-    <metadata>
-        <meta key="ImageVersion">1.5</meta>
-        <meta key="ImageType">Gold</meta>
-    </metadata>
+    <server name="test-server" id="52415800-8b69-11e0-9b19-734f335aa7b3">
+        <atom:link
+            rel="self"
+            href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/>
+        <atom:link
+            rel="bookmark"
+            href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/>
+    </server>
     <atom:link 
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/1"/>
-    <atom:link 
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/images/1"/>
-    <atom:link 
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/images/1"/>
+        href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
+    <atom:link 
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
 </image>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/images-page1.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/images-page1.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/images-page1.json	2011-06-24 02:29:39 +0000
@@ -1,22 +1,20 @@
 {
-    "images" : {
-        "values" : [
-            {
-                "id" : 1,
-                "name" : "CentOS 5.2",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/images/1"
-                    }
-                ]
-            }
-        ],
-        "links" : [
-            {
-                "rel" : "next",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/images?limit=1&marker=1"
-            }
-        ]
-    }
+    "images": [
+        {
+            "id": "52415800-8b69-11e0-9b19-734f6f006e54",
+            "name": "CentOS 5.2",
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+                }
+            ]
+        }
+    ],
+    "images_links" : [
+        {
+            "rel": "next",
+            "href": "http://servers.api.openstack.org/v1.1/1234/images?limit=1&marker=52415800-8b69-11e0-9b19-734f6f006e54"
+        }
+    ]
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/images-page1.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/images-page1.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/images-page1.xml	2011-06-24 02:29:39 +0000
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <images xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom">
-  <image id="1" name="CentOS 5.2">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54"
+         name="CentOS 5.2">
     <atom:link
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/1"/>
+        href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
   </image>
   <atom:link
       rel="next"
-      href="http://servers.api.openstack.org/v1.1/1234/images?limit=1&amp;marker=1"/>
+      href="http://servers.api.openstack.org/v1.1/1234/images?limit=1&amp;marker=52415800-8b69-11e0-9b19-734f6f006e54"/>
 </images>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/images-page2.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/images-page2.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/images-page2.json	2011-06-24 02:29:39 +0000
@@ -1,26 +1,20 @@
 {
-    "images" : {
-        "values" : [
+    "images" :  [
             {
-                "id" : 743,
+                "id" : "52415800-8b69-11e0-9b19-734f5736d2a2",
                 "name" : "My Server Backup",
                 "links": [
                     {
                         "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/images/743"
+                        "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
                     }
                 ]
             }
         ],
-        "links" : [
-            {
-                "rel" : "previous",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/images?limit=1"
-            },
-            {
-                "rel" : "next",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/images?limit=1&marker=743"
-            }
-        ]
-    }
+    "images_links": [
+        {
+    
+            "href" : "http://servers.api.openstack.org/v1.1/1234/images?limit=1&marker=52415800-8b69-11e0-9b19-734f5736d2a2"
+        }
+    ]
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/images-page2.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/images-page2.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/images-page2.xml	2011-06-24 02:29:39 +0000
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <images xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom">
-  <image id="743" name="My Server Backup">
+  <image id="52415800-8b69-11e0-9b19-734f5736d2a2" name="My Server Backup">
     <atom:link 
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/743"/>
+        href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
   </image>
-  <atom:link rel="previous"
-             href="http://servers.api.openstack.org/v1.1/1234/images?limit=1"/>
   <atom:link rel="next"
-             href="http://servers.api.openstack.org/v1.1/1234/images?limit=1&amp;marker=743"/>
+             href="http://servers.api.openstack.org/v1.1/1234/images?limit=1&amp;marker=52415800-8b69-11e0-9b19-734f5736d2a2"/>
 </images>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/images-page3.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/images-page3.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/images-page3.json	2011-06-24 02:29:39 +0000
@@ -1,22 +1,14 @@
 {
-    "images" : {
-        "values" : [
-            {
-                "id" : 999,
-                "name" : "Backup 2",
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/images/999"
-                    }
-                ]
-            }
-        ],
-        "links" : [
-            {
-                "rel" : "previous",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/images?limit=1&marker=1"
-            }
-        ]
-    }
+    "images": [
+        {
+            "id": "52415800-8b69-11e0-9b19-734f6ff7c475",
+            "name": "Backup 2",
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6ff7c475"
+                }
+            ]
+        }
+    ]
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/images-page3.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/images-page3.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/images-page3.xml	2011-06-24 02:29:39 +0000
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <images xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom">
-  <image id="999" name="Backup 2">
+  <image id="52415800-8b69-11e0-9b19-734f6ff7c475"
+         name="Backup 2">
     <atom:link 
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/999"/>
+        href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6ff7c475"/>
   </image>
-  <atom:link rel="previous"
-             href="http://servers.api.openstack.org/v1.1/1234/images?limit=1&amp;marker=1"/>
 </images>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/images.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/images.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/images.json	2011-06-24 02:29:39 +0000
@@ -1,60 +1,57 @@
 {
-    "images" : {
-        "values" : [
-            {
-                "id" : 1,
-                "name" : "CentOS 5.2",
-                "updated" : "2010-10-10T12:00:00Z",
-                "created" : "2010-08-10T12:00:00Z",
-                "status" : "ACTIVE",
-                "metadata" : {
-                    "values" : {
-                        "ImageType" : "Gold",
-                        "ImageVersion" : "1.5"
-                    }
-                },
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/images/1"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/images/1"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/images/1"
-                    }
-                ]
-            },
-            {
-                "id" : 743,
-                "name" : "My Server Backup",
-                "serverRef" : "http://servers.api.openstack.org/v1.1/1234/servers/12",
-                "updated" : "2010-10-10T12:00:00Z",
-                "created" : "2010-08-10T12:00:00Z",
-                "status" : "SAVING",
-                "progress" : 80,
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/images/743"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/images/743"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/images/743"
-                    }
-                ]
-            }
-        ]
-    }
+    "images": [
+        {
+            "id": "52415800-8b69-11e0-9b19-734f6f006e54",
+            "name": "CentOS 5.2",
+            "updated": "2010-10-10T12:00:00Z",
+            "created": "2010-08-10T12:00:00Z",
+            "status": "ACTIVE",
+            "metadata": {
+                "ImageType": "Gold",
+                "ImageVersion": "1.5"
+            },
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
+                }
+            ]
+        },
+        {
+            "id" : "52415800-8b69-11e0-9b19-734f5736d2a2",
+            "name" : "My Server Backup",
+            "updated" : "2010-10-10T12:00:00Z",
+            "created" : "2010-08-10T12:00:00Z",
+            "status" : "SAVING",
+            "progress" : 80,
+            "server" : {
+                "id": "52415800-8b69-11e0-9b19-734f335aa7b3",
+                "name": "test-server",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
+                    }
+                ]
+            },
+            "links": [
+                {
+                    "rel" : "self",
+                    "href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+                },
+                {
+                    "rel" : "bookmark",
+                    "href" : "http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
+                }
+            ]
+        }
+    ]
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/images.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/images.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/images.xml	2011-06-24 02:29:39 +0000
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <images xmlns="http://docs.openstack.org/compute/api/v1.1"
         xmlns:atom="http://www.w3.org/2005/Atom">
-  <image id="1" name="CentOS 5.2"
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54"
+         name="CentOS 5.2"
          updated="2010-10-10T12:00:00Z"
          created="2010-08-10T12:00:00Z"
          status="ACTIVE">
@@ -11,31 +12,30 @@
     </metadata>
     <atom:link
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/1"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/images/1"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/images/1"/>
+        href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
+    <atom:link
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
   </image>
-  <image id="743" name="My Server Backup"
-         serverRef="http://servers.api.openstack.org/v1.1/1234/servers/12"
-         updated="2010-10-10T12:00:00Z"
-         created="2010-08-10T12:00:00Z"
-         status="SAVING" progress="80">
-    <atom:link 
-        rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/images/743"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/images/743"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/images/743"/>
+  <image
+      id="52415800-8b69-11e0-9b19-734f5736d2a2"
+      name="My Server Backup"
+      updated="2010-10-10T12:00:00Z"
+      created="2010-08-10T12:00:00Z"
+      status="SAVING" progress="80">
+      <server name="test-server" id="52415800-8b69-11e0-9b19-734f335aa7b3">
+          <atom:link
+              rel="self"
+              href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/>
+          <atom:link
+              rel="bookmark"
+              href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/>
+      </server>
+      <atom:link 
+          rel="self"
+          href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
+      <atom:link 
+          rel="bookmark"
+          href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
   </image>
 </images>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup.json	2011-06-24 02:29:39 +0000
@@ -1,22 +1,16 @@
 {
     "sharedIpGroup" : {
-        "id" : 1234,
+        "id" : "52415800-8b69-11e0-9b19-734f68ab4a9f",
         "name" : "Shared IP Group 1",
-        "servers" : [422],
+        "servers" : ["52415800-8b69-11e0-9b19-734f0272444a"],
         "links": [
             {
                 "rel" : "self",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/1234"
-            },
-            {
-                "rel" : "bookmark",
-                "type" : "application/vnd.openstack.compute-v1.1+xml",
-                "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/1234"
-            },
-            {
-                "rel" : "bookmark",
-                "type" : "application/vnd.openstack.compute-v1.1+json",
-                "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/1234"
+                "href" : "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
+            },
+            {
+                "rel" : "bookmark",
+                "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
             }
         ]
     }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup.xml	2011-06-24 02:29:39 +0000
@@ -2,19 +2,15 @@
 <sharedIpGroup
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     xmlns:atom="http://www.w3.org/2005/Atom"
-    id="1234" name="Shared IP Group 1">
+    id="52415800-8b69-11e0-9b19-734f68ab4a9f"
+    name="Shared IP Group 1">
   <servers>
-    <server id="422"/>
+    <server id="52415800-8b69-11e0-9b19-734f0272444a"/>
   </servers>
   <atom:link
       rel="self"
-      href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/1234"/>
-  <atom:link
-      rel="bookmark"
-      type="application/vnd.openstack.compute-v1.1+xml"
-      href="http://servers.api.openstack.org/1234/shared_ip_groups/1234"/>
-  <atom:link
-      rel="bookmark"
-      type="application/vnd.openstack.compute-v1.1+json"
-      href="http://servers.api.openstack.org/1234/shared_ip_groups/1234"/>
+      href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
+  <atom:link
+      rel="bookmark"
+      href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
 </sharedIpGroup>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup2.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup2.json	2011-03-01 18:10:50 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup2.json	2011-06-24 02:29:39 +0000
@@ -1,6 +1,6 @@
 {
     "sharedIpGroup" : {
         "name" : "Shared IP Group 1",
-        "server" : 422
+        "server" : "52415800-8b69-11e0-9b19-734f0272444a"
     }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup2.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup2.xml	2011-03-01 18:24:38 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroup2.xml	2011-06-24 02:29:39 +0000
@@ -2,5 +2,5 @@
 <sharedIpGroup
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     name="Shared IP Group 1">
-  <server id="422"/>
+  <server id="52415800-8b69-11e0-9b19-734f0272444a"/>
 </sharedIpGroup>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups-page1.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups-page1.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups-page1.json	2011-06-24 02:29:39 +0000
@@ -1,53 +1,48 @@
 {
-    "sharedIpGroups" : {
-        "values" : [
-            {
-                "id" : 1234,
-                "name" : "Shared IP Group 1",
-                "servers" : [422, 3445],
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/1234"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/1234"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/1234"
-                    }
-                ]
-            },
-            {
-                "id" : 5678,
-                "name" : "Shared IP Group 2",
-                "servers" : [23203, 2456, 9891],
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/5678"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/5678"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/5678"
-                    }
-                ]
-            }
-        ],
-        "links" : [
-            {
-                "rel" : "next",
-                "href" : "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups?limit=2&marker=5678"
+    "sharedIpGroups": [
+        {
+            "id": "52415800-8b69-11e0-9b19-734f68ab4a9f",
+            "name": "Shared IP Group 1",
+            "servers": [
+                "52415800-8b69-11e0-9b19-734f0272444a",
+                "52415800-8b69-11e0-9b19-734f3b0d4465"
+            ],
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
+                }
+            ]
+        },
+        {
+            "id": "52415800-8b69-11e0-9b19-734f0e75433e",
+            "name": "Shared IP Group 2",
+            "servers": [
+                "52415800-8b69-11e0-9b19-734f10c97171",
+                "52415800-8b69-11e0-9b19-734f4306ea92",
+                "52415800-8b69-11e0-9b19-734f216543fd"
+            ],
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"
+                }
+            ]
+        }
+    ],
+    "sharedIpGroups_": {
+        "links": [
+            {
+                "rel": "next",
+                "href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups?limit=2&marker=52415800-8b69-11e0-9b19-734f0e75433e"
             }
         ]
     }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups-page1.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups-page1.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups-page1.xml	2011-06-24 02:29:39 +0000
@@ -2,42 +2,36 @@
 <sharedIpGroups
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     xmlns:atom="http://www.w3.org/2005/Atom">
-  <sharedIpGroup id="1234" name="Shared IP Group 1">
+  <sharedIpGroup
+      id="52415800-8b69-11e0-9b19-734f68ab4a9f"
+      name="Shared IP Group 1">
     <servers>
-      <server id="422"/>
-      <server id="3445"/>
+      <server id="52415800-8b69-11e0-9b19-734f0272444a"/>
+      <server id="52415800-8b69-11e0-9b19-734f3b0d4465"/>
     </servers>
     <atom:link
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/1234"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/shared_ip_groups/1234"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/shared_ip_groups/1234"/>
+        href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
+    <atom:link
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
   </sharedIpGroup>
-  <sharedIpGroup id="5678" name="Shared IP Group 2">
+  <sharedIpGroup
+      id="52415800-8b69-11e0-9b19-734f0e75433e"
+      name="Shared IP Group 2">
     <servers>
-      <server id="23203"/>
-      <server id="2456"/>
-      <server id="9891"/>
+      <server id="52415800-8b69-11e0-9b19-734f10c97171"/>
+      <server id="52415800-8b69-11e0-9b19-734f4306ea92"/>
+      <server id="52415800-8b69-11e0-9b19-734f216543fd"/>
     </servers>
     <atom:link
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/5678"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/shared_ip_groups/5678"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/shared_ip_groups/5678"/>
+        href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"/>
+    <atom:link
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"/>
   </sharedIpGroup>
   <atom:link
       rel="next"
-      href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups?limit=2&amp;marker=5678"/>
+      href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups?limit=2&amp;marker=52415800-8b69-11e0-9b19-734f0e75433e"/>
 </sharedIpGroups>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups.json	2011-06-24 02:29:39 +0000
@@ -1,48 +1,41 @@
 {
-    "sharedIpGroups" : {
-        "values" :  [
-            {
-                "id" : 1234,
-                "name" : "Shared IP Group 1",
-                "servers" : [422, 3445],
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/1234"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/1234"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/1234"
-                    }
-                ]
-            },
-            {
-                "id" : 5678,
-                "name" : "Shared IP Group 2",
-                "servers" : [23203, 2456, 9891],
-                "links": [
-                    {
-                        "rel" : "self",
-                        "href" : "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/5678"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+xml",
-                        "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/5678"
-                    },
-                    {
-                        "rel" : "bookmark",
-                        "type" : "application/vnd.openstack.compute-v1.1+json",
-                        "href" : "http://servers.api.openstack.org/1234/shared_ip_groups/5678"
-                    }
-                ]
-            }
-        ]
-    }
+    "sharedIpGroups": [
+        {
+            "id": "52415800-8b69-11e0-9b19-734f68ab4a9f",
+            "name": "Shared IP Group 1",
+            "servers": [
+                "52415800-8b69-11e0-9b19-734f0272444a",
+                "52415800-8b69-11e0-9b19-734f3b0d4465"
+            ],
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
+                }
+            ]
+        },
+        {
+            "id": "52415800-8b69-11e0-9b19-734f0e75433e",
+            "name": "Shared IP Group 2",
+            "servers": [
+                "52415800-8b69-11e0-9b19-734f10c97171",
+                "52415800-8b69-11e0-9b19-734f4306ea92",
+                "52415800-8b69-11e0-9b19-734f216543fd"
+            ],
+            "links": [
+                {
+                    "rel": "self",
+                    "href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"
+                },
+                {
+                    "rel": "bookmark",
+                    "href": "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"
+                }
+            ]
+        }
+    ]
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/ipgroups.xml	2011-06-24 02:29:39 +0000
@@ -2,39 +2,33 @@
 <sharedIpGroups
     xmlns="http://docs.openstack.org/compute/api/v1.1"
     xmlns:atom="http://www.w3.org/2005/Atom">
-  <sharedIpGroup id="1234" name="Shared IP Group 1">
+  <sharedIpGroup
+      id="52415800-8b69-11e0-9b19-734f68ab4a9f"
+      name="Shared IP Group 1">
     <servers>
-      <server id="422"/>
-      <server id="3445"/>
+      <server id="52415800-8b69-11e0-9b19-734f0272444a"/>
+      <server id="52415800-8b69-11e0-9b19-734f3b0d4465"/>
     </servers>
     <atom:link
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/1234"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/shared_ip_groups/1234"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/shared_ip_groups/1234"/>
+        href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
+    <atom:link
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
   </sharedIpGroup>
-  <sharedIpGroup id="5678" name="Shared IP Group 2">
+  <sharedIpGroup
+      id="52415800-8b69-11e0-9b19-734f0e75433e"
+      name="Shared IP Group 2">
     <servers>
-      <server id="23203"/>
-      <server id="2456"/>
-      <server id="9891"/>
+      <server id="52415800-8b69-11e0-9b19-734f10c97171"/>
+      <server id="52415800-8b69-11e0-9b19-734f4306ea92"/>
+      <server id="52415800-8b69-11e0-9b19-734f216543fd"/>
     </servers>
     <atom:link
         rel="self"
-        href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/5678"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+xml"
-        href="http://servers.api.openstack.org/1234/shared_ip_groups/5678"/>
-    <atom:link
-        rel="bookmark"
-        type="application/vnd.openstack.compute-v1.1+json"
-        href="http://servers.api.openstack.org/1234/shared_ip_groups/5678"/>
+        href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"/>
+    <atom:link
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"/>
   </sharedIpGroup>
 </sharedIpGroups>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/limits.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/limits.json	2011-04-26 03:49:47 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/limits.json	2011-06-24 02:29:39 +0000
@@ -1,70 +1,66 @@
 {
-    "limits" : {
-        "rate" : {
-            "values" : [
-                {
-                    "uri" : "*",
-                    "regex" : ".*",
-                    "limit" : [
-                        {
-                            "value" : 10,
-                            "verb" : "POST",
-                            "remaining" : 2,
-                            "unit" : "MINUTE",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        },
-                        {
-                            "value" : 10,
-                            "verb" : "PUT",
-                            "remaining" : 2,
-                            "unit" : "MINUTE",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        },
-                        {
-                            "value" : 100,
-                            "verb" : "DELETE",
-                            "remaining" : 100,
-                            "unit" : "MINUTE",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        }
-                    ]
-                },
-                {
-                    "uri" : "*changes-since*",
-                    "regex" : "changes-since",
-                    "limit" : [
-                        {
-                            "value" : 3,
-                            "verb" : "GET",
-                            "remaining" : 3,
-                            "unit" : "MINUTE",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        }
-                    ]
-                },
-                {
-                    "uri" : "*/servers",
-                    "regex" : "^/servers",
-                    "limit" : [
-                        {
-                            "verb" : "POST",
-                            "value" : 25,
-                            "remaining" : 24,
-                            "unit" : "DAY",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        }
-                    ]
-                }
-            ]
-        } ,
-        "absolute" : {
-            "values" : {
-                "maxTotalRAMSize" : 51200,
-                "maxServerMeta" : 5,
-                "maxImageMeta" : 5,
-                "maxPersonality" : 5,
-                "maxPersonalitySize" : 10240
+    "limits": {
+        "rate": [
+            {
+                "uri": "*",
+                "regex": ".*",
+                "limit": [
+                    {
+                        "value": 10,
+                        "verb": "POST",
+                        "remaining": 2,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    },
+                    {
+                        "value": 10,
+                        "verb": "PUT",
+                        "remaining": 2,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    },
+                    {
+                        "value": 100,
+                        "verb": "DELETE",
+                        "remaining": 100,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    }
+                ]
+            },
+            {
+                "uri": "*changes-since*",
+                "regex": "changes-since",
+                "limit": [
+                    {
+                        "value": 3,
+                        "verb": "GET",
+                        "remaining": 3,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    }
+                ]
+            },
+            {
+                "uri": "*/servers",
+                "regex": "^/servers",
+                "limit": [
+                    {
+                        "verb": "POST",
+                        "value": 25,
+                        "remaining": 24,
+                        "unit": "DAY",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    }
+                ]
             }
+        ],
+        "absolute": {
+            "maxTotalRAMSize": 51200,
+            "maxServerMeta": 5,
+            "maxImageMeta": 5,
+            "maxPersonality": 5,
+            "maxPersonalitySize": 10240
         }
     }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/limits2.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/limits2.json	2011-04-26 03:49:47 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/limits2.json	2011-06-24 02:29:39 +0000
@@ -1,55 +1,53 @@
 {
-    "limits" : {
-        "rate" : {
-            "values" : [
-                {
-                    "uri" : "*",
-                    "regex" : ".*",
-                    "limit" : [
-                        {
-                            "value" : 10,
-                            "verb" : "POST",
-                            "remaining" : 2,
-                            "unit" : "MINUTE",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        },
-                        {
-                            "value" : 10,
-                            "verb" : "PUT",
-                            "remaining" : 2,
-                            "unit" : "MINUTE",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        },
-                        {
-                            "value" : 3,
-                            "verb" : "GET",
-                            "remaining" : 3,
-                            "unit" : "MINUTE",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        },
-                        {
-                            "value" : 100,
-                            "verb" : "DELETE",
-                            "remaining" : 100,
-                            "unit" : "MINUTE",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        }
-                    ]
-                },
-                {
-                    "uri" : "*/servers",
-                    "regex" : "^/servers",
-                    "limit" : [
-                        {
-                            "verb" : "POST",
-                            "value" : 25,
-                            "remaining" : 24,
-                            "unit" : "DAY",
-                            "next-available" : "2011-12-15T22:42:45Z"
-                        }
-                    ]
-                }
-            ]
-        }
+    "limits": {
+        "rate": [
+            {
+                "uri": "*",
+                "regex": ".*",
+                "limit": [
+                    {
+                        "value": 10,
+                        "verb": "POST",
+                        "remaining": 2,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    },
+                    {
+                        "value": 10,
+                        "verb": "PUT",
+                        "remaining": 2,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    },
+                    {
+                        "value": 3,
+                        "verb": "GET",
+                        "remaining": 3,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    },
+                    {
+                        "value": 100,
+                        "verb": "DELETE",
+                        "remaining": 100,
+                        "unit": "MINUTE",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    }
+                ]
+            },
+            {
+                "uri": "*/servers",
+                "regex": "^/servers",
+                "limit": [
+                    {
+                        "verb": "POST",
+                        "value": 25,
+                        "remaining": 24,
+                        "unit": "DAY",
+                        "next-available": "2011-12-15T22:42:45Z"
+                    }
+                ]
+            }
+        ]
     }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/limits3.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/limits3.json	2011-04-26 03:49:47 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/limits3.json	2011-06-24 02:29:39 +0000
@@ -1,11 +1,9 @@
 {
-    "limits" : {
-        "absolute" : {
-            "values" : {
-                "maxTotalRAMSize" : 51200,
-                "maxIPGroups" : 50,
-                "maxIPGroupMembers" : 25
-            }
+    "limits": {
+        "absolute": {
+            "maxTotalRAMSize": 51200,
+            "maxIPGroups": 50,
+            "maxIPGroupMembers": 25
         }
     }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/limits4.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/limits4.json	2011-03-01 18:24:38 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/limits4.json	2011-06-24 02:29:39 +0000
@@ -1,5 +1,1 @@
-{
-    "limits" : {
-        
-    }
-}
+{ "limits" : {}}
\ No newline at end of file

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/metadata.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/metadata.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/metadata.json	2011-06-24 02:29:39 +0000
@@ -1,8 +1,6 @@
 {
-    "metadata" : {
-        "values" : {
+    "metadata" :  {
             "Server Label" : "Web Head 1",
             "Image Version" : "2.1"
         }
-    }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/private.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/private.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/private.json	2011-06-24 02:29:39 +0000
@@ -1,7 +1,7 @@
 {
     "network" {
         "id" : "private",
-        "values" : [
+        "ip" : [
             {"version" : 4, "addr" : "10.176.42.16"},
             {"version" : 6, "addr" : "::babe:10.176.42.16"}
         ]

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/public.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/public.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/public.json	2011-06-24 02:29:39 +0000
@@ -1,7 +1,7 @@
 {
     "network" {
         "id" : "public",
-        "values" : [
+        "ip" : [
             {"version" : 4, "addr" : "67.23.10.132"},
             {"version" : 6, "addr" : "::babe:67.23.10.132"},
             {"version" : 4, "addr" : "67.23.10.131"},

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild.json	2011-06-24 02:29:39 +0000
@@ -1,5 +1,7 @@
 {
     "rebuild" : {
-        "imageRef" : 2
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        }
     }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild.xml	2011-06-24 02:29:39 +0000
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2"/>
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1">
+    <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
+</rebuild>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_all.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_all.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_all.json	2011-06-24 02:29:39 +0000
@@ -1,11 +1,11 @@
 {
     "rebuild" : {
-        "imageRef" : "https://servers.api.rackspacecloud.com/v1.1/32278/images/2",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "name" : "newName",
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_all.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_all.xml	2011-03-01 18:24:38 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_all.xml	2011-06-24 02:29:39 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rebuild 
     xmlns="http://docs.openstack.org/compute/api/v1.1"
-    name="newName"
-    imageRef="https://servers.api.rackspacecloud.com/v1.1/32278/images/2">
+    name="newName">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_encoding.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_encoding.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_encoding.json	2011-06-24 02:29:39 +0000
@@ -1,11 +1,11 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "name" : "newName",
-        "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+        "metadata" :  {
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_encoding.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_encoding.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_encoding.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2" name="newName">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" name="newName">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_length.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_length.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_length.json	2011-06-24 02:29:39 +0000
@@ -1,11 +1,11 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "name" : "newName",
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_length.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_length.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_length.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2" name="newName">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" name="newName">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_path.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_path.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_path.json	2011-06-24 02:29:39 +0000
@@ -1,11 +1,11 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "name" : "newName",
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_path.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_path.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_file_path.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2" name="newName">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" name="newName">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_files.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_files.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_files.json	2011-06-24 02:29:39 +0000
@@ -1,11 +1,11 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "name" : "newName",
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_files.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_files.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_files.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2" name="newName">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" name="newName">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_key.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_key.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_key.json	2011-06-24 02:29:39 +0000
@@ -1,11 +1,11 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "name" : "newName",
         "metadata" : {
-            "values" :  {
-                "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" : "Apache1" 
-            }
+            "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" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_key.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_key.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_key.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2" name="newName">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" name="newName">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="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">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_value.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_value.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_value.json	2011-06-24 02:29:39 +0000
@@ -1,11 +1,11 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "name" : "newName",
         "metadata" : {
-            "values" : {
-                "My Server Name" : "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" 
-            }
+            "My Server Name" : "/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCADSANIDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDgiv5dqVM59qcV460IDn2rU5mDqRTRyKl5Y7ccU3G3gCgCM8H60hBPA/Opdu8UwjBxSAjK4qN14NTN7U3tQwK68DFIytnNS7c8Cl2cUrDIGGByKhb6cVYkBBpojosFyuVz2oKVYKAdqjZOtFhlZ4xULpVwjcKZsosO5RK4qJl5q88fpULR4+tAXKhXIqMrxVspioWWkMjC5NbFppW+FZZshT0UUzSNLn1C4HlRAxoQXdjhR9a7aPSFMQ3sTjoBwKibtojWnG+rOQktLeI5ZDj0BNPi05LkbYmcP6MK61tChK88Z655xXP3mnXek3SzJIGgZuRUc0u5o4LsZVxYy2rZcApnG4f1qAL7V0GoXK284bbuil+Vww68cGs42qT5ktmypONp9farjO+5nKFtijzRUxgcEgggj2oqzM6ErnpTkTnmnqBingZHArQyIWOOBTQCfrUjLliKUYHA60WEQkEHimEZPvVhlBFRYAOaLAQlfzpu3gVOy85ppGABRYCIKBmm7TUwWlEZZ1UdWOBSsMrSLmmgYroJNDjiRPNuwjN0BIqM6EGHyXUZrP2sO5r7GfYwyBmonHOMVvN4fuM/LLGfzqneaTc2sfmOgK+opqcXsxOEorVGVt28YpjLxxVgrkVG42H2qyLlY1E3U1Ow56VEw5NIZA44qzpmkT6tdCKMiONeZJW4Cj+p9qgKksBXRaVeRQaXLHDx5Zy746t61EnZGkI3Z0VlYQ2dulvCMRD8z7n3q8vAwOBXC27ajMZHivn2A5ORxXSabcXZASYK47Pnk/WsWdJpFlRiX4VfWsbWL1Gt2jC8HnpzWjPMskTRYAlzyO1Yl7E8zMqkDA4qW7FWMLUpZGgt0bn5SxPpS6TcxpcWtrKPkYfP/wAC7/gAKiubO63bHzjdxinpDLZ3cVztEoU4YEdu5FNSIkjdbeGIidmjB+Qlc5HairsPiOzSCNPKX5VA+77UVV0TYpjkn0p6ntTV75HFCjJz0rrOIXJ3YxQcHgU7gnHem55xSExpOKjHzGpHUnntTOgwOtAASM4pjDkGnY9aQnjBFAIFAxUsCk3UQ/2xUQXtViyXN9CB/epS2KjuReLNNuNW1mxs7YHcVJJH8Iro9P8AhjAlqvnXMvmlc8ORW5o1hHJqjXTqCyJxmtGS5eLUlyfkNeVKpbRHqvc8l8UeHdU8OP5sN5cNb9M7zxXRS7/+EKjeRizsgyWOa7vxJpsWpaJMpAYbT2ritWj+z+FIoh1GFrSnLmkianwM5DbTJBxU+Mjpio5AAteieYVdvrULDmrBHeojjd9DQNGro/h2W/ZZ5w0dsDnA+8/09B71r6rp0bWv2a0jCKOwGAcetZ8fijUY9q21qku0YIB24FXoL57/AFJcRyRwqgBD92z29a55Nt6nVBJbFa2gvLWPyYI02HhgwOc1sabZiNCJAWdvToBV8KoXgYJ74qWEEsA2AO59qhy0sVYrRaXHJccBwF6gH7xqtqFsI7t1VMZwa6QMqFAigcD8azJ4PMvwp5Lck9h7VLKi9bnKT2jmXKtjnuO1VPsFzEzfZyPLxxv5FdLfIkEjRu2WC/Io+83sB3NVdH8rWpTYxrcWdy6nYk4xv+lCiynJHMNBc7jmGDOfU/40VelsTHK6M/KsQc0U7SJui2enTinKN3GKaxOKdGTXceaNb71GAeaUjJx6Uzfg4HNAA56KKbt3H0pWGTkUKTxQMTZ1prCpT1pre1IEMXpiremof7ShHvmqoBzWjpC51CP2BqZv3WXBe8jt9Idn8+OI/vNtT6doN9f32yaUA9c+lcZp/iaHSvGU1vcPtjdRjPSvXtJ1DT96XKTx9M9a8pxPUkmVtV8P3NlpEuGDgLXmXidSmiwoRglxXreu+KLCW2a1jnVnbggEV5P41I8iBR0L1pS5fapRIqxapNyOOHGaikXIz2qxtyKryE5xXps80rv6VXbg9KtMO9Q7N0irgnJ7VI0W9PuVRpTHbTyKg2vIAAFPf6mtazu0maOSPOVYqeMU3TbPdbhZo0VckgEHP4VYstOFvcORyhOQB2NYNnVFNGsk2yPc78U0XQdiQSVI69uKY0AlUR8g561ft7eLYU2gL0xjpWTNkFjLLcoCwI46k5q5DZLbxtNM+9wcg+9Jb7LfgDgHiqmu6g1raRTGMvCJVEgXsppoTZgeJLJ7tmukkkS4gZZo" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_value.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_value.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_bad_meta_value.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2" name="newName">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" name="newName">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="My Server Name">
 /9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCADSANIDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDgiv5dqVM59qcV460IDn2rU5mDqRTRyKl5Y7ccU3G3gCgCM8H60hBPA/Opdu8UwjBxSAjK4qN14NTN7U3tQwK68DFIytnNS7c8Cl2cUrDIGGByKhb6cVYkBBpojosFyuVz2oKVYKAdqjZOtFhlZ4xULpVwjcKZsosO5RK4qJl5q88fpULR4+tAXKhXIqMrxVspioWWkMjC5NbFppW+FZZshT0UUzSNLn1C4HlRAxoQXdjhR9a7aPSFMQ3sTjoBwKibtojWnG+rOQktLeI5ZDj0BNPi05LkbYmcP6MK61tChK88Z655xXP3mnXek3SzJIGgZuRUc0u5o4LsZVxYy2rZcApnG4f1qAL7V0GoXK284bbuil+Vww68cGs42qT5ktmypONp9farjO+5nKFtijzRUxgcEgggj2oqzM6ErnpTkTnmnqBingZHArQyIWOOBTQCfrUjLliKUYHA60WEQkEHimEZPvVhlBFRYAOaLAQlfzpu3gVOy85ppGABRYCIKBmm7TUwWlEZZ1UdWOBSsMrSLmmgYroJNDjiRPNuwjN0BIqM6EGHyXUZrP2sO5r7GfYwyBmonHOMVvN4fuM/LLGfzqneaTc2sfmOgK+opqcXsxOEorVGVt28YpjLxxVgrkVG42H2qyLlY1E3U1Ow56VEw5NIZA44qzpmkT6tdCKMiONeZJW4Cj+p9qgKksBXRaVeRQaXLHDx5Zy746t61EnZGkI3Z0VlYQ2dulvCMRD8z7n3q8vAwOBXC27ajMZHivn2A5ORxXSabcXZASYK47Pnk/WsWdJpFlRiX4VfWsbWL1Gt2jC8HnpzWjPMskTRYAlzyO1Yl7E8zMqkDA4qW7FWMLUpZGgt0bn5SxPpS6TcxpcWtrKPkYfP/wAC7/gAKiubO63bHzjdxinpDLZ3cVztEoU4YEdu5FNSIkjdbeGIidmjB+Qlc5HairsPiOzSCNPKX5VA+77UVV0TYpjkn0p6ntTV75HFCjJz0rrOIXJ3YxQcHgU7gnHem55xSExpOKjHzGpHUnntTOgwOtAASM4pjDkGnY9aQnjBFAIFAxUsCk3UQ/2xUQXtViyXN9CB/epS2KjuReLNNuNW1mxs7YHcVJJH8Iro9P8AhjAlqvnXMvmlc8ORW5o1hHJqjXTqCyJxmtGS5eLUlyfkNeVKpbRHqvc8l8UeHdU8OP5sN5cNb9M7zxXRS7/+EKjeRizsgyWOa7vxJpsWpaJMpAYbT2ritWj+z+FIoh1GFrSnLmkianwM5DbTJBxU+Mjpio5AAteieYVdvrULDmrBHeojjd9DQNGro/h2W/ZZ5w0dsDnA+8/09B71r6rp0bWv2a0jCKOwGAcetZ8fijUY9q21qku0YIB24FXoL57/AFJcRyRwqgBD92z29a55Nt6nVBJbFa2gvLWPyYI02HhgwOc1sabZiNCJAWdvToBV8KoXgYJ74qWEEsA2AO59qhy0sVYrRaXHJccBwF6gH7xqtqFsI7t1VMZwa6QMqFAigcD8azJ4PMvwp5Lck9h7VLKi9bnKT2jmXKtjnuO1VPsFzEzfZyPLxxv5FdLfIkEjRu2WC/Io+83sB3NVdH8rWpTYxrcWdy6nYk4xv+lCiynJHMNBc7jmGDOfU/40VelsTHK6M/KsQc0U7SJui2enTinKN3GKaxOKdGTXceaNb71GAeaUjJx6Uzfg4HNAA56KKbt3H0pWGTkUKTxQMTZ1prCpT1pre1IEMXpiremof7ShHvmqoBzWjpC51CP2BqZv3WXBe8jt9Idn8+OI/vNtT6doN9f32yaUA9c+lcZp/iaHSvGU1vcPtjdRjPSvXtJ1DT96XKTx9M9a8pxPUkmVtV8P3NlpEuGDgLXmXidSmiwoRglxXreu+KLCW2a1jnVnbggEV5P41I8iBR0L1pS5fapRIqxapNyOOHGaikXIz2qxtyKryE5xXps80rv6VXbg9KtMO9Q7N0irgnJ7VI0W9PuVRpTHbTyKg2vIAAFPf6mtazu0maOSPOVYqeMU3TbPdbhZo0VckgEHP4VYstOFvcORyhOQB2NYNnVFNGsk2yPc78U0XQdiQSVI69uKY0AlUR8g561ft7eLYU2gL0xjpWTNkFjLLcoCwI46k5q5DZLbxtNM+9wcg+9Jb7LfgDgHiqmu6g1raRTGMvCJVEgXsppoTZgeJLJ7tmukkkS4gZZo</meta>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_both.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_both.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_both.json	2011-06-24 02:29:39 +0000
@@ -1,10 +1,10 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_both.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_both.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_both.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_file.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_file.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_file.json	2011-06-24 02:29:39 +0000
@@ -1,6 +1,8 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "personality" : [
             {
                 "path" : "/etc/banner.txt",

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_file.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_file.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_file.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <personality>
     <file path="/etc/banner.txt">
         ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_meta.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_meta.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_meta.json	2011-06-24 02:29:39 +0000
@@ -1,10 +1,10 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         }
     }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_meta.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_meta.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_meta.xml	2011-06-24 02:29:39 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2">
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_name.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_name.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_name.json	2011-06-24 02:29:39 +0000
@@ -1,6 +1,8 @@
 {
     "rebuild" : {
-        "imageRef" : 2,
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
         "name" : "newName"
     }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_name.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_name.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/rebuild_name.xml	2011-06-24 02:29:39 +0000
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="2" name="newName"/>
+<rebuild xmlns="http://docs.openstack.org/compute/api/v1.1" name="newName">
+    <image id="52415800-8b69-11e0-9b19-734f6f006e54" />
+</rebuild>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/resize.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/resize.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/resize.json	2011-06-24 02:29:39 +0000
@@ -1,5 +1,7 @@
 {
     "resize" : {
-        "flavorRef" : "http://servers.api.openstack.org/1234/flavors/3"
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        }
     }
 }

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/resize.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/resize.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/resize.xml	2011-06-24 02:29:39 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<resize
-    xmlns="http://docs.openstack.org/compute/api/v1.1"
-    flavorRef="http://servers.api.openstack.org/1234/flavors/3"/>
+<resize xmlns="http://docs.openstack.org/compute/api/v1.1">
+    <flavor id="52415800-8b69-11e0-9b19-734f1195ff37"/>
+</resize>

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-fault.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-fault.json	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-fault.json	2011-06-24 02:29:39 +0000
@@ -0,0 +1,31 @@
+{
+    "server": {
+        "id": "52415800-8b69-11e0-9b19-734f0000ffff",
+        "name": "sample-server",
+        "created": "2010-08-10T12:00:00Z",
+        "hostId": "e4d909c290d0fb1ca068ffafff22cbd0",
+        "status": "ERROR",
+        "progress": 66,
+        "image" : {
+            "id": "52415800-8b69-11e0-9b19-734f6f007777"
+        },
+        "flavor" : {
+            "id": "52415800-8b69-11e0-9b19-734f216543fd"
+        },
+        "fault" : {
+            "code" : 404,
+            "message" : "Could not find image 52415800-8b69-11e0-9b19-734f6f007777",
+            "details" : "Fault details"
+        },
+        "links": [
+            {
+                "rel": "self",
+                "href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"
+            },
+            {
+                "rel": "bookmark",
+                "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"
+            }
+        ]
+    }
+}

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-fault.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-fault.xml	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-fault.xml	2011-06-24 02:29:39 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1"
+        xmlns:atom="http://www.w3.org/2005/Atom"
+        id="52415800-8b69-11e0-9b19-734f0000ffff"
+        name="sample-server" status="ERROR"
+        created="2010-08-10T12:00:00Z"
+        progress="66" hostId="e4d909c290d0fb1ca068ffafff22cbd0">
+    <image id="52415800-8b69-11e0-9b19-734f6f007777" />
+    <flavor id="52415800-8b69-11e0-9b19-734f216543fd" />
+    <fault code="404">
+        <message>Could not find image 52415800-8b69-11e0-9b19-734f6f007777</message>
+        <details>Fault details</details>
+    </fault>
+    <atom:link
+        rel="self"
+        href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/>
+    <atom:link
+        rel="bookmark"
+        href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/>
+</server>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-encoding.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-encoding.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-encoding.json	2011-06-24 02:29:39 +0000
@@ -1,12 +1,14 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "imageRef" : "http://servers.api.openstack.org/1234/images/1",
-        "flavorRef" : "http://servers.api.openstack.org/1234/flavors/1",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        },
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-encoding.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-encoding.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-encoding.xml	2011-06-24 02:29:39 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test"
-        imageRef="http://servers.api.openstack.org/1234/images/1"
-        flavorRef="http://servers.api.openstack.org/1234/flavors/1">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test">
+  <image  id="52415800-8b69-11e0-9b19-734f6f006e54" />
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-length.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-length.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-length.json	2011-06-24 02:29:39 +0000
@@ -1,12 +1,14 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "imageRef" : "http://servers.api.openstack.org/1234/images/1",
-        "flavorRef" : "http://servers.api.openstack.org/1234/flavors/1",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        },
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-length.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-length.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-length.xml	2011-06-24 02:29:39 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test" 
-        imageRef="http://servers.api.openstack.org/1234/images/1"
-        flavorRef="http://servers.api.openstack.org/1234/flavors/1">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test">
+  <image  id="52415800-8b69-11e0-9b19-734f6f006e54" />
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-path.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-path.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-path.json	2011-06-24 02:29:39 +0000
@@ -1,12 +1,14 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "imageRef" : "http://servers.api.openstack.org/1234/images/1",
-        "flavorRef" : "http://servers.api.openstack.org/1234/flavors/1",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        },
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-path.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-path.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-file-path.xml	2011-06-24 02:29:39 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test"
-        imageRef="http://servers.api.openstack.org/1234/images/1"
-        flavorRef="http://servers.api.openstack.org/1234/flavors/1">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test">
+  <image  id="52415800-8b69-11e0-9b19-734f6f006e54" />
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-files.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-files.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-files.json	2011-06-24 02:29:39 +0000
@@ -1,12 +1,14 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "imageRef" : "http://servers.api.openstack.org/1234/images/1",
-        "flavorRef" : "http://servers.api.openstack.org/1234/flavors/1",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        },
         "metadata" : {
-            "values" : {
-                "My Server Name" : "Apache1" 
-            }
+            "My Server Name" : "Apache1" 
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-files.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-files.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-files.xml	2011-06-24 02:29:39 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test"
-        imageRef="http://servers.api.openstack.org/1234/images/1"
-        flavorRef="http://servers.api.openstack.org/1234/flavors/1">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test">
+  <image  id="52415800-8b69-11e0-9b19-734f6f006e54" />
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
   <metadata>
     <meta key="My Server Name">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-key.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-key.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-key.json	2011-06-24 02:29:39 +0000
@@ -1,12 +1,14 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "imageRef" : "http://servers.api.openstack.org/1234/images/1",
-        "flavorRef" : "http://servers.api.openstack.org/1234/flavors/1",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        },
         "metadata" : {
-            "values" {
                 "/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCADSANIDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDgiv5dqVM59qcV460IDn2rU5mDqRTRyKl5Y7ccU3G3gCgCM8H60hBPA/Opdu8UwjBxSAjK4qN14NTN7U3tQwK68DFIytnNS7c8Cl2cUrDIGGByKhb6cVYkBBpojosFyuVz2oKVYKAdqjZOtFhlZ4xULpVwjcKZsosO5RK4qJl5q88fpULR4+tAXKhXIqMrxVspioWWkMjC5NbFppW+FZZshT0UUzSNLn1C4HlRAxoQXdjhR9a7aPSFMQ3sTjoBwKibtojWnG+rOQktLeI5ZDj0BNPi05LkbYmcP6MK61tChK88Z655xXP3mnXek3SzJIGgZuRUc0u5o4LsZVxYy2rZcApnG4f1qAL7V0GoXK284bbuil+Vww68cGs42qT5ktmypONp9farjO+5nKFtijzRUxgcEgggj2oqzM6ErnpTkTnmnqBingZHArQyIWOOBTQCfrUjLliKUYHA60WEQkEHimEZPvVhlBFRYAOaLAQlfzpu3gVOy85ppGABRYCIKBmm7TUwWlEZZ1UdWOBSsMrSLmmgYroJNDjiRPNuwjN0BIqM6EGHyXUZrP2sO5r7GfYwyBmonHOMVvN4fuM/LLGfzqneaTc2sfmOgK+opqcXsxOEorVGVt28YpjLxxVgrkVG42H2qyLlY1E3U1Ow56VEw5NIZA44qzpmkT6tdCKMiONeZJW4Cj+p9qgKksBXRaVeRQaXLHDx5Zy746t61EnZGkI3Z0VlYQ2dulvCMRD8z7n3q8vAwOBXC27ajMZHivn2A5ORxXSabcXZASYK47Pnk/WsWdJpFlRiX4VfWsbWL1Gt2jC8HnpzWjPMskTRYAlzyO1Yl7E8zMqkDA4qW7FWMLUpZGgt0bn5SxPpS6TcxpcWtrKPkYfP/wAC7/gAKiubO63bHzjdxinpDLZ3cVztEoU4YEdu5FNSIkjdbeGIidmjB+Qlc5HairsPiOzSCNPKX5VA+77UVV0TYpjkn0p6ntTV75HFCjJz0rrOIXJ3YxQcHgU7gnHem55xSExpOKjHzGpHUnntTOgwOtAASM4pjDkGnY9aQnjBFAIFAxUsCk3UQ/2xUQXtViyXN9CB/epS2KjuReLNNuNW1mxs7YHcVJJH8Iro9P8AhjAlqvnXMvmlc8ORW5o1hHJqjXTqCyJxmtGS5eLUlyfkNeVKpbRHqvc8l8UeHdU8OP5sN5cNb9M7zxXRS7/+EKjeRizsgyWOa7vxJpsWpaJMpAYbT2ritWj+z+FIoh1GFrSnLmkianwM5DbTJBxU+Mjpio5AAteieYVdvrULDmrBHeojjd9DQNGro/h2W/ZZ5w0dsDnA+8/09B71r6rp0bWv2a0jCKOwGAcetZ8fijUY9q21qku0YIB24FXoL57/AFJcRyRwqgBD92z29a55Nt6nVBJbFa2gvLWPyYI02HhgwOc1sabZiNCJAWdvToBV8KoXgYJ74qWEEsA2AO59qhy0sVYrRaXHJccBwF6gH7xqtqFsI7t1VMZwa6QMqFAigcD8azJ4PMvwp5Lck9h7VLKi9bnKT2jmXKtjnuO1VPsFzEzfZyPLxxv5FdLfIkEjRu2WC/Io+83sB3NVdH8rWpTYxrcWdy6nYk4xv+lCiynJHMNBc7jmGDOfU/40VelsTHK6M/KsQc0U7SJui2enTinKN3GKaxOKdGTXceaNb71GAeaUjJx6Uzfg4HNAA56KKbt3H0pWGTkUKTxQMTZ1prCpT1pre1IEMXpiremof7ShHvmqoBzWjpC51CP2BqZv3WXBe8jt9Idn8+OI/vNtT6doN9f32yaUA9c+lcZp/iaHSvGU1vcPtjdRjPSvXtJ1DT96XKTx9M9a8pxPUkmVtV8P3NlpEuGDgLXmXidSmiwoRglxXreu+KLCW2a1jnVnbggEV5P41I8iBR0L1pS5fapRIqxapNyOOHGaikXIz2qxtyKryE5xXps80rv6VXbg9KtMO9Q7N0irgnJ7VI0W9PuVRpTHbTyKg2vIAAFPf6mtazu0maOSPOVYqeMU3TbPdbhZo0VckgEHP4VYstOFvcORyhOQB2NYNnVFNGsk2yPc78U0XQdiQSVI69uKY0AlUR8g561ft7eLYU2gL0xjpWTNkFjLLcoCwI46k5q5DZLbxtNM+9wcg+9Jb7LfgDgHiqmu6g1raRTGMvCJVEgXsppoTZgeJLJ7tmukkkS4gZZo" : "Apache1" 
-            }
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-key.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-key.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-key.xml	2011-06-24 02:29:39 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test"
-        imageRef="http://servers.api.openstack.org/1234/images/1"
-        flavorRef="http://servers.api.openstack.org/1234/flavors/1">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test">
+  <image  id="52415800-8b69-11e0-9b19-734f6f006e54" />
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
   <metadata>
     <meta key="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">Apache1</meta>
   </metadata>

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-value.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-value.json	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-value.json	2011-06-24 02:29:39 +0000
@@ -1,12 +1,14 @@
 {
     "server" : {
         "name" : "new-server-test",
-        "imageRef" : "http://servers.api.openstack.org/1234/images/1",
-        "flavorRef" : "http://servers.api.openstack.org/1234/flavors/1",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        },
         "metadata" : {
-            "values" : {
                 "My Server Name" : "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" 
-            }
         },
         "personality" : [
             {

=== modified file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-value.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-value.xml	2011-03-01 18:43:57 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-bad-meta-value.xml	2011-06-24 02:29:39 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test"
-        imageRef="http://servers.api.openstack.org/1234/images/1"
-        flavorRef="http://servers.api.openstack.org/1234/flavors/1">
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" name="new-server-test">
+  <image  id="52415800-8b69-11e0-9b19-734f6f006e54" />
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
   <metadata>
     <meta key="My Server Name">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</meta>
   </metadata>

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.json	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.json	2011-06-24 02:29:39 +0000
@@ -0,0 +1,12 @@
+{
+    "server" : {
+        "name" : "new-server-test",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        },
+        "primaryIPv4" : "67.23.10.132"
+    }
+}

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.xml'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.xml	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip.xml	2011-06-24 02:29:39 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1"
+        name="test" primaryIPv4="67.23.10.132">
+  <image  id="52415800-8b69-11e0-9b19-734f6f006e54" />
+  <flavor id="52415800-8b69-11e0-9b19-734f1195ff37" />
+</server>

=== added file 'doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.json'
--- doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.json	1970-01-01 00:00:00 +0000
+++ doc/source/docbkx/openstack-compute-api-1.1/samples/server-post-req-pip2.json	2011-06-24 02:29:39 +0000
@@ -0,0 +1,13 @@
+{
+    "server" : {
+        "name" : "new-server-test",
+        "image" : {
+            "id" : "52415800-8b69-11e0-9b19-734f6f006e54"
+        },
+        "flavor" : {
+            "id" : "52415800-8b69-11e0-9b19-734f1195ff37"
+        },