From 35335e41d926f659c6cfba66412a522b5a18ff4c Mon Sep 17 00:00:00 2001
From: "Jorge L. Williams" <jorge.williams@rackspace.com>
Date: Thu, 14 Apr 2011 22:19:06 -0500
Subject: Updated samples.

---
 docs/guide/src/docbkx/idmdevguide.xml              | 24 ++++++-------
 .../guide/src/docbkx/samples/add-baseurl-input.xml | 11 ------
 .../src/docbkx/samples/add-baseurlRef-input.xml    |  6 ----
 docs/guide/src/docbkx/samples/addclient.json       |  4 ---
 docs/guide/src/docbkx/samples/addclient.xml        |  6 ----
 docs/guide/src/docbkx/samples/addedclient.json     | 12 -------
 docs/guide/src/docbkx/samples/addedclient.xml      | 12 -------
 docs/guide/src/docbkx/samples/addeduser.json       |  9 -----
 .../src/docbkx/samples/addfirstuserresponse.json   |  7 ----
 .../src/docbkx/samples/addfirstuserresponse.xml    |  8 -----
 docs/guide/src/docbkx/samples/adduser.json         |  8 -----
 docs/guide/src/docbkx/samples/adduser.xml          |  4 ---
 docs/guide/src/docbkx/samples/adduserresponse.xml  |  5 ---
 docs/guide/src/docbkx/samples/bad_request.json     |  5 ---
 docs/guide/src/docbkx/samples/bad_request.xml      |  7 ----
 docs/guide/src/docbkx/samples/baseURLRefs.json     | 27 --------------
 docs/guide/src/docbkx/samples/baseURLRefs.xml      | 22 ------------
 .../src/docbkx/samples/base_url_ref_response.json  |  5 ---
 .../src/docbkx/samples/base_url_ref_response.xml   |  6 ----
 .../src/docbkx/samples/base_url_response.json      | 10 ------
 .../guide/src/docbkx/samples/base_url_response.xml | 12 -------
 .../src/docbkx/samples/base_urls_response.json     | 22 ------------
 .../src/docbkx/samples/base_urls_response.xml      | 18 ----------
 .../samples/client-credentials-response.json       |  3 --
 .../docbkx/samples/client-credentials-response.xml |  4 ---
 docs/guide/src/docbkx/samples/client.json          | 16 ---------
 docs/guide/src/docbkx/samples/client.xml           | 17 ---------
 docs/guide/src/docbkx/samples/clientGroup.json     |  4 ---
 docs/guide/src/docbkx/samples/clientGroup.xml      |  5 ---
 docs/guide/src/docbkx/samples/clientGroups.json    |  6 ----
 docs/guide/src/docbkx/samples/clientGroups.xml     |  7 ----
 .../docbkx/samples/clientWithOnlySoftDeleted.json  |  3 --
 .../docbkx/samples/clientWithOnlySoftDeleted.xml   |  4 ---
 .../src/docbkx/samples/client_credentials.json     |  3 --
 .../src/docbkx/samples/client_credentials.xml      |  4 ---
 .../src/docbkx/samples/clientname_conflict.json    |  5 ---
 .../src/docbkx/samples/clientname_conflict.xml     |  7 ----
 docs/guide/src/docbkx/samples/clients.json         | 22 ------------
 docs/guide/src/docbkx/samples/clients.xml          | 22 ------------
 docs/guide/src/docbkx/samples/customer.json        |  7 ----
 docs/guide/src/docbkx/samples/customer.xml         |  5 ---
 .../src/docbkx/samples/customer_conflict.json      |  5 ---
 .../guide/src/docbkx/samples/customer_conflict.xml |  7 ----
 docs/guide/src/docbkx/samples/customerlock.json    |  5 ---
 docs/guide/src/docbkx/samples/customerlock.xml     |  4 ---
 docs/guide/src/docbkx/samples/customers.json       | 15 --------
 docs/guide/src/docbkx/samples/customers.xml        |  9 -----
 .../src/docbkx/samples/definedpermissions.json     | 16 ---------
 .../src/docbkx/samples/definedpermissions.xml      | 14 --------
 docs/guide/src/docbkx/samples/email_conflict.json  |  5 ---
 docs/guide/src/docbkx/samples/email_conflict.xml   |  7 ----
 docs/guide/src/docbkx/samples/feed.xml             | 21 -----------
 docs/guide/src/docbkx/samples/forbidden.json       |  5 ---
 docs/guide/src/docbkx/samples/forbidden.xml        |  7 ----
 docs/guide/src/docbkx/samples/forgot_password.json | 17 ---------
 docs/guide/src/docbkx/samples/forgot_password.xml  | 13 -------
 .../src/docbkx/samples/getuser-with-mosso-id.json  | 20 -----------
 .../src/docbkx/samples/getuser-with-mosso-id.xml   | 21 -----------
 .../src/docbkx/samples/getuser-with-nast-id.json   | 20 -----------
 .../src/docbkx/samples/getuser-with-nast-id.xml    | 21 -----------
 .../src/docbkx/samples/getuser-with-username.json  | 20 -----------
 .../src/docbkx/samples/getuser-with-username.xml   | 21 -----------
 docs/guide/src/docbkx/samples/getuser.json         | 15 --------
 docs/guide/src/docbkx/samples/getuser.xml          |  8 -----
 docs/guide/src/docbkx/samples/globalgroup.json     |  6 ----
 docs/guide/src/docbkx/samples/globalgroup.xml      |  5 ---
 docs/guide/src/docbkx/samples/globalgroups.json    | 10 ------
 docs/guide/src/docbkx/samples/globalgroups.xml     | 10 ------
 .../src/docbkx/samples/grantedpermissions.json     | 16 ---------
 .../src/docbkx/samples/grantedpermissions.xml      | 14 --------
 docs/guide/src/docbkx/samples/group-create.json    |  6 ----
 docs/guide/src/docbkx/samples/group-create.xml     |  5 ---
 .../guide/src/docbkx/samples/group-updated-nt.json |  6 ----
 docs/guide/src/docbkx/samples/group-updated-nt.xml |  5 ---
 docs/guide/src/docbkx/samples/group-updated.json   |  7 ----
 docs/guide/src/docbkx/samples/group-updated.xml    |  5 ---
 docs/guide/src/docbkx/samples/group.json           |  7 ----
 docs/guide/src/docbkx/samples/group.xml            |  5 ---
 docs/guide/src/docbkx/samples/groups-nt.json       | 12 -------
 docs/guide/src/docbkx/samples/groups-nt.xml        |  9 -----
 docs/guide/src/docbkx/samples/groups.json          | 15 --------
 docs/guide/src/docbkx/samples/groups.xml           |  9 -----
 .../src/docbkx/samples/methodnotallowedfault.json  |  5 ---
 .../src/docbkx/samples/methodnotallowedfault.xml   |  7 ----
 .../guide/src/docbkx/samples/missing_username.json |  5 ---
 docs/guide/src/docbkx/samples/missing_username.xml |  7 ----
 .../samples/mosso-id-authentication-response.json  |  4 ---
 .../samples/mosso-id-authentication-response.xml   | 18 ----------
 docs/guide/src/docbkx/samples/mossoCredentials.xml |  5 ---
 docs/guide/src/docbkx/samples/nastCredentials.xml  |  5 ---
 .../src/docbkx/samples/password_recovery.json      | 15 --------
 .../guide/src/docbkx/samples/password_recovery.xml | 12 -------
 docs/guide/src/docbkx/samples/password_rule.json   |  5 ---
 docs/guide/src/docbkx/samples/password_rule.xml    |  6 ----
 .../src/docbkx/samples/password_rule_result.json   |  6 ----
 .../src/docbkx/samples/password_rule_result.xml    |  7 ----
 .../src/docbkx/samples/password_rule_results.json  | 16 ---------
 .../src/docbkx/samples/password_rule_results.xml   | 15 --------
 docs/guide/src/docbkx/samples/password_rules.json  | 14 --------
 docs/guide/src/docbkx/samples/password_rules.xml   | 13 -------
 .../src/docbkx/samples/password_validation.json    | 17 ---------
 .../src/docbkx/samples/password_validation.xml     | 17 ---------
 .../guide/src/docbkx/samples/passwordrotation.json |  4 ---
 docs/guide/src/docbkx/samples/passwordrotation.xml |  6 ----
 .../docbkx/samples/passwordvalidationfault.json    |  5 ---
 .../src/docbkx/samples/passwordvalidationfault.xml |  7 ----
 docs/guide/src/docbkx/samples/permission.json      |  7 ----
 docs/guide/src/docbkx/samples/permission.xml       |  7 ----
 docs/guide/src/docbkx/samples/permissions.json     | 30 ----------------
 docs/guide/src/docbkx/samples/permissions.xml      | 24 -------------
 .../src/docbkx/samples/reset_user_password.json    |  3 --
 .../src/docbkx/samples/reset_user_password.xml     |  4 ---
 .../src/docbkx/samples/resourceId_conflict.json    |  5 ---
 .../src/docbkx/samples/resourceId_conflict.xml     |  7 ----
 docs/guide/src/docbkx/samples/role.json            |  4 ---
 docs/guide/src/docbkx/samples/role.xml             |  4 ---
 docs/guide/src/docbkx/samples/roles.json           | 12 -------
 docs/guide/src/docbkx/samples/roles.xml            |  8 -----
 .../docbkx/samples/service-catalog-response.json   | 22 ------------
 .../docbkx/samples/service-catalog-response.xml    | 14 --------
 docs/guide/src/docbkx/samples/tenant.json          |  7 ++++
 docs/guide/src/docbkx/samples/tenant.xml           |  5 +++
 docs/guide/src/docbkx/samples/tenantlock.json      |  5 +++
 docs/guide/src/docbkx/samples/tenantlock.xml       |  4 +++
 docs/guide/src/docbkx/samples/tenants.json         | 15 ++++++++
 docs/guide/src/docbkx/samples/tenants.xml          |  9 +++++
 docs/guide/src/docbkx/samples/token.json           |  4 ---
 docs/guide/src/docbkx/samples/token.xml            |  5 ---
 docs/guide/src/docbkx/samples/unauthorized.json    |  5 ---
 docs/guide/src/docbkx/samples/unauthorized.xml     |  7 ----
 docs/guide/src/docbkx/samples/unavailable.json     |  5 ---
 docs/guide/src/docbkx/samples/unavailable.xml      |  6 ----
 docs/guide/src/docbkx/samples/updatedcustomer.json |  7 ----
 docs/guide/src/docbkx/samples/updatedcustomer.xml  |  5 ---
 docs/guide/src/docbkx/samples/updatedtenant.json   |  7 ++++
 docs/guide/src/docbkx/samples/updatedtenant.xml    |  5 +++
 docs/guide/src/docbkx/samples/updateduser.json     |  8 -----
 docs/guide/src/docbkx/samples/updateduser.xml      |  4 ---
 docs/guide/src/docbkx/samples/updateuser.json      |  6 ----
 docs/guide/src/docbkx/samples/updateuser.xml       |  3 --
 docs/guide/src/docbkx/samples/user.json            | 41 ----------------------
 docs/guide/src/docbkx/samples/user.xml             | 19 ----------
 docs/guide/src/docbkx/samples/userGroups.json      | 16 ---------
 docs/guide/src/docbkx/samples/userGroups.xml       |  6 ----
 .../guide/src/docbkx/samples/userWithOnlyLock.json |  5 ---
 docs/guide/src/docbkx/samples/userWithOnlyLock.xml |  3 --
 .../docbkx/samples/userWithOnlySoftDeleted.json    |  3 --
 .../src/docbkx/samples/userWithOnlySoftDeleted.xml |  4 ---
 .../src/docbkx/samples/userWithOnlyStatus.json     |  3 --
 .../src/docbkx/samples/userWithOnlyStatus.xml      |  4 ---
 docs/guide/src/docbkx/samples/user_api_key.json    |  5 ---
 docs/guide/src/docbkx/samples/user_api_key.xml     |  3 --
 .../guide/src/docbkx/samples/user_credentials.json |  8 -----
 docs/guide/src/docbkx/samples/user_credentials.xml |  6 ----
 docs/guide/src/docbkx/samples/user_disabled.json   |  5 ---
 docs/guide/src/docbkx/samples/user_disabled.xml    |  7 ----
 docs/guide/src/docbkx/samples/user_password.json   |  3 --
 docs/guide/src/docbkx/samples/user_password.xml    |  4 ---
 docs/guide/src/docbkx/samples/user_secret.json     |  4 ---
 docs/guide/src/docbkx/samples/user_secret.xml      |  5 ---
 .../src/docbkx/samples/usernameCredentials.xml     |  5 ---
 .../src/docbkx/samples/username_conflict.json      |  5 ---
 .../guide/src/docbkx/samples/username_conflict.xml |  7 ----
 docs/guide/src/docbkx/samples/users.json           | 17 ---------
 docs/guide/src/docbkx/samples/users.xml            |  7 ----
 165 files changed, 69 insertions(+), 1462 deletions(-)
 delete mode 100644 docs/guide/src/docbkx/samples/add-baseurl-input.xml
 delete mode 100644 docs/guide/src/docbkx/samples/add-baseurlRef-input.xml
 delete mode 100644 docs/guide/src/docbkx/samples/addclient.json
 delete mode 100644 docs/guide/src/docbkx/samples/addclient.xml
 delete mode 100644 docs/guide/src/docbkx/samples/addedclient.json
 delete mode 100644 docs/guide/src/docbkx/samples/addedclient.xml
 delete mode 100644 docs/guide/src/docbkx/samples/addeduser.json
 delete mode 100644 docs/guide/src/docbkx/samples/addfirstuserresponse.json
 delete mode 100644 docs/guide/src/docbkx/samples/addfirstuserresponse.xml
 delete mode 100644 docs/guide/src/docbkx/samples/adduser.json
 delete mode 100644 docs/guide/src/docbkx/samples/adduser.xml
 delete mode 100644 docs/guide/src/docbkx/samples/adduserresponse.xml
 delete mode 100644 docs/guide/src/docbkx/samples/bad_request.json
 delete mode 100644 docs/guide/src/docbkx/samples/bad_request.xml
 delete mode 100644 docs/guide/src/docbkx/samples/baseURLRefs.json
 delete mode 100644 docs/guide/src/docbkx/samples/baseURLRefs.xml
 delete mode 100644 docs/guide/src/docbkx/samples/base_url_ref_response.json
 delete mode 100644 docs/guide/src/docbkx/samples/base_url_ref_response.xml
 delete mode 100644 docs/guide/src/docbkx/samples/base_url_response.json
 delete mode 100644 docs/guide/src/docbkx/samples/base_url_response.xml
 delete mode 100644 docs/guide/src/docbkx/samples/base_urls_response.json
 delete mode 100644 docs/guide/src/docbkx/samples/base_urls_response.xml
 delete mode 100644 docs/guide/src/docbkx/samples/client-credentials-response.json
 delete mode 100644 docs/guide/src/docbkx/samples/client-credentials-response.xml
 delete mode 100644 docs/guide/src/docbkx/samples/client.json
 delete mode 100644 docs/guide/src/docbkx/samples/client.xml
 delete mode 100644 docs/guide/src/docbkx/samples/clientGroup.json
 delete mode 100644 docs/guide/src/docbkx/samples/clientGroup.xml
 delete mode 100644 docs/guide/src/docbkx/samples/clientGroups.json
 delete mode 100644 docs/guide/src/docbkx/samples/clientGroups.xml
 delete mode 100644 docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.json
 delete mode 100644 docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.xml
 delete mode 100644 docs/guide/src/docbkx/samples/client_credentials.json
 delete mode 100644 docs/guide/src/docbkx/samples/client_credentials.xml
 delete mode 100644 docs/guide/src/docbkx/samples/clientname_conflict.json
 delete mode 100644 docs/guide/src/docbkx/samples/clientname_conflict.xml
 delete mode 100644 docs/guide/src/docbkx/samples/clients.json
 delete mode 100644 docs/guide/src/docbkx/samples/clients.xml
 delete mode 100644 docs/guide/src/docbkx/samples/customer.json
 delete mode 100644 docs/guide/src/docbkx/samples/customer.xml
 delete mode 100644 docs/guide/src/docbkx/samples/customer_conflict.json
 delete mode 100644 docs/guide/src/docbkx/samples/customer_conflict.xml
 delete mode 100644 docs/guide/src/docbkx/samples/customerlock.json
 delete mode 100644 docs/guide/src/docbkx/samples/customerlock.xml
 delete mode 100644 docs/guide/src/docbkx/samples/customers.json
 delete mode 100644 docs/guide/src/docbkx/samples/customers.xml
 delete mode 100644 docs/guide/src/docbkx/samples/definedpermissions.json
 delete mode 100644 docs/guide/src/docbkx/samples/definedpermissions.xml
 delete mode 100644 docs/guide/src/docbkx/samples/email_conflict.json
 delete mode 100644 docs/guide/src/docbkx/samples/email_conflict.xml
 delete mode 100644 docs/guide/src/docbkx/samples/feed.xml
 delete mode 100644 docs/guide/src/docbkx/samples/forbidden.json
 delete mode 100644 docs/guide/src/docbkx/samples/forbidden.xml
 delete mode 100644 docs/guide/src/docbkx/samples/forgot_password.json
 delete mode 100644 docs/guide/src/docbkx/samples/forgot_password.xml
 delete mode 100644 docs/guide/src/docbkx/samples/getuser-with-mosso-id.json
 delete mode 100644 docs/guide/src/docbkx/samples/getuser-with-mosso-id.xml
 delete mode 100644 docs/guide/src/docbkx/samples/getuser-with-nast-id.json
 delete mode 100644 docs/guide/src/docbkx/samples/getuser-with-nast-id.xml
 delete mode 100644 docs/guide/src/docbkx/samples/getuser-with-username.json
 delete mode 100644 docs/guide/src/docbkx/samples/getuser-with-username.xml
 delete mode 100644 docs/guide/src/docbkx/samples/getuser.json
 delete mode 100644 docs/guide/src/docbkx/samples/getuser.xml
 delete mode 100644 docs/guide/src/docbkx/samples/globalgroup.json
 delete mode 100644 docs/guide/src/docbkx/samples/globalgroup.xml
 delete mode 100644 docs/guide/src/docbkx/samples/globalgroups.json
 delete mode 100644 docs/guide/src/docbkx/samples/globalgroups.xml
 delete mode 100644 docs/guide/src/docbkx/samples/grantedpermissions.json
 delete mode 100644 docs/guide/src/docbkx/samples/grantedpermissions.xml
 delete mode 100644 docs/guide/src/docbkx/samples/group-create.json
 delete mode 100644 docs/guide/src/docbkx/samples/group-create.xml
 delete mode 100644 docs/guide/src/docbkx/samples/group-updated-nt.json
 delete mode 100644 docs/guide/src/docbkx/samples/group-updated-nt.xml
 delete mode 100644 docs/guide/src/docbkx/samples/group-updated.json
 delete mode 100644 docs/guide/src/docbkx/samples/group-updated.xml
 delete mode 100644 docs/guide/src/docbkx/samples/group.json
 delete mode 100644 docs/guide/src/docbkx/samples/group.xml
 delete mode 100644 docs/guide/src/docbkx/samples/groups-nt.json
 delete mode 100644 docs/guide/src/docbkx/samples/groups-nt.xml
 delete mode 100644 docs/guide/src/docbkx/samples/groups.json
 delete mode 100644 docs/guide/src/docbkx/samples/groups.xml
 delete mode 100644 docs/guide/src/docbkx/samples/methodnotallowedfault.json
 delete mode 100644 docs/guide/src/docbkx/samples/methodnotallowedfault.xml
 delete mode 100644 docs/guide/src/docbkx/samples/missing_username.json
 delete mode 100644 docs/guide/src/docbkx/samples/missing_username.xml
 delete mode 100644 docs/guide/src/docbkx/samples/mosso-id-authentication-response.json
 delete mode 100644 docs/guide/src/docbkx/samples/mosso-id-authentication-response.xml
 delete mode 100644 docs/guide/src/docbkx/samples/mossoCredentials.xml
 delete mode 100644 docs/guide/src/docbkx/samples/nastCredentials.xml
 delete mode 100644 docs/guide/src/docbkx/samples/password_recovery.json
 delete mode 100644 docs/guide/src/docbkx/samples/password_recovery.xml
 delete mode 100644 docs/guide/src/docbkx/samples/password_rule.json
 delete mode 100644 docs/guide/src/docbkx/samples/password_rule.xml
 delete mode 100644 docs/guide/src/docbkx/samples/password_rule_result.json
 delete mode 100644 docs/guide/src/docbkx/samples/password_rule_result.xml
 delete mode 100644 docs/guide/src/docbkx/samples/password_rule_results.json
 delete mode 100644 docs/guide/src/docbkx/samples/password_rule_results.xml
 delete mode 100644 docs/guide/src/docbkx/samples/password_rules.json
 delete mode 100644 docs/guide/src/docbkx/samples/password_rules.xml
 delete mode 100644 docs/guide/src/docbkx/samples/password_validation.json
 delete mode 100644 docs/guide/src/docbkx/samples/password_validation.xml
 delete mode 100644 docs/guide/src/docbkx/samples/passwordrotation.json
 delete mode 100644 docs/guide/src/docbkx/samples/passwordrotation.xml
 delete mode 100644 docs/guide/src/docbkx/samples/passwordvalidationfault.json
 delete mode 100644 docs/guide/src/docbkx/samples/passwordvalidationfault.xml
 delete mode 100644 docs/guide/src/docbkx/samples/permission.json
 delete mode 100644 docs/guide/src/docbkx/samples/permission.xml
 delete mode 100644 docs/guide/src/docbkx/samples/permissions.json
 delete mode 100644 docs/guide/src/docbkx/samples/permissions.xml
 delete mode 100644 docs/guide/src/docbkx/samples/reset_user_password.json
 delete mode 100644 docs/guide/src/docbkx/samples/reset_user_password.xml
 delete mode 100644 docs/guide/src/docbkx/samples/resourceId_conflict.json
 delete mode 100644 docs/guide/src/docbkx/samples/resourceId_conflict.xml
 delete mode 100644 docs/guide/src/docbkx/samples/role.json
 delete mode 100644 docs/guide/src/docbkx/samples/role.xml
 delete mode 100644 docs/guide/src/docbkx/samples/roles.json
 delete mode 100644 docs/guide/src/docbkx/samples/roles.xml
 delete mode 100644 docs/guide/src/docbkx/samples/service-catalog-response.json
 delete mode 100644 docs/guide/src/docbkx/samples/service-catalog-response.xml
 create mode 100644 docs/guide/src/docbkx/samples/tenant.json
 create mode 100644 docs/guide/src/docbkx/samples/tenant.xml
 create mode 100644 docs/guide/src/docbkx/samples/tenantlock.json
 create mode 100644 docs/guide/src/docbkx/samples/tenantlock.xml
 create mode 100644 docs/guide/src/docbkx/samples/tenants.json
 create mode 100644 docs/guide/src/docbkx/samples/tenants.xml
 delete mode 100644 docs/guide/src/docbkx/samples/token.json
 delete mode 100644 docs/guide/src/docbkx/samples/token.xml
 delete mode 100644 docs/guide/src/docbkx/samples/unauthorized.json
 delete mode 100644 docs/guide/src/docbkx/samples/unauthorized.xml
 delete mode 100644 docs/guide/src/docbkx/samples/unavailable.json
 delete mode 100644 docs/guide/src/docbkx/samples/unavailable.xml
 delete mode 100644 docs/guide/src/docbkx/samples/updatedcustomer.json
 delete mode 100644 docs/guide/src/docbkx/samples/updatedcustomer.xml
 create mode 100644 docs/guide/src/docbkx/samples/updatedtenant.json
 create mode 100644 docs/guide/src/docbkx/samples/updatedtenant.xml
 delete mode 100644 docs/guide/src/docbkx/samples/updateduser.json
 delete mode 100644 docs/guide/src/docbkx/samples/updateduser.xml
 delete mode 100644 docs/guide/src/docbkx/samples/updateuser.json
 delete mode 100644 docs/guide/src/docbkx/samples/updateuser.xml
 delete mode 100644 docs/guide/src/docbkx/samples/user.json
 delete mode 100644 docs/guide/src/docbkx/samples/user.xml
 delete mode 100644 docs/guide/src/docbkx/samples/userGroups.json
 delete mode 100644 docs/guide/src/docbkx/samples/userGroups.xml
 delete mode 100644 docs/guide/src/docbkx/samples/userWithOnlyLock.json
 delete mode 100644 docs/guide/src/docbkx/samples/userWithOnlyLock.xml
 delete mode 100644 docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.json
 delete mode 100644 docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.xml
 delete mode 100644 docs/guide/src/docbkx/samples/userWithOnlyStatus.json
 delete mode 100644 docs/guide/src/docbkx/samples/userWithOnlyStatus.xml
 delete mode 100644 docs/guide/src/docbkx/samples/user_api_key.json
 delete mode 100644 docs/guide/src/docbkx/samples/user_api_key.xml
 delete mode 100644 docs/guide/src/docbkx/samples/user_credentials.json
 delete mode 100644 docs/guide/src/docbkx/samples/user_credentials.xml
 delete mode 100644 docs/guide/src/docbkx/samples/user_disabled.json
 delete mode 100644 docs/guide/src/docbkx/samples/user_disabled.xml
 delete mode 100644 docs/guide/src/docbkx/samples/user_password.json
 delete mode 100644 docs/guide/src/docbkx/samples/user_password.xml
 delete mode 100644 docs/guide/src/docbkx/samples/user_secret.json
 delete mode 100644 docs/guide/src/docbkx/samples/user_secret.xml
 delete mode 100644 docs/guide/src/docbkx/samples/usernameCredentials.xml
 delete mode 100644 docs/guide/src/docbkx/samples/username_conflict.json
 delete mode 100644 docs/guide/src/docbkx/samples/username_conflict.xml
 delete mode 100644 docs/guide/src/docbkx/samples/users.json
 delete mode 100644 docs/guide/src/docbkx/samples/users.xml

