Move api_samples to doc dir

The generated api_samples aren't used for the tests, they're only
included in git so that they can be synced into the docs. Move them
to the doc/ dir to make that more clear since I keep forgetting.

Change-Id: I0851ac0ee234dc1e8740666716733e05f856ddec

53 files changed, 2205 insertions, 0 deletions

diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/api_samples/all_extensions/extensions-get-resp.json
new file mode 100644
index 000000000..22eb1e207
--- /dev/null
+++ b/doc/api_samples/all_extensions/extensions-get-resp.json
@@ -0,0 +1,348 @@
+{
+    "extensions": [
+        {
+            "alias": "NMN",
+            "description": "Multiple network support",
+            "links": [],
+            "name": "Multinic",
+            "namespace": "http://docs.openstack.org/compute/ext/multinic/api/v1.1",
+            "updated": "2011-06-09T00:00:00+00:00"
+        },
+        {
+            "alias": "OS-DCF",
+            "description": "Disk Management Extension",
+            "links": [],
+            "name": "DiskConfig",
+            "namespace": "http://docs.openstack.org/compute/ext/disk_config/api/v1.1",
+            "updated": "2011-09-27T00:00:00+00:00"
+        },
+        {
+            "alias": "OS-EXT-SRV-ATTR",
+            "description": "Extended Server Attributes support.",
+            "links": [],
+            "name": "ExtendedServerAttributes",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1",
+            "updated": "2011-11-03T00:00:00+00:00"
+        },
+        {
+            "alias": "OS-EXT-STS",
+            "description": "Extended Status support",
+            "links": [],
+            "name": "ExtendedStatus",
+            "namespace": "http://docs.openstack.org/compute/ext/extended_status/api/v1.1",
+            "updated": "2011-11-03T00:00:00+00:00"
+        },
+        {
+            "alias": "OS-FLV-DISABLED",
+            "description": "Support to show the disabled status of a flavor",
+            "links": [],
+            "name": "FlavorDisabled",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1",
+            "updated": "2012-08-29T00:00:00+00:00"
+        },
+        {
+            "alias": "OS-FLV-EXT-DATA",
+            "description": "Provide additional data for flavors",
+            "links": [],
+            "name": "FlavorExtraData",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1",
+            "updated": "2011-09-14T00:00:00+00:00"
+        },
+        {
+            "alias": "os-admin-actions",
+            "description": "Enable admin-only server actions\n\n    Actions include: pause, unpause, suspend, resume, migrate,\n    resetNetwork, injectNetworkInfo, lock, unlock, createBackup\n    ",
+            "links": [],
+            "name": "AdminActions",
+            "namespace": "http://docs.openstack.org/compute/ext/admin-actions/api/v1.1",
+            "updated": "2011-09-20T00:00:00+00:00"
+        },
+        {
+            "alias": "os-aggregates",
+            "description": "Admin-only aggregate administration",
+            "links": [],
+            "name": "Aggregates",
+            "namespace": "http://docs.openstack.org/compute/ext/aggregates/api/v1.1",
+            "updated": "2012-01-12T00:00:00+00:00"
+        },
+        {
+            "alias": "os-availability-zone",
+            "description": "Add availability_zone to the Create Server v1.1 API",
+            "links": [],
+            "name": "AvailabilityZone",
+            "namespace": "http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1",
+            "updated": "2012-08-09T00:00:00+00:00"
+        },
+        {
+            "alias": "os-certificates",
+            "description": "Certificates support",
+            "links": [],
+            "name": "Certificates",
+            "namespace": "http://docs.openstack.org/compute/ext/certificates/api/v1.1",
+            "updated": "2012-01-19T00:00:00+00:00"
+        },
+        {
+            "alias": "os-cloudpipe",
+            "description": "Adds actions to create cloudpipe instances.\n\n    When running with the Vlan network mode, you need a mechanism to route\n    from the public Internet to your vlans.  This mechanism is known as a\n    cloudpipe.\n\n    At the time of creating this class, only OpenVPN is supported.  Support for\n    a SSH Bastion host is forthcoming.\n    ",
+            "links": [],
+            "name": "Cloudpipe",
+            "namespace": "http://docs.openstack.org/compute/ext/cloudpipe/api/v1.1",
+            "updated": "2011-12-16T00:00:00+00:00"
+        },
+        {
+            "alias": "os-config-drive",
+            "description": "Config Drive Extension",
+            "links": [],
+            "name": "ConfigDrive",
+            "namespace": "http://docs.openstack.org/compute/ext/config_drive/api/v1.1",
+            "updated": "2012-07-16T00:00:00+00:00"
+        },
+        {
+            "alias": "os-console-output",
+            "description": "Console log output support, with tailing ability.",
+            "links": [],
+            "name": "ConsoleOutput",
+            "namespace": "http://docs.openstack.org/compute/ext/os-console-output/api/v2",
+            "updated": "2011-12-08T00:00:00+00:00"
+        },
+        {
+            "alias": "os-consoles",
+            "description": "Interactive Console support.",
+            "links": [],
+            "name": "Consoles",
+            "namespace": "http://docs.openstack.org/compute/ext/os-consoles/api/v2",
+            "updated": "2011-12-23T00:00:00+00:00"
+        },
+        {
+            "alias": "os-create-server-ext",
+            "description": "Extended support to the Create Server v1.1 API",
+            "links": [],
+            "name": "Createserverext",
+            "namespace": "http://docs.openstack.org/compute/ext/createserverext/api/v1.1",
+            "updated": "2011-07-19T00:00:00+00:00"
+        },
+        {
+            "alias": "os-deferred-delete",
+            "description": "Instance deferred delete",
+            "links": [],
+            "name": "DeferredDelete",
+            "namespace": "http://docs.openstack.org/compute/ext/deferred-delete/api/v1.1",
+            "updated": "2011-09-01T00:00:00+00:00"
+        },
+        {
+            "alias": "os-flavor-access",
+            "description": "Flavor access supprt",
+            "links": [],
+            "name": "FlavorAccess",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_access/api/v2",
+            "updated": "2012-08-01T00:00:00+00:00"
+        },
+        {
+            "alias": "os-flavor-extra-specs",
+            "description": "Instance type (flavor) extra specs",
+            "links": [],
+            "name": "FlavorExtraSpecs",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_extra_specs/api/v1.1",
+            "updated": "2011-06-23T00:00:00+00:00"
+        },
+        {
+            "alias": "os-flavor-manage",
+            "description": "\n    Flavor create/delete API support\n    ",
+            "links": [],
+            "name": "FlavorManage",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1",
+            "updated": "2012-01-19T00:00:00+00:00"
+        },
+        {
+            "alias": "os-flavor-rxtx",
+            "description": "Support to show the rxtx status of a flavor",
+            "links": [],
+            "name": "FlavorRxtx",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_rxtx/api/v1.1",
+            "updated": "2012-08-29T00:00:00+00:00"
+        },
+        {
+            "alias": "os-flavor-swap",
+            "description": "Support to show the swap status of a flavor",
+            "links": [],
+            "name": "FlavorSwap",
+            "namespace": "http://docs.openstack.org/compute/ext/flavor_swap/api/v1.1",
+            "updated": "2012-08-29T00:00:00+00:00"
+        },
+        {
+            "alias": "os-floating-ip-dns",
+            "description": "Floating IP DNS support",
+            "links": [],
+            "name": "FloatingIpDns",
+            "namespace": "http://docs.openstack.org/ext/floating_ip_dns/api/v1.1",
+            "updated": "2011-12-23T00:00:00+00:00"
+        },
+        {
+            "alias": "os-floating-ip-pools",
+            "description": "Floating IPs support",
+            "links": [],
+            "name": "FloatingIpPools",
+            "namespace": "http://docs.openstack.org/compute/ext/floating_ip_pools/api/v1.1",
+            "updated": "2012-01-04T00:00:00+00:00"
+        },
+        {
+            "alias": "os-floating-ips",
+            "description": "Floating IPs support",
+            "links": [],
+            "name": "FloatingIps",
+            "namespace": "http://docs.openstack.org/compute/ext/floating_ips/api/v1.1",
+            "updated": "2011-06-16T00:00:00+00:00"
+        },
+        {
+            "alias": "os-hosts",
+            "description": "Admin-only host administration",
+            "links": [],
+            "name": "Hosts",
+            "namespace": "http://docs.openstack.org/compute/ext/hosts/api/v1.1",
+            "updated": "2011-06-29T00:00:00+00:00"
+        },
+        {
+            "alias": "os-hypervisors",
+            "description": "Admin-only hypervisor administration",
+            "links": [],
+            "name": "Hypervisors",
+            "namespace": "http://docs.openstack.org/compute/ext/hypervisors/api/v1.1",
+            "updated": "2012-06-21T00:00:00+00:00"
+        },
+        {
+            "alias": "os-instance_usage_audit_log",
+            "description": "Admin-only Task Log Monitoring",
+            "links": [],
+            "name": "OSInstanceUsageAuditLog",
+            "namespace": "http://docs.openstack.org/ext/services/api/v1.1",
+            "updated": "2012-07-06T01:00:00+00:00"
+        },
+        {
+            "alias": "os-keypairs",
+            "description": "Keypair Support",
+            "links": [],
+            "name": "Keypairs",
+            "namespace": "http://docs.openstack.org/compute/ext/keypairs/api/v1.1",
+            "updated": "2011-08-08T00:00:00+00:00"
+        },
+        {
+            "alias": "os-multiple-create",
+            "description": "Allow multiple create in the Create Server v1.1 API",
+            "links": [],
+            "name": "MultipleCreate",
+            "namespace": "http://docs.openstack.org/compute/ext/multiplecreate/api/v1.1",
+            "updated": "2012-08-07T00:00:00+00:00"
+        },
+        {
+            "alias": "os-networks",
+            "description": "Admin-only Network Management Extension",
+            "links": [],
+            "name": "Networks",
+            "namespace": "http://docs.openstack.org/compute/ext/networks/api/v1.1",
+            "updated": "2011-12-23T00:00:00+00:00"
+        },
+        {
+            "alias": "os-quota-class-sets",
+            "description": "Quota classes management support",
+            "links": [],
+            "name": "QuotaClasses",
+            "namespace": "http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1",
+            "updated": "2012-03-12T00:00:00+00:00"
+        },
+        {
+            "alias": "os-quota-sets",
+            "description": "Quotas management support",
+            "links": [],
+            "name": "Quotas",
+            "namespace": "http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1",
+            "updated": "2011-08-08T00:00:00+00:00"
+        },
+        {
+            "alias": "os-rescue",
+            "description": "Instance rescue mode",
+            "links": [],
+            "name": "Rescue",
+            "namespace": "http://docs.openstack.org/compute/ext/rescue/api/v1.1",
+            "updated": "2011-08-18T00:00:00+00:00"
+        },
+        {
+            "alias": "os-scheduler-hints",
+            "description": "Pass arbitrary key/value pairs to the scheduler",
+            "links": [],
+            "name": "SchedulerHints",
+            "namespace": "http://docs.openstack.org/compute/ext/scheduler-hints/api/v2",
+            "updated": "2011-07-19T00:00:00+00:00"
+        },
+        {
+            "alias": "os-security-groups",
+            "description": "Security group support",
+            "links": [],
+            "name": "SecurityGroups",
+            "namespace": "http://docs.openstack.org/compute/ext/securitygroups/api/v1.1",
+            "updated": "2011-07-21T00:00:00+00:00"
+        },
+        {
+            "alias": "os-server-diagnostics",
+            "description": "Allow Admins to view server diagnostics through server action",
+            "links": [],
+            "name": "ServerDiagnostics",
+            "namespace": "http://docs.openstack.org/compute/ext/server-diagnostics/api/v1.1",
+            "updated": "2011-12-21T00:00:00+00:00"
+        },
+        {
+            "alias": "os-server-start-stop",
+            "description": "Start/Stop instance compute API support",
+            "links": [],
+            "name": "ServerStartStop",
+            "namespace": "http://docs.openstack.org/compute/ext/servers/api/v1.1",
+            "updated": "2012-01-23T00:00:00+00:00"
+        },
+        {
+            "alias": "os-simple-tenant-usage",
+            "description": "Simple tenant usage extension",
+            "links": [],
+            "name": "SimpleTenantUsage",
+            "namespace": "http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1",
+            "updated": "2011-08-19T00:00:00+00:00"
+        },
+        {
+            "alias": "os-used-limits",
+            "description": "Provide data on limited resources that are being used.",
+            "links": [],
+            "name": "UsedLimits",
+            "namespace": "http://docs.openstack.org/compute/ext/used_limits/api/v1.1",
+            "updated": "2012-07-13T00:00:00+00:00"
+        },
+        {
+            "alias": "os-user-data",
+            "description": "Add user_data to the Create Server v1.1 API",
+            "links": [],
+            "name": "UserData",
+            "namespace": "http://docs.openstack.org/compute/ext/userdata/api/v1.1",
+            "updated": "2012-08-07T00:00:00+00:00"
+        },
+        {
+            "alias": "os-virtual-interfaces",
+            "description": "Virtual interface support",
+            "links": [],
+            "name": "VirtualInterfaces",
+            "namespace": "http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1",
+            "updated": "2011-08-17T00:00:00+00:00"
+        },
+        {
+            "alias": "os-volume-types",
+            "description": "Volume types support",
+            "links": [],
+            "name": "VolumeTypes",
+            "namespace": "http://docs.openstack.org/compute/ext/volume_types/api/v1.1",
+            "updated": "2011-08-24T00:00:00+00:00"
+        },
+        {
+            "alias": "os-volumes",
+            "description": "Volumes support",
+            "links": [],
+            "name": "Volumes",
+            "namespace": "http://docs.openstack.org/compute/ext/volumes/api/v1.1",
+            "updated": "2011-03-25T00:00:00+00:00"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/extensions-get-resp.xml b/doc/api_samples/all_extensions/extensions-get-resp.xml
new file mode 100644
index 000000000..4532244d9
--- /dev/null
+++ b/doc/api_samples/all_extensions/extensions-get-resp.xml
@@ -0,0 +1,146 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<extensions xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
+  <extension alias="NMN" updated="2011-06-09T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/multinic/api/v1.1" name="Multinic">
+    <description>Multiple network support</description>
+  </extension>
+  <extension alias="OS-DCF" updated="2011-09-27T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" name="DiskConfig">
+    <description>Disk Management Extension</description>
+  </extension>
+  <extension alias="OS-EXT-SRV-ATTR" updated="2011-11-03T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" name="ExtendedServerAttributes">
+    <description>Extended Server Attributes support.</description>
+  </extension>
+  <extension alias="OS-EXT-STS" updated="2011-11-03T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" name="ExtendedStatus">
+    <description>Extended Status support</description>
+  </extension>
+  <extension alias="OS-FLV-DISABLED" updated="2012-08-29T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" name="FlavorDisabled">
+    <description>Support to show the disabled status of a flavor</description>
+  </extension>
+  <extension alias="OS-FLV-EXT-DATA" updated="2011-09-14T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" name="FlavorExtraData">
+    <description>Provide additional data for flavors</description>
+  </extension>
+  <extension alias="os-admin-actions" updated="2011-09-20T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/admin-actions/api/v1.1" name="AdminActions">
+    <description>Enable admin-only server actions
+
+    Actions include: pause, unpause, suspend, resume, migrate,
+    resetNetwork, injectNetworkInfo, lock, unlock, createBackup
+    </description>
+  </extension>
+  <extension alias="os-aggregates" updated="2012-01-12T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/aggregates/api/v1.1" name="Aggregates">
+    <description>Admin-only aggregate administration</description>
+  </extension>
+  <extension alias="os-availability-zone" updated="2012-08-09T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/availabilityzone/api/v1.1" name="AvailabilityZone">
+    <description>Add availability_zone to the Create Server v1.1 API</description>
+  </extension>
+  <extension alias="os-certificates" updated="2012-01-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/certificates/api/v1.1" name="Certificates">
+    <description>Certificates support</description>
+  </extension>
+  <extension alias="os-cloudpipe" updated="2011-12-16T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/cloudpipe/api/v1.1" name="Cloudpipe">
+    <description>Adds actions to create cloudpipe instances.
+
+    When running with the Vlan network mode, you need a mechanism to route
+    from the public Internet to your vlans.  This mechanism is known as a
+    cloudpipe.
+
+    At the time of creating this class, only OpenVPN is supported.  Support for
+    a SSH Bastion host is forthcoming.
+    </description>
+  </extension>
+  <extension alias="os-config-drive" updated="2012-07-16T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/config_drive/api/v1.1" name="ConfigDrive">
+    <description>Config Drive Extension</description>
+  </extension>
+  <extension alias="os-console-output" updated="2011-12-08T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/os-console-output/api/v2" name="ConsoleOutput">
+    <description>Console log output support, with tailing ability.</description>
+  </extension>
+  <extension alias="os-consoles" updated="2011-12-23T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/os-consoles/api/v2" name="Consoles">
+    <description>Interactive Console support.</description>
+  </extension>
+  <extension alias="os-create-server-ext" updated="2011-07-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/createserverext/api/v1.1" name="Createserverext">
+    <description>Extended support to the Create Server v1.1 API</description>
+  </extension>
+  <extension alias="os-deferred-delete" updated="2011-09-01T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/deferred-delete/api/v1.1" name="DeferredDelete">
+    <description>Instance deferred delete</description>
+  </extension>
+  <extension alias="os-flavor-access" updated="2012-08-01T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/flavor_access/api/v2" name="FlavorAccess">
+    <description>Flavor access supprt</description>
+  </extension>
+  <extension alias="os-flavor-extra-specs" updated="2011-06-23T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/flavor_extra_specs/api/v1.1" name="FlavorExtraSpecs">
+    <description>Instance type (flavor) extra specs</description>
+  </extension>
+  <extension alias="os-flavor-manage" updated="2012-01-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/flavor_manage/api/v1.1" name="FlavorManage">
+    <description>
+    Flavor create/delete API support
+    </description>
+  </extension>
+  <extension alias="os-flavor-rxtx" updated="2012-08-29T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/flavor_rxtx/api/v1.1" name="FlavorRxtx">
+    <description>Support to show the rxtx status of a flavor</description>
+  </extension>
+  <extension alias="os-flavor-swap" updated="2012-08-29T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/flavor_swap/api/v1.1" name="FlavorSwap">
+    <description>Support to show the swap status of a flavor</description>
+  </extension>
+  <extension alias="os-floating-ip-dns" updated="2011-12-23T00:00:00+00:00" namespace="http://docs.openstack.org/ext/floating_ip_dns/api/v1.1" name="FloatingIpDns">
+    <description>Floating IP DNS support</description>
+  </extension>
+  <extension alias="os-floating-ip-pools" updated="2012-01-04T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/floating_ip_pools/api/v1.1" name="FloatingIpPools">
+    <description>Floating IPs support</description>
+  </extension>
+  <extension alias="os-floating-ips" updated="2011-06-16T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/floating_ips/api/v1.1" name="FloatingIps">
+    <description>Floating IPs support</description>
+  </extension>
+  <extension alias="os-hosts" updated="2011-06-29T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/hosts/api/v1.1" name="Hosts">
+    <description>Admin-only host administration</description>
+  </extension>
+  <extension alias="os-hypervisors" updated="2012-06-21T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/hypervisors/api/v1.1" name="Hypervisors">
+    <description>Admin-only hypervisor administration</description>
+  </extension>
+  <extension alias="os-instance_usage_audit_log" updated="2012-07-06T01:00:00+00:00" namespace="http://docs.openstack.org/ext/services/api/v1.1" name="OSInstanceUsageAuditLog">
+    <description>Admin-only Task Log Monitoring</description>
+  </extension>
+  <extension alias="os-keypairs" updated="2011-08-08T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/keypairs/api/v1.1" name="Keypairs">
+    <description>Keypair Support</description>
+  </extension>
+  <extension alias="os-multiple-create" updated="2012-08-07T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/multiplecreate/api/v1.1" name="MultipleCreate">
+    <description>Allow multiple create in the Create Server v1.1 API</description>
+  </extension>
+  <extension alias="os-networks" updated="2011-12-23T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/networks/api/v1.1" name="Networks">
+    <description>Admin-only Network Management Extension</description>
+  </extension>
+  <extension alias="os-quota-class-sets" updated="2012-03-12T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/quota-classes-sets/api/v1.1" name="QuotaClasses">
+    <description>Quota classes management support</description>
+  </extension>
+  <extension alias="os-quota-sets" updated="2011-08-08T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/quotas-sets/api/v1.1" name="Quotas">
+    <description>Quotas management support</description>
+  </extension>
+  <extension alias="os-rescue" updated="2011-08-18T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/rescue/api/v1.1" name="Rescue">
+    <description>Instance rescue mode</description>
+  </extension>
+  <extension alias="os-scheduler-hints" updated="2011-07-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/scheduler-hints/api/v2" name="SchedulerHints">
+    <description>Pass arbitrary key/value pairs to the scheduler</description>
+  </extension>
+  <extension alias="os-security-groups" updated="2011-07-21T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/securitygroups/api/v1.1" name="SecurityGroups">
+    <description>Security group support</description>
+  </extension>
+  <extension alias="os-server-diagnostics" updated="2011-12-21T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/server-diagnostics/api/v1.1" name="ServerDiagnostics">
+    <description>Allow Admins to view server diagnostics through server action</description>
+  </extension>
+  <extension alias="os-server-start-stop" updated="2012-01-23T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/servers/api/v1.1" name="ServerStartStop">
+    <description>Start/Stop instance compute API support</description>
+  </extension>
+  <extension alias="os-simple-tenant-usage" updated="2011-08-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1" name="SimpleTenantUsage">
+    <description>Simple tenant usage extension</description>
+  </extension>
+  <extension alias="os-used-limits" updated="2012-07-13T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/used_limits/api/v1.1" name="UsedLimits">
+    <description>Provide data on limited resources that are being used.</description>
+  </extension>
+  <extension alias="os-user-data" updated="2012-08-07T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/userdata/api/v1.1" name="UserData">
+    <description>Add user_data to the Create Server v1.1 API</description>
+  </extension>
+  <extension alias="os-virtual-interfaces" updated="2011-08-17T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/virtual_interfaces/api/v1.1" name="VirtualInterfaces">
+    <description>Virtual interface support</description>
+  </extension>
+  <extension alias="os-volume-types" updated="2011-08-24T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/volume_types/api/v1.1" name="VolumeTypes">
+    <description>Volume types support</description>
+  </extension>
+  <extension alias="os-volumes" updated="2011-03-25T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/volumes/api/v1.1" name="Volumes">
+    <description>Volumes support</description>
+  </extension>
+</extensions>
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/flavor-get-resp.json b/doc/api_samples/all_extensions/flavor-get-resp.json
new file mode 100644
index 000000000..bbd681e66
--- /dev/null
+++ b/doc/api_samples/all_extensions/flavor-get-resp.json
@@ -0,0 +1,24 @@
+{
+    "flavor": {
+        "OS-FLV-DISABLED:disabled": false,
+        "OS-FLV-EXT-DATA:ephemeral": 0,
+        "disk": 0,
+        "id": "1",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/flavors/1",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/flavors/1",
+                "rel": "bookmark"
+            }
+        ],
+        "name": "m1.tiny",
+        "os-flavor-access:is_public": true,
+        "ram": 512,
+        "rxtx_factor": 1.0,
+        "swap": "",
+        "vcpus": 1
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/flavor-get-resp.xml b/doc/api_samples/all_extensions/flavor-get-resp.xml
new file mode 100644
index 000000000..fe0451c1e
--- /dev/null
+++ b/doc/api_samples/all_extensions/flavor-get-resp.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="0" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
+  <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
+</flavor>
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/flavors-list-resp.json b/doc/api_samples/all_extensions/flavors-list-resp.json
new file mode 100644
index 000000000..ab86d2a52
--- /dev/null
+++ b/doc/api_samples/all_extensions/flavors-list-resp.json
@@ -0,0 +1,74 @@
+{
+    "flavors": [
+        {
+            "id": "1",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/1",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/1",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.tiny"
+        },
+        {
+            "id": "2",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/2",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/2",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.small"
+        },
+        {
+            "id": "3",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/3",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/3",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.medium"
+        },
+        {
+            "id": "4",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/4",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/4",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.large"
+        },
+        {
+            "id": "5",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/5",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/5",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.xlarge"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/flavors-list-resp.xml b/doc/api_samples/all_extensions/flavors-list-resp.xml
new file mode 100644
index 000000000..435f96be5
--- /dev/null
+++ b/doc/api_samples/all_extensions/flavors-list-resp.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <flavor name="m1.tiny" id="1">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
+  </flavor>
+  <flavor name="m1.small" id="2">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
+  </flavor>
+  <flavor name="m1.medium" id="3">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
+  </flavor>
+  <flavor name="m1.large" id="4">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
+  </flavor>
+  <flavor name="m1.xlarge" id="5">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
+  </flavor>
+</flavors>
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-get-resp.json b/doc/api_samples/all_extensions/server-get-resp.json
new file mode 100644
index 000000000..3eb1870f9
--- /dev/null
+++ b/doc/api_samples/all_extensions/server-get-resp.json
@@ -0,0 +1,68 @@
+{
+    "server": {
+        "OS-DCF:diskConfig": "AUTO",
+        "OS-EXT-SRV-ATTR:host": "3972bc79fa2a4754b7559153a5a48422",
+        "OS-EXT-SRV-ATTR:hypervisor_hostname": null,
+        "OS-EXT-SRV-ATTR:instance_name": "instance-00000001",
+        "OS-EXT-STS:power_state": 1,
+        "OS-EXT-STS:task_state": null,
+        "OS-EXT-STS:vm_state": "active",
+        "accessIPv4": "",
+        "accessIPv6": "",
+        "addresses": {
+            "private": [
+                {
+                    "addr": "192.168.0.3",
+                    "version": 4
+                }
+            ]
+        },
+        "config_drive": "",
+        "created": "2012-08-20T21:11:06Z",
+        "flavor": {
+            "id": "1",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/1",
+                    "rel": "bookmark"
+                }
+            ]
+        },
+        "hostId": "dc23873c80c22f14705d190b645b59398cbc8ed3cdf6145468051c0d",
+        "id": "7dc62bde-85f0-45b5-8c74-5fb209314807",
+        "image": {
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "bookmark"
+                }
+            ]
+        },
+        "key_name": null,
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/servers/7dc62bde-85f0-45b5-8c74-5fb209314807",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/servers/7dc62bde-85f0-45b5-8c74-5fb209314807",
+                "rel": "bookmark"
+            }
+        ],
+        "metadata": {
+            "My Server Name": "Apache1"
+        },
+        "name": "new-server-test",
+        "progress": 0,
+        "security_groups": [
+            {
+                "name": "default"
+            }
+        ],
+        "status": "ACTIVE",
+        "tenant_id": "openstack",
+        "updated": "2012-08-20T21:11:06Z",
+        "user_id": "fake"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-get-resp.xml b/doc/api_samples/all_extensions/server-get-resp.xml
new file mode 100644
index 000000000..6f2d8587f
--- /dev/null
+++ b/doc/api_samples/all_extensions/server-get-resp.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-08-29T18:31:11Z" hostId="28cb24b3eafec0079eaca92bb439843ccdbe0cc2597b3ad9956f2113" name="new-server-test" created="2012-08-29T18:31:11Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="f3053932-a09d-446d-ba6e-4303b6725317" key_name="None" config_drive="" OS-EXT-SRV-ATTR:vm_state="active" OS-EXT-SRV-ATTR:task_state="None" OS-EXT-SRV-ATTR:power_state="1" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="6f18ef4ea265447d8fe1b957b1e23ab4" OS-EXT-SRV-ATTR:hypervisor_hostname="None" OS-DCF:diskConfig="AUTO">
+  <image id="70a599e0-31e7-49b7-b260-868f441e862b">
+    <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
+  </image>
+  <flavor id="1">
+    <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
+  </flavor>
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <addresses>
+    <network id="private">
+      <ip version="4" addr="192.168.0.3"/>
+    </network>
+  </addresses>
+  <atom:link href="http://openstack.example.com/v2/openstack/servers/f3053932-a09d-446d-ba6e-4303b6725317" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/servers/f3053932-a09d-446d-ba6e-4303b6725317" rel="bookmark"/>
+  <security_groups>
+    <security_group name="default"/>
+  </security_groups>
+</server>
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-post-req.json b/doc/api_samples/all_extensions/server-post-req.json
new file mode 100644
index 000000000..2269848f4
--- /dev/null
+++ b/doc/api_samples/all_extensions/server-post-req.json
@@ -0,0 +1,16 @@
+{
+    "server": {
+        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
+        "imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "metadata": {
+            "My Server Name": "Apache1"
+        },
+        "name": "new-server-test",
+        "personality": [
+            {
+                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==",
+                "path": "/etc/banner.txt"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-post-req.xml b/doc/api_samples/all_extensions/server-post-req.xml
new file mode 100644
index 000000000..2dbbb4438
--- /dev/null
+++ b/doc/api_samples/all_extensions/server-post-req.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <personality>
+    <file path="/etc/banner.txt">
+        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
+        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
+        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
+        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
+        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
+        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
+        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
+        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
+        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
+    </file>
+  </personality>
+</server>
diff --git a/doc/api_samples/all_extensions/server-post-resp.json b/doc/api_samples/all_extensions/server-post-resp.json
new file mode 100644
index 000000000..a8dc8258a
--- /dev/null
+++ b/doc/api_samples/all_extensions/server-post-resp.json
@@ -0,0 +1,22 @@
+{
+    "server": {
+        "OS-DCF:diskConfig": "AUTO",
+        "adminPass": "ahW3PjQNAu6r",
+        "id": "e726f5ae-8179-44ba-bbfb-8a0c52b33095",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/servers/e726f5ae-8179-44ba-bbfb-8a0c52b33095",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/servers/e726f5ae-8179-44ba-bbfb-8a0c52b33095",
+                "rel": "bookmark"
+            }
+        ],
+        "security_groups": [
+            {
+                "name": "default"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/all_extensions/server-post-resp.xml b/doc/api_samples/all_extensions/server-post-resp.xml
new file mode 100644
index 000000000..1754dc700
--- /dev/null
+++ b/doc/api_samples/all_extensions/server-post-resp.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="f3053932-a09d-446d-ba6e-4303b6725317" adminPass="phFnce4H8pnP" OS-DCF:diskConfig="AUTO">
+  <metadata/>
+  <atom:link href="http://openstack.example.com/v2/openstack/servers/f3053932-a09d-446d-ba6e-4303b6725317" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/servers/f3053932-a09d-446d-ba6e-4303b6725317" rel="bookmark"/>
+  <security_groups>
+    <security_group name="default"/>
+  </security_groups>
+</server>
\ No newline at end of file
diff --git a/doc/api_samples/flavor-get-resp.json b/doc/api_samples/flavor-get-resp.json
new file mode 100644
index 000000000..160238eea
--- /dev/null
+++ b/doc/api_samples/flavor-get-resp.json
@@ -0,0 +1,19 @@
+{
+    "flavor": {
+        "disk": 0,
+        "id": "1",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/flavors/1",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/flavors/1",
+                "rel": "bookmark"
+            }
+        ],
+        "name": "m1.tiny",
+        "ram": 512,
+        "vcpus": 1
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/flavor-get-resp.xml b/doc/api_samples/flavor-get-resp.xml
new file mode 100644
index 000000000..93b91a531
--- /dev/null
+++ b/doc/api_samples/flavor-get-resp.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1">
+  <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
+</flavor>
\ No newline at end of file
diff --git a/doc/api_samples/flavors-list-resp.json b/doc/api_samples/flavors-list-resp.json
new file mode 100644
index 000000000..ab86d2a52
--- /dev/null
+++ b/doc/api_samples/flavors-list-resp.json
@@ -0,0 +1,74 @@
+{
+    "flavors": [
+        {
+            "id": "1",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/1",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/1",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.tiny"
+        },
+        {
+            "id": "2",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/2",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/2",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.small"
+        },
+        {
+            "id": "3",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/3",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/3",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.medium"
+        },
+        {
+            "id": "4",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/4",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/4",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.large"
+        },
+        {
+            "id": "5",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/flavors/5",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/5",
+                    "rel": "bookmark"
+                }
+            ],
+            "name": "m1.xlarge"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/flavors-list-resp.xml b/doc/api_samples/flavors-list-resp.xml
new file mode 100644
index 000000000..435f96be5
--- /dev/null
+++ b/doc/api_samples/flavors-list-resp.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <flavor name="m1.tiny" id="1">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
+  </flavor>
+  <flavor name="m1.small" id="2">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/2" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/2" rel="bookmark"/>
+  </flavor>
+  <flavor name="m1.medium" id="3">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/3" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/3" rel="bookmark"/>
+  </flavor>
+  <flavor name="m1.large" id="4">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/4" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/4" rel="bookmark"/>
+  </flavor>
+  <flavor name="m1.xlarge" id="5">
+    <atom:link href="http://openstack.example.com/v2/openstack/flavors/5" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/flavors/5" rel="bookmark"/>
+  </flavor>
+</flavors>
\ No newline at end of file
diff --git a/doc/api_samples/image-get-resp.json b/doc/api_samples/image-get-resp.json
new file mode 100644
index 000000000..da419650d
--- /dev/null
+++ b/doc/api_samples/image-get-resp.json
@@ -0,0 +1,33 @@
+{
+    "image": {
+        "created": "2011-01-01T01:02:03Z",
+        "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                "rel": "bookmark"
+            },
+            {
+                "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                "rel": "alternate",
+                "type": "application/vnd.openstack.image"
+            }
+        ],
+        "metadata": {
+            "architecture": "x86_64",
+            "auto_disk_config": "True",
+            "kernel_id": "nokernel",
+            "ramdisk_id": "nokernel"
+        },
+        "minDisk": 0,
+        "minRam": 0,
+        "name": "fakeimage7",
+        "progress": 100,
+        "status": "ACTIVE",
+        "updated": "2011-01-01T01:02:03Z"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-get-resp.xml b/doc/api_samples/image-get-resp.xml
new file mode 100644
index 000000000..77fa67bb1
--- /dev/null
+++ b/doc/api_samples/image-get-resp.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<image xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b">
+  <metadata>
+    <meta key="kernel_id">nokernel</meta>
+    <meta key="auto_disk_config">True</meta>
+    <meta key="ramdisk_id">nokernel</meta>
+    <meta key="architecture">x86_64</meta>
+  </metadata>
+  <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
+  <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
+</image>
\ No newline at end of file
diff --git a/doc/api_samples/image-meta-key-get.json b/doc/api_samples/image-meta-key-get.json
new file mode 100644
index 000000000..6d022eb97
--- /dev/null
+++ b/doc/api_samples/image-meta-key-get.json
@@ -0,0 +1,5 @@
+{
+    "meta": {
+        "kernel_id": "nokernel"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-meta-key-get.xml b/doc/api_samples/image-meta-key-get.xml
new file mode 100644
index 000000000..1de6b4078
--- /dev/null
+++ b/doc/api_samples/image-meta-key-get.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="kernel_id">nokernel</meta>
\ No newline at end of file
diff --git a/doc/api_samples/image-meta-key-put-req.json b/doc/api_samples/image-meta-key-put-req.json
new file mode 100644
index 000000000..8dec6767d
--- /dev/null
+++ b/doc/api_samples/image-meta-key-put-req.json
@@ -0,0 +1,5 @@
+{
+    "meta" : {
+            "auto_disk_config" : "False"
+        }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-meta-key-put-req.xml b/doc/api_samples/image-meta-key-put-req.xml
new file mode 100644
index 000000000..23a6f4718
--- /dev/null
+++ b/doc/api_samples/image-meta-key-put-req.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<meta
+    xmlns="http://docs.openstack.org/compute/api/v1.1"
+    key="auto_disk_config">False</meta>
\ No newline at end of file
diff --git a/doc/api_samples/image-meta-key-put-resp.json b/doc/api_samples/image-meta-key-put-resp.json
new file mode 100644
index 000000000..3db563ec1
--- /dev/null
+++ b/doc/api_samples/image-meta-key-put-resp.json
@@ -0,0 +1,5 @@
+{
+    "meta": {
+        "auto_disk_config": "False"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-meta-key-put-resp.xml b/doc/api_samples/image-meta-key-put-resp.xml
new file mode 100644
index 000000000..c989c38a2
--- /dev/null
+++ b/doc/api_samples/image-meta-key-put-resp.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="auto_disk_config">False</meta>
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-get-resp.json b/doc/api_samples/image-metadata-get-resp.json
new file mode 100644
index 000000000..588f688d5
--- /dev/null
+++ b/doc/api_samples/image-metadata-get-resp.json
@@ -0,0 +1,8 @@
+{
+    "metadata": {
+        "architecture": "x86_64",
+        "auto_disk_config": "True",
+        "kernel_id": "nokernel",
+        "ramdisk_id": "nokernel"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-get-resp.xml b/doc/api_samples/image-metadata-get-resp.xml
new file mode 100644
index 000000000..8409016bf
--- /dev/null
+++ b/doc/api_samples/image-metadata-get-resp.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <meta key="kernel_id">nokernel</meta>
+  <meta key="auto_disk_config">True</meta>
+  <meta key="ramdisk_id">nokernel</meta>
+  <meta key="architecture">x86_64</meta>
+</metadata>
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-post-req.json b/doc/api_samples/image-metadata-post-req.json
new file mode 100644
index 000000000..8447c3dec
--- /dev/null
+++ b/doc/api_samples/image-metadata-post-req.json
@@ -0,0 +1,6 @@
+{
+    "metadata": {
+        "kernel_id": "False",
+        "Label": "UpdatedImage"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-post-req.xml b/doc/api_samples/image-metadata-post-req.xml
new file mode 100644
index 000000000..db1b74572
--- /dev/null
+++ b/doc/api_samples/image-metadata-post-req.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
+    <meta key="kernel_id">False</meta>
+    <meta key="Label">UpdatedImage</meta>
+</metadata>
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-post-resp.json b/doc/api_samples/image-metadata-post-resp.json
new file mode 100644
index 000000000..9479bb339
--- /dev/null
+++ b/doc/api_samples/image-metadata-post-resp.json
@@ -0,0 +1,9 @@
+{
+    "metadata": {
+        "Label": "UpdatedImage",
+        "architecture": "x86_64",
+        "auto_disk_config": "True",
+        "kernel_id": "False",
+        "ramdisk_id": "nokernel"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-post-resp.xml b/doc/api_samples/image-metadata-post-resp.xml
new file mode 100644
index 000000000..1d96bd9af
--- /dev/null
+++ b/doc/api_samples/image-metadata-post-resp.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <meta key="kernel_id">False</meta>
+  <meta key="ramdisk_id">nokernel</meta>
+  <meta key="Label">UpdatedImage</meta>
+  <meta key="architecture">x86_64</meta>
+  <meta key="auto_disk_config">True</meta>
+</metadata>
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-put-req.json b/doc/api_samples/image-metadata-put-req.json
new file mode 100644
index 000000000..36fbc003d
--- /dev/null
+++ b/doc/api_samples/image-metadata-put-req.json
@@ -0,0 +1,6 @@
+{
+    "metadata": {
+        "auto_disk_config": "True",
+        "Label": "Changed"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-put-req.xml b/doc/api_samples/image-metadata-put-req.xml
new file mode 100644
index 000000000..454d9294f
--- /dev/null
+++ b/doc/api_samples/image-metadata-put-req.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
+    <meta key="auto_disk_config">True</meta>
+    <meta key="Label">Changed</meta>
+</metadata>
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-put-resp.json b/doc/api_samples/image-metadata-put-resp.json
new file mode 100644
index 000000000..c8c5ee9c4
--- /dev/null
+++ b/doc/api_samples/image-metadata-put-resp.json
@@ -0,0 +1,6 @@
+{
+    "metadata": {
+        "Label": "Changed",
+        "auto_disk_config": "True"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-put-resp.xml b/doc/api_samples/image-metadata-put-resp.xml
new file mode 100644
index 000000000..7011871cc
--- /dev/null
+++ b/doc/api_samples/image-metadata-put-resp.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<metadata xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <meta key="auto_disk_config">True</meta>
+  <meta key="Label">Changed</meta>
+</metadata>
\ No newline at end of file
diff --git a/doc/api_samples/image-metadata-resp.json b/doc/api_samples/image-metadata-resp.json
new file mode 100644
index 000000000..657f0b197
--- /dev/null
+++ b/doc/api_samples/image-metadata-resp.json
@@ -0,0 +1,6 @@
+{
+    "metadata": {
+        "kernel_id": "nokernel",
+        "ramdisk_id": "nokernel"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/images-details-get-resp.json b/doc/api_samples/images-details-get-resp.json
new file mode 100644
index 000000000..44a0e1d77
--- /dev/null
+++ b/doc/api_samples/images-details-get-resp.json
@@ -0,0 +1,212 @@
+{
+    "images": [
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "auto_disk_config": "True",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage7",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "auto_disk_config": "False",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage6",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                "ramdisk_id": null
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "cedef40a-ed67-4d10-800e-17455edce175",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/images-details-get-resp.xml b/doc/api_samples/images-details-get-resp.xml
new file mode 100644
index 000000000..654251a33
--- /dev/null
+++ b/doc/api_samples/images-details-get-resp.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="auto_disk_config">True</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+      <meta key="architecture">x86_64</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+      <meta key="architecture">x86_64</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="auto_disk_config">False</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+      <meta key="architecture">x86_64</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
+    <metadata>
+      <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta>
+      <meta key="ramdisk_id">None</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+</images>
\ No newline at end of file
diff --git a/doc/api_samples/images-details-resp.json b/doc/api_samples/images-details-resp.json
new file mode 100644
index 000000000..44a0e1d77
--- /dev/null
+++ b/doc/api_samples/images-details-resp.json
@@ -0,0 +1,212 @@
+{
+    "images": [
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "auto_disk_config": "True",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage7",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "architecture": "x86_64",
+                "auto_disk_config": "False",
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage6",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                "ramdisk_id": null
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "cedef40a-ed67-4d10-800e-17455edce175",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        },
+        {
+            "created": "2011-01-01T01:02:03Z",
+            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "metadata": {
+                "kernel_id": "nokernel",
+                "ramdisk_id": "nokernel"
+            },
+            "minDisk": 0,
+            "minRam": 0,
+            "name": "fakeimage123456",
+            "progress": 100,
+            "status": "ACTIVE",
+            "updated": "2011-01-01T01:02:03Z"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/images-details-resp.xml b/doc/api_samples/images-details-resp.xml
new file mode 100644
index 000000000..654251a33
--- /dev/null
+++ b/doc/api_samples/images-details-resp.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="auto_disk_config">True</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+      <meta key="architecture">x86_64</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+      <meta key="architecture">x86_64</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="auto_disk_config">False</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+      <meta key="architecture">x86_64</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
+    <metadata>
+      <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta>
+      <meta key="ramdisk_id">None</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
+    <metadata>
+      <meta key="kernel_id">nokernel</meta>
+      <meta key="ramdisk_id">nokernel</meta>
+    </metadata>
+    <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+</images>
\ No newline at end of file
diff --git a/doc/api_samples/images-list-get-resp.json b/doc/api_samples/images-list-get-resp.json
new file mode 100644
index 000000000..eb14ed3c7
--- /dev/null
+++ b/doc/api_samples/images-list-get-resp.json
@@ -0,0 +1,137 @@
+{
+    "images": [
+        {
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage7"
+        },
+        {
+            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage6"
+        },
+        {
+            "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "cedef40a-ed67-4d10-800e-17455edce175",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/images-list-get-resp.xml b/doc/api_samples/images-list-get-resp.xml
new file mode 100644
index 000000000..0674afb09
--- /dev/null
+++ b/doc/api_samples/images-list-get-resp.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <image name="fakeimage7" id="70a599e0-31e7-49b7-b260-868f441e862b">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="a2459075-d96c-40d5-893e-577ff92e721c">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage6" id="a440c04b-79fa-479c-bed1-0b816eaec379">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="cedef40a-ed67-4d10-800e-17455edce175">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+</images>
\ No newline at end of file
diff --git a/doc/api_samples/images-list-resp.json b/doc/api_samples/images-list-resp.json
new file mode 100644
index 000000000..eb14ed3c7
--- /dev/null
+++ b/doc/api_samples/images-list-resp.json
@@ -0,0 +1,137 @@
+{
+    "images": [
+        {
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage7"
+        },
+        {
+            "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "a2459075-d96c-40d5-893e-577ff92e721c",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "a440c04b-79fa-479c-bed1-0b816eaec379",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage6"
+        },
+        {
+            "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "cedef40a-ed67-4d10-800e-17455edce175",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        },
+        {
+            "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "bookmark"
+                },
+                {
+                    "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6",
+                    "rel": "alternate",
+                    "type": "application/vnd.openstack.image"
+                }
+            ],
+            "name": "fakeimage123456"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/images-list-resp.xml b/doc/api_samples/images-list-resp.xml
new file mode 100644
index 000000000..0674afb09
--- /dev/null
+++ b/doc/api_samples/images-list-resp.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
+  <image name="fakeimage7" id="70a599e0-31e7-49b7-b260-868f441e862b">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="155d900f-4e14-4e4c-a73d-069cbf4541e6">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="a2459075-d96c-40d5-893e-577ff92e721c">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage6" id="a440c04b-79fa-479c-bed1-0b816eaec379">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="cedef40a-ed67-4d10-800e-17455edce175">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+  <image name="fakeimage123456" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6">
+    <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/>
+    <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/>
+  </image>
+</images>
\ No newline at end of file
diff --git a/doc/api_samples/limit-get-resp.json b/doc/api_samples/limit-get-resp.json
new file mode 100644
index 000000000..a4bc99bf9
--- /dev/null
+++ b/doc/api_samples/limit-get-resp.json
@@ -0,0 +1,72 @@
+{
+    "limits": {
+        "absolute": {
+            "maxImageMeta": 128,
+            "maxPersonality": 5,
+            "maxPersonalitySize": 10240,
+            "maxServerMeta": 128,
+            "maxTotalCores": 20,
+            "maxTotalFloatingIps": 10,
+            "maxTotalInstances": 10,
+            "maxTotalKeypairs": 100,
+            "maxTotalRAMSize": 51200,
+            "maxTotalVolumeGigabytes": 1000,
+            "maxTotalVolumes": 10
+        },
+        "rate": [
+            {
+                "limit": [
+                    {
+                        "next-available": "2012-08-31T22:36:27Z",
+                        "remaining": 10,
+                        "unit": "MINUTE",
+                        "value": 10,
+                        "verb": "POST"
+                    },
+                    {
+                        "next-available": "2012-08-31T22:36:27Z",
+                        "remaining": 10,
+                        "unit": "MINUTE",
+                        "value": 10,
+                        "verb": "PUT"
+                    },
+                    {
+                        "next-available": "2012-08-31T22:36:27Z",
+                        "remaining": 100,
+                        "unit": "MINUTE",
+                        "value": 100,
+                        "verb": "DELETE"
+                    }
+                ],
+                "regex": ".*",
+                "uri": "*"
+            },
+            {
+                "limit": [
+                    {
+                        "next-available": "2012-08-31T22:36:27Z",
+                        "remaining": 50,
+                        "unit": "DAY",
+                        "value": 50,
+                        "verb": "POST"
+                    }
+                ],
+                "regex": "^/servers",
+                "uri": "*/servers"
+            },
+            {
+                "limit": [
+                    {
+                        "next-available": "2012-08-31T22:36:27Z",
+                        "remaining": 3,
+                        "unit": "MINUTE",
+                        "value": 3,
+                        "verb": "GET"
+                    }
+                ],
+                "regex": ".*changes-since.*",
+                "uri": "*changes-since*"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/limit-get-resp.xml b/doc/api_samples/limit-get-resp.xml
new file mode 100644
index 000000000..8157eeb11
--- /dev/null
+++ b/doc/api_samples/limit-get-resp.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<limits xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
+  <rates>
+    <rate regex=".*" uri="*">
+      <limit next-available="2012-08-31T22:36:23Z" unit="MINUTE" verb="POST" remaining="10" value="10"/>
+      <limit next-available="2012-08-31T22:36:23Z" unit="MINUTE" verb="PUT" remaining="10" value="10"/>
+      <limit next-available="2012-08-31T22:36:23Z" unit="MINUTE" verb="DELETE" remaining="100" value="100"/>
+    </rate>
+    <rate regex="^/servers" uri="*/servers">
+      <limit next-available="2012-08-31T22:36:23Z" unit="DAY" verb="POST" remaining="50" value="50"/>
+    </rate>
+    <rate regex=".*changes-since.*" uri="*changes-since*">
+      <limit next-available="2012-08-31T22:36:23Z" unit="MINUTE" verb="GET" remaining="3" value="3"/>
+    </rate>
+  </rates>
+  <absolute>
+    <limit name="maxServerMeta" value="128"/>
+    <limit name="maxTotalInstances" value="10"/>
+    <limit name="maxPersonality" value="5"/>
+    <limit name="maxImageMeta" value="128"/>
+    <limit name="maxPersonalitySize" value="10240"/>
+    <limit name="maxTotalKeypairs" value="100"/>
+    <limit name="maxTotalVolumes" value="10"/>
+    <limit name="maxTotalCores" value="20"/>
+    <limit name="maxTotalFloatingIps" value="10"/>
+    <limit name="maxTotalVolumeGigabytes" value="1000"/>
+    <limit name="maxTotalRAMSize" value="51200"/>
+  </absolute>
+</limits>
\ No newline at end of file
diff --git a/doc/api_samples/server-get-resp.json b/doc/api_samples/server-get-resp.json
new file mode 100644
index 000000000..c6ebd4195
--- /dev/null
+++ b/doc/api_samples/server-get-resp.json
@@ -0,0 +1,54 @@
+{
+    "server": {
+        "accessIPv4": "",
+        "accessIPv6": "",
+        "addresses": {
+            "private": [
+                {
+                    "addr": "192.168.0.3",
+                    "version": 4
+                }
+            ]
+        },
+        "created": "2012-08-20T21:11:09Z",
+        "flavor": {
+            "id": "1",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/openstack/flavors/1",
+                    "rel": "bookmark"
+                }
+            ]
+        },
+        "hostId": "65201c14a29663e06d0748e561207d998b343e1d164bfa0aafa9c45d",
+        "id": "893c7791-f1df-4c3d-8383-3caae9656c62",
+        "image": {
+            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "rel": "bookmark"
+                }
+            ]
+        },
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/servers/893c7791-f1df-4c3d-8383-3caae9656c62",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/servers/893c7791-f1df-4c3d-8383-3caae9656c62",
+                "rel": "bookmark"
+            }
+        ],
+        "metadata": {
+            "My Server Name": "Apache1"
+        },
+        "name": "new-server-test",
+        "progress": 0,
+        "status": "ACTIVE",
+        "tenant_id": "openstack",
+        "updated": "2012-08-20T21:11:09Z",
+        "user_id": "fake"
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/server-get-resp.xml b/doc/api_samples/server-get-resp.xml
new file mode 100644
index 000000000..e59319e42
--- /dev/null
+++ b/doc/api_samples/server-get-resp.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2012-08-20T21:11:10Z" hostId="1746536de20daadad89a6fab8d6968b1214b0ba9fb37b29e7098e0b9" name="new-server-test" created="2012-08-20T21:11:10Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="3f9f7d18-aaf3-4703-b368-ea9b4d609c95">
+  <image id="70a599e0-31e7-49b7-b260-868f441e862b">
+    <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
+  </image>
+  <flavor id="1">
+    <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
+  </flavor>
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <addresses>
+    <network id="private">
+      <ip version="4" addr="192.168.0.3"/>
+    </network>
+  </addresses>
+  <atom:link href="http://openstack.example.com/v2/openstack/servers/3f9f7d18-aaf3-4703-b368-ea9b4d609c95" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/servers/3f9f7d18-aaf3-4703-b368-ea9b4d609c95" rel="bookmark"/>
+</server>
\ No newline at end of file
diff --git a/doc/api_samples/server-post-req.json b/doc/api_samples/server-post-req.json
new file mode 100644
index 000000000..2269848f4
--- /dev/null
+++ b/doc/api_samples/server-post-req.json
@@ -0,0 +1,16 @@
+{
+    "server": {
+        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
+        "imageRef": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "metadata": {
+            "My Server Name": "Apache1"
+        },
+        "name": "new-server-test",
+        "personality": [
+            {
+                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==",
+                "path": "/etc/banner.txt"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/server-post-req.xml b/doc/api_samples/server-post-req.xml
new file mode 100644
index 000000000..2dbbb4438
--- /dev/null
+++ b/doc/api_samples/server-post-req.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <personality>
+    <file path="/etc/banner.txt">
+        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
+        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
+        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
+        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
+        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
+        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
+        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
+        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
+        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
+    </file>
+  </personality>
+</server>
diff --git a/doc/api_samples/server-post-resp.json b/doc/api_samples/server-post-resp.json
new file mode 100644
index 000000000..29ce13717
--- /dev/null
+++ b/doc/api_samples/server-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "server": {
+        "adminPass": "MVk5HPrazHcG",
+        "id": "5bbcc3c4-1da2-4437-a48a-66f15b1b13f9",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/servers/5bbcc3c4-1da2-4437-a48a-66f15b1b13f9",
+                "rel": "bookmark"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/server-post-resp.xml b/doc/api_samples/server-post-resp.xml
new file mode 100644
index 000000000..9725f33bf
--- /dev/null
+++ b/doc/api_samples/server-post-resp.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="ea8417a1-7957-4ed5-8b3c-0befc1724308" adminPass="FoFw84XtQj3c">
+  <metadata/>
+  <atom:link href="http://openstack.example.com/v2/openstack/servers/ea8417a1-7957-4ed5-8b3c-0befc1724308" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/servers/ea8417a1-7957-4ed5-8b3c-0befc1724308" rel="bookmark"/>
+</server>
\ No newline at end of file
diff --git a/doc/api_samples/versions-get-resp.json b/doc/api_samples/versions-get-resp.json
new file mode 100644
index 000000000..8bcc7f4f2
--- /dev/null
+++ b/doc/api_samples/versions-get-resp.json
@@ -0,0 +1,15 @@
+{
+    "versions": [
+        {
+            "id": "v2.0",
+            "links": [
+                {
+                    "href": "http://openstack.example.com/v2/",
+                    "rel": "self"
+                }
+            ],
+            "status": "CURRENT",
+            "updated": "2011-01-21T11:33:21Z"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/doc/api_samples/versions-get-resp.xml b/doc/api_samples/versions-get-resp.xml
new file mode 100644
index 000000000..d0cea0cd5
--- /dev/null
+++ b/doc/api_samples/versions-get-resp.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<versions xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/common/api/v1.0">
+  <version status="CURRENT" updated="2011-01-21T11:33:21Z" id="v2.0">
+    <atom:link href="http://openstack.example.com/v2/" rel="self"/>
+  </version>
+</versions>
\ No newline at end of file