diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/OS-KSADM-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/OS-KSADM-admin-devguide.xml
deleted file mode 100644
index e1d60544..00000000
--- a/openstack-identity-api/v2.0/src/docbkx/OS-KSADM/OS-KSADM-admin-devguide.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-
-
-
-
-
-
-
-GET'>
-PUT'>
-POST'>
-DELETE'>
-
-
-
-
-
-'>
-
-
-
-
-
-
-
-
-
-
-Verb |
-URI |
-Description |
-
-'>
-
-
-
-
-]>
-
-
-
- OpenStack Identity OS-KSADM (Admin Operations)
- OS-KSADM (Admin)
-
-
-
-
-
-
-
- OpenStack
-
-
-
- 2010
- 2011
- OpenStack
-
- API v2.0
- OpenStack Identity
- 2011-08-29
-
-
- Copyright details are filled in by the
- template.
-
-
-
-
- Joe
- Savak
-
- joe.savak@RACKSPACE.COM
-
-
- OpenStack extensions to Identity API v2.0,
- which enable administrative API operations.
-
-
-
-
- This document includes details on various operations
- supported by the OS-KSADM extensions on top of core
- OpenStack Identity operations.
-
-
-
- 2011-09-13
-
-
-
- Initial release.
-
-
-
-
-
-
-
- Extension Operations
-
- OS-KSADM Admin Extension
- Extension operations.
-
- Authentication Header
-
-
- Header Type |
- Name |
- Value |
-
-
-
-
- HTTP/1.1 Request |
- X-Auth-Token |
- txfa8426a08eaf |
-
-
-
-
- The following calls are supported by OS-KSADM-admin
- Extension:
-
- User Operations
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Tenant Operations
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Role Operations
-
-
-
-
-
-
-
- Service Operations
-
-
-
-
-
-
-
-
diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/OS-KSCATALOG-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/OS-KSCATALOG-admin-devguide.xml
deleted file mode 100644
index fee01d0e..00000000
--- a/openstack-identity-api/v2.0/src/docbkx/OS-KSCATALOG/OS-KSCATALOG-admin-devguide.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
-GET'>
-PUT'>
-POST'>
-DELETE'>
-
-
-
-
-
-'>
-
-
-
-
-
-
-
-
-
-
-Verb |
-URI |
-Description |
-
-'>
-
-
-
-
-]>
-
-
- OpenStack Identity OS-KSCATALOG Extension
- OS-KSCATALOG (Admin)
-
-
-
-
-
-
-
- OpenStack
-
-
-
- 2010
- 2011
- OpenStack
-
- API v2.0
- OpenStack Identity
- 2011-08-29
-
-
- Copyright details are filled in by the template.
-
-
-
-
- Joe
- Savak
-
- joe.savak@RACKSPACE.COM
-
-
- OpenStack extensions to Identity API v2.0 enabling Admin Operations to support Catalog. Adds the capability to do CRUD on Endpoint Templates and Endpoints
-
-
-
-
- This document includes details on various operations supported by the OS-KSCATALOG extensions on top of core OpenStack Identity operations.
-
-
-
- 2011-09-13
-
-
-
-
- Initial release.
-
-
-
-
-
-
-
-
- Extension Operations
-
- OS-KSCATALOG Admin Extension
-
- Authentication Header
-
-
- Header Type |
- Name |
- Value |
-
-
-
-
- HTTP/1.1 Request |
- X-Auth-Token |
- txfa8426a08eaf |
-
-
-
-
- The OS-KSCATALOG extension extends the OpenStack Identity Admin API v2.0 with the following calls:
-
- Endpoint Template Operations
-
-
-
-
-
-
-
-
-
-
-
-
-
- Endpoint Operations
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-admin-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-admin-devguide.xml
deleted file mode 100644
index 253ea863..00000000
--- a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-admin-devguide.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-
-
-
-
-GET'>
-PUT'>
-POST'>
-DELETE'>
-
-
-
-
-'>
-
-
-
-
-
-
-
-
-Verb |
-URI |
-Description |
-
-'>
-
-
-
-
-
-
-
-
-]>
-
-
- OpenStack Identity EC2 authentication Extension (Admin Operations)
- OS-KSEC2 (Admin)
-
-
-
-
-
-
-
- OpenStack
-
-
-
- 2010
- 2011
- OpenStack
-
- OpenStack Identity
- &PUB_DATE;
-
-
- Copyright details are filled in by the template.
-
-
-
-
- This document is intended for client developers interested
- in using the OpenStack EC2 Authentication Service Extension along with the
- OpenStack Identity
- API v2.0.
-
-
-
-
- Adds the capability to support EC2 style authentication.
-
-
-
-
-
-
- 2011-09-13
-
-
-
-
- Initial release.
-
-
-
-
-
-
-
-
- Summary of Changes
-
- The OpenStack EC2 authentication Extension allows crud/listing operations on ec2Credentials.
-
-
-
-
- New Resources
- None.
-
-
-
- New Element
-
- ec2Credentials
- This extension allows authentication calls to accept new type of credentials ec2Credentials.
- These are additional type of credentials defined to support ec2 style authentication.
- Examples of ec2Credentials are illustrated below
-
-
- ec2Credentials XML
-
-
-
- ec2Credentials JSON
-
-
-
-
-
- OS-KSEC2 Admin Extension
-
- Authentication Header
-
-
- Header Type |
- Name |
- Value |
-
-
-
-
- HTTP/1.1 Request |
- X-Auth-Token |
- txfa8426a08eaf |
-
-
-
- The OpenStack EC2 authentication extension adds the following calls:
-
- User Operations
-
-
-
-
-
-
-
-
diff --git a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-service-devguide.xml b/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-service-devguide.xml
deleted file mode 100644
index e996d029..00000000
--- a/openstack-identity-api/v2.0/src/docbkx/OS-KSEC2/OS-KSEC2-service-devguide.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-
-
-
-
-
-
-
- GET'>
- PUT'>
- POST'>
- DELETE'>
-
-
-
-
-
- '>
-
-
-
-
-
-
-
-
-
-
- Verb |
- URI |
- Description |
-
- '>
-
-
-
-
-]>
-
-
- OpenStack Identity EC2 authentication Extension (Service
- Operations)
- OS-KSEC2 (Admin)
-
-
-
-
-
-
-
- OpenStack
-
-
-
- 2010
- 2011
- OpenStack
-
- EXT v1.0
- OpenStack Identity
- &PUB_DATE;
-
-
- Copyright details are filled in by the
- template.
-
-
-
- This document is intended for client developers
- interested in using the OpenStack EC2 Authentication
- Service Extension along with the Keystone - OpenStack
- Identity (API).
-
-
-
- Adds the capability to support EC2 style
- authentication.
-
-
-
-
-
-
- 2011-08-26
-
-
-
- Initial release.
-
-
-
-
-
-
-
- Summary of Changes
- The OpenStack EC2 authentication Service Extension
- allows authenticate call using ec2Credentials.
-
-
-
- New Resources
- None.
-
-
-
- New Element
-
- OS-KSEC2 Admin Extension
-
- Authenticate
- This extension enables the
- ec2Credentials
- parameter, which supports the EC2 style of
- authentication.
- &URI_REFHEAD;
-
- &POST; |
- /tokens |
- Authenticate to
- generate a token. |
-
-
-
- &CODES;200,
- 203
- &ERROR_CODES; unauthorized
- (401), userDisabled
- (403), badRequest
- (400),
- identityFault (500),
- serviceUnavailable(503)
- This call returns a token if successful.
- Clients obtain this token, along with the URL
- to other service APIs, by first authenticating
- against Identity and supplying valid
- credentials. This extension provides support
- for Rackspace style API key
- credentials.
- Client authentication is provided via a ReST
- interface using the POST method, with
- v2.0/tokens supplied as the path. A payload of
- credentials must be included in the
- body.
- The Identity API is a ReSTful web service.
- It is the entry point to all service APIs. To
- access the Identity API, you must know its
- URL.
-
- XML Auth Request using
- EC2CREDENTIALS
-
-
-
- JSON Auth Request using
- EC2CREDENTIALS
-
-
-
- XML Auth Response
-
-
-
- JSON Auth Response
-
-
-
-
-
-
-
diff --git a/openstack-identity-api/v2.0/src/docbkx/common/ch_os_extensions.xml b/openstack-identity-api/v2.0/src/docbkx/common/ch_os_extensions.xml
index 2cbe4dea..cacc0ea4 100644
--- a/openstack-identity-api/v2.0/src/docbkx/common/ch_os_extensions.xml
+++ b/openstack-identity-api/v2.0/src/docbkx/common/ch_os_extensions.xml
@@ -1,19 +1,177 @@
+ xmlns:xi="http://www.w3.org/2001/XInclude" role="api-reference">
OpenStack Identity Extensions
-
-
-
-
-
+
+ OS-KSADM admin extension
+
+ Users
+
+
+
+
+
+
+
+
+
+
+
+
+ Roles
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tenants
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Services
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OS-KSCATALOG admin extension
+
+ Endpoint templates
+
+
+
+
+
+
+
+
+
+
+
+
+ Endpoints
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OS-KSEC2 admin extension
+
+
+
+
+
+
+ OS-KSS3 admin extension
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OS-KSVALIDATE admin extension
+
+
+
+
+
+
+
+
+
+
-
-