(limited to 'docs')

diff --git a/docs/guide/src/docbkx/idmdevguide.xml b/docs/guide/src/docbkx/idmdevguide.xml
index e3271cde..1bad4a16 100644
--- a/docs/guide/src/docbkx/idmdevguide.xml
+++ b/docs/guide/src/docbkx/idmdevguide.xml
@@ -866,25 +866,25 @@ Host: idm.api.openstack.org/v1.1/
       <example>
         <title>XML Tenant Create Request</title>
         <programlisting language="xml">
-<xi:include href="samples/customer.xml" parse="text"/>
+<xi:include href="samples/tenant.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Tenant Create Request</title>
         <programlisting language="javascript">
-<xi:include href="samples/customer.json" parse="text"/>
+<xi:include href="samples/tenant.json" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>XML Tenant Create Response</title>
         <programlisting language="xml">
-<xi:include href="samples/customer.xml" parse="text"/>
+<xi:include href="samples/tenant.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Tenant Create Response</title>
         <programlisting language="javascript">
-<xi:include href="samples/customer.json" parse="text"/>
+<xi:include href="samples/tenant.json" parse="text"/>
 </programlisting>
       </example>
        </section>
@@ -914,13 +914,13 @@ Host: idm.api.openstack.org/v1.1/
         <example>
           <title>XML Tenants Response</title>
           <programlisting language="xml">
-<xi:include href="samples/customers.xml" parse="text"/>
+<xi:include href="samples/tenants.xml" parse="text"/>
 </programlisting>
         </example>
         <example>
           <title>JSON Tenants Response</title>
           <programlisting language="javascript">
-<xi:include href="samples/customers.json" parse="text"/>
+<xi:include href="samples/tenants.json" parse="text"/>
 </programlisting>
         </example>
       </section>
@@ -945,13 +945,13 @@ Host: idm.api.openstack.org/v1.1/
         <example>
           <title>XML Tenant Response</title>
           <programlisting language="xml">
-<xi:include href="samples/customer.xml" parse="text"/>
+<xi:include href="samples/tenant.xml" parse="text"/>
 </programlisting>
         </example>
         <example>
           <title>JSON Tenant Response</title>
           <programlisting language="javascript">
-<xi:include href="samples/customer.json" parse="text"/>
+<xi:include href="samples/tenant.json" parse="text"/>
 </programlisting>
         </example>
       </section>
@@ -975,25 +975,25 @@ Host: idm.api.openstack.org/v1.1/
       <example>
         <title>XML Tenant Update Request</title>
         <programlisting language="xml">
-<xi:include href="samples/customerlock.xml" parse="text"/>
+<xi:include href="samples/tenantlock.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Tenant Update Request</title>
         <programlisting language="javascript">
-<xi:include href="samples/customerlock.json" parse="text"/>
+<xi:include href="samples/tenantlock.json" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>XML Tenant Update Response</title>
         <programlisting language="xml">
-<xi:include href="samples/updatedcustomer.xml" parse="text"/>
+<xi:include href="samples/updatedtenant.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Tenant Update Response</title>
         <programlisting language="javascript">
-<xi:include href="samples/updatedcustomer.json" parse="text"/>
+<xi:include href="samples/updatedtenant.json" parse="text"/>
 </programlisting>
       </example>
        </section>     
diff --git a/docs/guide/src/docbkx/samples/add-baseurl-input.xml b/docs/guide/src/docbkx/samples/add-baseurl-input.xml
deleted file mode 100644
index ddbe52da..00000000
--- a/docs/guide/src/docbkx/samples/add-baseurl-input.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURL xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    id="111114"
-    userType="NAST"
-    serviceName="cloudFiles"
-    region="DFW"
-    publicURL="https://storage.clouddrive.com/v1"
-    internalURL="https://storage-snet.clouddrive.com/v1"
-    adminURL="https://storage-snet.clouddrive.com/v1"
-    default="true"/>
diff --git a/docs/guide/src/docbkx/samples/add-baseurlRef-input.xml b/docs/guide/src/docbkx/samples/add-baseurlRef-input.xml
deleted file mode 100644
index 7dd65a08..00000000
--- a/docs/guide/src/docbkx/samples/add-baseurlRef-input.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURLRef xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    id="111114"
-    href="https://storage-snet.clouddrive.com/v1"
-    v1Default="true"/>
diff --git a/docs/guide/src/docbkx/samples/addclient.json b/docs/guide/src/docbkx/samples/addclient.json
deleted file mode 100644
index 7a279e23..00000000
--- a/docs/guide/src/docbkx/samples/addclient.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ 
-  "customerId": "RCN-000-000-000",
-  "name": "Test Application2"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addclient.xml b/docs/guide/src/docbkx/samples/addclient.xml
deleted file mode 100644
index 85cf6b72..00000000
--- a/docs/guide/src/docbkx/samples/addclient.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<client xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    name="Test Application2" 
-    customerId="RCN-000-000-000">
-</client>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addedclient.json b/docs/guide/src/docbkx/samples/addedclient.json
deleted file mode 100644
index 76555364..00000000
--- a/docs/guide/src/docbkx/samples/addedclient.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{  
-  "credentials": {
-    "clientSecret": "3af738fbeiwu23"
-  },
-  "clientId": "ab4820dhcb39347",
-  "customerId": "RCN-000-000-000",
-  "name": "Test Application2",
-  "inum": "@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001",
-  "status": "ACTIVE",
-  "locked": false,
-  "softDeleted": false
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addedclient.xml b/docs/guide/src/docbkx/samples/addedclient.xml
deleted file mode 100644
index f4631ad0..00000000
--- a/docs/guide/src/docbkx/samples/addedclient.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<client xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="false" 
-    locked="false" 
-    status="ACTIVE"
-    inum="@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001"
-    name="Test Application2" 
-    customerId="RCN-000-000-000" 
-    clientId="ab4820dhcb39347">
-    <credentials clientSecret="3af738fbeiwu23" />
-</client>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addeduser.json b/docs/guide/src/docbkx/samples/addeduser.json
deleted file mode 100644
index 0566f29b..00000000
--- a/docs/guide/src/docbkx/samples/addeduser.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{"user":
-    {
-      "password": "P@ssword1",
-      "id": "jqsmith",
-      "tenantId": "12234",
-      "email": "john.smith@example.org",
-      "enabled" : true
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/addfirstuserresponse.json b/docs/guide/src/docbkx/samples/addfirstuserresponse.json
deleted file mode 100644
index 65115251..00000000
--- a/docs/guide/src/docbkx/samples/addfirstuserresponse.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "password": "P@ssword1",
-  "username": "jqsmith",
-  "tenantId": "12234",
-  "email": "john.smith@example.org",
-  "enabled" : true
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/addfirstuserresponse.xml b/docs/guide/src/docbkx/samples/addfirstuserresponse.xml
deleted file mode 100644
index 0b4f2259..00000000
--- a/docs/guide/src/docbkx/samples/addfirstuserresponse.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    email="john.smith@example.org"
-    tenantId="1234" 
-    username="jqsmith"
-    enabled="true"
-    password="C@n+f001me!" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/adduser.json b/docs/guide/src/docbkx/samples/adduser.json
deleted file mode 100644
index 3bf8ca3b..00000000
--- a/docs/guide/src/docbkx/samples/adduser.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"user":
-    {
-      "password": "P@ssword1",
-      "id": "jqsmith",
-      "tenantId": "12234",
-      "email": "john.smith@example.org"
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/adduser.xml b/docs/guide/src/docbkx/samples/adduser.xml
deleted file mode 100644
index 60816acd..00000000
--- a/docs/guide/src/docbkx/samples/adduser.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      email="john.smith@example.org" tenantId="1234"
-      id="jqsmith" password="C@n+f001me!"/>
diff --git a/docs/guide/src/docbkx/samples/adduserresponse.xml b/docs/guide/src/docbkx/samples/adduserresponse.xml
deleted file mode 100644
index add18f52..00000000
--- a/docs/guide/src/docbkx/samples/adduserresponse.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      email="john.smith@example.org"
-      tenantId="1234" id="jqsmith"
-      enabled="true" password="C@n+f001me!"/>
diff --git a/docs/guide/src/docbkx/samples/bad_request.json b/docs/guide/src/docbkx/samples/bad_request.json
deleted file mode 100644
index 25796991..00000000
--- a/docs/guide/src/docbkx/samples/bad_request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Bad Request!",
-  "details": "Error Details...",
-  "code": 400
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/bad_request.xml b/docs/guide/src/docbkx/samples/bad_request.xml
deleted file mode 100644
index 275a40b6..00000000
--- a/docs/guide/src/docbkx/samples/bad_request.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<badRequest xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="400">
-	<message>Bad Request!</message>
-	<details>Error Details...</details>
-</badRequest>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/baseURLRefs.json b/docs/guide/src/docbkx/samples/baseURLRefs.json
deleted file mode 100644
index 30e56d45..00000000
--- a/docs/guide/src/docbkx/samples/baseURLRefs.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "baseURLRefs" : [
-  {
-  "id" : 1,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/1",
-  "v1Default" : true
-  },
-  {
-  "id" : 2,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/2"
-  },
-  {
-  "id" : 3,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/3",
-  "v1Default" : true
-  },
-  {
-  "id" : 4,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/4"
-  },
-  {
-  "id" : 5,
-  "href" : "https://auth.api.rackspacecloud.com/v1.1/baseURLs/5",
-  "v1Default" : true
-  }
- ]
-}
diff --git a/docs/guide/src/docbkx/samples/baseURLRefs.xml b/docs/guide/src/docbkx/samples/baseURLRefs.xml
deleted file mode 100644
index a33c34e8..00000000
--- a/docs/guide/src/docbkx/samples/baseURLRefs.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURLRefs xmlns="http://docs.rackspacecloud.com/auth/api/v1.1">
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/1"
-        id="1" 
-        v1Default="true" />
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/2"
-        id="2" />
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/3"
-        id="3" 
-        v1Default="true" />
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/4"
-        id="4" />
-	<baseURLRef 
-        href="https://auth.api.rackspacecloud.com/v1.1/baseURLs/5"
-        id="5" 
-        v1Default="true" />
-</baseURLRefs>
diff --git a/docs/guide/src/docbkx/samples/base_url_ref_response.json b/docs/guide/src/docbkx/samples/base_url_ref_response.json
deleted file mode 100644
index 65bc55c3..00000000
--- a/docs/guide/src/docbkx/samples/base_url_ref_response.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "id": 111111,
-   "href": "https://idm.rackspace.com/v1.0/baseurls/111111",
-   "v1Default": true
-}
diff --git a/docs/guide/src/docbkx/samples/base_url_ref_response.xml b/docs/guide/src/docbkx/samples/base_url_ref_response.xml
deleted file mode 100644
index ab90847a..00000000
--- a/docs/guide/src/docbkx/samples/base_url_ref_response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURLRef xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    id="111111" 
-    href="https://idm.rackspace.com/v1.0/baseurls/111111" 
-    v1Default="true" />
diff --git a/docs/guide/src/docbkx/samples/base_url_response.json b/docs/guide/src/docbkx/samples/base_url_response.json
deleted file mode 100644
index 41ca4de6..00000000
--- a/docs/guide/src/docbkx/samples/base_url_response.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-   "id": 111111,
-   "userType": "NAST",
-   "serviceName": "cloudFiles",
-   "region": "DFW",
-   "publicURL": "https://storage.clouddrive.com/v1",
-   "internalURL": "https://storage-snet.clouddrive.com/v1",
-   "adminURL": null,
-   "default": true
-}
diff --git a/docs/guide/src/docbkx/samples/base_url_response.xml b/docs/guide/src/docbkx/samples/base_url_response.xml
deleted file mode 100644
index 8310eec4..00000000
--- a/docs/guide/src/docbkx/samples/base_url_response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Response xmlns="http://10.127.7.164/v1.0/baseurls/111111"
-    adminURL="https://storage-snet.clouddrive.com/v1"
-    default="true"
-    id="111111"
-    internalURL="https://storage-snet.clouddrive.com/v1"
-    publicURL="https://storage.clouddrive.com/v1"
-    region="DFW"
-    serviceName="cloudFiles"
-    userType="NAST"/>
-   
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/base_urls_response.json b/docs/guide/src/docbkx/samples/base_urls_response.json
deleted file mode 100644
index 284bccdb..00000000
--- a/docs/guide/src/docbkx/samples/base_urls_response.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{"baseURL": [
-      {
-      "id": 111111,
-      "userType": "NAST",
-      "serviceName": "cloudFiles",
-      "region": "DFW",
-      "publicURL": "https://storage.clouddrive.com/v1",
-      "internalURL": "https://storage-snet.clouddrive.com/v1",
-      "adminURL": null,
-      "default": true
-   },
-      {
-      "id": 222222,
-      "userType": "MOSSO",
-      "serviceName": "cloudServers",
-      "region": null,
-      "publicURL": "https://servers.api.rackspacecloud.com/v1.0",
-      "internalURL": null,
-      "adminURL": null,
-      "default": true
-   }
-]}
diff --git a/docs/guide/src/docbkx/samples/base_urls_response.xml b/docs/guide/src/docbkx/samples/base_urls_response.xml
deleted file mode 100644
index eb52f45f..00000000
--- a/docs/guide/src/docbkx/samples/base_urls_response.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<baseURLs xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <baseURL 
-        id="111111" 
-        userType="NAST" 
-        serviceName="cloudFiles" 
-        region="DFW" 
-        publicURL="https://storage.clouddrive.com/v1" 
-        internalURL="https://storage-snet.clouddrive.com/v1" 
-        default="true"/>
-    <baseURL 
-        id="222222" 
-        userType="MOSSO" 
-        serviceName="cloudServers" 
-        publicURL="https://servers.api.rackspacecloud.com/v1.0" 
-        default="true"/>
-</baseURLs>
diff --git a/docs/guide/src/docbkx/samples/client-credentials-response.json b/docs/guide/src/docbkx/samples/client-credentials-response.json
deleted file mode 100644
index 96f07aaa..00000000
--- a/docs/guide/src/docbkx/samples/client-credentials-response.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "clientSecret" : "eca2d413a1790dc6473842ab5a49387a29996757"
-}
diff --git a/docs/guide/src/docbkx/samples/client-credentials-response.xml b/docs/guide/src/docbkx/samples/client-credentials-response.xml
deleted file mode 100644
index dd881ca5..00000000
--- a/docs/guide/src/docbkx/samples/client-credentials-response.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<clientCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-	clientSecret="c582fe94dda4c0da19bf234c504db0b63df96daa" />
diff --git a/docs/guide/src/docbkx/samples/client.json b/docs/guide/src/docbkx/samples/client.json
deleted file mode 100644
index faef1dd0..00000000
--- a/docs/guide/src/docbkx/samples/client.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{ "permissions": {
-    "permission": [
-      {
-        "resourceId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]},
-  "clientId": "ab4820dhcb39347",
-  "customerId": "RCN-000-000-000",
-  "name": "Test Application2",
-  "inum": "@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001",
-  "status": "ACTIVE",
-  "locked": false,
-  "softDeleted": false
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/client.xml b/docs/guide/src/docbkx/samples/client.xml
deleted file mode 100644
index e2a621bc..00000000
--- a/docs/guide/src/docbkx/samples/client.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<client xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="false" 
-    locked="false" 
-    status="ACTIVE"
-    iname="@Rackspace*Rackspace*ControlPanel" 
-    inum="@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001"
-    name="Test Application2" 
-    customerId="RCN-000-000-000" 
-    clientId="ab4820dhcb39347">
-    <permissions>
-        <permission clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            resourceId="addCustomer" />
-    </permissions>
-</client>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientGroup.json b/docs/guide/src/docbkx/samples/clientGroup.json
deleted file mode 100644
index 75e81859..00000000
--- a/docs/guide/src/docbkx/samples/clientGroup.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tenantId" : "1234",
-    "name" : "Admin"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientGroup.xml b/docs/guide/src/docbkx/samples/clientGroup.xml
deleted file mode 100644
index 55ef0456..00000000
--- a/docs/guide/src/docbkx/samples/clientGroup.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<group xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    tenantId="1234"
-    name="Admin" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientGroups.json b/docs/guide/src/docbkx/samples/clientGroups.json
deleted file mode 100644
index b8c62c93..00000000
--- a/docs/guide/src/docbkx/samples/clientGroups.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"group": [
-    {
-        "tenantId" : "1234",
-        "name" : "Admin"
-    }]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientGroups.xml b/docs/guide/src/docbkx/samples/clientGroups.xml
deleted file mode 100644
index e761dc94..00000000
--- a/docs/guide/src/docbkx/samples/clientGroups.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<groups xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <group xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-        tenantId="1234"
-        name="Admin" />
-</groups>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.json b/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.json
deleted file mode 100644
index 410afe99..00000000
--- a/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ 
-  "softDeleted": "true"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.xml b/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.xml
deleted file mode 100644
index 8c73be48..00000000
--- a/docs/guide/src/docbkx/samples/clientWithOnlySoftDeleted.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<client xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="true" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/client_credentials.json b/docs/guide/src/docbkx/samples/client_credentials.json
deleted file mode 100644
index 3de72a8f..00000000
--- a/docs/guide/src/docbkx/samples/client_credentials.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "clientSecret": "cncv9823823bfb"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/client_credentials.xml b/docs/guide/src/docbkx/samples/client_credentials.xml
deleted file mode 100644
index c9eba3bd..00000000
--- a/docs/guide/src/docbkx/samples/client_credentials.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<clientCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	clientSecret="cncv9823823bfb" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientname_conflict.json b/docs/guide/src/docbkx/samples/clientname_conflict.json
deleted file mode 100644
index 9b064015..00000000
--- a/docs/guide/src/docbkx/samples/clientname_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Clientname already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clientname_conflict.xml b/docs/guide/src/docbkx/samples/clientname_conflict.xml
deleted file mode 100644
index 0694d96e..00000000
--- a/docs/guide/src/docbkx/samples/clientname_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<clientnameConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>Clientname already taken.</message>
-	<details>Error Details...</details>
-</clientnameConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clients.json b/docs/guide/src/docbkx/samples/clients.json
deleted file mode 100644
index 3c5193eb..00000000
--- a/docs/guide/src/docbkx/samples/clients.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "client": [
-    {
-      "clientId": "ab4820dhcb39347",
-      "customerId": "RCN-000-000-000",
-      "name": "Test Application2",
-      "inum": "@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001",
-      "status": "ACTIVE",
-      "locked": false,
-      "softDeleted": false
-    },
-    {
-      "clientId": "632h389cv902bde",
-      "customerId": "RCN-000-000-000",
-      "name": "Test Application2",
-      "inum": "@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0002",
-      "status": "ACTIVE",
-      "locked": false,
-      "softDeleted": false
-    }
-  ]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/clients.xml b/docs/guide/src/docbkx/samples/clients.xml
deleted file mode 100644
index 2d870f9b..00000000
--- a/docs/guide/src/docbkx/samples/clients.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<clients xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-	<client 
-	   softDeleted="false" 
-	   locked="false" 
-	   status="ACTIVE"
-	   inum="@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0001"
-	   name="Test Application2" 
-	   customerId="RCN-000-000-000" 
-	   clientId="ab4820dhcb39347">
-	</client>
-	<client 
-	   softDeleted="false" 
-	   locked="false" 
-	   status="ACTIVE"
-	   inum="@FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!0002"
-	   name="Test Application2" 
-	   customerId="RCN-000-000-000" 
-	   clientId="632h389cv902bde">
-	</client>
-</clients>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/customer.json b/docs/guide/src/docbkx/samples/customer.json
deleted file mode 100644
index 7ff7ce32..00000000
--- a/docs/guide/src/docbkx/samples/customer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"tenant":
-    {
-      "id": "1234",
-      "description": "A description ...",
-      "enabled": true
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/customer.xml b/docs/guide/src/docbkx/samples/customer.xml
deleted file mode 100644
index ea6a63dc..00000000
--- a/docs/guide/src/docbkx/samples/customer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/idm/api/v1.0"
-        enabled="true" id="1234">
-    <description>A description...</description>
-</tenant>
diff --git a/docs/guide/src/docbkx/samples/customer_conflict.json b/docs/guide/src/docbkx/samples/customer_conflict.json
deleted file mode 100644
index 4fd3a6a8..00000000
--- a/docs/guide/src/docbkx/samples/customer_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "CustomerId already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/customer_conflict.xml b/docs/guide/src/docbkx/samples/customer_conflict.xml
deleted file mode 100644
index 5641ad34..00000000
--- a/docs/guide/src/docbkx/samples/customer_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<customerIdConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>CustomerId already taken.</message>
-	<details>Error Details...</details>
-</customerIdConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/customerlock.json b/docs/guide/src/docbkx/samples/customerlock.json
deleted file mode 100644
index 584c21a4..00000000
--- a/docs/guide/src/docbkx/samples/customerlock.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"tenant":
-    {
-      "description": "A NEW description..."
-    }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/customerlock.xml b/docs/guide/src/docbkx/samples/customerlock.xml
deleted file mode 100644
index 9d7081d4..00000000
--- a/docs/guide/src/docbkx/samples/customerlock.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <description>A NEW description...</description>
-</tenant>
diff --git a/docs/guide/src/docbkx/samples/customers.json b/docs/guide/src/docbkx/samples/customers.json
deleted file mode 100644
index 7fb848f7..00000000
--- a/docs/guide/src/docbkx/samples/customers.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"tenants": {
-    "values" : [
-        {
-            "id": "1234",
-            "description": "A description ...",
-            "enabled": true
-        },
-        {
-            "id": "3456",
-            "description": "A description ...",
-            "enabled": true
-        }
-    ]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/customers.xml b/docs/guide/src/docbkx/samples/customers.xml
deleted file mode 100644
index 9b503ce2..00000000
--- a/docs/guide/src/docbkx/samples/customers.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tenants xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <tenant enabled="true" id="1234">
-        <description>A description...</description>
-    </tenant>
-    <tenant enabled="true" id="3645">
-        <description>A description...</description>
-    </tenant>
-</tenants>
diff --git a/docs/guide/src/docbkx/samples/definedpermissions.json b/docs/guide/src/docbkx/samples/definedpermissions.json
deleted file mode 100644
index f725235c..00000000
--- a/docs/guide/src/docbkx/samples/definedpermissions.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "defined": {
-    "permission": [
-      {
-        "permissionId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      },
-      {
-        "permissionId": "getCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/definedpermissions.xml b/docs/guide/src/docbkx/samples/definedpermissions.xml
deleted file mode 100644
index b8b28a5b..00000000
--- a/docs/guide/src/docbkx/samples/definedpermissions.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<permissions xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <defined>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="addCustomer"/>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="getCustomer"/>
-    </defined>
-</permissions>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/email_conflict.json b/docs/guide/src/docbkx/samples/email_conflict.json
deleted file mode 100644
index aa9ba6ef..00000000
--- a/docs/guide/src/docbkx/samples/email_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Email Address already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/email_conflict.xml b/docs/guide/src/docbkx/samples/email_conflict.xml
deleted file mode 100644
index c30052bc..00000000
--- a/docs/guide/src/docbkx/samples/email_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<emailConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>Email Address already taken.</message>
-	<details>Error Details...</details>
-</emailConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/feed.xml b/docs/guide/src/docbkx/samples/feed.xml
deleted file mode 100644
index 15603de1..00000000
--- a/docs/guide/src/docbkx/samples/feed.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<feed xmlns="http://www.w3.org/2005/Atom" 
-      xml:lang="en-US">
-<entry>
- <title>User, "mkovacs" was modified.</title>
- <summary>User, "mkovacs" was modified.</summary>
- <link rel="actual"
-    href="/customers/RCN-000-000-000/users/mkovacs" />
- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
- <updated>2003-12-13T18:30:02Z</updated>
-</entry>
-<entry>
- <title>User, "hueyly" was created.</title>
- <summary>User, "hueyly" was created.</summary>
- <link rel="actual"
-    href="/customers/RCN-000-000-000/users/hueyly" />
- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-920474efa234</id>
- <updated>2003-12-13T18:29:20Z</updated>
-</entry>
-</feed>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/forbidden.json b/docs/guide/src/docbkx/samples/forbidden.json
deleted file mode 100644
index 48b23ea5..00000000
--- a/docs/guide/src/docbkx/samples/forbidden.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Forbidden",
-  "details": "Error Details...",
-  "code": 403
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/forbidden.xml b/docs/guide/src/docbkx/samples/forbidden.xml
deleted file mode 100644
index 23123805..00000000
--- a/docs/guide/src/docbkx/samples/forbidden.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<forbidden xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="403">
-	<message>Forbidden</message>
-	<details>Error Details...</details>
-</forbidden>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/forgot_password.json b/docs/guide/src/docbkx/samples/forgot_password.json
deleted file mode 100644
index e8d2114a..00000000
--- a/docs/guide/src/docbkx/samples/forgot_password.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "customParams" : [ 
-            { 
-                "name": "%%FirstName%%",
-                "value": "Steve"
-            },
-            { 
-                "name": "%%LastName%%",
-                "value": "Smith"
-            }
-        ],
-    "templateUrl": "http://cp.rackspace.com/files/passwordRecovery.txt",
-    "callbackUrl": "http://cp.rackspace.com/passwordRecovery.html", 
-    "from": "Rackspace Control Panel",
-    "replyTo": "cpsupport@rackspace.com",
-    "subject": "Rackspace Password Reset"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/forgot_password.xml b/docs/guide/src/docbkx/samples/forgot_password.xml
deleted file mode 100644
index 53a7a1a8..00000000
--- a/docs/guide/src/docbkx/samples/forgot_password.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<passwordRecovery xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    templateUrl="http://cp.rackspace.com/files/passwordRecovery.txt" 
-    callbackUrl="http://cp.rackspace.com/passwordRecovery.html" 
-    from="Rackspace Control Panel"
-    replyTo="cpsupport@rackspace.com" 
-    subject="Rackspace Password Reset">
-    <customParams>
-        <customParam name="%%FirstName%%" value="Steve" />
-        <customParam name="%%LastName%%" value="Smith" />
-    </customParams>
-</passwordRecovery>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/getuser-with-mosso-id.json b/docs/guide/src/docbkx/samples/getuser-with-mosso-id.json
deleted file mode 100644
index 4ba14bbc..00000000
--- a/docs/guide/src/docbkx/samples/getuser-with-mosso-id.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "username": "qauser",
-   "customerId": "RCN-QATestingCustomer",
-   "customerInum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999",
-   "email": "quauser@example.com",
-   "personId": "RPN-qauser-000-10001",
-   "firstName": "qauser",
-   "middleName": "none",
-   "lastName": "Tester",
-   "displayName": "qauser",
-   "prefLanguage": "en-us",
-   "inum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001",
-   "status": "ACTIVE",
-   "locked": false,
-   "softDeleted": false,
-   "country": "USA",
-   "timeZone": "America/Chicago",
-   "mossoId": 999112358,
-   "nastId": "nastid-qauser"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/getuser-with-mosso-id.xml b/docs/guide/src/docbkx/samples/getuser-with-mosso-id.xml
deleted file mode 100644
index 26c12ede..00000000
--- a/docs/guide/src/docbkx/samples/getuser-with-mosso-id.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    username="qauser" 
-    customerId="RCN-QATestingCustomer"
-    customerInum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999" 
-    email="quauser@example.com"
-    personId="RPN-qauser-000-10001" 
-    firstName="qauser" 
-    middleName="none"
-    lastName="Tester" 
-    displayName="qauser" 
-    prefLanguage="en-us"
-    inum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001" 
-    status="ACTIVE" 
-    locked="false" 
-    softDeleted="false" 
-    country="USA"
-    timeZone="America/Chicago" 
-    mossoId="999112358" 
-    nastId="nastid-qauser"/>
diff --git a/docs/guide/src/docbkx/samples/getuser-with-nast-id.json b/docs/guide/src/docbkx/samples/getuser-with-nast-id.json
deleted file mode 100644
index 4ba14bbc..00000000
--- a/docs/guide/src/docbkx/samples/getuser-with-nast-id.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "username": "qauser",
-   "customerId": "RCN-QATestingCustomer",
-   "customerInum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999",
-   "email": "quauser@example.com",
-   "personId": "RPN-qauser-000-10001",
-   "firstName": "qauser",
-   "middleName": "none",
-   "lastName": "Tester",
-   "displayName": "qauser",
-   "prefLanguage": "en-us",
-   "inum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001",
-   "status": "ACTIVE",
-   "locked": false,
-   "softDeleted": false,
-   "country": "USA",
-   "timeZone": "America/Chicago",
-   "mossoId": 999112358,
-   "nastId": "nastid-qauser"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/getuser-with-nast-id.xml b/docs/guide/src/docbkx/samples/getuser-with-nast-id.xml
deleted file mode 100644
index 26c12ede..00000000
--- a/docs/guide/src/docbkx/samples/getuser-with-nast-id.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    username="qauser" 
-    customerId="RCN-QATestingCustomer"
-    customerInum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999" 
-    email="quauser@example.com"
-    personId="RPN-qauser-000-10001" 
-    firstName="qauser" 
-    middleName="none"
-    lastName="Tester" 
-    displayName="qauser" 
-    prefLanguage="en-us"
-    inum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001" 
-    status="ACTIVE" 
-    locked="false" 
-    softDeleted="false" 
-    country="USA"
-    timeZone="America/Chicago" 
-    mossoId="999112358" 
-    nastId="nastid-qauser"/>
diff --git a/docs/guide/src/docbkx/samples/getuser-with-username.json b/docs/guide/src/docbkx/samples/getuser-with-username.json
deleted file mode 100644
index 4ba14bbc..00000000
--- a/docs/guide/src/docbkx/samples/getuser-with-username.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "username": "qauser",
-   "customerId": "RCN-QATestingCustomer",
-   "customerInum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999",
-   "email": "quauser@example.com",
-   "personId": "RPN-qauser-000-10001",
-   "firstName": "qauser",
-   "middleName": "none",
-   "lastName": "Tester",
-   "displayName": "qauser",
-   "prefLanguage": "en-us",
-   "inum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001",
-   "status": "ACTIVE",
-   "locked": false,
-   "softDeleted": false,
-   "country": "USA",
-   "timeZone": "America/Chicago",
-   "mossoId": 999112358,
-   "nastId": "nastid-qauser"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/getuser-with-username.xml b/docs/guide/src/docbkx/samples/getuser-with-username.xml
deleted file mode 100644
index 5e92fb9c..00000000
--- a/docs/guide/src/docbkx/samples/getuser-with-username.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    username="qauser" 
-    customerId="RCN-QATestingCustomer"
-    customerInum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999" 
-    email="quauser@example.com"
-    personId="RPN-qauser-000-10001" 
-    firstName="qauser" 
-    middleName="none"
-    lastName="Tester" 
-    displayName="qauser" 
-    prefLanguage="en-us"
-    inum="@!FFFF.FFFF.FFFF.FFFF!EEEE.999!10001"
-    status="ACTIVE" 
-    locked="false" 
-    softDeleted="false" 
-    country="USA"
-    timeZone="America/Chicago" 
-    mossoId="999112358" 
-    nastId="nastid-qauser"/>
diff --git a/docs/guide/src/docbkx/samples/getuser.json b/docs/guide/src/docbkx/samples/getuser.json
deleted file mode 100644
index b9d00949..00000000
--- a/docs/guide/src/docbkx/samples/getuser.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"user":
-    {
-      "groups": {
-        "values": [
-          {
-            "tenantId" : "1234",
-            "id": "Admin"
-          }
-        ]},
-      "id": "jqsmith",
-      "tenantId": "1234",
-      "email": "john.smith@example.org",
-      "enabled": true
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/getuser.xml b/docs/guide/src/docbkx/samples/getuser.xml
deleted file mode 100644
index 095db4ef..00000000
--- a/docs/guide/src/docbkx/samples/getuser.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      enabled="true" email="john.smith@example.org"
-      tenantId="1234" id="jqsmith">
-	<groups>
-		<group tenantId="1234" id="Admin"/>
-	</groups>
-</user>
diff --git a/docs/guide/src/docbkx/samples/globalgroup.json b/docs/guide/src/docbkx/samples/globalgroup.json
deleted file mode 100644
index 8c524d61..00000000
--- a/docs/guide/src/docbkx/samples/globalgroup.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"group":
-    {
-        "name" : "Admin",
-        "description" : "A description ..."
-    }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/globalgroup.xml b/docs/guide/src/docbkx/samples/globalgroup.xml
deleted file mode 100644
index 387611c9..00000000
--- a/docs/guide/src/docbkx/samples/globalgroup.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<group xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    name="Admin"
-    description="A description..." />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/globalgroups.json b/docs/guide/src/docbkx/samples/globalgroups.json
deleted file mode 100644
index 523bb222..00000000
--- a/docs/guide/src/docbkx/samples/globalgroups.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"groups": [
-    {
-        "name" : "Admin",
-        "description" : "A description ..."
-    },
-    {
-        "name" : "Technical",
-        "description" : "Another description ..."
-    }]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/globalgroups.xml b/docs/guide/src/docbkx/samples/globalgroups.xml
deleted file mode 100644
index c272f370..00000000
--- a/docs/guide/src/docbkx/samples/globalgroups.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<groups xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <group
-        name="Admin" 
-        description="A description..."/>
-    <group
-        name="Technical" 
-        description="Another description..."/>
-</groups>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/grantedpermissions.json b/docs/guide/src/docbkx/samples/grantedpermissions.json
deleted file mode 100644
index 8269646e..00000000
--- a/docs/guide/src/docbkx/samples/grantedpermissions.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "granted": {
-    "permission": [
-      {
-        "permissionId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      },
-      {
-        "permissionId": "getCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/grantedpermissions.xml b/docs/guide/src/docbkx/samples/grantedpermissions.xml
deleted file mode 100644
index 07ca960d..00000000
--- a/docs/guide/src/docbkx/samples/grantedpermissions.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<permissions xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <granted>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="addCustomer"/>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="getCustomer"/>
-    </granted>
-</permissions>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/group-create.json b/docs/guide/src/docbkx/samples/group-create.json
deleted file mode 100644
index 4f5a15f7..00000000
--- a/docs/guide/src/docbkx/samples/group-create.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"group":
-    {
-        "id" : "Admin",
-        "description" : "A Description of the group..."
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/group-create.xml b/docs/guide/src/docbkx/samples/group-create.xml
deleted file mode 100644
index fbba3c61..00000000
--- a/docs/guide/src/docbkx/samples/group-create.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<group xmlns="http://docs.openstack.org/idm/api/v1.0"
-       id="Admin">
-    <description>A Description of the group...</description>
-</group>
diff --git a/docs/guide/src/docbkx/samples/group-updated-nt.json b/docs/guide/src/docbkx/samples/group-updated-nt.json
deleted file mode 100644
index 004fa368..00000000
--- a/docs/guide/src/docbkx/samples/group-updated-nt.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"group":
-    {
-        "id" : "Admin",
-        "description" : "A New description of the group..."
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/group-updated-nt.xml b/docs/guide/src/docbkx/samples/group-updated-nt.xml
deleted file mode 100644
index 1e10d24a..00000000
--- a/docs/guide/src/docbkx/samples/group-updated-nt.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<group xmlns="http://docs.openstack.org/idm/api/v1.0"
-       id="Admin">
-    <description>A New description of the group...</description>
-</group>
diff --git a/docs/guide/src/docbkx/samples/group-updated.json b/docs/guide/src/docbkx/samples/group-updated.json
deleted file mode 100644
index da20dac5..00000000
--- a/docs/guide/src/docbkx/samples/group-updated.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"group":
-    {
-        "tenantId" : "1234",
-        "id" : "Admin",
-        "description" : "A New description of the group..."
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/group-updated.xml b/docs/guide/src/docbkx/samples/group-updated.xml
deleted file mode 100644
index 991a6b1e..00000000
--- a/docs/guide/src/docbkx/samples/group-updated.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<group xmlns="http://docs.openstack.org/idm/api/v1.0"
-       tenantId="1234" id="Admin">
-    <description>A New description of the group...</description>
-</group>
diff --git a/docs/guide/src/docbkx/samples/group.json b/docs/guide/src/docbkx/samples/group.json
deleted file mode 100644
index 22efc41f..00000000
--- a/docs/guide/src/docbkx/samples/group.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"group":
-    {
-        "tenantId" : "1234",
-        "id" : "Admin",
-        "description" : "A Description of the group..."
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/group.xml b/docs/guide/src/docbkx/samples/group.xml
deleted file mode 100644
index ba3063ae..00000000
--- a/docs/guide/src/docbkx/samples/group.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<group xmlns="http://docs.openstack.org/idm/api/v1.0"
-       tenantId="1234" id="Admin">
-    <description>A Description of the group...</description>
-</group>
diff --git a/docs/guide/src/docbkx/samples/groups-nt.json b/docs/guide/src/docbkx/samples/groups-nt.json
deleted file mode 100644
index b183edac..00000000
--- a/docs/guide/src/docbkx/samples/groups-nt.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{"groups": {
-    "values" : [
-        {
-            "id" : "Admin",
-            "description" : "A description ..."
-        },
-        {
-            "id" : "Technical",
-            "description" : "Another description ..."
-        }]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/groups-nt.xml b/docs/guide/src/docbkx/samples/groups-nt.xml
deleted file mode 100644
index 7dd515aa..00000000
--- a/docs/guide/src/docbkx/samples/groups-nt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<groups xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <group id="Admin">
-        <description>A Description of the group...</description>
-    </group>
-    <group id="Technical">
-        <description>Another description...</description>
-    </group>
-</groups>
diff --git a/docs/guide/src/docbkx/samples/groups.json b/docs/guide/src/docbkx/samples/groups.json
deleted file mode 100644
index 1c6f6c03..00000000
--- a/docs/guide/src/docbkx/samples/groups.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{"groups": {
-    "values" : [
-        {
-            "tenantId" : "1234",
-            "id" : "Admin",
-            "description" : "A description ..."
-        },
-        {
-            "tenantId" : "1234",
-            "id" : "Technical",
-            "description" : "Another description ..."
-        }
-    ]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/groups.xml b/docs/guide/src/docbkx/samples/groups.xml
deleted file mode 100644
index 3f5ba19a..00000000
--- a/docs/guide/src/docbkx/samples/groups.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<groups xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <group tenantId="1234" id="Admin">
-        <description>A Description of the group...</description>
-    </group>
-    <group tenantId="1234" id="Technical">
-        <description>Another description...</description>
-    </group>
-</groups>
diff --git a/docs/guide/src/docbkx/samples/methodnotallowedfault.json b/docs/guide/src/docbkx/samples/methodnotallowedfault.json
deleted file mode 100644
index ad9cec4b..00000000
--- a/docs/guide/src/docbkx/samples/methodnotallowedfault.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Method Not Allowed",
-  "details": "Error Details...",
-  "code": 405
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/methodnotallowedfault.xml b/docs/guide/src/docbkx/samples/methodnotallowedfault.xml
deleted file mode 100644
index 01068572..00000000
--- a/docs/guide/src/docbkx/samples/methodnotallowedfault.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<methodNotAllowed xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="405">
-	<message>Method Not Allowed</message>
-	<details>Error Details...</details>
-</methodNotAllowed>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/missing_username.json b/docs/guide/src/docbkx/samples/missing_username.json
deleted file mode 100644
index a257f72e..00000000
--- a/docs/guide/src/docbkx/samples/missing_username.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "What username?",
-  "details": "Error Details...",
-  "code": 400
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/missing_username.xml b/docs/guide/src/docbkx/samples/missing_username.xml
deleted file mode 100644
index 9d1330fc..00000000
--- a/docs/guide/src/docbkx/samples/missing_username.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<missingUsername xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="400">
-	<message>What username?</message>
-	<details>Error Details...</details>
-</missingUsername>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/mosso-id-authentication-response.json b/docs/guide/src/docbkx/samples/mosso-id-authentication-response.json
deleted file mode 100644
index e071f01c..00000000
--- a/docs/guide/src/docbkx/samples/mosso-id-authentication-response.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"token": {
-   "id": "DFW-c6dfc4456f6545f8b8265ff5b6bda775",
-   "expires_in": 16110
-}}
diff --git a/docs/guide/src/docbkx/samples/mosso-id-authentication-response.xml b/docs/guide/src/docbkx/samples/mosso-id-authentication-response.xml
deleted file mode 100644
index 6bce8a03..00000000
--- a/docs/guide/src/docbkx/samples/mosso-id-authentication-response.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cloudAuth xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <token id="DFW-c6dfc4456f6545f8b8265ff5b6bda775" 
-        expires_in="16640"/>
-	<serviceCatalog xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-	    <service name="cloudFiles">
-	        <endpoint region="DFW" 
-	            v1Default="true" 
-	            publicURL="https://storage.clouddrive.com/v1/KovacsNastId" 
-	            internalURL="https://storage-snet.clouddrive.com/v1/KovacsNastId"/>
-	   </service>
-	   <service name="cloudServers">
-	        <endpoint v1Default="false" 
-	            publicURL="https://servers.api.rackspacecloud.com/v1.0/90000"/>
-	   </service>
-	</serviceCatalog>
-</cloudAuth>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/mossoCredentials.xml b/docs/guide/src/docbkx/samples/mossoCredentials.xml
deleted file mode 100644
index 17352331..00000000
--- a/docs/guide/src/docbkx/samples/mossoCredentials.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<mossoCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"  
-    mossoId="999112358"  
-    key="qauser-000-001" />
diff --git a/docs/guide/src/docbkx/samples/nastCredentials.xml b/docs/guide/src/docbkx/samples/nastCredentials.xml
deleted file mode 100644
index b478c3e6..00000000
--- a/docs/guide/src/docbkx/samples/nastCredentials.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<nastCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    nastId="nastid-qauser" 
-    key="qauser-000-001" />
diff --git a/docs/guide/src/docbkx/samples/password_recovery.json b/docs/guide/src/docbkx/samples/password_recovery.json
deleted file mode 100644
index 4650969a..00000000
--- a/docs/guide/src/docbkx/samples/password_recovery.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "customParams": {
-    "param": [
-      {
-        "name": "FirstName",
-        "value": "Steve"
-      }
-    ]
-  },
-  "callbackUrl": "http://www.someurl.com",
-  "templateUrl": "http://www.someurl.com",
-  "from": "email@email.com",
-  "replyTo": "replay@email.com",
-  "subject": "Password Recovery"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_recovery.xml b/docs/guide/src/docbkx/samples/password_recovery.xml
deleted file mode 100644
index d13922e7..00000000
--- a/docs/guide/src/docbkx/samples/password_recovery.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordRecovery xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    subject="Password Recovery" 
-    replyTo="replay@email.com" 
-    from="email@email.com"
-    templateUrl="http://www.someurl.com" 
-    callbackUrl="http://www.someurl.com">
-    <customParams>
-        <params value="Steve" name="FirstName" />
-    </customParams>
-</passwordRecovery>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule.json b/docs/guide/src/docbkx/samples/password_rule.json
deleted file mode 100644
index fe03ec4a..00000000
--- a/docs/guide/src/docbkx/samples/password_rule.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": 1,
-  "name": "Mininum Legth",
-  "message": "Password must be at least 7 characters long."
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule.xml b/docs/guide/src/docbkx/samples/password_rule.xml
deleted file mode 100644
index 78038228..00000000
--- a/docs/guide/src/docbkx/samples/password_rule.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordRule xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	message="Password must be at least 7 characters long." 
-	name="Mininum Legth"
-	id="1" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule_result.json b/docs/guide/src/docbkx/samples/password_rule_result.json
deleted file mode 100644
index 1c538dce..00000000
--- a/docs/guide/src/docbkx/samples/password_rule_result.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "passed": true,
-  "ruleId": 1,
-  "ruleName": "Minimum Length",
-  "ruleMessage": "Password must be at least 7 characters long."
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule_result.xml b/docs/guide/src/docbkx/samples/password_rule_result.xml
deleted file mode 100644
index 3e17ddab..00000000
--- a/docs/guide/src/docbkx/samples/password_rule_result.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordRuleResult xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	ruleMessage="Password must be at least 7 characters long." 
-	ruleName="Minimum Length"
-	ruleId="1" 
-	passed="true" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule_results.json b/docs/guide/src/docbkx/samples/password_rule_results.json
deleted file mode 100644
index 4a811cf4..00000000
--- a/docs/guide/src/docbkx/samples/password_rule_results.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "passwordRuleResult": [
-    {
-      "passed": true,
-      "ruleId": 1,
-      "ruleName": "Minimum Length",
-      "ruleMessage": "Password must be at least 7 characters long."
-    },
-    {
-      "passed": true,
-      "ruleId": 2,
-      "ruleName": "Lowercase Character",
-      "ruleMessage": "Password must contain a lowercase character."
-    }
-  ]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rule_results.xml b/docs/guide/src/docbkx/samples/password_rule_results.xml
deleted file mode 100644
index 8a48eb70..00000000
--- a/docs/guide/src/docbkx/samples/password_rule_results.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordRuleResults 
-    xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <passwordRuleResults 
-        ruleMessage="Password must be at least 7 characters."
-        ruleName="Minimum Length" 
-        ruleId="1" 
-        passed="true" />
-    <passwordRuleResults 
-        ruleMessage="Password must contain a lowercase."
-        ruleName="Lowercase Character" 
-        ruleId="2" 
-        passed="true" />
-</passwordRuleResults>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rules.json b/docs/guide/src/docbkx/samples/password_rules.json
deleted file mode 100644
index d65c3f9f..00000000
--- a/docs/guide/src/docbkx/samples/password_rules.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "passwordRule": [
-    {
-      "id": 1,
-      "name": "Mininum Legth",
-      "message": "Password must be at least 7 characters long."
-    },
-    {
-      "id": 2,
-      "name": "Lowercase Character",
-      "message": "Password must contain a lowercase character."
-    }
-  ]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_rules.xml b/docs/guide/src/docbkx/samples/password_rules.xml
deleted file mode 100644
index e6375876..00000000
--- a/docs/guide/src/docbkx/samples/password_rules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<passwordRules 
-    xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <passwordRule 
-        message="Password must be at least 7 characters."
-        name="Mininum Legth" 
-        id="1" />
-    <passwordRule 
-        message="Password must contain a lowercase." 
-        name="Lowercase Character" 
-        id="2" />
-</passwordRules>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_validation.json b/docs/guide/src/docbkx/samples/password_validation.json
deleted file mode 100644
index 3d4d86be..00000000
--- a/docs/guide/src/docbkx/samples/password_validation.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{"passwordRuleResults":{
-    "passwordRuleResults":[
-        {
-            "passed":true,
-            "ruleId":1,"ruleName":
-            "Mininumn Length",
-            "ruleMessage":"The password must be at least 7 characters long"
-        },
-        {
-            "passed":false,
-            "ruleId":2,"ruleName":
-            "Uppercase Rule","ruleMessage":
-            "The password must contain an uppercase charater"
-        }
-     ]},
-     "validPassword":false
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/password_validation.xml b/docs/guide/src/docbkx/samples/password_validation.xml
deleted file mode 100644
index a7619130..00000000
--- a/docs/guide/src/docbkx/samples/password_validation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<passwordValidation xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	validPassword="true">
-	<passwordRuleResults>
-		<passwordRuleResults 
-		  ruleMessage="Password must be at least 7 characters long."
-		  ruleName="Minimum Length" 
-		  ruleId="1" 
-		  passed="true" />
-		<passwordRuleResults 
-		  ruleMessage="Password must contain a lowercase character."
-		  ruleName="Lowercase Character" 
-		  ruleId="2" 
-		  passed="true" />
-	</passwordRuleResults>
-</passwordValidation>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/passwordrotation.json b/docs/guide/src/docbkx/samples/passwordrotation.json
deleted file mode 100644
index 828289bb..00000000
--- a/docs/guide/src/docbkx/samples/passwordrotation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "enabled": true,
-  "duration": "60"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/passwordrotation.xml b/docs/guide/src/docbkx/samples/passwordrotation.xml
deleted file mode 100644
index d4316dc4..00000000
--- a/docs/guide/src/docbkx/samples/passwordrotation.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<passwordRotationPolicy xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    enabled="true"
-    duration="90"
-</passwordRotationPolicy>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/passwordvalidationfault.json b/docs/guide/src/docbkx/samples/passwordvalidationfault.json
deleted file mode 100644
index 29b70594..00000000
--- a/docs/guide/src/docbkx/samples/passwordvalidationfault.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Password Failed Validation",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/passwordvalidationfault.xml b/docs/guide/src/docbkx/samples/passwordvalidationfault.xml
deleted file mode 100644
index efe6c3e8..00000000
--- a/docs/guide/src/docbkx/samples/passwordvalidationfault.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<passwordValidationFault xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>Password Failed Validation</message>
-	<details>Error Details...</details>
-</passwordValidationFault>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/permission.json b/docs/guide/src/docbkx/samples/permission.json
deleted file mode 100644
index cb7b261c..00000000
--- a/docs/guide/src/docbkx/samples/permission.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "value": "POST /customers",
-  "permissionId": "addCustomer",
-  "customerId": "RCN-000-000-000",
-  "clientId": "IDM",
-  "type": "application/text"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/permission.xml b/docs/guide/src/docbkx/samples/permission.xml
deleted file mode 100644
index d8157aa1..00000000
--- a/docs/guide/src/docbkx/samples/permission.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<permission xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    type="application/text" 
-    clientId="IDM" 
-    customerId="RCN-000-000-000"
-    permissionId="addCustomer">POST /customers</permission>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/permissions.json b/docs/guide/src/docbkx/samples/permissions.json
deleted file mode 100644
index aef0cd9d..00000000
--- a/docs/guide/src/docbkx/samples/permissions.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "granted": {
-    "permission": [
-      {
-        "permissionId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      },
-      {
-        "permissionId": "getCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]
-  },
-  "defined": {
-    "permission": [
-      {
-        "permissionId": "addCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      },
-      {
-        "permissionId": "getCustomer",
-        "customerId": "RCN-000-000-000",
-        "clientId": "IDM"
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/permissions.xml b/docs/guide/src/docbkx/samples/permissions.xml
deleted file mode 100644
index 84c2de60..00000000
--- a/docs/guide/src/docbkx/samples/permissions.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<permissions xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <granted>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="addCustomer"/>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="getCustomer"/>
-    </granted>
-    <defined>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="addCustomer"/>
-        <permission 
-            clientId="IDM" 
-            customerId="RCN-000-000-000" 
-            permissionId="getCustomer"/>
-    </defined>
-</permissions>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/reset_user_password.json b/docs/guide/src/docbkx/samples/reset_user_password.json
deleted file mode 100644
index 38cb9e1f..00000000
--- a/docs/guide/src/docbkx/samples/reset_user_password.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "password": "7ud$dnF"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/reset_user_password.xml b/docs/guide/src/docbkx/samples/reset_user_password.xml
deleted file mode 100644
index 187b9122..00000000
--- a/docs/guide/src/docbkx/samples/reset_user_password.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<userPassword xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    password="7ud$dnF" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/resourceId_conflict.json b/docs/guide/src/docbkx/samples/resourceId_conflict.json
deleted file mode 100644
index 7eaf859b..00000000
--- a/docs/guide/src/docbkx/samples/resourceId_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "ResourceId already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/resourceId_conflict.xml b/docs/guide/src/docbkx/samples/resourceId_conflict.xml
deleted file mode 100644
index 1710f51c..00000000
--- a/docs/guide/src/docbkx/samples/resourceId_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<resourceIdConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>ResourceId already taken.</message>
-	<details>Error Details...</details>
-</resourceIdConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/role.json b/docs/guide/src/docbkx/samples/role.json
deleted file mode 100644
index bc4bb59d..00000000
--- a/docs/guide/src/docbkx/samples/role.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-      "name": "Admin",
-      "type": "RackspaceDefined"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/role.xml b/docs/guide/src/docbkx/samples/role.xml
deleted file mode 100644
index 3c91848d..00000000
--- a/docs/guide/src/docbkx/samples/role.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<role type="RackspaceDefined" 
-	  name="Admin" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/roles.json b/docs/guide/src/docbkx/samples/roles.json
deleted file mode 100644
index 465f36b1..00000000
--- a/docs/guide/src/docbkx/samples/roles.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "role": [
-    {
-      "name": "Admin",
-      "type": "RackspaceDefined"
-    },
-    {
-      "name": "HR",
-      "type": "CustomerDefined"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/roles.xml b/docs/guide/src/docbkx/samples/roles.xml
deleted file mode 100644
index e8b57c0a..00000000
--- a/docs/guide/src/docbkx/samples/roles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<roles xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <role type="RackspaceDefined" 
-        name="Admin" />
-    <role type="CustomerDefined" 
-        name="HR" />
-</roles>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/service-catalog-response.json b/docs/guide/src/docbkx/samples/service-catalog-response.json
deleted file mode 100644
index 6e6f6533..00000000
--- a/docs/guide/src/docbkx/samples/service-catalog-response.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{"service": [
-      {
-      "endpoint": [      {
-         "region": "DFW",
-         "v1Default": true,
-         "publicURL": "https://storage.clouddrive.com/v1/KovacsNastId",
-         "internalURL": "https://storage-snet.clouddrive.com/v1/KovacsNastId",
-         "adminURL": null
-      }],
-      "name": "cloudFiles"
-   },
-      {
-      "endpoint": [      {
-         "region": null,
-         "v1Default": false,
-         "publicURL": "https://servers.api.rackspacecloud.com/v1.0/90000",
-         "internalURL": null,
-         "adminURL": null
-      }],
-      "name": "cloudServers"
-   }
-]}
diff --git a/docs/guide/src/docbkx/samples/service-catalog-response.xml b/docs/guide/src/docbkx/samples/service-catalog-response.xml
deleted file mode 100644
index 0cdb9222..00000000
--- a/docs/guide/src/docbkx/samples/service-catalog-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<serviceCatalog xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <service name="cloudFiles">
-        <endpoint region="DFW" 
-            v1Default="true" 
-            publicURL="https://storage.clouddrive.com/v1/KovacsNastId" 
-            internalURL="https://storage-snet.clouddrive.com/v1/KovacsNastId"/>
-   </service>
-   <service name="cloudServers">
-        <endpoint v1Default="false" 
-            publicURL="https://servers.api.rackspacecloud.com/v1.0/90000"/>
-   </service>
-</serviceCatalog>
diff --git a/docs/guide/src/docbkx/samples/tenant.json b/docs/guide/src/docbkx/samples/tenant.json
new file mode 100644
index 00000000..7ff7ce32
--- /dev/null
+++ b/docs/guide/src/docbkx/samples/tenant.json
@@ -0,0 +1,7 @@
+{"tenant":
+    {
+      "id": "1234",
+      "description": "A description ...",
+      "enabled": true
+    }
+}
diff --git a/docs/guide/src/docbkx/samples/tenant.xml b/docs/guide/src/docbkx/samples/tenant.xml
new file mode 100644
index 00000000..ea6a63dc
--- /dev/null
+++ b/docs/guide/src/docbkx/samples/tenant.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tenant xmlns="http://docs.openstack.org/idm/api/v1.0"
+        enabled="true" id="1234">
+    <description>A description...</description>
+</tenant>
diff --git a/docs/guide/src/docbkx/samples/tenantlock.json b/docs/guide/src/docbkx/samples/tenantlock.json
new file mode 100644
index 00000000..584c21a4
--- /dev/null
+++ b/docs/guide/src/docbkx/samples/tenantlock.json
@@ -0,0 +1,5 @@
+{"tenant":
+    {
+      "description": "A NEW description..."
+    }
+}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/tenantlock.xml b/docs/guide/src/docbkx/samples/tenantlock.xml
new file mode 100644
index 00000000..9d7081d4
--- /dev/null
+++ b/docs/guide/src/docbkx/samples/tenantlock.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tenant xmlns="http://docs.openstack.org/idm/api/v1.0">
+    <description>A NEW description...</description>
+</tenant>
diff --git a/docs/guide/src/docbkx/samples/tenants.json b/docs/guide/src/docbkx/samples/tenants.json
new file mode 100644
index 00000000..7fb848f7
--- /dev/null
+++ b/docs/guide/src/docbkx/samples/tenants.json
@@ -0,0 +1,15 @@
+{"tenants": {
+    "values" : [
+        {
+            "id": "1234",
+            "description": "A description ...",
+            "enabled": true
+        },
+        {
+            "id": "3456",
+            "description": "A description ...",
+            "enabled": true
+        }
+    ]
+}
+}
diff --git a/docs/guide/src/docbkx/samples/tenants.xml b/docs/guide/src/docbkx/samples/tenants.xml
new file mode 100644
index 00000000..9b503ce2
--- /dev/null
+++ b/docs/guide/src/docbkx/samples/tenants.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tenants xmlns="http://docs.openstack.org/idm/api/v1.0">
+    <tenant enabled="true" id="1234">
+        <description>A description...</description>
+    </tenant>
+    <tenant enabled="true" id="3645">
+        <description>A description...</description>
+    </tenant>
+</tenants>
diff --git a/docs/guide/src/docbkx/samples/token.json b/docs/guide/src/docbkx/samples/token.json
deleted file mode 100644
index a25f1530..00000000
--- a/docs/guide/src/docbkx/samples/token.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "id": "309487987f0892397a9439875900b",
-  "expiresIn": 3600
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/token.xml b/docs/guide/src/docbkx/samples/token.xml
deleted file mode 100644
index 98b78611..00000000
--- a/docs/guide/src/docbkx/samples/token.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<token xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    expires_in="3600" 
-    id="309487987f0892397a9439875900b" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/unauthorized.json b/docs/guide/src/docbkx/samples/unauthorized.json
deleted file mode 100644
index e969fc0e..00000000
--- a/docs/guide/src/docbkx/samples/unauthorized.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Oh no you don't.",
-  "details": "Error Details...",
-  "code": 401
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/unauthorized.xml b/docs/guide/src/docbkx/samples/unauthorized.xml
deleted file mode 100644
index 6dad6bca..00000000
--- a/docs/guide/src/docbkx/samples/unauthorized.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<unauthorized xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="401">
-	<message>Oh no you don't.</message>
-	<details>Error Details...</details>
-</unauthorized>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/unavailable.json b/docs/guide/src/docbkx/samples/unavailable.json
deleted file mode 100644
index b91a23e7..00000000
--- a/docs/guide/src/docbkx/samples/unavailable.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "The IdM Service is Unavailable at the moment.",
-  "details": "Error Details...",
-  "code": 503
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/unavailable.xml b/docs/guide/src/docbkx/samples/unavailable.xml
deleted file mode 100644
index ebd9f106..00000000
--- a/docs/guide/src/docbkx/samples/unavailable.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<serviceUnavailable xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="503">
-	<message>The IdM Service is Unavailable at the moment.</message>
-	<details>Error Details...</details>
-</serviceUnavailable>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/updatedcustomer.json b/docs/guide/src/docbkx/samples/updatedcustomer.json
deleted file mode 100644
index 05df6a3a..00000000
--- a/docs/guide/src/docbkx/samples/updatedcustomer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{"tenant":
-    {
-      "id": "1234",
-      "description": "A NEW description...",
-      "enabled": true
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/updatedcustomer.xml b/docs/guide/src/docbkx/samples/updatedcustomer.xml
deleted file mode 100644
index 8bcce9bf..00000000
--- a/docs/guide/src/docbkx/samples/updatedcustomer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/idm/api/v1.0"
-        enabled="true" id="1234">
-    <description>A NEW description...</description>
-</tenant>
diff --git a/docs/guide/src/docbkx/samples/updatedtenant.json b/docs/guide/src/docbkx/samples/updatedtenant.json
new file mode 100644
index 00000000..05df6a3a
--- /dev/null
+++ b/docs/guide/src/docbkx/samples/updatedtenant.json
@@ -0,0 +1,7 @@
+{"tenant":
+    {
+      "id": "1234",
+      "description": "A NEW description...",
+      "enabled": true
+    }
+}
diff --git a/docs/guide/src/docbkx/samples/updatedtenant.xml b/docs/guide/src/docbkx/samples/updatedtenant.xml
new file mode 100644
index 00000000..8bcce9bf
--- /dev/null
+++ b/docs/guide/src/docbkx/samples/updatedtenant.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tenant xmlns="http://docs.openstack.org/idm/api/v1.0"
+        enabled="true" id="1234">
+    <description>A NEW description...</description>
+</tenant>
diff --git a/docs/guide/src/docbkx/samples/updateduser.json b/docs/guide/src/docbkx/samples/updateduser.json
deleted file mode 100644
index 73a67c6a..00000000
--- a/docs/guide/src/docbkx/samples/updateduser.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{"user":
-    {
-      "id": "jqsmith",
-      "tenantId": "1234",
-      "email": "john.smith@somenewemail.org",
-      "enabled": true
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/updateduser.xml b/docs/guide/src/docbkx/samples/updateduser.xml
deleted file mode 100644
index c11bc8fc..00000000
--- a/docs/guide/src/docbkx/samples/updateduser.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      email="john.smith@somenewemail.org" tenantId="1234"
-      id="jqsmith" enabled="true"/>
diff --git a/docs/guide/src/docbkx/samples/updateuser.json b/docs/guide/src/docbkx/samples/updateuser.json
deleted file mode 100644
index 2e431d9a..00000000
--- a/docs/guide/src/docbkx/samples/updateuser.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"user":
-    {
-      "email": "john.smith@somenewemail.org",
-      "id": "jqsmith"
-    }
-}
diff --git a/docs/guide/src/docbkx/samples/updateuser.xml b/docs/guide/src/docbkx/samples/updateuser.xml
deleted file mode 100644
index 7d1988e4..00000000
--- a/docs/guide/src/docbkx/samples/updateuser.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      email="john.smith@somenewemail.org" id="jqsmith" />
diff --git a/docs/guide/src/docbkx/samples/user.json b/docs/guide/src/docbkx/samples/user.json
deleted file mode 100644
index 1051172c..00000000
--- a/docs/guide/src/docbkx/samples/user.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "secret": {
-    "secretQuestion": "What is the middle name of your best fried, spelled backward?",
-    "secretAnswer": "sicnarF"
-  },
-  "password": {
-    "password": "C@n+f001me!"
-  },
-  "apiKey": {
-    "apiKey": "10388a8497547f8w77e"
-  },
-  "roles": [
-      {
-        "name": "Admin",
-        "type": "RackspaceDefined"
-      }
-    ],
-  "permissions": [
-      {
-        "description": "POST /users",
-        "name": "AddUser"
-      },
-      {}
-    ],
-  "username": "jqsmith",
-  "customerId": "RCN-000-000-000",
-  "customerInum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.EEEE",
-  "email": "john.smith@example.org",
-  "personId": "RPN-111-111-111",
-  "firstName": "John",
-  "middleName": "Quincy",
-  "lastName": "Smith",
-  "displayName": "John Smith",
-  "prefLanguage": "US_en",
-  "inum": "@!FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!1111",
-  "iname": "@Example.Smith*John",
-  "region": "America/Chicago",
-  "status": "ACTIVE",
-  "locked": false,
-  "softDeleted": false
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user.xml b/docs/guide/src/docbkx/samples/user.xml
deleted file mode 100644
index c252696d..00000000
--- a/docs/guide/src/docbkx/samples/user.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="false" locked="false" 
-    status="ACTIVE" timeZone="America/Chicago"
-    region="SAT" iname="@Example.Smith*John" 
-    inum="@!FFFF.FFFF.FFFF.FFFF!EEEE.EEEE!1111"
-    prefLanguage="US_en" displayName="John Smith" 
-    lastName="Smith" middleName="Quincy" 
-    firstName="John" personId="RPN-111-111-111" 
-    email="john.smith@example.org"
-    customerInum="@!FFFF.FFFF.FFFF.FFFF!EEEE.EEEE" 
-    customerId="RCN-000-000-000"
-    username="jqsmith">
-    <roles>
-        <role type="RackspaceDefined" 
-            name="Admin" />
-    </roles>
-</user>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userGroups.json b/docs/guide/src/docbkx/samples/userGroups.json
deleted file mode 100644
index dc7b3f3b..00000000
--- a/docs/guide/src/docbkx/samples/userGroups.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{"groups": {
-    "values" : [
-        {
-            "tenantId" : "1234",
-            "id" : "Admin",
-        },
-        {
-            "tenantId" : "1234",
-            "id" : "Technical",
-        },
-        {
-            "id" : "Customer",
-        }
-    ]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/userGroups.xml b/docs/guide/src/docbkx/samples/userGroups.xml
deleted file mode 100644
index 16f73c51..00000000
--- a/docs/guide/src/docbkx/samples/userGroups.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<groups xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <group tenantId="1234" id="Admin" />
-    <group tenantId="1234" id="Technical"/>
-    <group id="Customer"/>
-</groups>
diff --git a/docs/guide/src/docbkx/samples/userWithOnlyLock.json b/docs/guide/src/docbkx/samples/userWithOnlyLock.json
deleted file mode 100644
index 11d640e6..00000000
--- a/docs/guide/src/docbkx/samples/userWithOnlyLock.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"user":
-    {
-      "enabled": "true"
-    }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userWithOnlyLock.xml b/docs/guide/src/docbkx/samples/userWithOnlyLock.xml
deleted file mode 100644
index 42eecba2..00000000
--- a/docs/guide/src/docbkx/samples/userWithOnlyLock.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      enabled="true"/>
diff --git a/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.json b/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.json
deleted file mode 100644
index bc3a14ff..00000000
--- a/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "softDeleted": "true"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.xml b/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.xml
deleted file mode 100644
index 6284eb54..00000000
--- a/docs/guide/src/docbkx/samples/userWithOnlySoftDeleted.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    softDeleted="true" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userWithOnlyStatus.json b/docs/guide/src/docbkx/samples/userWithOnlyStatus.json
deleted file mode 100644
index d4bd36c9..00000000
--- a/docs/guide/src/docbkx/samples/userWithOnlyStatus.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "status": "INACTIVE"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/userWithOnlyStatus.xml b/docs/guide/src/docbkx/samples/userWithOnlyStatus.xml
deleted file mode 100644
index 30e7b127..00000000
--- a/docs/guide/src/docbkx/samples/userWithOnlyStatus.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<user xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    status="ACTIVE" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_api_key.json b/docs/guide/src/docbkx/samples/user_api_key.json
deleted file mode 100644
index ff5dd33a..00000000
--- a/docs/guide/src/docbkx/samples/user_api_key.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"user":
-    {
-      "password": "P@$$word1"
-    }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_api_key.xml b/docs/guide/src/docbkx/samples/user_api_key.xml
deleted file mode 100644
index 24f86935..00000000
--- a/docs/guide/src/docbkx/samples/user_api_key.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
-      password="P@$$word1"/>
diff --git a/docs/guide/src/docbkx/samples/user_credentials.json b/docs/guide/src/docbkx/samples/user_credentials.json
deleted file mode 100644
index dbcb9977..00000000
--- a/docs/guide/src/docbkx/samples/user_credentials.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "newPassword": {
-    "password": "newpassword"
-  },
-  "currentPassword": {
-    "password": "oldpassword"
-  }
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_credentials.xml b/docs/guide/src/docbkx/samples/user_credentials.xml
deleted file mode 100644
index 56dc2776..00000000
--- a/docs/guide/src/docbkx/samples/user_credentials.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<userCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0">
-    <newPassword password="newpassword" />
-    <currentPassword password="oldpassword" />
-</userCredentials>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_disabled.json b/docs/guide/src/docbkx/samples/user_disabled.json
deleted file mode 100644
index 5eeb83f2..00000000
--- a/docs/guide/src/docbkx/samples/user_disabled.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "The user has been disabled.",
-  "details": "Error Details...",
-  "code": 403
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_disabled.xml b/docs/guide/src/docbkx/samples/user_disabled.xml
deleted file mode 100644
index 9f6b528e..00000000
--- a/docs/guide/src/docbkx/samples/user_disabled.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<userDisabled xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    code="409">
-    <message>The user has been disabled.</message>
-    <details>Error Details...</details>
-</userDisabled>
diff --git a/docs/guide/src/docbkx/samples/user_password.json b/docs/guide/src/docbkx/samples/user_password.json
deleted file mode 100644
index 1e1643b9..00000000
--- a/docs/guide/src/docbkx/samples/user_password.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "password": "newpassword"
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_password.xml b/docs/guide/src/docbkx/samples/user_password.xml
deleted file mode 100644
index ba8a49cb..00000000
--- a/docs/guide/src/docbkx/samples/user_password.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<userPassword xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    password="newpassword" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_secret.json b/docs/guide/src/docbkx/samples/user_secret.json
deleted file mode 100644
index e0a4a6a8..00000000
--- a/docs/guide/src/docbkx/samples/user_secret.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "secretQuestion": "Is this a secret question?",
-  "secretAnswer": "Not a very good one."
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/user_secret.xml b/docs/guide/src/docbkx/samples/user_secret.xml
deleted file mode 100644
index d1ab5610..00000000
--- a/docs/guide/src/docbkx/samples/user_secret.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<userSecret xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-    secretAnswer="Not a very good one." 
-    secretQuestion="Is this a secret question?" />
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/usernameCredentials.xml b/docs/guide/src/docbkx/samples/usernameCredentials.xml
deleted file mode 100644
index 4d03497d..00000000
--- a/docs/guide/src/docbkx/samples/usernameCredentials.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<usernameCredentials xmlns="http://docs.rackspacecloud.com/idm/api/v1.0" 
-    username="qauser"
-    key="qauser-000-001" />
diff --git a/docs/guide/src/docbkx/samples/username_conflict.json b/docs/guide/src/docbkx/samples/username_conflict.json
deleted file mode 100644
index e30c009d..00000000
--- a/docs/guide/src/docbkx/samples/username_conflict.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "message": "Username already taken.",
-  "details": "Error Details...",
-  "code": 409
-}
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/username_conflict.xml b/docs/guide/src/docbkx/samples/username_conflict.xml
deleted file mode 100644
index a3d3dbbc..00000000
--- a/docs/guide/src/docbkx/samples/username_conflict.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<usernameConflict xmlns="http://docs.rackspacecloud.com/idm/api/v1.0"
-	code="409">
-	<message>Username already taken.</message>
-	<details>Error Details...</details>
-</usernameConflict>
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/users.json b/docs/guide/src/docbkx/samples/users.json
deleted file mode 100644
index 4bac51c9..00000000
--- a/docs/guide/src/docbkx/samples/users.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{"users": {
-    "values" :  [
-        {
-            "id": "jqsmith",
-            "tenantId": "1234",
-            "email": "john.smith@example.org",
-            "enabled": true
-        },
-        {
-            "id": "jdoe",
-            "tenantId": "1234",
-            "email": "john.doe@example.org",
-            "enabled": true
-        }
-    ]
-}
-}
diff --git a/docs/guide/src/docbkx/samples/users.xml b/docs/guide/src/docbkx/samples/users.xml
deleted file mode 100644
index c30c1550..00000000
--- a/docs/guide/src/docbkx/samples/users.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<users xmlns="http://docs.openstack.org/idm/api/v1.0">
-    <user enabled="true" tenantId="1234"
-          email="john.smith@example.org" id="jqsmith"/>
-    <user enabled="true" tenantId="1234"
-          email="john.doe@example.org" id="jdoe"/>
-</users>
-- 
cgit