From b505656a796a39ba42f722f795891c40090bd96f Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Fri, 17 Jan 2014 15:38:41 -0600
Subject: [PATCH] Change xml and json files that contain only text to *.txt
 files

Otherwise, this book fails the new validation gates

Closes-Bug: #1270267

Change-Id: Ibbe16c8e4db64abb29c66c3b1a14cb90014d56a3
author: diane fleming
---
 .gitignore                                    |    5 +
 apidocs/.gitignore                            |    0
 apidocs/includewars.xml                       |    3 +-
 apidocs/pom.xml                               |  264 +--
 apidocs/src/{resources => }/cdb-devguide.xml  |  418 ++--
 .../images/Choose_CS_Image.png                |  Bin
 .../images/Choose_CS_Image_CCP.png            |  Bin
 .../images/Choose_Image_CCP.png               |  Bin
 .../images/Choose_Image_CCP.tiff              |  Bin
 .../images/Cloud_DB_Infographic-1.png         |  Bin
 .../images/Cloud_DB_Infographic-1.svg         |    0
 .../src/{resources => }/images/Create_CS.png  |  Bin
 .../src/{resources => }/images/phpMyAdmin.png |  Bin
 apidocs/src/resources/samples/db-auth-20.json |  144 --
 apidocs/src/resources/samples/db-auth-20.xml  |   74 -
 .../samples/db-auth-repose-header.json        |   10 -
 apidocs/src/resources/samples/db-auth.json    |   72 -
 apidocs/src/resources/samples/db-auth.xml     |   50 -
 .../db-change-users-password-request.json     |   19 -
 .../samples/db-check-root-user-response.xml   |   11 -
 .../db-create-database-instance-response.json |   41 -
 .../db-create-database-instance-response.xml  |   24 -
 .../samples/db-create-databases-request.json  |   22 -
 .../samples/db-create-databases-request.xml   |   13 -
 .../samples/db-create-instance-request.json   |   37 -
 .../samples/db-create-instance-request.xml    |   22 -
 .../samples/db-create-instance-response.json  |   42 -
 .../samples/db-create-instance-response.xml   |   21 -
 .../samples/db-create-users-request.json      |   33 -
 .../samples/db-create-users-request.xml       |   18 -
 .../resources/samples/db-credentials-20.json  |   18 -
 .../resources/samples/db-credentials-20.xml   |   14 -
 .../src/resources/samples/db-credentials.json |   13 -
 .../src/resources/samples/db-credentials.xml  |   11 -
 .../samples/db-delete-instance-response.json  |    6 -
 .../samples/db-enable-root-user-response.json |   13 -
 .../samples/db-enable-root-user-response.xml  |    9 -
 .../samples/db-faults-badRequest.xml          |   10 -
 .../samples/db-faults-instanceFault.xml       |   10 -
 .../samples/db-faults-itemNotFound.json       |   11 -
 .../samples/db-faults-itemNotFound.xml        |   10 -
 .../samples/db-flavors-by-id-response.xml     |   14 -
 .../samples/db-flavors-response-no8_16.json   |   71 -
 .../samples/db-flavors-response-no8_16.xml    |   34 -
 .../resources/samples/db-flavors-response.xml |   46 -
 ...-gs-create-database-instance-response.json |   41 -
 ...b-gs-create-database-instance-response.xml |   21 -
 .../samples/db-guest-update-request.json      |   10 -
 .../samples/db-guest-update-request.xml       |   10 -
 .../samples/db-guest-update-response.json     |    6 -
 .../samples/db-instance-reboot-request.json   |   10 -
 .../samples/db-instance-reboot-request.xml    |    9 -
 .../samples/db-instance-reboot-response.xml   |    6 -
 .../db-instance-resize-instance-response.json |    6 -
 .../db-instance-resize-instance-response.xml  |    6 -
 .../db-instance-resize-volume-request.json    |   14 -
 .../db-instance-resize-volume-request.xml     |   11 -
 .../samples/db-instance-restart-response.json |    6 -
 .../samples/db-instance-restart-response.xml  |    6 -
 .../db-instance-status-detail-response.json   |   43 -
 .../db-instance-status-detail-response.xml    |   21 -
 .../db-instance-update-guest-request.json     |   11 -
 .../db-instance-update-guest-request.xml      |   10 -
 .../db-instance-update-guest-response.json    |    8 -
 .../db-instance-update-guest-response.xml     |    8 -
 ...b-instances-index-pagination-response.json |   79 -
 ...db-instances-index-pagination-response.xml |   39 -
 .../samples/db-instances-index-response.json  |   73 -
 .../samples/db-instances-index-response.xml   |   36 -
 .../db-instances-paged-index-request.xml      |    8 -
 .../db-instances-paged-index-response.json    |   90 -
 .../db-instances-paged-index-response.xml     |   41 -
 ...db-list-databases-pagination-response.json |   20 -
 .../db-list-databases-pagination-response.xml |   15 -
 .../samples/db-list-databases-response.json   |   26 -
 .../samples/db-list-user-access-response.xml  |    8 -
 .../samples/db-list-user-dbs-response.xml     |   10 -
 .../db-list-users-pagination-response.xml     |   22 -
 .../db-mgmt-get-account-details-request.json  |    8 -
 .../db-mgmt-get-account-details-request.xml   |    8 -
 .../db-mgmt-get-account-details-response.json |   26 -
 .../db-mgmt-get-account-details-response.xml  |   14 -
 .../db-mgmt-get-host-detail-request.json      |    8 -
 .../db-mgmt-get-host-detail-request.xml       |    8 -
 .../db-mgmt-get-host-detail-response.json     |   31 -
 .../db-mgmt-get-host-detail-response.xml      |   14 -
 .../db-mgmt-get-instance-details-request.json |    8 -
 .../db-mgmt-get-instance-details-request.xml  |    8 -
 ...db-mgmt-get-instance-details-response.json |   80 -
 .../db-mgmt-get-instance-details-response.xml |   86 -
 .../db-mgmt-get-root-details-request.json     |    8 -
 .../db-mgmt-get-root-details-request.xml      |    8 -
 .../db-mgmt-get-root-details-response.json    |   14 -
 .../db-mgmt-get-root-details-response.xml     |    9 -
 .../samples/db-mgmt-get-storage-request.json  |    8 -
 .../samples/db-mgmt-get-storage-request.xml   |    8 -
 .../samples/db-mgmt-get-storage-response.json |   25 -
 .../samples/db-mgmt-get-storage-response.xml  |   14 -
 .../db-mgmt-get-usage-account-request.json    |    6 -
 .../db-mgmt-get-usage-account-request.xml     |    6 -
 .../db-mgmt-get-usage-account-response.json   |   30 -
 .../db-mgmt-get-usage-account-response.xml    |   64 -
 .../db-mgmt-get-usage-all-response.json       |   31 -
 .../db-mgmt-get-usage-all-response.xml        |   63 -
 .../db-mgmt-get-usage-instance-request.json   |    6 -
 .../db-mgmt-get-usage-instance-request.xml    |    6 -
 .../db-mgmt-get-usage-instance-response.json  |   31 -
 .../db-mgmt-get-usage-instance-response.xml   |   63 -
 .../samples/db-mgmt-host-update-request.json  |   12 -
 .../samples/db-mgmt-host-update-request.xml   |   10 -
 .../samples/db-mgmt-host-update-response.xml  |    6 -
 .../db-mgmt-instance-diagnostics-request.json |    8 -
 .../db-mgmt-instance-diagnostics-request.xml  |    8 -
 ...db-mgmt-instance-diagnostics-response.json |   18 -
 .../db-mgmt-instance-diagnostics-response.xml |    9 -
 .../db-mgmt-instance-hwinfo-request.json      |    8 -
 .../db-mgmt-instance-hwinfo-request.xml       |    8 -
 .../db-mgmt-instance-hwinfo-response.json     |   13 -
 .../db-mgmt-instance-hwinfo-response.xml      |   15 -
 .../db-mgmt-instance-index-request.json       |    8 -
 .../db-mgmt-instance-index-request.xml        |    8 -
 .../db-mgmt-instance-index-response.json      |  107 -
 .../db-mgmt-instance-index-response.xml       |   94 -
 .../db-mgmt-list-accounts-request.json        |    8 -
 .../samples/db-mgmt-list-accounts-request.xml |    8 -
 .../db-mgmt-list-accounts-response.json       |   15 -
 .../db-mgmt-list-accounts-response.xml        |   11 -
 .../samples/db-mgmt-list-hosts-request.json   |    8 -
 .../samples/db-mgmt-list-hosts-request.xml    |    8 -
 .../samples/db-mgmt-list-hosts-response.json  |   19 -
 .../samples/db-mgmt-list-hosts-response.xml   |   12 -
 ...b-mgmt-migrate-instance-force-request.json |   10 -
 ...db-mgmt-migrate-instance-force-request.xml |   10 -
 ...-mgmt-migrate-instance-force-response.json |    6 -
 ...b-mgmt-migrate-instance-force-response.xml |    6 -
 .../db-mgmt-migrate-instance-request.json     |   10 -
 .../db-mgmt-migrate-instance-request.xml      |   10 -
 .../db-mgmt-migrate-instance-response.json    |    6 -
 .../db-mgmt-migrate-instance-response.xml     |    6 -
 ...mt-reset-instance-task-status-request.json |   10 -
 ...gmt-reset-instance-task-status-request.xml |   10 -
 ...t-reset-instance-task-status-response.json |    6 -
 ...mt-reset-instance-task-status-response.xml |    6 -
 .../resources/samples/db-request-types.json   |   15 -
 .../resources/samples/db-response-types.xml   |   24 -
 .../resources/samples/db-version-response.xml |   10 -
 ...db-change-users-password-request-json.txt} |    6 +-
 .../db-change-users-password-request-xml.txt} |    6 +-
 .../db-change-users-password-request.json     |   12 +
 .../db-change-users-password-request.xml      |    4 +
 ...b-change-users-password-response-json.txt} |    3 +-
 ...db-change-users-password-response-xml.txt} |    4 +-
 .../db-check-root-user-request-json.txt}      |    4 +-
 .../db-check-root-user-request-xml.txt}       |    4 +-
 .../db-check-root-user-response-json.txt}     |    6 +-
 .../db-check-root-user-response-xml.txt       |    6 +
 .../samples/db-check-root-user-response.json  |    3 +
 .../samples/db-check-root-user-response.xml   |    3 +
 .../db-create-databases-request-json.txt      |    6 +
 .../db-create-databases-request-xml.txt       |    6 +
 .../samples/db-create-databases-request.json  |   15 +
 .../samples/db-create-databases-request.xml   |    7 +
 .../db-create-databases-response-json.txt}    |    2 +-
 .../db-create-databases-response-xml.txt}     |    2 +-
 .../db-create-instance-request-json.txt}      |    4 +-
 .../db-create-instance-request-xml.txt}       |    4 +-
 .../samples/db-create-instance-request.json   |   30 +
 .../samples/db-create-instance-request.xml    |   17 +
 .../db-create-instance-response-json.txt      |    6 +
 .../db-create-instance-response-xml.txt       |    6 +
 .../samples/db-create-instance-response.json  |   35 +
 .../samples/db-create-instance-response.xml   |   25 +
 .../samples/db-create-users-request-json.txt  |    6 +
 .../samples/db-create-users-request-xml.txt   |    6 +
 .../src/samples/db-create-users-request.json  |   26 +
 .../src/samples/db-create-users-request.xml   |   11 +
 .../db-create-users-response-json.txt}        |    2 +-
 .../db-create-users-response-xml.txt}         |    2 +-
 .../db-delete-databases-request-json.txt}     |    4 +-
 .../db-delete-databases-request-xml.txt}      |    4 +-
 .../db-delete-databases-response-json.txt}    |    2 +-
 .../db-delete-databases-response-xml.txt}     |    2 +-
 .../db-delete-instance-request-json.txt}      |    4 +-
 .../db-delete-instance-request-xml.txt}       |    4 +-
 .../db-delete-instance-response-json.txt}     |    2 +-
 .../db-delete-instance-response-xml.txt}      |    2 +-
 .../db-delete-users-request-json.txt}         |    4 +-
 .../db-delete-users-request-xml.txt}          |    4 +-
 .../db-delete-users-response-json.txt}        |    2 +-
 .../db-delete-users-response-xml.txt}         |    2 +-
 .../db-enable-root-user-request-json.txt}     |    4 +-
 .../db-enable-root-user-request-xml.txt}      |    4 +-
 .../db-enable-root-user-response-json.txt     |    6 +
 .../db-enable-root-user-response-xml.txt      |    6 +
 .../samples/db-enable-root-user-response.json |    6 +
 .../samples/db-enable-root-user-response.xml  |    3 +
 .../samples/db-faults-badRequest.json         |    5 -
 apidocs/src/samples/db-faults-badRequest.xml  |    6 +
 .../samples/db-faults-instanceFault.json      |    5 -
 .../src/samples/db-faults-instanceFault.xml   |    6 +
 .../src/samples/db-faults-itemNotFound.json   |    6 +
 .../src/samples/db-faults-itemNotFound.xml    |    5 +
 .../db-flavors-by-id-request-json.txt}        |    4 +-
 .../db-flavors-by-id-request-xml.txt}         |    4 +-
 .../db-flavors-by-id-response-json.txt        |    6 +
 .../samples/db-flavors-by-id-response-xml.txt |    6 +
 .../samples/db-flavors-by-id-response.json    |    7 -
 .../src/samples/db-flavors-by-id-response.xml |   12 +
 .../db-flavors-request-json.txt}              |    4 +-
 .../db-flavors-request-xml.txt}               |    4 +-
 .../src/samples/db-flavors-response-json.txt  |    6 +
 .../src/samples/db-flavors-response-xml.txt   |    6 +
 .../samples/db-flavors-response.json          |    7 -
 apidocs/src/samples/db-flavors-response.xml   |   63 +
 .../db-grant-user-access-request-json.txt}    |   13 +-
 .../db-grant-user-access-request-xml.txt}     |    6 +-
 .../samples/db-grant-user-access-request.json |   10 +
 .../samples/db-grant-user-access-request.xml  |    4 +
 .../db-grant-user-access-response-json.txt}   |    2 +-
 .../db-grant-user-access-response-xml.txt}    |    2 +-
 ...instance-resize-instance-request-json.txt} |    8 +-
 ...-instance-resize-instance-request-xml.txt} |    7 +-
 .../db-instance-resize-instance-request.json  |    5 +
 .../db-instance-resize-instance-request.xml   |    4 +
 ...nstance-resize-instance-response-json.txt} |    4 +-
 ...instance-resize-instance-response-xml.txt} |    4 +-
 ...b-instance-resize-volume-request-json.txt} |    6 +-
 ...db-instance-resize-volume-request-xml.txt} |    5 +-
 .../db-instance-resize-volume-request.json    |    7 +
 .../db-instance-resize-volume-request.xml     |    4 +
 ...-instance-resize-volume-response-json.txt} |    2 +-
 ...b-instance-resize-volume-response-xml.txt} |    2 +-
 .../db-instance-restart-request-json.txt}     |    8 +-
 .../db-instance-restart-request-xml.txt}      |    5 +-
 .../samples/db-instance-restart-request.json  |    5 +
 .../samples/db-instance-restart-request.xml   |    2 +
 .../db-instance-restart-response-json.txt}    |    2 +-
 .../db-instance-restart-response-xml.txt}     |    2 +-
 ...b-instance-status-detail-request-json.txt} |    0
 ...db-instance-status-detail-request-xml.txt} |    4 +-
 ...b-instance-status-detail-response-json.txt |    6 +
 ...db-instance-status-detail-response-xml.txt |    6 +
 .../db-instance-status-detail-response.json   |   36 +
 .../db-instance-status-detail-response.xml    |   25 +
 ...stances-index-pagination-request-json.txt} |    4 +-
 ...nstances-index-pagination-request-xml.txt} |    4 +-
 ...b-instances-index-pagination-response.json |   72 +
 ...db-instances-index-pagination-response.xml |   52 +
 .../db-instances-index-request-json.txt}      |    4 +-
 .../db-instances-index-request-xml.txt}       |    4 +-
 .../db-instances-index-response-json.txt      |    6 +
 .../db-instances-index-response-xml.txt       |    6 +
 .../samples/db-instances-index-response.json  |   66 +
 .../samples/db-instances-index-response.xml   |   47 +
 ...ist-databases-pagination-request-json.txt} |    4 +-
 ...list-databases-pagination-request-xml.txt} |    0
 ...ist-databases-pagination-response-json.txt |    6 +
 ...list-databases-pagination-response-xml.txt |    6 +
 ...db-list-databases-pagination-response.json |   13 +
 .../db-list-databases-pagination-response.xml |   10 +
 .../db-list-databases-request-json.txt}       |    4 +-
 .../db-list-databases-request-xml.txt}        |    4 +-
 .../db-list-databases-response-json.txt       |    6 +
 .../db-list-databases-response-xml.txt        |    6 +
 .../samples/db-list-databases-response.json   |   19 +
 .../samples/db-list-databases-response.xml    |   11 +-
 .../db-list-user-access-request-json.txt}     |    4 +-
 .../db-list-user-access-request-xml.txt}      |    4 +-
 .../db-list-user-access-response-json.txt     |    4 +
 .../db-list-user-access-response-xml.txt      |    4 +
 .../samples/db-list-user-access-response.json |    5 -
 .../samples/db-list-user-access-response.xml  |    4 +
 .../db-list-user-dbs-request-json.txt}        |    4 +-
 .../db-list-user-dbs-request-xml.txt}         |    4 +-
 .../db-list-user-dbs-response-json.txt        |    4 +
 .../samples/db-list-user-dbs-response-xml.txt |    4 +
 .../samples/db-list-user-dbs-response.json    |    4 -
 .../src/samples/db-list-user-dbs-response.xml |    7 +
 ...db-list-users-pagination-request-json.txt} |    4 +-
 .../db-list-users-pagination-request-xml.txt} |    4 +-
 ...db-list-users-pagination-response-json.txt |    6 +
 .../db-list-users-pagination-response-xml.txt |    6 +
 .../db-list-users-pagination-response.json    |    7 -
 .../db-list-users-pagination-response.xml     |   17 +
 .../db-list-users-request-json.txt}           |    4 +-
 .../db-list-users-request-xml.txt}            |    4 +-
 .../samples/db-list-users-response-json.txt   |    6 +
 .../samples/db-list-users-response-xml.txt    |    6 +
 .../samples/db-list-users-response.json       |    7 -
 .../samples/db-list-users-response.xml        |    9 +-
 .../db-revoke-user-access-request-json.txt}   |    4 +-
 .../db-revoke-user-access-request-xml.txt}    |    4 +-
 .../db-revoke-user-access-response-json.txt}  |    2 +-
 .../db-revoke-user-access-response-xml.txt}   |    2 +-
 .../db-version-request-json.txt}              |    4 +-
 .../db-version-request-xml.txt}               |    4 +-
 .../src/samples/db-version-response-json.txt  |    4 +
 .../src/samples/db-version-response-xml.txt   |    4 +
 .../samples/db-version-response.json          |    5 -
 apidocs/src/samples/db-version-response.xml   |    9 +
 .../db-versions-request-json.txt}             |    4 +-
 .../db-versions-request-xml.txt}              |    4 +-
 .../src/samples/db-versions-response-json.txt |    4 +
 .../src/samples/db-versions-response-xml.txt  |    4 +
 .../samples/db-versions-response.json         |    5 -
 .../samples/db-versions-response.xml          |   11 +-
 {xsd => apidocs/src/xsd}/common.ent           |    0
 apidocs/src/xsd/dbaas.wadl                    | 2021 +++++++++++++++++
 {xsd => apidocs/src/xsd}/dbaas.xsd            |    0
 .../{resources => }/xslts/js/shjs/sh_java.js  |    0
 .../xslts/js/shjs/sh_javascript.js            |    0
 .../{resources => }/xslts/js/shjs/sh_main.js  |    0
 .../{resources => }/xslts/js/shjs/sh_xml.js   |    0
 .../xslts/js/trc/schema/controller.js         |    0
 .../xslts/js/trc/schema/layoutManager.js      |    0
 .../xslts/js/trc/schema/sampleManager.js      |    0
 .../src/{resources => }/xslts/js/trc/util.js  |    0
 .../{resources => }/xslts/style/schema.css    |    0
 .../xslts/style/shjs/sh_acid.css              |    0
 .../xslts/style/shjs/sh_darkblue.css          |    0
 .../xslts/style/shjs/sh_emacs.css             |    0
 .../xslts/style/shjs/sh_night.css             |    0
 .../xslts/style/shjs/sh_pablo.css             |    0
 .../xslts/style/shjs/sh_print.css             |    0
 .../xslts/style/shjs/sh_style.css             |    0
 .../xslts/style/shjs/sh_whitengrey.css        |    0
 .../src/{resources => }/xslts/xslt/.htaccess  |    0
 .../{resources => }/xslts/xslt/schema.xslt    |    0
 xsd/dbaas.wadl                                | 1426 ------------
 329 files changed, 3373 insertions(+), 4964 deletions(-)
 create mode 100644 apidocs/.gitignore
 rename apidocs/src/{resources => }/cdb-devguide.xml (73%)
 rename apidocs/src/{resources => }/images/Choose_CS_Image.png (100%)
 rename apidocs/src/{resources => }/images/Choose_CS_Image_CCP.png (100%)
 rename apidocs/src/{resources => }/images/Choose_Image_CCP.png (100%)
 rename apidocs/src/{resources => }/images/Choose_Image_CCP.tiff (100%)
 rename apidocs/src/{resources => }/images/Cloud_DB_Infographic-1.png (100%)
 rename apidocs/src/{resources => }/images/Cloud_DB_Infographic-1.svg (100%)
 rename apidocs/src/{resources => }/images/Create_CS.png (100%)
 rename apidocs/src/{resources => }/images/phpMyAdmin.png (100%)
 delete mode 100644 apidocs/src/resources/samples/db-auth-20.json
 delete mode 100644 apidocs/src/resources/samples/db-auth-20.xml
 delete mode 100644 apidocs/src/resources/samples/db-auth-repose-header.json
 delete mode 100644 apidocs/src/resources/samples/db-auth.json
 delete mode 100644 apidocs/src/resources/samples/db-auth.xml
 delete mode 100644 apidocs/src/resources/samples/db-change-users-password-request.json
 delete mode 100644 apidocs/src/resources/samples/db-check-root-user-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-create-database-instance-response.json
 delete mode 100644 apidocs/src/resources/samples/db-create-database-instance-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-create-databases-request.json
 delete mode 100644 apidocs/src/resources/samples/db-create-databases-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-create-instance-request.json
 delete mode 100644 apidocs/src/resources/samples/db-create-instance-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-create-instance-response.json
 delete mode 100644 apidocs/src/resources/samples/db-create-instance-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-create-users-request.json
 delete mode 100644 apidocs/src/resources/samples/db-create-users-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-credentials-20.json
 delete mode 100644 apidocs/src/resources/samples/db-credentials-20.xml
 delete mode 100644 apidocs/src/resources/samples/db-credentials.json
 delete mode 100644 apidocs/src/resources/samples/db-credentials.xml
 delete mode 100644 apidocs/src/resources/samples/db-delete-instance-response.json
 delete mode 100644 apidocs/src/resources/samples/db-enable-root-user-response.json
 delete mode 100644 apidocs/src/resources/samples/db-enable-root-user-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-faults-badRequest.xml
 delete mode 100644 apidocs/src/resources/samples/db-faults-instanceFault.xml
 delete mode 100644 apidocs/src/resources/samples/db-faults-itemNotFound.json
 delete mode 100644 apidocs/src/resources/samples/db-faults-itemNotFound.xml
 delete mode 100644 apidocs/src/resources/samples/db-flavors-by-id-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-flavors-response-no8_16.json
 delete mode 100644 apidocs/src/resources/samples/db-flavors-response-no8_16.xml
 delete mode 100644 apidocs/src/resources/samples/db-flavors-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-gs-create-database-instance-response.json
 delete mode 100644 apidocs/src/resources/samples/db-gs-create-database-instance-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-guest-update-request.json
 delete mode 100644 apidocs/src/resources/samples/db-guest-update-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-guest-update-response.json
 delete mode 100644 apidocs/src/resources/samples/db-instance-reboot-request.json
 delete mode 100644 apidocs/src/resources/samples/db-instance-reboot-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-instance-reboot-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-instance-resize-instance-response.json
 delete mode 100644 apidocs/src/resources/samples/db-instance-resize-instance-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-instance-resize-volume-request.json
 delete mode 100644 apidocs/src/resources/samples/db-instance-resize-volume-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-instance-restart-response.json
 delete mode 100644 apidocs/src/resources/samples/db-instance-restart-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-instance-status-detail-response.json
 delete mode 100644 apidocs/src/resources/samples/db-instance-status-detail-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-instance-update-guest-request.json
 delete mode 100644 apidocs/src/resources/samples/db-instance-update-guest-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-instance-update-guest-response.json
 delete mode 100644 apidocs/src/resources/samples/db-instance-update-guest-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-instances-index-pagination-response.json
 delete mode 100644 apidocs/src/resources/samples/db-instances-index-pagination-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-instances-index-response.json
 delete mode 100644 apidocs/src/resources/samples/db-instances-index-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-instances-paged-index-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-instances-paged-index-response.json
 delete mode 100644 apidocs/src/resources/samples/db-instances-paged-index-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-list-databases-pagination-response.json
 delete mode 100644 apidocs/src/resources/samples/db-list-databases-pagination-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-list-databases-response.json
 delete mode 100644 apidocs/src/resources/samples/db-list-user-access-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-list-user-dbs-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-list-users-pagination-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-account-details-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-account-details-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-account-details-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-account-details-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-host-detail-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-host-detail-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-host-detail-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-host-detail-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-instance-details-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-instance-details-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-instance-details-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-instance-details-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-root-details-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-root-details-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-root-details-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-root-details-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-storage-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-storage-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-storage-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-storage-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-account-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-account-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-account-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-account-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-all-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-all-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-instance-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-instance-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-instance-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-get-usage-instance-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-host-update-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-host-update-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-host-update-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-diagnostics-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-diagnostics-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-diagnostics-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-diagnostics-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-hwinfo-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-hwinfo-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-hwinfo-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-hwinfo-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-index-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-index-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-index-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-instance-index-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-list-accounts-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-list-accounts-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-list-accounts-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-list-accounts-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-list-hosts-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-list-hosts-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-list-hosts-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-list-hosts-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-migrate-instance-force-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-migrate-instance-force-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-migrate-instance-force-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-migrate-instance-force-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-migrate-instance-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-migrate-instance-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-migrate-instance-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-migrate-instance-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-request.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-request.xml
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-response.json
 delete mode 100644 apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-response.xml
 delete mode 100644 apidocs/src/resources/samples/db-request-types.json
 delete mode 100644 apidocs/src/resources/samples/db-response-types.xml
 delete mode 100644 apidocs/src/resources/samples/db-version-response.xml
 rename apidocs/src/{resources/samples/db-instances-paged-index-request.json => samples/db-change-users-password-request-json.txt} (56%)
 rename apidocs/src/{resources/samples/db-change-users-password-request.xml => samples/db-change-users-password-request-xml.txt} (61%)
 create mode 100644 apidocs/src/samples/db-change-users-password-request.json
 create mode 100644 apidocs/src/samples/db-change-users-password-request.xml
 rename apidocs/src/{resources/samples/db-change-users-password-response.json => samples/db-change-users-password-response-json.txt} (66%)
 rename apidocs/src/{resources/samples/db-change-users-password-response.xml => samples/db-change-users-password-response-xml.txt} (65%)
 rename apidocs/src/{resources/samples/db-check-root-user-request.json => samples/db-check-root-user-request-json.txt} (87%)
 rename apidocs/src/{resources/samples/db-check-root-user-request.xml => samples/db-check-root-user-request-xml.txt} (87%)
 rename apidocs/src/{resources/samples/db-check-root-user-response.json => samples/db-check-root-user-response-json.txt} (68%)
 create mode 100644 apidocs/src/samples/db-check-root-user-response-xml.txt
 create mode 100644 apidocs/src/samples/db-check-root-user-response.json
 create mode 100644 apidocs/src/samples/db-check-root-user-response.xml
 create mode 100644 apidocs/src/samples/db-create-databases-request-json.txt
 create mode 100644 apidocs/src/samples/db-create-databases-request-xml.txt
 create mode 100644 apidocs/src/samples/db-create-databases-request.json
 create mode 100644 apidocs/src/samples/db-create-databases-request.xml
 rename apidocs/src/{resources/samples/db-create-users-response.json => samples/db-create-databases-response-json.txt} (81%)
 rename apidocs/src/{resources/samples/db-delete-databases-response.xml => samples/db-create-databases-response-xml.txt} (81%)
 rename apidocs/src/{resources/samples/db-mgmt-get-usage-all-request.json => samples/db-create-instance-request-json.txt} (69%)
 rename apidocs/src/{resources/samples/db-mgmt-get-usage-all-request.xml => samples/db-create-instance-request-xml.txt} (70%)
 create mode 100644 apidocs/src/samples/db-create-instance-request.json
 create mode 100644 apidocs/src/samples/db-create-instance-request.xml
 create mode 100644 apidocs/src/samples/db-create-instance-response-json.txt
 create mode 100644 apidocs/src/samples/db-create-instance-response-xml.txt
 create mode 100644 apidocs/src/samples/db-create-instance-response.json
 create mode 100644 apidocs/src/samples/db-create-instance-response.xml
 create mode 100644 apidocs/src/samples/db-create-users-request-json.txt
 create mode 100644 apidocs/src/samples/db-create-users-request-xml.txt
 create mode 100644 apidocs/src/samples/db-create-users-request.json
 create mode 100644 apidocs/src/samples/db-create-users-request.xml
 rename apidocs/src/{resources/samples/db-create-databases-response.json => samples/db-create-users-response-json.txt} (81%)
 rename apidocs/src/{resources/samples/db-create-databases-response.xml => samples/db-create-users-response-xml.txt} (81%)
 rename apidocs/src/{resources/samples/db-delete-databases-request.json => samples/db-delete-databases-request-json.txt} (88%)
 rename apidocs/src/{resources/samples/db-delete-databases-request.xml => samples/db-delete-databases-request-xml.txt} (88%)
 rename apidocs/src/{resources/samples/db-delete-databases-response.json => samples/db-delete-databases-response-json.txt} (81%)
 rename apidocs/src/{resources/samples/db-create-users-response.xml => samples/db-delete-databases-response-xml.txt} (81%)
 rename apidocs/src/{resources/samples/db-delete-instance-request.json => samples/db-delete-instance-request-json.txt} (87%)
 rename apidocs/src/{resources/samples/db-delete-instance-request.xml => samples/db-delete-instance-request-xml.txt} (87%)
 rename apidocs/src/{resources/samples/db-instance-resize-flavor-response.json => samples/db-delete-instance-response-json.txt} (81%)
 rename apidocs/src/{resources/samples/db-delete-instance-response.xml => samples/db-delete-instance-response-xml.txt} (81%)
 rename apidocs/src/{resources/samples/db-delete-users-request.json => samples/db-delete-users-request-json.txt} (88%)
 rename apidocs/src/{resources/samples/db-delete-users-request.xml => samples/db-delete-users-request-xml.txt} (88%)
 rename apidocs/src/{resources/samples/db-delete-users-response.json => samples/db-delete-users-response-json.txt} (81%)
 rename apidocs/src/{resources/samples/db-delete-users-response.xml => samples/db-delete-users-response-xml.txt} (81%)
 rename apidocs/src/{resources/samples/db-enable-root-user-request.json => samples/db-enable-root-user-request-json.txt} (87%)
 rename apidocs/src/{resources/samples/db-enable-root-user-request.xml => samples/db-enable-root-user-request-xml.txt} (87%)
 create mode 100644 apidocs/src/samples/db-enable-root-user-response-json.txt
 create mode 100644 apidocs/src/samples/db-enable-root-user-response-xml.txt
 create mode 100644 apidocs/src/samples/db-enable-root-user-response.json
 create mode 100644 apidocs/src/samples/db-enable-root-user-response.xml
 rename apidocs/src/{resources => }/samples/db-faults-badRequest.json (55%)
 create mode 100644 apidocs/src/samples/db-faults-badRequest.xml
 rename apidocs/src/{resources => }/samples/db-faults-instanceFault.json (53%)
 create mode 100644 apidocs/src/samples/db-faults-instanceFault.xml
 create mode 100644 apidocs/src/samples/db-faults-itemNotFound.json
 create mode 100644 apidocs/src/samples/db-faults-itemNotFound.xml
 rename apidocs/src/{resources/samples/db-flavors-by-id-request.json => samples/db-flavors-by-id-request-json.txt} (85%)
 rename apidocs/src/{resources/samples/db-flavors-by-id-request.xml => samples/db-flavors-by-id-request-xml.txt} (85%)
 create mode 100644 apidocs/src/samples/db-flavors-by-id-response-json.txt
 create mode 100644 apidocs/src/samples/db-flavors-by-id-response-xml.txt
 rename apidocs/src/{resources => }/samples/db-flavors-by-id-response.json (71%)
 create mode 100644 apidocs/src/samples/db-flavors-by-id-response.xml
 rename apidocs/src/{resources/samples/db-flavors-request.json => samples/db-flavors-request-json.txt} (84%)
 rename apidocs/src/{resources/samples/db-flavors-request.xml => samples/db-flavors-request-xml.txt} (85%)
 create mode 100644 apidocs/src/samples/db-flavors-response-json.txt
 create mode 100644 apidocs/src/samples/db-flavors-response-xml.txt
 rename apidocs/src/{resources => }/samples/db-flavors-response.json (94%)
 create mode 100644 apidocs/src/samples/db-flavors-response.xml
 rename apidocs/src/{resources/samples/db-grant-user-access-request.json => samples/db-grant-user-access-request-json.txt} (62%)
 rename apidocs/src/{resources/samples/db-grant-user-access-request.xml => samples/db-grant-user-access-request-xml.txt} (64%)
 create mode 100644 apidocs/src/samples/db-grant-user-access-request.json
 create mode 100644 apidocs/src/samples/db-grant-user-access-request.xml
 rename apidocs/src/{resources/samples/db-grant-user-access-response.json => samples/db-grant-user-access-response-json.txt} (66%)
 rename apidocs/src/{resources/samples/db-grant-user-access-response.xml => samples/db-grant-user-access-response-xml.txt} (66%)
 rename apidocs/src/{resources/samples/db-instance-resize-instance-request.json => samples/db-instance-resize-instance-request-json.txt} (61%)
 rename apidocs/src/{resources/samples/db-instance-resize-instance-request.xml => samples/db-instance-resize-instance-request-xml.txt} (51%)
 create mode 100644 apidocs/src/samples/db-instance-resize-instance-request.json
 create mode 100644 apidocs/src/samples/db-instance-resize-instance-request.xml
 rename apidocs/src/{resources/samples/db-mgmt-host-update-response.json => samples/db-instance-resize-instance-response-json.txt} (68%)
 rename apidocs/src/{resources/samples/db-guest-update-response.xml => samples/db-instance-resize-instance-response-xml.txt} (68%)
 rename apidocs/src/{resources/samples/db-instance-restart-request.json => samples/db-instance-resize-volume-request-json.txt} (81%)
 rename apidocs/src/{resources/samples/db-instance-restart-request.xml => samples/db-instance-resize-volume-request-xml.txt} (70%)
 create mode 100644 apidocs/src/samples/db-instance-resize-volume-request.json
 create mode 100644 apidocs/src/samples/db-instance-resize-volume-request.xml
 rename apidocs/src/{resources/samples/db-instance-reboot-response.json => samples/db-instance-resize-volume-response-json.txt} (81%)
 rename apidocs/src/{resources/samples/db-instance-resize-flavor-response.xml => samples/db-instance-resize-volume-response-xml.txt} (81%)
 rename apidocs/src/{resources/samples/db-instance-resize-flavor-request.json => samples/db-instance-restart-request-json.txt} (74%)
 rename apidocs/src/{resources/samples/db-instance-resize-flavor-request.xml => samples/db-instance-restart-request-xml.txt} (68%)
 create mode 100644 apidocs/src/samples/db-instance-restart-request.json
 create mode 100644 apidocs/src/samples/db-instance-restart-request.xml
 rename apidocs/src/{resources/samples/db-instance-resize-volume-response.json => samples/db-instance-restart-response-json.txt} (81%)
 rename apidocs/src/{resources/samples/db-instance-resize-volume-response.xml => samples/db-instance-restart-response-xml.txt} (81%)
 rename apidocs/src/{resources/samples/db-instance-status-detail-request.json => samples/db-instance-status-detail-request-json.txt} (100%)
 rename apidocs/src/{resources/samples/db-instance-status-detail-request.xml => samples/db-instance-status-detail-request-xml.txt} (87%)
 create mode 100644 apidocs/src/samples/db-instance-status-detail-response-json.txt
 create mode 100644 apidocs/src/samples/db-instance-status-detail-response-xml.txt
 create mode 100644 apidocs/src/samples/db-instance-status-detail-response.json
 create mode 100644 apidocs/src/samples/db-instance-status-detail-response.xml
 rename apidocs/src/{resources/samples/db-instances-index-pagination-request.json => samples/db-instances-index-pagination-request-json.txt} (84%)
 rename apidocs/src/{resources/samples/db-instances-index-pagination-request.xml => samples/db-instances-index-pagination-request-xml.txt} (84%)
 create mode 100644 apidocs/src/samples/db-instances-index-pagination-response.json
 create mode 100644 apidocs/src/samples/db-instances-index-pagination-response.xml
 rename apidocs/src/{resources/samples/db-instances-index-request.json => samples/db-instances-index-request-json.txt} (85%)
 rename apidocs/src/{resources/samples/db-instances-index-request.xml => samples/db-instances-index-request-xml.txt} (85%)
 create mode 100644 apidocs/src/samples/db-instances-index-response-json.txt
 create mode 100644 apidocs/src/samples/db-instances-index-response-xml.txt
 create mode 100644 apidocs/src/samples/db-instances-index-response.json
 create mode 100644 apidocs/src/samples/db-instances-index-response.xml
 rename apidocs/src/{resources/samples/db-list-databases-pagination-request.json => samples/db-list-databases-pagination-request-json.txt} (88%)
 rename apidocs/src/{resources/samples/db-list-databases-pagination-request.xml => samples/db-list-databases-pagination-request-xml.txt} (100%)
 create mode 100644 apidocs/src/samples/db-list-databases-pagination-response-json.txt
 create mode 100644 apidocs/src/samples/db-list-databases-pagination-response-xml.txt
 create mode 100644 apidocs/src/samples/db-list-databases-pagination-response.json
 create mode 100644 apidocs/src/samples/db-list-databases-pagination-response.xml
 rename apidocs/src/{resources/samples/db-list-databases-request.json => samples/db-list-databases-request-json.txt} (87%)
 rename apidocs/src/{resources/samples/db-list-databases-request.xml => samples/db-list-databases-request-xml.txt} (87%)
 create mode 100644 apidocs/src/samples/db-list-databases-response-json.txt
 create mode 100644 apidocs/src/samples/db-list-databases-response-xml.txt
 create mode 100644 apidocs/src/samples/db-list-databases-response.json
 rename apidocs/src/{resources => }/samples/db-list-databases-response.xml (55%)
 rename apidocs/src/{resources/samples/db-list-user-access-request.json => samples/db-list-user-access-request-json.txt} (88%)
 rename apidocs/src/{resources/samples/db-list-user-access-request.xml => samples/db-list-user-access-request-xml.txt} (88%)
 create mode 100644 apidocs/src/samples/db-list-user-access-response-json.txt
 create mode 100644 apidocs/src/samples/db-list-user-access-response-xml.txt
 rename apidocs/src/{resources => }/samples/db-list-user-access-response.json (52%)
 create mode 100644 apidocs/src/samples/db-list-user-access-response.xml
 rename apidocs/src/{resources/samples/db-list-user-dbs-request.json => samples/db-list-user-dbs-request-json.txt} (88%)
 rename apidocs/src/{resources/samples/db-list-user-dbs-request.xml => samples/db-list-user-dbs-request-xml.txt} (88%)
 create mode 100644 apidocs/src/samples/db-list-user-dbs-response-json.txt
 create mode 100644 apidocs/src/samples/db-list-user-dbs-response-xml.txt
 rename apidocs/src/{resources => }/samples/db-list-user-dbs-response.json (64%)
 create mode 100644 apidocs/src/samples/db-list-user-dbs-response.xml
 rename apidocs/src/{resources/samples/db-list-users-pagination-request.json => samples/db-list-users-pagination-request-json.txt} (87%)
 rename apidocs/src/{resources/samples/db-list-users-pagination-request.xml => samples/db-list-users-pagination-request-xml.txt} (88%)
 create mode 100644 apidocs/src/samples/db-list-users-pagination-response-json.txt
 create mode 100644 apidocs/src/samples/db-list-users-pagination-response-xml.txt
 rename apidocs/src/{resources => }/samples/db-list-users-pagination-response.json (77%)
 create mode 100644 apidocs/src/samples/db-list-users-pagination-response.xml
 rename apidocs/src/{resources/samples/db-list-users-request.json => samples/db-list-users-request-json.txt} (87%)
 rename apidocs/src/{resources/samples/db-list-users-request.xml => samples/db-list-users-request-xml.txt} (87%)
 create mode 100644 apidocs/src/samples/db-list-users-response-json.txt
 create mode 100644 apidocs/src/samples/db-list-users-response-xml.txt
 rename apidocs/src/{resources => }/samples/db-list-users-response.json (78%)
 rename apidocs/src/{resources => }/samples/db-list-users-response.xml (73%)
 rename apidocs/src/{resources/samples/db-revoke-user-access-request.json => samples/db-revoke-user-access-request-json.txt} (88%)
 rename apidocs/src/{resources/samples/db-revoke-user-access-request.xml => samples/db-revoke-user-access-request-xml.txt} (89%)
 rename apidocs/src/{resources/samples/db-revoke-user-access-response.json => samples/db-revoke-user-access-response-json.txt} (66%)
 rename apidocs/src/{resources/samples/db-revoke-user-access-response.xml => samples/db-revoke-user-access-response-xml.txt} (66%)
 rename apidocs/src/{resources/samples/db-version-request.json => samples/db-version-request-json.txt} (83%)
 rename apidocs/src/{resources/samples/db-version-request.xml => samples/db-version-request-xml.txt} (84%)
 create mode 100644 apidocs/src/samples/db-version-response-json.txt
 create mode 100644 apidocs/src/samples/db-version-response-xml.txt
 rename apidocs/src/{resources => }/samples/db-version-response.json (73%)
 create mode 100644 apidocs/src/samples/db-version-response.xml
 rename apidocs/src/{resources/samples/db-versions-request.json => samples/db-versions-request-json.txt} (83%)
 rename apidocs/src/{resources/samples/db-versions-request.xml => samples/db-versions-request-xml.txt} (83%)
 create mode 100644 apidocs/src/samples/db-versions-response-json.txt
 create mode 100644 apidocs/src/samples/db-versions-response-xml.txt
 rename apidocs/src/{resources => }/samples/db-versions-response.json (76%)
 rename apidocs/src/{resources => }/samples/db-versions-response.xml (63%)
 rename {xsd => apidocs/src/xsd}/common.ent (100%)
 create mode 100644 apidocs/src/xsd/dbaas.wadl
 rename {xsd => apidocs/src/xsd}/dbaas.xsd (100%)
 rename apidocs/src/{resources => }/xslts/js/shjs/sh_java.js (100%)
 rename apidocs/src/{resources => }/xslts/js/shjs/sh_javascript.js (100%)
 rename apidocs/src/{resources => }/xslts/js/shjs/sh_main.js (100%)
 rename apidocs/src/{resources => }/xslts/js/shjs/sh_xml.js (100%)
 rename apidocs/src/{resources => }/xslts/js/trc/schema/controller.js (100%)
 rename apidocs/src/{resources => }/xslts/js/trc/schema/layoutManager.js (100%)
 rename apidocs/src/{resources => }/xslts/js/trc/schema/sampleManager.js (100%)
 rename apidocs/src/{resources => }/xslts/js/trc/util.js (100%)
 rename apidocs/src/{resources => }/xslts/style/schema.css (100%)
 rename apidocs/src/{resources => }/xslts/style/shjs/sh_acid.css (100%)
 rename apidocs/src/{resources => }/xslts/style/shjs/sh_darkblue.css (100%)
 rename apidocs/src/{resources => }/xslts/style/shjs/sh_emacs.css (100%)
 rename apidocs/src/{resources => }/xslts/style/shjs/sh_night.css (100%)
 rename apidocs/src/{resources => }/xslts/style/shjs/sh_pablo.css (100%)
 rename apidocs/src/{resources => }/xslts/style/shjs/sh_print.css (100%)
 rename apidocs/src/{resources => }/xslts/style/shjs/sh_style.css (100%)
 rename apidocs/src/{resources => }/xslts/style/shjs/sh_whitengrey.css (100%)
 rename apidocs/src/{resources => }/xslts/xslt/.htaccess (100%)
 rename apidocs/src/{resources => }/xslts/xslt/schema.xslt (100%)
 delete mode 100644 xsd/dbaas.wadl

diff --git a/.gitignore b/.gitignore
index a06b801..2e0db1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
 .DS_Store
+apidocs/.DS_Store
+apidocs/src/.DS_Store
+apidocs/src/samples/.DS_Store
+apidocs/includewars.xml
+apidocs/src/bookinfo.xml
 
 # Testenvironment
 .tox/
diff --git a/apidocs/.gitignore b/apidocs/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/apidocs/includewars.xml b/apidocs/includewars.xml
index bf2393a..9a96249 100644
--- a/apidocs/includewars.xml
+++ b/apidocs/includewars.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <assembly>
   <id>includewars</id>
   <formats>
@@ -12,4 +13,4 @@
       </includes>
     </fileSet>
   </fileSets>
-</assembly>
+</assembly>
\ No newline at end of file
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 3e1b6eb..90f0866 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -22,148 +22,148 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>com.rackspace.cloud.api</groupId>
-        <artifactId>clouddocs-maven-plugin</artifactId>
-        <!-- this <version> relates only to the *plugin* used for document formatting -->
-        <!-- the version of the *API* that is the subject of the document is indicated within each document -->
-        <version>1.12.2</version>
-        <executions>
-
-          <execution>
-            <id>cdb-devguide</id>
-            <goals>
-              <goal>generate-webhelp</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <security>reviewer</security>
-              <sourceDirectory>src/resources</sourceDirectory>
-              <highlightSource>false</highlightSource>
-              <trimWadlUriCount>2</trimWadlUriCount>
-              <!-- this is the public-facing client developer guide formerly known as PublicAPISpec.xml -->
-              <!-- this document that will be published as cdb-devguide-latest.pdf at http://docs.rackspacecloud.com/api/ -->
-              <enableDisqus>1</enableDisqus>
-              <googleAnalyticsId>UA-23102455-4</googleAnalyticsId>
-              <includes>cdb-devguide.xml</includes>
-              <canonicalUrlBase>http://docs.rackspace.com/cdb/api/v1.0/cdb-devguide/content</canonicalUrlBase>
-              <feedbackEmail>mike.asthalter@rackspace.com</feedbackEmail>
-            </configuration>
-          </execution>
-
-        </executions>
-        <configuration>
-          <socialIcons>1</socialIcons>
-          <feedbackEmail>mike.asthalter@rackspace.com</feedbackEmail>
-                <branding>openstack</branding>
-          <!-- <failOnValidationError>false</failOnValidationError> -->
-        </configuration>
+	<groupId>com.rackspace.cloud.api</groupId>
+	<artifactId>clouddocs-maven-plugin</artifactId>
+	<!-- this <version> relates only to the *plugin* used for document formatting -->
+	<!-- the version of the *API* that is the subject of the document is indicated within each document -->
+	<version>1.12.2</version>
+	<executions>
+	  
+	  <execution>
+	    <id>cdb-devguide</id>
+	    <goals>
+	      <goal>generate-webhelp</goal>
+	    </goals>
+	    <phase>generate-sources</phase>
+	    <configuration>
+	      <security>reviewer</security>
+	      <sourceDirectory>src</sourceDirectory>
+	      <highlightSource>false</highlightSource>
+	      <trimWadlUriCount>2</trimWadlUriCount>
+	      <!-- this is the public-facing client developer guide formerly known as PublicAPISpec.xml -->
+	      <!-- this document that will be published as cdb-devguide-latest.pdf at http://docs.rackspacecloud.com/api/ --> 
+	      <enableDisqus>1</enableDisqus>
+	      <googleAnalyticsId>UA-23102455-4</googleAnalyticsId>
+	      <includes>cdb-devguide.xml</includes>
+	      <canonicalUrlBase>http://docs.rackspace.com/cdb/api/v1.0/cdb-devguide/content</canonicalUrlBase>
+	      <feedbackEmail>mike.asthalter@rackspace.com</feedbackEmail>
+	    </configuration>
+	  </execution>
+	  
+	</executions>
+	<configuration>
+	  <socialIcons>1</socialIcons>
+	  <feedbackEmail>mike.asthalter@rackspace.com</feedbackEmail>
+		<branding>openstack</branding>
+	  <!-- <failOnValidationError>false</failOnValidationError> -->
+	</configuration>
             </plugin>
-            <!-- Unpack the wadl normalization xslts -->
+	    <!-- Unpack the wadl normalization xslts -->
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
+	      <groupId>org.apache.maven.plugins</groupId>
+	      <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
-                  <execution>
-                    <id>unpack-shared-resources</id>
-                    <goals>
-                      <goal>unpack-dependencies</goal>
-                    </goals>
-                    <phase>generate-sources</phase>
-                    <configuration>
-                      <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-                      <includeGroupIds>com.rackspace.cloud.api</includeGroupIds>
-                      <includeArtifactIds>wadl-tools</includeArtifactIds>
-                      <excludeTransitive>true</excludeTransitive>
-                      <includes>**/xsl/*.xsl</includes>
-                    </configuration>
-                  </execution>
+		  <execution>
+		    <id>unpack-shared-resources</id>
+		    <goals>
+		      <goal>unpack-dependencies</goal>
+		    </goals>
+		    <phase>generate-sources</phase>
+		    <configuration>
+		      <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+		      <includeGroupIds>com.rackspace.cloud.api</includeGroupIds>
+		      <includeArtifactIds>wadl-tools</includeArtifactIds>
+		      <excludeTransitive>true</excludeTransitive>
+		      <includes>**/xsl/*.xsl</includes>
+		    </configuration>
+		  </execution>
                 </executions>
-            </plugin>
+            </plugin>            
             <!-- Normalize the dbaas wadl -->
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <version>1.5</version>
-              <executions>
-                <execution>
-                  <id>ant</id>
-                  <phase>generate-sources</phase>
-                  <configuration>
-                    <target>
-                      <copy todir="${project.build.directory}/generated-resources/normalized/api/v1.0">
-                        <fileset dir="src/resources">
-                          <include name="xslts/**"/>
-                        </fileset>
-                        <fileset dir="src/resources">
-                          <include name="samples/**"/>
-                        </fileset>
-                      </copy>
-                      <copy file="../xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/xsd/cdb.xsd"/>
-                      <copy file="../xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.xsd"/>
-                      <java
-                          jar="${net.sourceforge.saxon:saxon:jar}"
-                          fork="true">
-                        <arg value="-u"/>
-                        <arg value="-s:../xsd/dbaas.wadl"/>
-                        <arg value="-xsl:${project.build.directory}/generated-resources/xsl/normalizeWadl.xsl"/>
-                        <arg value="-o:${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"/>
-                        <arg value="flattenXsds=false"/>
-                      </java>
-                      <replaceregexp file="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"
-                                     match="file:/.*/xsd/dbaas.xsd"
-                                     replace="xsd/cdb.xsd"/>
-                      <war destfile="${project.build.directory}/docbkx/webhelp/cdb-wadls.war" needxmlfile="false">
-                        <fileset dir="${project.build.directory}/generated-resources/normalized"/>
-                      </war>
-                    </target>
-                  </configuration>
-                  <goals>
-                    <goal>run</goal>
-                  </goals>
-                </execution>
-              </executions>
+	      <groupId>org.apache.maven.plugins</groupId>
+	      <artifactId>maven-antrun-plugin</artifactId>
+	      <version>1.5</version>
+	      <executions>
+		<execution>
+		  <id>ant</id>
+		  <phase>generate-sources</phase>
+		  <configuration>
+		    <target>
+		      <copy todir="${project.build.directory}/generated-resources/normalized/api/v1.0">
+			<fileset dir="src">
+			  <include name="xslts/**"/>
+			</fileset>
+			<fileset dir="src">
+			  <include name="samples/**"/>
+			</fileset>
+		      </copy>
+		      <copy file="src/xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/xsd/cdb.xsd"/>
+		      <copy file="src/xsd/dbaas.xsd" tofile="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.xsd"/>
+		       <java
+			  jar="${net.sourceforge.saxon:saxon:jar}"
+			  fork="true">
+			<arg value="-u"/>
+			<arg value="-s:src/xsd/dbaas.wadl"/>
+			<arg value="-xsl:${project.build.directory}/generated-resources/xsl/normalizeWadl.xsl"/>
+			<arg value="-o:${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"/>
+			<arg value="flattenXsds=false"/>
+		      </java>
+		      <replaceregexp file="${project.build.directory}/generated-resources/normalized/api/v1.0/cdb.wadl"
+				     match="file:/.*/src/xsd/dbaas.xsd"
+				     replace="xsd/cdb.xsd"/>
+		      <war destfile="${project.build.directory}/docbkx/webhelp/cdb-wadls.war" needxmlfile="false">
+			<fileset dir="${project.build.directory}/generated-resources/normalized"/>			
+		      </war>		    
+		    </target>
+		  </configuration>
+		  <goals>
+		    <goal>run</goal>
+		  </goals>
+		</execution>
+	      </executions>
             </plugin>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-assembly-plugin</artifactId>
-              <version>2.3</version>
-              <configuration>
-                <descriptors>
-                  <descriptor>includewars.xml</descriptor>
-                </descriptors>
-              </configuration>
-              <executions>
-                <execution>
-                  <id>assembly</id>
-                  <goals>
-                    <goal>single</goal>
-                  </goals>
-                  <phase>package</phase>
-                </execution>
-              </executions>
+	      <groupId>org.apache.maven.plugins</groupId>
+	      <artifactId>maven-assembly-plugin</artifactId>
+	      <version>2.3</version>
+	      <configuration>
+		<descriptors>
+		  <descriptor>includewars.xml</descriptor>
+		</descriptors>
+	      </configuration>
+	      <executions>
+		<execution>
+		  <id>assembly</id>
+		  <goals>
+		    <goal>single</goal>
+		  </goals>
+		  <phase>package</phase>
+		</execution>
+	      </executions>
             </plugin>
         </plugins>
       </build>
-      <profiles>
-    <profile>
-      <id>Rackspace Research Repositories</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <repositories>
-        <repository>
-          <id>rackspace-research</id>
-          <name>Rackspace Research Repository</name>
-          <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>rackspace-research</id>
-          <name>Rackspace Research Repository</name>
-          <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
+      <profiles>                                                                                              
+    <profile>                                                                                           
+      <id>Rackspace Research Repositories</id>                                                        
+      <activation>                                                                                    
+        <activeByDefault>true</activeByDefault>                                                     
+      </activation>                                                                                   
+      <repositories>                                                                                  
+        <repository>                                                                                
+          <id>rackspace-research</id>                                                             
+          <name>Rackspace Research Repository</name>                                              
+          <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>              
+        </repository>                                                                               
+      </repositories>                                                                                 
+      <pluginRepositories>                                                                            
+        <pluginRepository>                                                                          
+          <id>rackspace-research</id>                                                             
+          <name>Rackspace Research Repository</name>                                              
+          <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>              
+        </pluginRepository>                                                                         
+      </pluginRepositories>                                                                           
+    </profile> 
   </profiles>
 </project>
diff --git a/apidocs/src/resources/cdb-devguide.xml b/apidocs/src/cdb-devguide.xml
similarity index 73%
rename from apidocs/src/resources/cdb-devguide.xml
rename to apidocs/src/cdb-devguide.xml
index b62faee..b58ae7b 100644
--- a/apidocs/src/resources/cdb-devguide.xml
+++ b/apidocs/src/cdb-devguide.xml
@@ -36,8 +36,7 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:svg="http://www.w3.org/2000/svg"
     xmlns:m="http://www.w3.org/1998/Math/MathML"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    xml:id="cdb-devguide"
+    xmlns:html="http://www.w3.org/1999/xhtml" xml:id="cdb-devguide"
     version="5.0">
 
     <?rax title.font.size="35px" subtitle.font.size="20px"?>
@@ -66,7 +65,8 @@
         <pubdate>2013-05-02</pubdate>
         <legalnotice role="apache2">
             <annotation>
-                <remark>Copyright details are filled in by the template.</remark>
+                <remark>Copyright details are filled in by the
+                    template.</remark>
             </annotation>
         </legalnotice>
         <abstract>
@@ -90,17 +90,18 @@
             </revision>
         </revhistory>
 
-    <cover>
-        <para>this is a placeholder for the front cover</para>
-    </cover>
-    <cover>
-        <para>this is a placeholder for the back cover</para>
-    </cover>
-    <raxm:metadata xmlns:raxm="http://docs.rackspace.com/api/metadata">
-      <raxm:displayname>API Developer Guide</raxm:displayname>
-      <raxm:product version="v1.0">cdb</raxm:product>
-      <raxm:priority>20</raxm:priority>
-    </raxm:metadata>
+        <cover>
+            <para>this is a placeholder for the front cover</para>
+        </cover>
+        <cover>
+            <para>this is a placeholder for the back cover</para>
+        </cover>
+        <raxm:metadata
+            xmlns:raxm="http://docs.rackspace.com/api/metadata">
+            <raxm:displayname>API Developer Guide</raxm:displayname>
+            <raxm:product version="v1.0">cdb</raxm:product>
+            <raxm:priority>20</raxm:priority>
+        </raxm:metadata>
     </info>
     <chapter xml:id="overview">
         <title>Overview</title>
@@ -117,27 +118,27 @@
                     >mysqldump</emphasis> until backups are supported
                 in Cloud Databases.</para>
         </note>
-        <para>The following figure shows an
-            overview of Cloud Databases Infrastructure: <informalfigure>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata
-                            fileref="images/Cloud_DB_Infographic-1.svg"
-                            contentwidth="6in"/>
-                    </imageobject>
-                </mediaobject>
-            </informalfigure>
-        </para>
+        <para>The following figure shows an overview of Cloud
+            Databases Infrastructure:</para>
+        <informalfigure>
+            <mediaobject>
+                <imageobject>
+                    <imagedata
+                        fileref="images/Cloud_DB_Infographic-1.svg"
+                        contentwidth="6in"/>
+                </imageobject>
+            </mediaobject>
+        </informalfigure>
         <remark security="reviewer">Reviewer: need to edit graphic
             above so it says "The Cloud" rather than "The Rackspace
             Cloud".</remark>
         <?hard-pagebreak?>
         <section xml:id="Intended_Audience-d1e122">
             <title>Intended Audience</title>
-            <para>This Guide is intended to assist software
-                developers who want to develop applications using the
-                Cloud Databases API. It assumes the reader has a
-                general understanding of databases and is familiar
+            <para>This Guide is intended to assist software developers
+                who want to develop applications using the Cloud
+                Databases API. It assumes the reader has a general
+                understanding of databases and is familiar
                 with:</para>
             <itemizedlist spacing="compact">
                 <listitem>
@@ -167,7 +168,8 @@
                     xlink:href="http://docs.openstack.org/"
                     >http://docs.openstack.org/</link>.</para>
             <para>We welcome feedback, comments, and bug reports at
-                <link xlink:href="https://bugs.launchpad.net/reddwarf"
+                    <link
+                    xlink:href="https://bugs.launchpad.net/reddwarf"
                     >https://bugs.launchpad.net/reddwarf</link>.</para>
             <para>This API uses standard HTTP 1.1 response codes as
                 documented at: <link
@@ -230,19 +232,20 @@
             authentication system that allows seamless access between
             products and services.</para>
         <note>
-            <para>All requests to authenticate against and operate the service are performed using
-                SSL over HTTP (HTTPS) on TCP port 443.</para>
+            <para>All requests to authenticate against and operate the
+                service are performed using SSL over HTTP (HTTPS) on
+                TCP port 443.</para>
         </note>
         <section xml:id="Authentication-d1e647">
             <title>Authentication</title>
-            <para>Each HTTP request against the Cloud Database
-                service requires the inclusion of specific
-                authentication credentials. A single deployment may
-                support multiple authentication schemes (OAuth, Basic
-                Auth, Token). The authentication scheme used is
-                determined by the provider of the Cloud Database
-                service. Please contact your provider to determine the
-                best way to authenticate against this API.</para>
+            <para>Each HTTP request against the Cloud Database service
+                requires the inclusion of specific authentication
+                credentials. A single deployment may support multiple
+                authentication schemes (OAuth, Basic Auth, Token). The
+                authentication scheme used is determined by the
+                provider of the Cloud Database service. Please contact
+                your provider to determine the best way to
+                authenticate against this API.</para>
             <note>
                 <para>Some authentication schemes may require that the
                     API operate using SSL over HTTP (HTTPS).</para>
@@ -250,8 +253,8 @@
         </section>
         <section xml:id="DB_service_versions">
             <title>Cloud Databases Service Versions</title>
-            <para>The Cloud Databases version defines the contract
-                and build information for the API.</para>
+            <para>The Cloud Databases version defines the contract and
+                build information for the API.</para>
             <section xml:id="Contract_Version-d1e825">
                 <title>Contract Version</title>
                 <para>The contract version denotes the data model and
@@ -259,18 +262,17 @@
                     contract version is included in all request URLs.
                     Different contract versions of the API may be
                     available at any given time and are not guaranteed
-                    to be compatible with one another.
-                </para>
+                    to be compatible with one another.</para>
                 <example>
-                        <title>Example Request URL (contract version
-                            in <emphasis role="strong"
-                            >bold</emphasis>)</title>
-                        <programlisting>https://ord.databases.api.rackspacecloud.com/<emphasis role="strong">v1.0</emphasis>/1234</programlisting>
+                    <title>Example Request URL (contract version in
+                            <emphasis role="strong"
+                        >bold</emphasis>)</title>
+                    <programlisting>https://ord.databases.api.rackspacecloud.com/<emphasis role="strong">v1.0</emphasis>/1234</programlisting>
                 </example>
-                    <note>
-                        <para>This document pertains to contract
-                            version 1.0.</para>
-                    </note>
+                <note>
+                    <para>This document pertains to contract version
+                        1.0.</para>
+                </note>
 
             </section>
             <section xml:id="API_Version_Headers-d1e855">
@@ -284,24 +286,26 @@
         <?hard-pagebreak?>
         <section xml:id="datetimeformat">
             <title>Date/Time Format</title>
-            <para>The Database Service uses an ISO-8601 compliant
-                date format for the display and consumption of
-                date/time values.</para>
-            <para>The system timezone is in UTC. MySQL converts TIMESTAMP values from
-                    the current time zone to UTC for storage, and back
-                    from UTC to the current time zone for retrieval.
-                    This does not occur for other types, such as DATETIME.
-            </para>
-                <example>
-                    <title>DB Service Date/Time Format</title>
-                    <programlisting>yyyy-MM-dd'T'HH:mm:ss.SSSZ</programlisting>
-                <para>See the table below for a description of the date/time format codes.</para>
-                    <para>May 19th, 2011 at 8:07:08 AM, GMT-5 would have the following
-                    format:</para>
-                    <programlisting>2011-05-19T08:07:08-05:00</programlisting>
-                </example>
+            <para>The Database Service uses an ISO-8601 compliant date
+                format for the display and consumption of date/time
+                values.</para>
+            <para>The system timezone is in UTC. MySQL converts
+                TIMESTAMP values from the current time zone to UTC for
+                storage, and back from UTC to the current time zone
+                for retrieval. This does not occur for other types,
+                such as DATETIME.</para>
+            <example>
+                <title>DB Service Date/Time Format</title>
+                <programlisting>yyyy-MM-dd'T'HH:mm:ss.SSSZ</programlisting>
+                <para>See the table below for a description of the
+                    date/time format codes.</para>
+                <para>May 19th, 2011 at 8:07:08 AM, GMT-5 would have
+                    the following format:</para>
+                <programlisting>2011-05-19T08:07:08-05:00</programlisting>
+            </example>
             <table rules="all">
-                <caption>Explanation of Date/Time Format Codes</caption>
+                <caption>Explanation of Date/Time Format
+                    Codes</caption>
                 <thead>
                     <tr>
                         <td>Code</td>
@@ -339,7 +343,8 @@
                     </tr>
                     <tr>
                         <td>SSS</td>
-                        <td>Three digit milliseconds of the second</td>
+                        <td>Three digit milliseconds of the
+                            second</td>
                     </tr>
                     <tr>
                         <td>Z</td>
@@ -359,8 +364,8 @@
                 20. If a request supplies no limit or one that exceeds
                 the configured default limit, the default is used
                 instead.</para>
-            <para>Pagination provides the ability to limit the size
-                of the returned data as well as retrieve a specified
+            <para>Pagination provides the ability to limit the size of
+                the returned data as well as retrieve a specified
                 subset of a large data set. Pagination has two key
                 concepts: limit and marker. <emphasis>Limit</emphasis>
                 is the restriction on the maximum number of items for
@@ -400,7 +405,8 @@
                     </tr>
                     <tr>
                         <td colspan="1">&GET;</td>
-                        <td colspan="2"> /instances/{instanceId}/users</td>
+                        <td colspan="2">
+                            /instances/{instanceId}/users</td>
                         <td colspan="3">Lists the users in the
                             specified database instance.</td>
                     </tr>
@@ -417,21 +423,17 @@
                 returned.</para>
             <para>See the examples of paged List Instances calls that
                 follow.</para>
-            <remark security="reviewer">Reviewer: Need new examples that show OpenStack
-                host.</remark>
+            <remark security="reviewer">Reviewer: Need new examples
+                that show OpenStack host.</remark>
             <example>
                 <title>List Instances Paged Request: XML</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="xml">
-<xi:include href="samples/db-instances-index-pagination-request.xml" parse="text"/>
-                    </programlisting>
+                <programlisting language="xml"><xi:include href="samples/db-instances-index-pagination-request-xml.txt" parse="text"/></programlisting>
             </example>
             <example>
                 <title>List Instances Paged Request: JSON</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="json">
-<xi:include href="samples/db-instances-index-pagination-request.json" parse="text"/>
-                    </programlisting>
+                <programlisting language="json"><xi:include href="samples/db-instances-index-pagination-request-json.txt" parse="text"/></programlisting>
             </example>
             <para>Notice that the paged request examples above set the
                 limit to 2 (<code>?limit=2</code>), so the responses
@@ -446,27 +448,35 @@
             <example>
                 <title>List Instances Paged Response: XML</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="xml">
-<xi:include href="samples/db-instances-index-pagination-response.xml" parse="text"/>
-                    </programlisting>
+                <literallayout>HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 1538
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)</literallayout>
+                <programlisting language="xml"><xi:include href="samples/db-instances-index-pagination-response.xml" parse="text"/></programlisting>
             </example>
             <example>
                 <title>List Instances Paged Response: JSON</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="json">
-<xi:include href="samples/db-instances-index-pagination-response.json" parse="text"/>
-                    </programlisting>
+                <literallayout>HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 1172
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)</literallayout>
+<programlisting language="json"><xi:include href="samples/db-instances-index-pagination-response.json" parse="text"/></programlisting>
             </example>
         </section>
         <section xml:id="DB_faults">
             <title>Faults</title>
-            <para>When an error occurs, the Database Service returns
-                a fault object containing an HTTP error response code
+            <para>When an error occurs, the Database Service returns a
+                fault object containing an HTTP error response code
                 that denotes the type of error. In the body of the
                 response, the system will return additional
                 information about the fault.</para>
-            <para>The following table lists possible fault types with their associated error codes
-                and descriptions.</para>
+            <para>The following table lists possible fault types with
+                their associated error codes and descriptions.</para>
             <informaltable rules="all">
                 <thead>
                     <tr align="center">
@@ -479,12 +489,15 @@
                     <tr>
                         <td colspan="2"><code>badRequest</code></td>
                         <td colspan="1">400</td>
-                        <td colspan="3">There was one or more errors in the user request.</td>
+                        <td colspan="3">There was one or more errors
+                            in the user request.</td>
                     </tr>
                     <tr>
                         <td colspan="2"><code>unauthorized</code></td>
                         <td colspan="1">401</td>
-                        <td colspan="3">The supplied token is not authorized to access the resources, either it's expired or invalid.</td>
+                        <td colspan="3">The supplied token is not
+                            authorized to access the resources, either
+                            it's expired or invalid.</td>
                     </tr>
                     <tr>
                         <td colspan="2"><code>forbidden</code></td>
@@ -502,20 +515,25 @@
                     <tr>
                         <td colspan="2"><code>badMethod</code></td>
                         <td colspan="1">405</td>
-                        <td colspan="3">The request method is not allowed for this resource.</td>
+                        <td colspan="3">The request method is not
+                            allowed for this resource.</td>
                     </tr>
                     <tr>
                         <td colspan="2"><code>overLimit</code></td>
                         <td colspan="1">413</td>
-                        <td colspan="3">Either the number of entities in the request is larger than
-                            allowed limits, or the user has exceeded allowable request rate limits.
-                            See the <code>details</code> element for more specifics. Contact support
-                            if you think you need higher request rate limits.</td>
+                        <td colspan="3">Either the number of entities
+                            in the request is larger than allowed
+                            limits, or the user has exceeded allowable
+                            request rate limits. See the
+                                <code>details</code> element for more
+                            specifics. Contact support if you think
+                            you need higher request rate limits.</td>
                     </tr>
                     <tr>
                         <td colspan="2"><code>badMediaType</code></td>
                         <td colspan="1">415</td>
-                        <td colspan="3">The requested content type is not supported by this service.</td>
+                        <td colspan="3">The requested content type is
+                            not supported by this service.</td>
                     </tr>
                     <tr>
                         <td colspan="2"
@@ -528,13 +546,17 @@
                         <td colspan="2"
                             ><code>instanceFault</code></td>
                         <td colspan="1">500</td>
-                        <td colspan="3">This is a generic server error and the message contains the reason for the error. This error could wrap several error messages and is a catch all.</td>
+                        <td colspan="3">This is a generic server error
+                            and the message contains the reason for
+                            the error. This error could wrap several
+                            error messages and is a catch all.</td>
                     </tr>
                     <tr>
                         <td colspan="2"
                             ><code>notImplemented</code></td>
                         <td colspan="1">501</td>
-                        <td colspan="3">The requested method or resource is not implemented.</td>
+                        <td colspan="3">The requested method or
+                            resource is not implemented.</td>
                     </tr>
                     <tr>
                         <td colspan="2"
@@ -545,66 +567,83 @@
                     </tr>
                 </tbody>
             </informaltable>
-            <para>The following two  <code>instanceFault</code>
+            <para>The following two <code>instanceFault</code>
                 examples show errors when the server has erred or
                 cannot perform the requested operation:</para>
 
             <example>
                 <title>Example instanceFault Response: XML</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="xml">
-<xi:include href="samples/db-faults-instanceFault.xml" parse="text"/>
-                    </programlisting>
+                <literallayout>HTTP/1.1 500 Internal Server Error
+Content-Type: application/xml
+Content-Length: 121
+Date: Mon, 28 Nov 2011 18:19:37 GMT</literallayout>
+<programlisting language="xml"><xi:include href="samples/db-faults-instanceFault.xml" parse="text"/></programlisting>
             </example>
             <example>
                 <title>Example Fault Response: JSON</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="json">
-<xi:include href="samples/db-faults-instanceFault.json" parse="text"/>
-                    </programlisting>
+                <literallayout>HTTP/1.1 500 Internal Server Error
+Content-Length: 120
+Content-Type: application/json; charset=UTF-8
+Date: Tue, 29 Nov 2011 00:33:48 GMT</literallayout>
+<programlisting language="json"><xi:include href="samples/db-faults-instanceFault.json" parse="text"/></programlisting>
             </example>
-            <para>The error code (<code>code</code>) is returned in the body of the response for
-                convenience. The <code>message</code> element returns a human-readable message that
-                is appropriate for display to the end user. The <code>details</code> element is
-                optional and may contain information that is useful for tracking down an error, such
-                as a stack trace. The <code>details</code> element may or may not be appropriate for
-                display to an end user, depending on the role and experience of the end user.</para>
+            <para>The error code (<code>code</code>) is returned in
+                the body of the response for convenience. The
+                    <code>message</code> element returns a
+                human-readable message that is appropriate for display
+                to the end user. The <code>details</code> element is
+                optional and may contain information that is useful
+                for tracking down an error, such as a stack trace. The
+                    <code>details</code> element may or may not be
+                appropriate for display to an end user, depending on
+                the role and experience of the end user.</para>
             <para>The fault's root element (for example,
                     <code>instanceFault</code>) may change depending
                 on the type of error.</para>
-            <para><?rax-fo keep-with-next?>The following two <code>badRequest</code> examples
-                show errors when the volume size is invalid:</para>
+            <para><?rax-fo keep-with-next?>The following two
+                    <code>badRequest</code> examples show errors when
+                the volume size is invalid:</para>
             <example>
                 <title>Example badRequest Fault on Volume Size Errors:
                     XML</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="xml">
-<xi:include href="samples/db-faults-badRequest.xml" parse="text"/>
-                    </programlisting>
+                <literallayout>HTTP/1.1 400 None
+Content-Type: application/xml
+Content-Length: 121
+Date: Mon, 28 Nov 2011 18:19:37 GMT</literallayout>
+<programlisting language="xml"><xi:include href="samples/db-faults-badRequest.xml" parse="text"/></programlisting>
             </example>
             <example>
                 <title>Example badRequest Fault on Volume Size Errors:
                     JSON</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="json">
-<xi:include href="samples/db-faults-badRequest.json" parse="text"/>
-                    </programlisting>
+                <literallayout>HTTP/1.1 400 None
+Content-Length: 120
+Content-Type: application/json; charset=UTF-8
+Date: Tue, 29 Nov 2011 00:33:48 GMT</literallayout>
+<programlisting language="json"><xi:include href="samples/db-faults-badRequest.json" parse="text"/></programlisting>
             </example>
-            <para>The next two examples show
-                    <code>itemNotFound</code> errors:</para>
+            <para>The next two examples show <code>itemNotFound</code>
+                errors:</para>
             <example>
                 <title>Example itemNotFound Fault: XML</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="xml">
-<xi:include href="samples/db-faults-itemNotFound.xml" parse="text"/>
-                    </programlisting>
+                <literallayout>HTTP/1.1 404 Not Found
+Content-Length: 147
+Content-Type: application/xml; charset=UTF-8
+Date: Mon, 28 Nov 2011 19:50:15 GMT</literallayout>
+<programlisting language="xml"><xi:include href="samples/db-faults-itemNotFound.xml" parse="text"/></programlisting>
             </example>
             <example>
                 <title>Example itemNotFound Fault: JSON</title>
                 <?dbfo keep-together="always"?>
-                <programlisting language="json">
-<xi:include href="samples/db-faults-itemNotFound.json" parse="text"/>
-                    </programlisting>
+                <literallayout>HTTP/1.1 404 Not Found
+Content-Length: 78
+Content-Type: application/json; charset=UTF-8
+Date: Tue, 29 Nov 2011 00:35:24 GMT</literallayout>
+<programlisting language="json"><xi:include href="samples/db-faults-itemNotFound.json" parse="text"/></programlisting>
             </example>
             <section xml:id="synchro_vs_async_faults">
                 <title>Synchronous Versus Asynchronous
@@ -614,7 +653,8 @@
                     fault contains an HTTP error response code, a
                     human readable message, and optional details about
                     the error. The following Database API calls are
-                    synchronous and may produce synchronous faults:<itemizedlist spacing="compact">
+                    synchronous and may produce synchronous
+                        faults:<itemizedlist spacing="compact">
                         <listitem>
                             <para>List Users</para>
                         </listitem>
@@ -654,7 +694,7 @@
                     HTTP error response code, a human readable
                     message, and optional details about the error. The
                     following Database API calls are asynchronous and
-                    may produce asynchronous faults:<itemizedlist
+                    may produce asynchronous faults:</para><itemizedlist
                         spacing="compact">
                         <listitem>
                             <para>Create Instance</para>
@@ -683,22 +723,25 @@
                         <listitem>
                             <para>Restart Instance</para>
                         </listitem>
-                    </itemizedlist><note>
+                    </itemizedlist>
+                    <note>
                         <para>Note that an asynchronous operation, if
                             it fails, may not give the user an error,
                             and the operation can error out without a
                             failure notification.</para>
-                    </note></para>
+                    </note>
             </section>
         </section>
         <section xml:id="database_instance_status">
             <title>Database Instance Status</title>
-            <para><?rax-fo keep-with-next?>When making an API call to create, list, or delete
-                database instance(s), the following database instance
-                status values are possible:</para>
+            <para><?rax-fo keep-with-next?>When making an API call to
+                create, list, or delete database instance(s), the
+                following database instance status values are
+                possible:</para>
             <itemizedlist spacing="compact">
                 <listitem>
-                    <para>BUILD &ndash; The database instance is being provisioned.</para>
+                    <para>BUILD &ndash; The database instance is being
+                        provisioned.</para>
                 </listitem>
                 <listitem>
                     <para>REBOOT &ndash; The database instance is
@@ -713,21 +756,19 @@
                         unresponsive at the moment.</para>
                 </listitem>
                 <listitem>
-                    <para>RESIZE &ndash; The database instance is being
-                        resized at the moment.</para>
+                    <para>RESIZE &ndash; The database instance is
+                        being resized at the moment.</para>
                 </listitem>
                 <listitem>
                     <para>SHUTDOWN &ndash; The database instance is
                         terminating services. Also, SHUTDOWN is
                         returned if for any reason the MySQL instance
                         is shut down but not the actual server.</para>
-                    <para>
-                        <note>
-                            <para>If MySQL has crashed (causing the
-                                SHUTDOWN status), please call support
-                                for assistance.</para>
-                        </note>
-                    </para>
+                    <note>
+                        <para>If MySQL has crashed (causing the
+                            SHUTDOWN status), please call support for
+                            assistance.</para>
+                    </note>
                 </listitem>
                 <listitem>
                     <para>ERROR &ndash; The last operation for the
@@ -739,8 +780,7 @@
     </chapter>
 
     <chapter xml:id="API_Operations-d1e2264"
-        xmlns="http://docbook.org/ns/docbook"
-        role="api-reference">
+        xmlns="http://docbook.org/ns/docbook" role="api-reference">
         <title>API Operations</title>
         <note>
             <para>Do not use trailing slashes (/) at the end of calls
@@ -754,12 +794,13 @@
             <title>API Versions</title>
             <para>This section describes the versions that are
                 supported for the Cloud Databases API.</para>
-            <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#versions">
+            <wadl:resources
+                xmlns:wadl="http://wadl.dev.java.net/2009/02">
+                <wadl:resource href="xsd/dbaas.wadl#versions">
                     <wadl:method href="getVersions"/>
                 </wadl:resource>
-                <wadl:resource href="../../../xsd/dbaas.wadl#version">
-                    <wadl:method href="getVersionInfo" />
+                <wadl:resource href="xsd/dbaas.wadl#version">
+                    <wadl:method href="getVersionInfo"/>
                 </wadl:resource>
             </wadl:resources>
 
@@ -767,18 +808,20 @@
 
         <section xml:id="Database_Instances">
             <title>Database Instances</title>
-            <para>This section describes the operations that are supported for database instances.</para>
-            <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#instances" >
+            <para>This section describes the operations that are
+                supported for database instances.</para>
+            <wadl:resources
+                xmlns:wadl="http://wadl.dev.java.net/2009/02">
+                <wadl:resource href="xsd/dbaas.wadl#instances">
                     <wadl:method href="createInstance"/>
                     <wadl:method href="getInstance"/>
                 </wadl:resource>
 
-                <wadl:resource href="../../../xsd/dbaas.wadl#instanceId">
+                <wadl:resource href="xsd/dbaas.wadl#instanceId">
                     <wadl:method href="getInstanceById"/>
                     <wadl:method href="deleteInstance"/>
                 </wadl:resource>
-                <wadl:resource href="../../../xsd/dbaas.wadl#root">
+                <wadl:resource href="xsd/dbaas.wadl#root">
                     <wadl:method href="createRoot"/>
                     <wadl:method href="isRootEnabled"/>
                 </wadl:resource>
@@ -787,9 +830,11 @@
 
         <section xml:id="Database_Instances_Actions">
             <title>Database Instance Actions</title>
-            <para>This section describes the actions that are supported for database instances.</para>
-            <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#instanceAction" >
+            <para>This section describes the actions that are
+                supported for database instances.</para>
+            <wadl:resources
+                xmlns:wadl="http://wadl.dev.java.net/2009/02">
+                <wadl:resource href="xsd/dbaas.wadl#instanceAction">
                     <wadl:method href="restartInstance"/>
                     <wadl:method href="resizeInstance"/>
                     <wadl:method href="resizeVolume"/>
@@ -803,11 +848,11 @@
                 supported for databases.</para>
             <wadl:resources
                 xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#databases">
+                <wadl:resource href="xsd/dbaas.wadl#databases">
                     <wadl:method href="createDatabase"/>
                     <wadl:method href="getDatabases"/>
                 </wadl:resource>
-                <wadl:resource href="../../../xsd/dbaas.wadl#databaseName">
+                <wadl:resource href="xsd/dbaas.wadl#databaseName">
                     <wadl:method href="deleteDatabase"/>
                 </wadl:resource>
             </wadl:resources>
@@ -840,20 +885,18 @@
             </warning>
             <wadl:resources
                 xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#users">
+                <wadl:resource href="xsd/dbaas.wadl#users">
                     <wadl:method href="createUser"/>
                     <wadl:method href="getUsers"/>
                     <wadl:method href="changePass"/>
                 </wadl:resource>
-                <wadl:resource href="../../../xsd/dbaas.wadl#userId">
+                <wadl:resource href="xsd/dbaas.wadl#userId">
                     <wadl:method href="listUser"/>
                     <wadl:method href="deleteUser"/>
-                    <wadl:resource
-                        href="../../../xsd/dbaas.wadl#database">
+                    <wadl:resource href="xsd/dbaas.wadl#database">
                         <wadl:method href="getUserAccess"/>
                         <wadl:method href="grantUserAccess"/>
-                        <wadl:resource
-                            href="../../../xsd/dbaas.wadl#dbName">
+                        <wadl:resource href="xsd/dbaas.wadl#dbName">
                             <wadl:method href="revokeUserAccess"/>
                         </wadl:resource>
                     </wadl:resource>
@@ -867,11 +910,11 @@
                 supported for flavors.</para>
             <wadl:resources
                 xmlns:wadl="http://wadl.dev.java.net/2009/02">
-                <wadl:resource href="../../../xsd/dbaas.wadl#flavors">
+                <wadl:resource href="xsd/dbaas.wadl#flavors">
                     <wadl:method href="getFlavors"/>
                 </wadl:resource>
 
-                <wadl:resource href="../../../xsd/dbaas.wadl#flavorId">
+                <wadl:resource href="xsd/dbaas.wadl#flavorId">
                     <wadl:method href="getFlavorById"/>
                 </wadl:resource>
             </wadl:resources>
@@ -882,31 +925,44 @@
         <glossentry xml:id="Database-d1e017">
             <glossterm>database</glossterm>
             <glossdef>
-                <para>A MySQL database within a database instance.</para>
+                <para>A MySQL database within a database
+                    instance.</para>
             </glossdef>
         </glossentry>
         <glossentry xml:id="Database-Instance-d1e016">
             <glossterm>database instance</glossterm>
             <glossdef>
-                <para>A database instance is an isolated MySQL instance in a single tenant environment on a
-                    shared physical host machine. Also referred to as instance.</para>
+                <para>A database instance is an isolated MySQL
+                    instance in a single tenant environment on a
+                    shared physical host machine. Also referred to as
+                    instance.</para>
             </glossdef>
         </glossentry>
         <glossentry xml:id="Flavor-d1e018">
             <glossterm>flavor</glossterm>
             <glossdef>
-                <para>A flavor is an available hardware configuration for a database instance. Each flavor has a unique combination of memory capacity and priority for CPU time.</para>
+                <para>A flavor is an available hardware configuration
+                    for a database instance. Each flavor has a unique
+                    combination of memory capacity and priority for
+                    CPU time.</para>
             </glossdef>
         </glossentry>
         <glossentry xml:id="Volume-d1e019">
             <glossterm>volume</glossterm>
             <glossdef>
-                <para>A volume is user-specified storage that contains the MySQL data directory.
-                    Volumes are automatically provisioned on shared Internet Small Computer System Interface (iSCSI)
-                    storage area networks (SAN) that provide for increased performance, scalability, availability
-                    and manageability. Applications with high I/O demands are performance optimized and data is
-                    protected through both local and network RAID-10. Additionally, network RAID provides synchronous
-                    replication of volumes with automatic failover and load balancing across available storage clusters.</para>
+                <para>A volume is user-specified storage that contains
+                    the MySQL data directory. Volumes are
+                    automatically provisioned on shared Internet Small
+                    Computer System Interface (iSCSI) storage area
+                    networks (SAN) that provide for increased
+                    performance, scalability, availability and
+                    manageability. Applications with high I/O demands
+                    are performance optimized and data is protected
+                    through both local and network RAID-10.
+                    Additionally, network RAID provides synchronous
+                    replication of volumes with automatic failover and
+                    load balancing across available storage
+                    clusters.</para>
             </glossdef>
         </glossentry>
     </glossary>
diff --git a/apidocs/src/resources/images/Choose_CS_Image.png b/apidocs/src/images/Choose_CS_Image.png
similarity index 100%
rename from apidocs/src/resources/images/Choose_CS_Image.png
rename to apidocs/src/images/Choose_CS_Image.png
diff --git a/apidocs/src/resources/images/Choose_CS_Image_CCP.png b/apidocs/src/images/Choose_CS_Image_CCP.png
similarity index 100%
rename from apidocs/src/resources/images/Choose_CS_Image_CCP.png
rename to apidocs/src/images/Choose_CS_Image_CCP.png
diff --git a/apidocs/src/resources/images/Choose_Image_CCP.png b/apidocs/src/images/Choose_Image_CCP.png
similarity index 100%
rename from apidocs/src/resources/images/Choose_Image_CCP.png
rename to apidocs/src/images/Choose_Image_CCP.png
diff --git a/apidocs/src/resources/images/Choose_Image_CCP.tiff b/apidocs/src/images/Choose_Image_CCP.tiff
similarity index 100%
rename from apidocs/src/resources/images/Choose_Image_CCP.tiff
rename to apidocs/src/images/Choose_Image_CCP.tiff
diff --git a/apidocs/src/resources/images/Cloud_DB_Infographic-1.png b/apidocs/src/images/Cloud_DB_Infographic-1.png
similarity index 100%
rename from apidocs/src/resources/images/Cloud_DB_Infographic-1.png
rename to apidocs/src/images/Cloud_DB_Infographic-1.png
diff --git a/apidocs/src/resources/images/Cloud_DB_Infographic-1.svg b/apidocs/src/images/Cloud_DB_Infographic-1.svg
similarity index 100%
rename from apidocs/src/resources/images/Cloud_DB_Infographic-1.svg
rename to apidocs/src/images/Cloud_DB_Infographic-1.svg
diff --git a/apidocs/src/resources/images/Create_CS.png b/apidocs/src/images/Create_CS.png
similarity index 100%
rename from apidocs/src/resources/images/Create_CS.png
rename to apidocs/src/images/Create_CS.png
diff --git a/apidocs/src/resources/images/phpMyAdmin.png b/apidocs/src/images/phpMyAdmin.png
similarity index 100%
rename from apidocs/src/resources/images/phpMyAdmin.png
rename to apidocs/src/images/phpMyAdmin.png
diff --git a/apidocs/src/resources/samples/db-auth-20.json b/apidocs/src/resources/samples/db-auth-20.json
deleted file mode 100644
index facf9ca..0000000
--- a/apidocs/src/resources/samples/db-auth-20.json
+++ /dev/null
@@ -1,144 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json; charset=UTF-8
-Content-Length: 477
-Date: Thu, 12 Apr 2012 18:45:13 GMT
-
-{
-    "access": {
-     
-        "token": {
-            "expires": "2011-12-08T22:51:02.000-06:00", 
-            "id": "vvvvvvvv-wwww-xxxx-yyyy-zzzzzzzzzzzz"
-        }, 
-        "user": {
-            "id": "123456", 
-            "name": "jsmith",
-            "RAX-AUTH:defaultRegion": "DFW",
-            "roles": [
-                {
-                    "description": "Admin Role.", 
-                    "id": "identity:admin", 
-                    "name": "identity:admin"
-                }, 
-                {
-                    "description": "Default Role.", 
-                    "id": "identity:default", 
-                    "name": "identity:default"
-                }
-            ]
-        },
-        "serviceCatalog": [
-            {
-                "endpoints": [
-                    {
-                        "publicURL": "https://dfw.databases.api.rackspacecloud.com/v1.0/1100111", 
-                        "region": "DFW", 
-                        "tenantId": "1100111"
-                    }, 
-                    {
-                        "publicURL": "https://ord.databases.api.rackspacecloud.com/v1.0/1100111", 
-                        "region": "ORD", 
-                        "tenantId": "1100111"
-                    }
-                ], 
-                "name": "cloudDatabases", 
-                "type": "rax:database"
-            },
-            {
-                "endpoints": [
-                    {
-                        "publicURL": "https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/1100111", 
-                        "region": "DFW", 
-                        "tenantId": "1100111"
-                    }, 
-                    {
-                        "publicURL": "https://ord.loadbalancers.api.rackspacecloud.com/v1.0/1100111", 
-                        "region": "ORD", 
-                        "tenantId": "1100111"
-                    }
-                ], 
-                "name": "cloudLoadBalancers", 
-                "type": "rax:load-balancer"
-            }, 
-            {
-                "endpoints": [
-                    {
-                        "tenantId": "1100111",
-                        "region": "DFW",
-                        "publicURL": "https://dfw.servers.api.rackspacecloud.com/v2/1100111", 
-                        "versionId": "2", 
-                        "versionInfo": "https://dfw.servers.api.rackspacecloud.com/v2/", 
-                        "versionList": "https://dfw.servers.api.rackspacecloud.com/"
-                    },
-                    {
-                        "tenantId": "1100111",
-                        "region": "ORD",
-                        "publicURL": "https://ord.servers.api.rackspacecloud.com/v2/1100111", 
-                        "versionId": "2", 
-                        "versionInfo": "https://ord.servers.api.rackspacecloud.com/v2/", 
-                        "versionList": "https://ord.servers.api.rackspacecloud.com/"
-                    }
-                ],
-                "name": "cloudServersOpenStack", 
-                "type": "compute"
-            },
-            {
-                "endpoints": [
-                    {
-                        "tenantId": "1100111", 
-                        "publicURL": "https://servers.api.rackspacecloud.com/v1.0/1100111", 
-                        "versionId": "1.0", 
-                        "versionInfo": "https://servers.api.rackspacecloud.com/v1.0/", 
-                        "versionList": "https://servers.api.rackspacecloud.com/"
-                    }
-                ],
-                "name": "cloudServers", 
-                "type": "compute"
-            }, 
-            {
-                "endpoints": [
-                    {
-                        "tenantId": "MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee",
-                        "publicURL": "https://storage101.dfw1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee", 
-                        "internalURL": "https://snet-storage101.dfw1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee", 
-                        "region": "DFW" 
-                    },
-                    {
-                        "tenantId": "MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee",
-                        "publicURL": "https://storage101.ord1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee", 
-                        "internalURL": "https://snet-storage101.ord1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee", 
-                        "region": "ORD" 
-                    }
-                ], 
-                "name": "cloudFiles", 
-                "type": "object-store"
-            }, 
-            {
-                "endpoints": [  
-                    {
-                        "tenantId": "MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee", 
-                        "publicURL": "https://cdn1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee", 
-                        "region": "DFW"
-                    },                
-                    {
-                        "tenantId": "MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee", 
-                        "publicURL": "https://cdn2.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee", 
-                        "region": "ORD"
-                    }
-                ],
-                "name": "cloudFilesCDN", 
-                "type": "rax:object-cdn"
-            }, 
-            {
-                "endpoints": [
-                    {
-                        "tenantId": "1100111",
-                        "publicURL": "https://dns.api.rackspacecloud.com/v1.0/1100111"
-                    }
-                ],
-                "name": "cloudDNS", 
-                "type": "rax:dns"
-            }
-        ]
-    }
-}
diff --git a/apidocs/src/resources/samples/db-auth-20.xml b/apidocs/src/resources/samples/db-auth-20.xml
deleted file mode 100644
index 597eb16..0000000
--- a/apidocs/src/resources/samples/db-auth-20.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml; charset=UTF-8
-Content-Length: 477
-Date: Thu, 12 Apr 2012 18:50:20 GMT
-
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<access xmlns:os-ksadm="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
-  xmlns="http://docs.openstack.org/identity/api/v2.0"
-  xmlns:rax-kskey="http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0"
-  xmlns:rax-ksqa="http://docs.rackspace.com/identity/api/ext/RAX-KSQA/v1.0"
-  xmlns:common="http://docs.openstack.org/common/api/v1.0"
-  xmlns:ksgrp="http://docs.rackspace.com/identity/api/ext/RAX-KSGRP/v1.0"
-  xmlns:rax-kscatalog="http://docs.openstack.org/identity/api/ext/OS-KSCATALOG/v1.0"
-  xmlns:atom="http://www.w3.org/2005/Atom">
-  <token id="vvvvvvvv-wwww-xxxx-yyyy-zzzzzzzzzzzz" expires="2011-12-08T22:51:02.000-06:00"/>
-  <user id="123456" name="jsmith" rax-auth:defaultRegion="DFW">
-    <roles>
-      <role id="identity:admin" name="identity:admin" description="Admin Role."/>
-      <role id="identity:default" name="identity:default" description="Default Role."/>
-    </roles>
-  </user>
-  <serviceCatalog>
-    <service type="rax:database" name="cloudDatabases">
-      <endpoint region="DFW" tenantId="1100111" publicURL="https://dfw.databases.api.rackspacecloud.com/v1.0/1100111"/>
-      <endpoint region="ORD" tenantId="1100111" publicURL="https://ord.databases.api.rackspacecloud.com/v1.0/1100111"/>
-    </service>
-    <service type="rax:load-balancer" name="cloudLoadBalancers">
-      <endpoint region="DFW" tenantId="1100111" publicURL="https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/1100111"/>
-      <endpoint region="ORD" tenantId="1100111" publicURL="https://ord.loadbalancers.api.rackspacecloud.com/v1.0/1100111"/>
-    </service>
-    <service type="compute" name="cloudServersOpenStack">
-      <endpoint region="DFW" tenantId="1100111"
-        publicURL="https://dfw.servers.api.rackspacecloud.com/v2/1100111">
-        <version id="2" info="https://dfw.servers.api.rackspacecloud.com/v2/"
-          list="https://dfw.servers.api.rackspacecloud.com/" />
-      </endpoint>
-      <endpoint region="ORD" tenantId="1100111"
-        publicURL="https://ord.servers.api.rackspacecloud.com/v2/1100111">
-        <version id="2" info="https://ord.servers.api.rackspacecloud.com/v2/"
-          list="https://ord.servers.api.rackspacecloud.com/" />
-      </endpoint>
-    </service>
-    <service type="compute" name="cloudServers">
-      <endpoint tenantId="1100111"
-        publicURL="https://servers.api.rackspacecloud.com/v1.0/1100111">
-        <version id="1.0"
-          info="https://servers.api.rackspacecloud.com/v1.0/"
-          list="https://servers.api.rackspacecloud.com/"/>
-      </endpoint>
-    </service>
-    <service type="object-store" name="cloudFiles">
-      <endpoint region="DFW"
-        tenantId="MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"
-        publicURL="https://storage101.dfw1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"
-        internalURL="https://snet-storage101.dfw1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"/>
-      <endpoint region="ORD"
-        tenantId="MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"
-        publicURL="https://storage101.ord1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"
-        internalURL="https://snet-storage101.ord1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"/>
-    </service>
-    <service type="rax:object-cdn" name="cloudFilesCDN">
-      <endpoint region="DFW"
-        tenantId="MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"
-        publicURL="https://cdn1.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"/>
-      <endpoint region="ORD"
-        tenantId="MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"
-        publicURL="https://cdn2.clouddrive.com/v1/MossoCloudFS_aaaaaaaa-bbbb-cccc-dddd-eeeeeeee"/>
-    </service>
-    <service type="rax:dns" name="cloudDNS">
-      <endpoint tenantId="1100111"
-        publicURL="https://dns.api.rackspacecloud.com/v1.0/1100111"/>
-    </service>
-  </serviceCatalog>
-</access>
diff --git a/apidocs/src/resources/samples/db-auth-repose-header.json b/apidocs/src/resources/samples/db-auth-repose-header.json
deleted file mode 100644
index ee51d1b..0000000
--- a/apidocs/src/resources/samples/db-auth-repose-header.json
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/0.8.55
-Date: Tue, 26 Feb 2013 16:03:24 GMT
-Content-Type: application/json
-Transfer-Encoding: chunked
-Connection: keep-alive
-response-source: cloud-auth
-vary: Accept, Accept-Encoding, X-Auth-Token
-VIA: 1.0 Repose (Repose/2.3.5)
-Front-End-Https: on
diff --git a/apidocs/src/resources/samples/db-auth.json b/apidocs/src/resources/samples/db-auth.json
deleted file mode 100644
index 583b584..0000000
--- a/apidocs/src/resources/samples/db-auth.json
+++ /dev/null
@@ -1,72 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json; charset=UTF-8
-Content-Length: 477
-Date: Thu, 12 Apr 2012 18:45:13 GMT
-
-{
-    "auth": {
-        "serviceCatalog": {
-            "cloudDNS": [
-                {
-                    "publicURL": "https://dns.api.rackspacecloud.com/v1.0/1234"
-                }
-            ],
-            "cloudDatabases": [
-                {           
-                    "publicURL": "https://dfw.databases.api.rackspacecloud.com/v1.0/1234",
-                    "region": "DFW"
-                },
-                {
-                    "publicURL": "https://ord.databases.api.rackspacecloud.com/v1.0/1234",
-                    "region": "ORD"
-                }
-            ],
-            "cloudFiles": [
-                {
-                    "internalURL": "https://snet-storage101.dfw1.clouddrive.com/v1/ MossoCloudFS_aaaa-bbbbb-cccc-ddddd ",
-                    "publicURL": "https://storage101.dfw1.clouddrive.com/v1/ MossoCloudFS_aaaa-bbbbb-cccc-ddddd ",
-                    "region": "DFW",
-                    "v1Default": true
-                }
-            ],
-            "cloudFilesCDN": [
-                {
-                    "publicURL": "https://cdn1.clouddrive.com/v1/MossoCloudFS_aaaa-bbbbb-cccc-ddddd",
-                    "region": "DFW",
-                    "v1Default": true
-                }
-            ],
-            "cloudLoadBalancers": [
-                {
-                    "publicURL": "https://ord.loadbalancers.api.rackspacecloud.com/v1.0/1234",
-                    "region": "ORD"
-                },
-                {
-                    "publicURL": "https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/1234",
-                    "region": "DFW"
-                }
-            ],
-            "cloudMonitoring": [
-                {
-                    "publicURL": "https://monitoring.api.rackspacecloud.com/v1.0/1234"
-                }
-            ],
-            "cloudServers": [
-                {
-                    "publicURL": "https://servers.api.rackspacecloud.com/v1.0/1234",
-                    "v1Default": true
-                }
-            ],
-            "cloudServersOpenStack": [
-                {
-                    "publicURL": "https://dfw.servers.api.rackspacecloud.com/v2/1234",
-                    "region": "DFW"
-                }
-            ]
-        },
-        "token": {
-            "expires": "2012-04-12T13:15:52.000-05:00",
-            "id": "aaaaa-bbbbbb-cccccc-ddddd"
-        }
-    }
-}
diff --git a/apidocs/src/resources/samples/db-auth.xml b/apidocs/src/resources/samples/db-auth.xml
deleted file mode 100644
index 35bb35e..0000000
--- a/apidocs/src/resources/samples/db-auth.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml; charset=UTF-8
-Content-Length: 477
-Date: Thu, 12 Apr 2012 18:50:20 GMT
-
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<auth  xmlns="http://docs.rackspacecloud.com/auth/api/v1.1">
-  <token id="aaaaa-bbbbbb-cccccc-ddddd"
-    expires="2012-04-12T13:15:52.000-05:00" />
-  <serviceCatalog>
-    <service name="cloudDatabases">
-      <endpoint region="ORD" v1Default="false"
-        publicURL="https://ord.databases.api.rackspacecloud.com/v1.0/1234"/>
-      <endpoint region="DFW" v1Default="false"
-        publicURL="https://dfw.databases.api.rackspacecloud.com/v1.0/1234"/>
-    </service>
-    <service name="cloudDNS">
-      <endpoint v1Default="false" publicURL="https://dns.api.rackspacecloud.com/v1.0/1234"/>
-    </service>
-    <service name="cloudServers">
-      <endpoint v1Default="true"
-        publicURL="https://servers.api.rackspacecloud.com/v1.0/1234"/>
-    </service>
-    <service name="cloudLoadBalancers">
-      <endpoint region="DFW" v1Default="false"
-        publicURL="https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/1234"/>
-      <endpoint region="ORD" v1Default="false"
-        publicURL="https://ord.loadbalancers.api.rackspacecloud.com/v1.0/1234"/>
-    </service>
-    <service name="cloudMonitoring">
-      <endpoint v1Default="false"
-        publicURL="https://monitoring.api.rackspacecloud.com/v1.0/1234"/>
-    </service>
-    <service name="cloudServersOpenStack">
-      <endpoint region="DFW" v1Default="false"
-        publicURL="https://dfw.servers.api.rackspacecloud.com/v2/1234"/>
-    </service>
-    <service name="cloudFiles">
-      <endpoint region="DFW" v1Default="true"
-        publicURL="https://storage101.dfw1.clouddrive.com/v1/MossoCloudFS_aaaa-bbbbbb-ccccc-ddddd"
-        internalURL="https://snet-storage101.dfw1.clouddrive.com/v1/MossoCloudFS_aaaa-bbbbbb-ccccc-ddddd"
-      />
-    </service>
-    <service name="cloudFilesCDN">
-      <endpoint region="DFW" v1Default="true"
-        publicURL="https://cdn1.clouddrive.com/v1/MossoCloudFS_aaaa-bbbbbb-ccccc-ddddd"
-      />
-    </service>
-  </serviceCatalog>
-</auth>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-change-users-password-request.json b/apidocs/src/resources/samples/db-change-users-password-request.json
deleted file mode 100644
index cc97484..0000000
--- a/apidocs/src/resources/samples/db-change-users-password-request.json
+++ /dev/null
@@ -1,19 +0,0 @@
-PUT /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/users HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-{
-   "users": [
-      {
-          "name": "dbuser1",
-          "password": "newpassword"
-      },
-      {
-           "name": "dbuser2",
-           "password": "anotherpassword"
-      }
-   ]
-}
diff --git a/apidocs/src/resources/samples/db-check-root-user-response.xml b/apidocs/src/resources/samples/db-check-root-user-response.xml
deleted file mode 100644
index 1cc0bd8..0000000
--- a/apidocs/src/resources/samples/db-check-root-user-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 90
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<rootEnabled xmlns="http://docs.openstack.org/database/api/v1.0">
-    True
-</rootEnabled>
-
diff --git a/apidocs/src/resources/samples/db-create-database-instance-response.json b/apidocs/src/resources/samples/db-create-database-instance-response.json
deleted file mode 100644
index 78b1743..0000000
--- a/apidocs/src/resources/samples/db-create-database-instance-response.json
+++ /dev/null
@@ -1,41 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 632
-Date: Mon, 28 Nov 2011 21:35:41 GMT
-
-{
-    "instance": {
-        "created": "2011-11-03T15:55:26Z", 
-        "flavor": {
-            "id": "1", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
-                    "rel": "bookmark"
-                }
-            ]
-        }, 
-        "hostname": "d735f61b985bb003a61dc72948dbf4e7174da12c.rackspaceclouddb.com",
-        "id": "00ff11ee-22dd-33cc-44bb-55aa66007799", 
-        "links": [
-            {
-                "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/00ff11ee-22dd-33cc-44bb-55aa66007799", 
-                "rel": "self"
-            }, 
-            {
-                "href": "https://ord.databases.api.rackspacecloud.com/instances/00ff11ee-22dd-33cc-44bb-55aa66007799", 
-                "rel": "bookmark"
-            }
-        ], 
-        "name": "myrackinstance", 
-        "status": "BUILD", 
-        "updated": "2011-11-03T15:55:27Z", 
-        "volume": {
-            "size": "2"
-        }
-    }
-}
diff --git a/apidocs/src/resources/samples/db-create-database-instance-response.xml b/apidocs/src/resources/samples/db-create-database-instance-response.xml
deleted file mode 100644
index 9f0cc35..0000000
--- a/apidocs/src/resources/samples/db-create-database-instance-response.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 639
-Date: Mon, 28 Nov 2011 16:19:34 GMT
-
-<instance created="2011-11-03T15:57:52Z"
-    hostname="d735f61b985bb003a61dc72948dbf4e7174da12c.rackspaceclouddb.com"
-    id="00ff11ee-22dd-33cc-44bb-55aa66007799" name="myrackinstance" status="BUILD" updated="2011-11-03T15:57:55Z"
-    xmlns="http://docs.openstack.org/database/api/v1.0">
-    <links>
-        <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/00ff11ee-22dd-33cc-44bb-55aa66007799" rel="self"/>
-        <link href="https://ord.databases.api.rackspacecloud.com/instances/00ff11ee-22dd-33cc-44bb-55aa66007799" rel="bookmark"
-        />
-    </links>
-    <volume size="2"/>
-    <flavor id="1">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
-                rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/1"
-                rel="bookmark"/>
-        </links>
-    </flavor>
-</instance>
diff --git a/apidocs/src/resources/samples/db-create-databases-request.json b/apidocs/src/resources/samples/db-create-databases-request.json
deleted file mode 100644
index 49d66c1..0000000
--- a/apidocs/src/resources/samples/db-create-databases-request.json
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-{
-    "databases": [
-        {
-            "character_set": "utf8", 
-            "collate": "utf8_general_ci", 
-            "name": "testingdb"
-        }, 
-        {
-            "name": "anotherdb"
-        }, 
-        {
-            "name": "oneMoreDB"
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-create-databases-request.xml b/apidocs/src/resources/samples/db-create-databases-request.xml
deleted file mode 100644
index ae2b8e2..0000000
--- a/apidocs/src/resources/samples/db-create-databases-request.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-POST /v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/databases HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-<databases xmlns="http://docs.openstack.org/database/api/v1.0">
-  <database collate="utf8_general_ci" name="testingdb" character_set="utf8"/>
-  <database name="anotherdb"/>
-  <database name="oneMoreDB"/>
-</databases>
-
diff --git a/apidocs/src/resources/samples/db-create-instance-request.json b/apidocs/src/resources/samples/db-create-instance-request.json
deleted file mode 100644
index 51acb78..0000000
--- a/apidocs/src/resources/samples/db-create-instance-request.json
+++ /dev/null
@@ -1,37 +0,0 @@
-POST /v1.0/1234/instances HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-{
-    "instance": {
-        "databases": [
-            {
-                "character_set": "utf8", 
-                "collate": "utf8_general_ci", 
-                "name": "sampledb"
-            }, 
-            {
-                "name": "nextround"
-            }
-        ], 
-        "flavorRef": 1, 
-        "name": "json_rack_instance", 
-        "users": [
-            {
-                "databases": [
-                    {
-                        "name": "sampledb"
-                    }
-                ], 
-                "name": "demouser", 
-                "password": "demopassword"
-            }
-        ], 
-        "volume": {
-            "size": 2
-        }
-    }
-}
diff --git a/apidocs/src/resources/samples/db-create-instance-request.xml b/apidocs/src/resources/samples/db-create-instance-request.xml
deleted file mode 100644
index b0a6069..0000000
--- a/apidocs/src/resources/samples/db-create-instance-request.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-POST /v1.0/1234/instances HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-<instance xmlns="http://docs.openstack.org/database/api/v1.0" flavorRef="1" name="xml_rack_instance">
-  <volume size="2"/>
-  <users>
-    <user password="demopassword" name="demouser">
-      <databases>
-        <database name="sampledb"/>
-      </databases>
-    </user>
-  </users>
-  <databases>
-    <database collate="utf8_general_ci" name="sampledb" character_set="utf8"/>
-    <database name="nextround"/>
-  </databases>
-</instance>
-
diff --git a/apidocs/src/resources/samples/db-create-instance-response.json b/apidocs/src/resources/samples/db-create-instance-response.json
deleted file mode 100644
index 81f667a..0000000
--- a/apidocs/src/resources/samples/db-create-instance-response.json
+++ /dev/null
@@ -1,42 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 591
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "instance": {
-        "created": "2013-03-18T19:09:17", 
-        "flavor": {
-            "id": "1", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/flavors/1", 
-                    "rel": "bookmark"
-                }
-            ]
-        }, 
-        "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-        "links": [
-            {
-                "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                "rel": "self"
-            }, 
-            {
-                "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                "rel": "bookmark"
-            }
-        ], 
-        "name": "json_rack_instance", 
-        "status": "BUILD", 
-        "updated": "2013-03-18T19:09:17", 
-        "volume": {
-            "size": 2
-        }
-    }
-}
diff --git a/apidocs/src/resources/samples/db-create-instance-response.xml b/apidocs/src/resources/samples/db-create-instance-response.xml
deleted file mode 100644
index 0cad6bf..0000000
--- a/apidocs/src/resources/samples/db-create-instance-response.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 724
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<instance created="2013-03-18 19:09:17.441489" id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance" status="BUILD" updated="2013-03-18 19:09:17.441606" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <links>
-        <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="self"/>
-        <link href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="bookmark"/>
-    </links>
-    <volume size="2"/>
-    <flavor id="1">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-        </links>
-    </flavor>
-</instance>
-
diff --git a/apidocs/src/resources/samples/db-create-users-request.json b/apidocs/src/resources/samples/db-create-users-request.json
deleted file mode 100644
index 85bcf0d..0000000
--- a/apidocs/src/resources/samples/db-create-users-request.json
+++ /dev/null
@@ -1,33 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/users HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-{
-    "users": [
-        {
-            "database": "databaseA", 
-            "name": "dbuser1", 
-            "password": "password"
-        }, 
-        {
-            "databases": [
-                {
-                    "name": "databaseB"
-                }, 
-                {
-                    "name": "databaseC"
-                }
-            ], 
-            "name": "dbuser2", 
-            "password": "password"
-        }, 
-        {
-            "database": "databaseD", 
-            "name": "dbuser3", 
-            "password": "password"
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-create-users-request.xml b/apidocs/src/resources/samples/db-create-users-request.xml
deleted file mode 100644
index 8140fd5..0000000
--- a/apidocs/src/resources/samples/db-create-users-request.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-POST /v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/users HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-<users xmlns="http://docs.openstack.org/database/api/v1.0">
-  <user password="password" name="dbuser1" database="databaseA"/>
-  <user password="password" name="dbuser2">
-    <databases>
-      <database name="databaseB"/>
-      <database name="databaseC"/>
-    </databases>
-  </user>
-  <user password="password" name="dbuser3" database="databaseD"/>
-</users>
-
diff --git a/apidocs/src/resources/samples/db-credentials-20.json b/apidocs/src/resources/samples/db-credentials-20.json
deleted file mode 100644
index 1ae90cd..0000000
--- a/apidocs/src/resources/samples/db-credentials-20.json
+++ /dev/null
@@ -1,18 +0,0 @@
-POST /v2.0/tokens HTTP/1.1
-User-Agent: curl/7.21.0 (x86_64-pc-linux-gnu) libcurl/7.21.0 OpenSSL/0.9.8o zlib/1.2.3.4 libidn/1.15 libssh2/1.2.6
-Host: identity.api.rackspacecloud.com
-Accept: application/json
-Content-Type: application/json
-Content-Length: 54
-
-{
-   "auth":
-   {
-      "RAX-KSKEY:apiKeyCredentials":
-      {
-         "username": "jsmith",
-         "apiKey": "aaaaa-bbbbb-ccccc-12345678"
-      }
-   }
-}
-
diff --git a/apidocs/src/resources/samples/db-credentials-20.xml b/apidocs/src/resources/samples/db-credentials-20.xml
deleted file mode 100644
index 0ab471f..0000000
--- a/apidocs/src/resources/samples/db-credentials-20.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-POST /v2.0/tokens HTTP/1.1
-User-Agent: curl/7.21.0 (x86_64-pc-linux-gnu) libcurl/7.21.0 OpenSSL/0.9.8o zlib/1.2.3.4 libidn/1.15 libssh2/1.2.6
-Host: identity.api.rackspacecloud.com
-Accept: application/xml
-Content-Type: application/xml
-Content-Length: 88
-
-<?xml version="1.0" encoding="UTF-8"?>
-<auth>
-   <apiKeyCredentials
-       xmlns="http://docs.rackspace.com/identity/api/ext/RAX-KSKEY/v1.0"
-       username="jsmith"
-       apiKey="aaaaa-bbbbb-ccccc-12345678"/>
-</auth>
diff --git a/apidocs/src/resources/samples/db-credentials.json b/apidocs/src/resources/samples/db-credentials.json
deleted file mode 100644
index bf15936..0000000
--- a/apidocs/src/resources/samples/db-credentials.json
+++ /dev/null
@@ -1,13 +0,0 @@
-POST /v1.1/auth HTTP/1.1
-User-Agent: curl/7.21.0 (x86_64-pc-linux-gnu) libcurl/7.21.0 OpenSSL/0.9.8o zlib/1.2.3.4 libidn/1.15 libssh2/1.2.6
-Host: auth.api.rackspacecloud.com
-Accept: application/json
-Content-Type: application/json
-Content-Length: 54
-
-{
-    "credentials" : {
-        "username" : "hub_cap",
-        "key"  : "a86850deb2742ec3cb41518e26aa2d89"
-    }
-}
diff --git a/apidocs/src/resources/samples/db-credentials.xml b/apidocs/src/resources/samples/db-credentials.xml
deleted file mode 100644
index ae7f897..0000000
--- a/apidocs/src/resources/samples/db-credentials.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-POST /v1.1/auth HTTP/1.1
-User-Agent: curl/7.21.0 (x86_64-pc-linux-gnu) libcurl/7.21.0 OpenSSL/0.9.8o zlib/1.2.3.4 libidn/1.15 libssh2/1.2.6
-Host: auth.api.rackspacecloud.com
-Accept: application/xml
-Content-Type: application/xml
-Content-Length: 88
-
-<?xml version="1.0" encoding="UTF-8"?>
-<credentials xmlns="http://docs.rackspacecloud.com/auth/api/v1.1"
-             username="hub_cap"
-             key="a86850deb2742ec3cb41518e26aa2d89"/>
diff --git a/apidocs/src/resources/samples/db-delete-instance-response.json b/apidocs/src/resources/samples/db-delete-instance-response.json
deleted file mode 100644
index a117127..0000000
--- a/apidocs/src/resources/samples/db-delete-instance-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
diff --git a/apidocs/src/resources/samples/db-enable-root-user-response.json b/apidocs/src/resources/samples/db-enable-root-user-response.json
deleted file mode 100644
index 27de05c..0000000
--- a/apidocs/src/resources/samples/db-enable-root-user-response.json
+++ /dev/null
@@ -1,13 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 47
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "user": {
-        "name": "root", 
-        "password": "12345"
-    }
-}
diff --git a/apidocs/src/resources/samples/db-enable-root-user-response.xml b/apidocs/src/resources/samples/db-enable-root-user-response.xml
deleted file mode 100644
index cbb96b6..0000000
--- a/apidocs/src/resources/samples/db-enable-root-user-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 89
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<user name="root" password="12345" xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-faults-badRequest.xml b/apidocs/src/resources/samples/db-faults-badRequest.xml
deleted file mode 100644
index 6067a4d..0000000
--- a/apidocs/src/resources/samples/db-faults-badRequest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 400 None
-Content-Type: application/xml
-Content-Length: 121
-Date: Mon, 28 Nov 2011 18:19:37 GMT
-
-<badRequest code="400" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <message>
-        Volume 'size' needs to be a positive integer value, -1.0 cannot be accepted.
-    </message>
-</badRequest>
diff --git a/apidocs/src/resources/samples/db-faults-instanceFault.xml b/apidocs/src/resources/samples/db-faults-instanceFault.xml
deleted file mode 100644
index 4864b0b..0000000
--- a/apidocs/src/resources/samples/db-faults-instanceFault.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 500 Internal Server Error
-Content-Type: application/xml
-Content-Length: 121
-Date: Mon, 28 Nov 2011 18:19:37 GMT
-
-<instanceFault code="500" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <message>
-        The server has either erred or is incapable of performing the requested operation.
-    </message>
-</instanceFault>
diff --git a/apidocs/src/resources/samples/db-faults-itemNotFound.json b/apidocs/src/resources/samples/db-faults-itemNotFound.json
deleted file mode 100644
index 866329b..0000000
--- a/apidocs/src/resources/samples/db-faults-itemNotFound.json
+++ /dev/null
@@ -1,11 +0,0 @@
-HTTP/1.1 404 Not Found
-Content-Length: 78
-Content-Type: application/json; charset=UTF-8
-Date: Tue, 29 Nov 2011 00:35:24 GMT
-
-{
-    "itemNotFound": {
-        "code": 404,
-        "message": "The resource could not be found."
-    }
-}
diff --git a/apidocs/src/resources/samples/db-faults-itemNotFound.xml b/apidocs/src/resources/samples/db-faults-itemNotFound.xml
deleted file mode 100644
index 806bc2c..0000000
--- a/apidocs/src/resources/samples/db-faults-itemNotFound.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 404 Not Found
-Content-Length: 147
-Content-Type: application/xml; charset=UTF-8
-Date: Mon, 28 Nov 2011 19:50:15 GMT
-
-<itemNotFound code="404" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <message>
-        The resource could not be found.
-    </message>
-</itemNotFound>
diff --git a/apidocs/src/resources/samples/db-flavors-by-id-response.xml b/apidocs/src/resources/samples/db-flavors-by-id-response.xml
deleted file mode 100644
index 757122b..0000000
--- a/apidocs/src/resources/samples/db-flavors-by-id-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 283
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<flavor id="1" name="512MB Instance" ram="512" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <links>
-        <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-        <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-    </links>
-</flavor>
-
diff --git a/apidocs/src/resources/samples/db-flavors-response-no8_16.json b/apidocs/src/resources/samples/db-flavors-response-no8_16.json
deleted file mode 100644
index 970c08a..0000000
--- a/apidocs/src/resources/samples/db-flavors-response-no8_16.json
+++ /dev/null
@@ -1,71 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1186
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "flavors": [
-        {
-            "id": 1, 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/flavors/1", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "512MB Instance", 
-            "ram": 512
-        }, 
-        {
-            "id": 2, 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/flavors/2", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "1GB Instance", 
-            "ram": 1024
-        }, 
-        {
-            "id": 3, 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/flavors/3", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "2GB Instance", 
-            "ram": 2048
-        }, 
-        {
-            "id": 4, 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/4", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/flavors/4", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "4GB Instance", 
-            "ram": 4096
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-flavors-response-no8_16.xml b/apidocs/src/resources/samples/db-flavors-response-no8_16.xml
deleted file mode 100644
index 28ccd59..0000000
--- a/apidocs/src/resources/samples/db-flavors-response-no8_16.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1600
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<flavors xmlns="http://docs.openstack.org/database/api/v1.0">
-    <flavor id="1" name="512MB Instance" ram="512">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-        </links>
-    </flavor>
-    <flavor id="2" name="1GB Instance" ram="1024">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/2" rel="bookmark"/>
-        </links>
-    </flavor>
-    <flavor id="3" name="2GB Instance" ram="2048">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/3" rel="bookmark"/>
-        </links>
-    </flavor>
-    <flavor id="4" name="4GB Instance" ram="4096">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/4" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/4" rel="bookmark"/>
-        </links>
-    </flavor>
-</flavors>
-
diff --git a/apidocs/src/resources/samples/db-flavors-response.xml b/apidocs/src/resources/samples/db-flavors-response.xml
deleted file mode 100644
index c489bde..0000000
--- a/apidocs/src/resources/samples/db-flavors-response.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1600
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<flavors xmlns="http://docs.openstack.org/database/api/v1.0">
-    <flavor id="1" name="512MB Instance" ram="512">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-        </links>
-    </flavor>
-    <flavor id="2" name="1GB Instance" ram="1024">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/2" rel="bookmark"/>
-        </links>
-    </flavor>
-    <flavor id="3" name="2GB Instance" ram="2048">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/3" rel="bookmark"/>
-        </links>
-    </flavor>
-    <flavor id="4" name="4GB Instance" ram="4096">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/4" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/4" rel="bookmark"/>
-        </links>
-    </flavor>
-    <flavor id="5" name="8GB Instance" ram="8192">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/5" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/5" rel="bookmark"/>
-        </links>
-    </flavor>
-    <flavor id="6" name="16GB Instance" ram="16384">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/6" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/6" rel="bookmark"/>
-        </links>
-    </flavor>
-</flavors>
-
diff --git a/apidocs/src/resources/samples/db-gs-create-database-instance-response.json b/apidocs/src/resources/samples/db-gs-create-database-instance-response.json
deleted file mode 100644
index 69f69b4..0000000
--- a/apidocs/src/resources/samples/db-gs-create-database-instance-response.json
+++ /dev/null
@@ -1,41 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 756
-Date: Thu, 05 Apr 2012 16:48:44 GMT
-
-{
-    "instance": {
-        "status": "BUILD", 
-        "updated": "2012-04-05T16:48:44Z", 
-        "name": "myrackinstance", 
-        "links": [
-            {
-                "href": "http://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/d379ba5c-9a1f-4aa9-9a17-afe237d04c65", 
-                "rel": "self"
-            }, 
-            {
-                "href": "http://ord.databases.api.rackspacecloud.com/instances/d379ba5c-9a1f-4aa9-9a17-afe237d04c65", 
-                "rel": "bookmark"
-            }
-         ], 
-         "created": "2012-04-05T16:48:44Z", 
-         "hostname": "ca9fa2985e47b351915c75f1a8e95d0729068892.rackspaceclouddb.com", 
-         "volume": {
-            "size": 2
-         }, 
-         "flavor": {
-            "id": "1", 
-            "links": [
-                {
-                    "href": "http://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1", 
-                    "rel": "self"
-                }, 
-                {   "href": "http://ord.databases.api.rackspacecloud.com/flavors/1",
-                    "rel": "bookmark"
-                }
-             ]
-          }, 
-          "id": "d379ba5c-9a1f-4aa9-9a17-afe237d04c65"
-       }
-}
-
diff --git a/apidocs/src/resources/samples/db-gs-create-database-instance-response.xml b/apidocs/src/resources/samples/db-gs-create-database-instance-response.xml
deleted file mode 100644
index cdcda3f..0000000
--- a/apidocs/src/resources/samples/db-gs-create-database-instance-response.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 870
-Date: Thu, 05 Apr 2012 16:17:29 GMT
-
-<instance created="2012-04-05T16:17:29Z"
-    hostname="8ba52fad9ec4aab5d75eabd1136c9750f64233ba.rackspaceclouddb.com"
-    id="d379ba5c-9a1f-4aa9-9a17-afe237d04c65" name="myrackinstance" status="BUILD" updated="2012-04-05T16:17:29Z"
-    xmlns="http://docs.openstack.org/database/api/v1.0">
-    <links>
-        <link href="http://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/d379ba5c-9a1f-4aa9-9a17-afe237d04c65" rel="self"/>
-        <link href="http://ord.databases.api.rackspacecloud.com/instances/d379ba5c-9a1f-4aa9-9a17-afe237d04c65" rel="bookmark"/>
-    </links>
-    <volume size="2"/>
-    <flavor id="1">
-        <links>
-            <link href="http://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-            <link href="http://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-        </links>
-    </flavor>
-</instance>
diff --git a/apidocs/src/resources/samples/db-guest-update-request.json b/apidocs/src/resources/samples/db-guest-update-request.json
deleted file mode 100644
index 9d03d2b..0000000
--- a/apidocs/src/resources/samples/db-guest-update-request.json
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/3b16f448-4387-44f5-b464-45111dd7a934/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 570ef429-78eb-43ec-ad69-de9456cd88c9
-Accept: application/json
-Content-Type: application/json
-
-{
-    "update": {}
-}
diff --git a/apidocs/src/resources/samples/db-guest-update-request.xml b/apidocs/src/resources/samples/db-guest-update-request.xml
deleted file mode 100644
index 7d64bdd..0000000
--- a/apidocs/src/resources/samples/db-guest-update-request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/f3a9e303-1542-4663-9dca-bfdcd7abe095/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 570ef429-78eb-43ec-ad69-de9456cd88c9
-Accept: application/xml
-Content-Type: application/xml
-
-<?xml version="1.0" ?>
-<update xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-guest-update-response.json b/apidocs/src/resources/samples/db-guest-update-response.json
deleted file mode 100644
index 1b02999..0000000
--- a/apidocs/src/resources/samples/db-guest-update-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Mon, 05 Mar 2012 23:48:46 GMT
-
-   
diff --git a/apidocs/src/resources/samples/db-instance-reboot-request.json b/apidocs/src/resources/samples/db-instance-reboot-request.json
deleted file mode 100644
index 3d8d475..0000000
--- a/apidocs/src/resources/samples/db-instance-reboot-request.json
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/44b277eb-39be-4921-be31-3d61b43651d7/action HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-{
-    "reboot": {}
-}
diff --git a/apidocs/src/resources/samples/db-instance-reboot-request.xml b/apidocs/src/resources/samples/db-instance-reboot-request.xml
deleted file mode 100644
index 65aacb9..0000000
--- a/apidocs/src/resources/samples/db-instance-reboot-request.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-POST /v1.0/1234/mgmt/instances/098653ba-218b-47ce-936a-e0b749101f81/action HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-<reboot xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-instance-reboot-response.xml b/apidocs/src/resources/samples/db-instance-reboot-response.xml
deleted file mode 100644
index 3d53e00..0000000
--- a/apidocs/src/resources/samples/db-instance-reboot-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
diff --git a/apidocs/src/resources/samples/db-instance-resize-instance-response.json b/apidocs/src/resources/samples/db-instance-resize-instance-response.json
deleted file mode 100644
index 48a2e91..0000000
--- a/apidocs/src/resources/samples/db-instance-resize-instance-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Mon, 06 Feb 2012 21:28:10 GMT
-
-   
diff --git a/apidocs/src/resources/samples/db-instance-resize-instance-response.xml b/apidocs/src/resources/samples/db-instance-resize-instance-response.xml
deleted file mode 100644
index b7e6c02..0000000
--- a/apidocs/src/resources/samples/db-instance-resize-instance-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Mon, 06 Feb 2012 21:28:11 GMT
-
-
diff --git a/apidocs/src/resources/samples/db-instance-resize-volume-request.json b/apidocs/src/resources/samples/db-instance-resize-volume-request.json
deleted file mode 100644
index 28c2fdc..0000000
--- a/apidocs/src/resources/samples/db-instance-resize-volume-request.json
+++ /dev/null
@@ -1,14 +0,0 @@
-POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/action HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-{
-    "resize": {
-        "volume": {
-            "size": 4
-        }
-    }
-}
diff --git a/apidocs/src/resources/samples/db-instance-resize-volume-request.xml b/apidocs/src/resources/samples/db-instance-resize-volume-request.xml
deleted file mode 100644
index 0fbb91e..0000000
--- a/apidocs/src/resources/samples/db-instance-resize-volume-request.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-POST /v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/action HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-<resize xmlns="http://docs.openstack.org/database/api/v1.0">
-  <volume size="4"/>
-</resize>
-
diff --git a/apidocs/src/resources/samples/db-instance-restart-response.json b/apidocs/src/resources/samples/db-instance-restart-response.json
deleted file mode 100644
index a117127..0000000
--- a/apidocs/src/resources/samples/db-instance-restart-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
diff --git a/apidocs/src/resources/samples/db-instance-restart-response.xml b/apidocs/src/resources/samples/db-instance-restart-response.xml
deleted file mode 100644
index 3d53e00..0000000
--- a/apidocs/src/resources/samples/db-instance-restart-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 0
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
diff --git a/apidocs/src/resources/samples/db-instance-status-detail-response.json b/apidocs/src/resources/samples/db-instance-status-detail-response.json
deleted file mode 100644
index 20cacb0..0000000
--- a/apidocs/src/resources/samples/db-instance-status-detail-response.json
+++ /dev/null
@@ -1,43 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 621
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "instance": {
-        "created": "2013-03-18T19:09:17", 
-        "flavor": {
-            "id": "1", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/flavors/1", 
-                    "rel": "bookmark"
-                }
-            ]
-        }, 
-        "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-        "links": [
-            {
-                "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                "rel": "self"
-            }, 
-            {
-                "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                "rel": "bookmark"
-            }
-        ], 
-        "name": "json_rack_instance", 
-        "status": "ACTIVE", 
-        "updated": "2013-03-18T19:09:17", 
-        "volume": {
-            "size": 2, 
-            "used": 0.16368598397821188
-        }
-    }
-}
diff --git a/apidocs/src/resources/samples/db-instance-status-detail-response.xml b/apidocs/src/resources/samples/db-instance-status-detail-response.xml
deleted file mode 100644
index 43b8636..0000000
--- a/apidocs/src/resources/samples/db-instance-status-detail-response.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 747
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<instance created="2013-03-18 19:09:17.441489" id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance" status="ACTIVE" updated="2013-03-18 19:09:17.513134" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <links>
-        <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="self"/>
-        <link href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="bookmark"/>
-    </links>
-    <volume size="2" used="0.163685983978"/>
-    <flavor id="1">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-        </links>
-    </flavor>
-</instance>
-
diff --git a/apidocs/src/resources/samples/db-instance-update-guest-request.json b/apidocs/src/resources/samples/db-instance-update-guest-request.json
deleted file mode 100644
index c73ff9f..0000000
--- a/apidocs/src/resources/samples/db-instance-update-guest-request.json
+++ /dev/null
@@ -1,11 +0,0 @@
-GET /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-{
-    "update": {
-    }
-}
diff --git a/apidocs/src/resources/samples/db-instance-update-guest-request.xml b/apidocs/src/resources/samples/db-instance-update-guest-request.xml
deleted file mode 100644
index a146f78..0000000
--- a/apidocs/src/resources/samples/db-instance-update-guest-request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-GET /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-<?xml version="1.0" ?>
-<update xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-instance-update-guest-response.json b/apidocs/src/resources/samples/db-instance-update-guest-response.json
deleted file mode 100644
index 23bd9c1..0000000
--- a/apidocs/src/resources/samples/db-instance-update-guest-response.json
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Wed, 29 Feb 2012 23:53:42 GMT
-
-202 Accepted
-
-The request is accepted for processing.
diff --git a/apidocs/src/resources/samples/db-instance-update-guest-response.xml b/apidocs/src/resources/samples/db-instance-update-guest-response.xml
deleted file mode 100644
index 23bd9c1..0000000
--- a/apidocs/src/resources/samples/db-instance-update-guest-response.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Wed, 29 Feb 2012 23:53:42 GMT
-
-202 Accepted
-
-The request is accepted for processing.
diff --git a/apidocs/src/resources/samples/db-instances-index-pagination-response.json b/apidocs/src/resources/samples/db-instances-index-pagination-response.json
deleted file mode 100644
index 889e634..0000000
--- a/apidocs/src/resources/samples/db-instances-index-pagination-response.json
+++ /dev/null
@@ -1,79 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1172
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "instances": [
-        {
-            "flavor": {
-                "id": "1", 
-                "links": [
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1", 
-                        "rel": "self"
-                    }, 
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/flavors/1", 
-                        "rel": "bookmark"
-                    }
-                ]
-            }, 
-            "id": "098653ba-218b-47ce-936a-e0b749101f81", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "xml_rack_instance", 
-            "status": "ACTIVE", 
-            "volume": {
-                "size": 2
-            }
-        }, 
-        {
-            "flavor": {
-                "id": "1", 
-                "links": [
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1", 
-                        "rel": "self"
-                    }, 
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/flavors/1", 
-                        "rel": "bookmark"
-                    }
-                ]
-            }, 
-            "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "json_rack_instance", 
-            "status": "ACTIVE", 
-            "volume": {
-                "size": 2
-            }
-        }
-    ], 
-    "links": [
-        {
-            "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances?marker=44b277eb-39be-4921-be31-3d61b43651d7&limit=2", 
-            "rel": "next"
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-instances-index-pagination-response.xml b/apidocs/src/resources/samples/db-instances-index-pagination-response.xml
deleted file mode 100644
index b11563e..0000000
--- a/apidocs/src/resources/samples/db-instances-index-pagination-response.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1538
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<instances xmlns="http://docs.openstack.org/database/api/v1.0">
-    <instance id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="bookmark"/>
-        </links>
-        <volume size="2"/>
-        <flavor id="1">
-            <links>
-                <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-                <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-            </links>
-        </flavor>
-    </instance>
-    <instance id="44b277eb-39be-4921-be31-3d61b43651d7" name="json_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7" rel="bookmark"/>
-        </links>
-        <volume size="2"/>
-        <flavor id="1">
-            <links>
-                <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-                <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-            </links>
-        </flavor>
-    </instance>
-    <links>
-        <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances?marker=44b277eb-39be-4921-be31-3d61b43651d7&amp;limit=2" rel="next"/>
-    </links>
-</instances>
-
diff --git a/apidocs/src/resources/samples/db-instances-index-response.json b/apidocs/src/resources/samples/db-instances-index-response.json
deleted file mode 100644
index 7e46642..0000000
--- a/apidocs/src/resources/samples/db-instances-index-response.json
+++ /dev/null
@@ -1,73 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1038
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "instances": [
-        {
-            "flavor": {
-                "id": "1", 
-                "links": [
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1", 
-                        "rel": "self"
-                    }, 
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/flavors/1", 
-                        "rel": "bookmark"
-                    }
-                ]
-            }, 
-            "id": "098653ba-218b-47ce-936a-e0b749101f81", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "xml_rack_instance", 
-            "status": "ACTIVE", 
-            "volume": {
-                "size": 2
-            }
-        }, 
-        {
-            "flavor": {
-                "id": "1", 
-                "links": [
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1", 
-                        "rel": "self"
-                    }, 
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/flavors/1", 
-                        "rel": "bookmark"
-                    }
-                ]
-            }, 
-            "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "json_rack_instance", 
-            "status": "ACTIVE", 
-            "volume": {
-                "size": 2
-            }
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-instances-index-response.xml b/apidocs/src/resources/samples/db-instances-index-response.xml
deleted file mode 100644
index 25da6c2..0000000
--- a/apidocs/src/resources/samples/db-instances-index-response.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1380
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<instances xmlns="http://docs.openstack.org/database/api/v1.0">
-    <instance id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="bookmark"/>
-        </links>
-        <volume size="2"/>
-        <flavor id="1">
-            <links>
-                <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-                <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-            </links>
-        </flavor>
-    </instance>
-    <instance id="44b277eb-39be-4921-be31-3d61b43651d7" name="json_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7" rel="bookmark"/>
-        </links>
-        <volume size="2"/>
-        <flavor id="1">
-            <links>
-                <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1" rel="self"/>
-                <link href="https://ord.databases.api.rackspacecloud.com/flavors/1" rel="bookmark"/>
-            </links>
-        </flavor>
-    </instance>
-</instances>
-
diff --git a/apidocs/src/resources/samples/db-instances-paged-index-request.xml b/apidocs/src/resources/samples/db-instances-paged-index-request.xml
deleted file mode 100644
index d7fd876..0000000
--- a/apidocs/src/resources/samples/db-instances-paged-index-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/instances?marker=369018b0-30de-2775-ab39-a19bd20006e9&limit=5 HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-instances-paged-index-response.json b/apidocs/src/resources/samples/db-instances-paged-index-response.json
deleted file mode 100644
index d8de646..0000000
--- a/apidocs/src/resources/samples/db-instances-paged-index-response.json
+++ /dev/null
@@ -1,90 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 648
-Date: Wed, 25 Jan 2012 21:58:14 GMT
-
-{
-    "instances": [
-        {
-            "id": "28290db6-2f47-80d4-1b62-92bde6ff1a6e",
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/28290db6-2f47-80d4-1b62-92bde6ff1a6e",
-                    "rel": "self"
-                },
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/28290db6-2f47-80d4-1b62-92bde6ff1a6e",
-                    "rel": "bookmark"
-                }
-            ],
-            "name": "example_rack_instance",
-            "status": "ACTIVE"
-        },
-        {
-            "id": "ae939ae2-3827-d005-4de6-0028a5f438d0",
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/ae939ae2-3827-d005-4de6-0028a5f438d0",
-                    "rel": "self"
-                },
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/ae939ae2-3827-d005-4de6-0028a5f438d0",
-                    "rel": "bookmark"
-                }
-            ],
-            "name": "example_rack_instance",
-            "status": "ACTIVE"
-        },
-        {
-            "id": "006e4db2-5729-3f8e-77b0-075a1723ad37",
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/006e4db2-5729-3f8e-77b0-075a1723ad37",
-                    "rel": "self"
-                },
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/006e4db2-5729-3f8e-77b0-075a1723ad37",
-                    "rel": "bookmark"
-                }
-            ],
-            "name": "example_rack_instance",
-            "status": "ACTIVE"
-        },
-        {
-            "id": "2806d85e-d363-2a27-f7fd-4e9911ebd8a9",
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/2806d85e-d363-2a27-f7fd-4e9911ebd8a9",
-                    "rel": "self"
-                },
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/2806d85e-d363-2a27-f7fd-4e9911ebd8a9",
-                    "rel": "bookmark"
-                }
-            ],
-            "name": "example_rack_instance",
-            "status": "ACTIVE"
-        },
-        {
-            "id": "e0846e3b-3df4-398f-1e9a-d53650573dd1",
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/e0846e3b-3df4-398f-1e9a-d53650573dd1",
-                    "rel": "self"
-                },
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/e0846e3b-3df4-398f-1e9a-d53650573dd1",
-                    "rel": "bookmark"
-                }
-            ],
-            "name": "example_rack_instance",
-            "status": "ACTIVE"
-        }
-    ],
-    "links": [
-        {
-            "rel": "next",
-            "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances?marker=e0846e3b-3df4-398f-1e9a-d53650573dd1&limit=5"
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-instances-paged-index-response.xml b/apidocs/src/resources/samples/db-instances-paged-index-response.xml
deleted file mode 100644
index 05dc526..0000000
--- a/apidocs/src/resources/samples/db-instances-paged-index-response.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 828
-Date: Wed, 25 Jan 2012 21:58:14 GMT
-
-<instances xmlns="http://docs.openstack.org/database/api/v1.0">
-    </instance>
-    <instance id="28290db6-2f47-80d4-1b62-92bde6ff1a6e" name="example_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/28290db6-2f47-80d4-1b62-92bde6ff1a6e" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/28290db6-2f47-80d4-1b62-92bde6ff1a6e" rel="bookmark"/>
-        </links>
-    </instance>
-    <instance id="ae939ae2-3827-d005-4de6-0028a5f438d0" name="example_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/ae939ae2-3827-d005-4de6-0028a5f438d0" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/ae939ae2-3827-d005-4de6-0028a5f438d0" rel="bookmark"/>
-        </links>
-    </instance>
-    <instance id="006e4db2-5729-3f8e-77b0-075a1723ad37" name="example_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/006e4db2-5729-3f8e-77b0-075a1723ad37" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/006e4db2-5729-3f8e-77b0-075a1723ad37" rel="bookmark"/>
-        </links>
-    </instance>
-    <instance id="2806d85e-d363-2a27-f7fd-4e9911ebd8a9" name="example_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/2806d85e-d363-2a27-f7fd-4e9911ebd8a9" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/2806d85e-d363-2a27-f7fd-4e9911ebd8a9" rel="bookmark"/>
-        </links>
-    </instance>
-    <instance id="e0846e3b-3df4-398f-1e9a-d53650573dd1" name="example_rack_instance" status="ACTIVE">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/e0846e3b-3df4-398f-1e9a-d53650573dd1" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/e0846e3b-3df4-398f-1e9a-d53650573dd1" rel="bookmark"/>
-        </links>
-    </instance>
-</instances>
-<links>
-    <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances?marker=e0846e3b-3df4-398f-1e9a-d53650573dd1&limit=5" rel="next" />
-</links>
diff --git a/apidocs/src/resources/samples/db-list-databases-pagination-response.json b/apidocs/src/resources/samples/db-list-databases-pagination-response.json
deleted file mode 100644
index 1eabfc4..0000000
--- a/apidocs/src/resources/samples/db-list-databases-pagination-response.json
+++ /dev/null
@@ -1,20 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 192
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "databases": [
-        {
-            "name": "anotherdb"
-        }
-    ], 
-    "links": [
-        {
-            "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases?marker=anotherdb&limit=1", 
-            "rel": "next"
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-list-databases-pagination-response.xml b/apidocs/src/resources/samples/db-list-databases-pagination-response.xml
deleted file mode 100644
index 1e97739..0000000
--- a/apidocs/src/resources/samples/db-list-databases-pagination-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 321
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<databases xmlns="http://docs.openstack.org/database/api/v1.0">
-    <database name="anotherdb"/>
-    <database name="nextround"/>
-    <links>
-        <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/databases?marker=nextround&amp;limit=2" rel="next"/>
-    </links>
-</databases>
-
diff --git a/apidocs/src/resources/samples/db-list-databases-response.json b/apidocs/src/resources/samples/db-list-databases-response.json
deleted file mode 100644
index 26b5520..0000000
--- a/apidocs/src/resources/samples/db-list-databases-response.json
+++ /dev/null
@@ -1,26 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 129
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "databases": [
-        {
-            "name": "anotherdb"
-        }, 
-        {
-            "name": "nextround"
-        }, 
-        {
-            "name": "oneMoreDB"
-        }, 
-        {
-            "name": "sampledb"
-        }, 
-        {
-            "name": "testingdb"
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-list-user-access-response.xml b/apidocs/src/resources/samples/db-list-user-access-response.xml
deleted file mode 100644
index ce6440a..0000000
--- a/apidocs/src/resources/samples/db-list-user-access-response.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT
-
-<databases xmlns="http://docs.openstack.org/database/api/v1.0">
-    <database name="exampledb"/>
-</databases>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-user-dbs-response.xml b/apidocs/src/resources/samples/db-list-user-dbs-response.xml
deleted file mode 100644
index 5e2afd6..0000000
--- a/apidocs/src/resources/samples/db-list-user-dbs-response.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT
-
-<user name="testuser" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <databases>
-        <database name="exampledb"/>
-    </databases>
-</user>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-users-pagination-response.xml b/apidocs/src/resources/samples/db-list-users-pagination-response.xml
deleted file mode 100644
index db636ec..0000000
--- a/apidocs/src/resources/samples/db-list-users-pagination-response.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 461
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<users xmlns="http://docs.openstack.org/database/api/v1.0">
-    <user name="dbuser1">
-        <databases/>
-    </user>
-    <user name="dbuser2">
-        <databases>
-            <database name="databaseB"/>
-            <database name="databaseC"/>
-        </databases>
-    </user>
-    <links>
-        <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/users?marker=dbuser2&amp;limit=2" rel="next"/>
-    </links>
-</users>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-account-details-request.json b/apidocs/src/resources/samples/db-mgmt-get-account-details-request.json
deleted file mode 100644
index bcd6c60..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-account-details-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/accounts/3000 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-account-details-request.xml b/apidocs/src/resources/samples/db-mgmt-get-account-details-request.xml
deleted file mode 100644
index d472cc9..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-account-details-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/accounts/3000 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-account-details-response.json b/apidocs/src/resources/samples/db-mgmt-get-account-details-response.json
deleted file mode 100644
index 90040a9..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-account-details-response.json
+++ /dev/null
@@ -1,26 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 283
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "account": {
-        "id": "3000", 
-        "instances": [
-            {
-                "host": "hostname_1", 
-                "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-                "name": "json_rack_instance", 
-                "status": "ACTIVE"
-            }, 
-            {
-                "host": "hostname_1", 
-                "id": "098653ba-218b-47ce-936a-e0b749101f81", 
-                "name": "xml_rack_instance", 
-                "status": "ACTIVE"
-            }
-        ]
-    }
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-get-account-details-response.xml b/apidocs/src/resources/samples/db-mgmt-get-account-details-response.xml
deleted file mode 100644
index 33932de..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-account-details-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 361
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<account id="3000" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <instances>
-        <instance host="hostname_1" id="44b277eb-39be-4921-be31-3d61b43651d7" name="json_rack_instance" status="ACTIVE"/>
-        <instance host="hostname_1" id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance" status="ACTIVE"/>
-    </instances>
-</account>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-host-detail-request.json b/apidocs/src/resources/samples/db-mgmt-get-host-detail-request.json
deleted file mode 100644
index 78420e2..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-host-detail-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/hosts/hostname_1 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-host-detail-request.xml b/apidocs/src/resources/samples/db-mgmt-get-host-detail-request.xml
deleted file mode 100644
index 6c59bb9..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-host-detail-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/hosts/hostname_1 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-host-detail-response.json b/apidocs/src/resources/samples/db-mgmt-get-host-detail-response.json
deleted file mode 100644
index 76fe822..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-host-detail-response.json
+++ /dev/null
@@ -1,31 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 456
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "host": {
-        "instances": [
-            {
-                "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-                "name": "json_rack_instance", 
-                "server_id": "48996795-5fd8-4bf7-8b33-3824a86f3b19", 
-                "status": "ACTIVE", 
-                "tenant_id": "3000"
-            }, 
-            {
-                "id": "098653ba-218b-47ce-936a-e0b749101f81", 
-                "name": "xml_rack_instance", 
-                "server_id": "b3aca411-ef1c-4c47-88d3-5a309096c204", 
-                "status": "ACTIVE", 
-                "tenant_id": "3000"
-            }
-        ], 
-        "name": "hostname_1", 
-        "percentUsed": 204, 
-        "totalRAM": 2004, 
-        "usedRAM": 4096
-    }
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-get-host-detail-response.xml b/apidocs/src/resources/samples/db-mgmt-get-host-detail-response.xml
deleted file mode 100644
index a2e0223..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-host-detail-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 517
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<host name="hostname_1" percentUsed="204" totalRAM="2004" usedRAM="4096" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <instances>
-        <instance id="44b277eb-39be-4921-be31-3d61b43651d7" name="json_rack_instance" server_id="48996795-5fd8-4bf7-8b33-3824a86f3b19" status="ACTIVE" tenant_id="3000"/>
-        <instance id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance" server_id="b3aca411-ef1c-4c47-88d3-5a309096c204" status="ACTIVE" tenant_id="3000"/>
-    </instances>
-</host>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-instance-details-request.json b/apidocs/src/resources/samples/db-mgmt-get-instance-details-request.json
deleted file mode 100644
index 2070669..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-instance-details-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances/44b277eb-39be-4921-be31-3d61b43651d7 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-instance-details-request.xml b/apidocs/src/resources/samples/db-mgmt-get-instance-details-request.xml
deleted file mode 100644
index 987777c..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-instance-details-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances/098653ba-218b-47ce-936a-e0b749101f81 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-instance-details-response.json b/apidocs/src/resources/samples/db-mgmt-get-instance-details-response.json
deleted file mode 100644
index dc5da7e..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-instance-details-response.json
+++ /dev/null
@@ -1,80 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1404
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "instance": {
-        "created": "2013-03-18T19:09:17", 
-        "deleted": false, 
-        "deleted_at": null, 
-        "flavor": {
-            "id": "3", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/flavors/3", 
-                    "rel": "bookmark"
-                }
-            ]
-        }, 
-        "guest_status": {
-            "state_description": "running"
-        }, 
-        "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-        "links": [
-            {
-                "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                "rel": "self"
-            }, 
-            {
-                "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                "rel": "bookmark"
-            }
-        ], 
-        "name": "json_rack_instance", 
-        "root_enabled": "2013-03-18T19:09:17", 
-        "root_enabled_by": null, 
-        "server": {
-            "addresses": {
-                "private": [
-                    {
-                        "addr": "123.123.123.123"
-                    }
-                ]
-            }, 
-            "deleted": false, 
-            "deleted_at": null, 
-            "host": "hostname_1", 
-            "id": "48996795-5fd8-4bf7-8b33-3824a86f3b19", 
-            "local_id": 0, 
-            "name": "json_rack_instance", 
-            "status": "ACTIVE", 
-            "tenant_id": "3000"
-        }, 
-        "service_status": "ACTIVE", 
-        "status": "ACTIVE", 
-        "task_description": "No tasks for the instance.", 
-        "tenant_id": "3000", 
-        "updated": "2013-03-18T19:09:18", 
-        "volume": {
-            "attachments": [
-                {
-                    "device": "vdb", 
-                    "server_id": "48996795-5fd8-4bf7-8b33-3824a86f3b19"
-                }
-            ], 
-            "availability_zone": "fake-availability-zone", 
-            "created_at": "2001-01-01-12:30:30", 
-            "id": "VOL_70110787-f822-4cdf-8ead-44d25082befd", 
-            "size": 4, 
-            "status": "in-use", 
-            "used": 0.16368598397821188
-        }
-    }
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-get-instance-details-response.xml b/apidocs/src/resources/samples/db-mgmt-get-instance-details-response.xml
deleted file mode 100644
index c990183..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-instance-details-response.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 2401
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<instance created="2013-03-18 19:09:17.441489" deleted="False" deleted_at="None" id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance" status="ACTIVE" task_description="No tasks for the instance." tenant_id="3000" updated="2013-03-18 19:09:18.280855" xmlns="http://docs.openstack.org/database/api/v1.0">
-    <links>
-        <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="self"/>
-        <link href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="bookmark"/>
-    </links>
-    <server>
-        <status>
-            ACTIVE
-        </status>
-        <host>
-            hostname_1
-        </host>
-        <local_id>
-            0
-        </local_id>
-        <name>
-            xml_rack_instance
-        </name>
-        <deleted>
-            False
-        </deleted>
-        <tenant_id>
-            3000
-        </tenant_id>
-        <deleted_at>
-            None
-        </deleted_at>
-        <id>
-            b3aca411-ef1c-4c47-88d3-5a309096c204
-        </id>
-        <addresses>
-            <private>
-                <item>
-                    <addr>
-                        123.123.123.123
-                    </addr>
-                </item>
-            </private>
-        </addresses>
-    </server>
-    <volume id="VOL_d3870ed4-3f5b-4b78-8ce4-c81f35f0fe2c" size="4" used="0.163685983978">
-        <status>
-            in-use
-        </status>
-        <attachments>
-            <attachment>
-                <device>
-                    vdb
-                </device>
-                <server_id>
-                    b3aca411-ef1c-4c47-88d3-5a309096c204
-                </server_id>
-            </attachment>
-        </attachments>
-        <availability_zone>
-            fake-availability-zone
-        </availability_zone>
-        <created_at>
-            2001-01-01-12:30:30
-        </created_at>
-    </volume>
-    <guest_status state_description="running"/>
-    <service_status>
-        ACTIVE
-    </service_status>
-    <root_enabled>
-        2013-03-18 19:09:17.772833
-    </root_enabled>
-    <flavor id="3">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/flavors/3" rel="bookmark"/>
-        </links>
-    </flavor>
-    <root_enabled_by>
-        None
-    </root_enabled_by>
-</instance>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-root-details-request.json b/apidocs/src/resources/samples/db-mgmt-get-root-details-request.json
deleted file mode 100644
index 12aac00..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-root-details-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances/44b277eb-39be-4921-be31-3d61b43651d7/root HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-root-details-request.xml b/apidocs/src/resources/samples/db-mgmt-get-root-details-request.xml
deleted file mode 100644
index aa4e557..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-root-details-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances/098653ba-218b-47ce-936a-e0b749101f81/root HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-root-details-response.json b/apidocs/src/resources/samples/db-mgmt-get-root-details-response.json
deleted file mode 100644
index 50d5713..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-root-details-response.json
+++ /dev/null
@@ -1,14 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 112
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "root_history": {
-        "enabled": "2013-03-18T19:09:17", 
-        "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-        "user": null
-    }
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-get-root-details-response.xml b/apidocs/src/resources/samples/db-mgmt-get-root-details-response.xml
deleted file mode 100644
index 6b96a1f..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-root-details-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 159
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<root_history enabled="2013-03-18 19:09:17.772833" id="098653ba-218b-47ce-936a-e0b749101f81" user="None" xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-storage-request.json b/apidocs/src/resources/samples/db-mgmt-get-storage-request.json
deleted file mode 100644
index c16c0b7..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-storage-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/storage HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-storage-request.xml b/apidocs/src/resources/samples/db-mgmt-get-storage-request.xml
deleted file mode 100644
index 65b1870..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-storage-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/storage HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-storage-response.json b/apidocs/src/resources/samples/db-mgmt-get-storage-response.json
deleted file mode 100644
index caef8ae..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-storage-response.json
+++ /dev/null
@@ -1,25 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 177
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "devices": [
-        {
-            "capacity": {
-                "available": 90, 
-                "total": 100
-            }, 
-            "name": "fake_storage", 
-            "provision": {
-                "available": 40, 
-                "percent": 10, 
-                "total": 50
-            }, 
-            "type": "test_type", 
-            "used": 10
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-get-storage-response.xml b/apidocs/src/resources/samples/db-mgmt-get-storage-response.xml
deleted file mode 100644
index fd2fd7f..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-storage-response.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 254
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<devices xmlns="http://docs.openstack.org/database/api/v1.0">
-    <device name="fake_storage" type="test_type" used="10">
-        <provision available="40" percent="10" total="50"/>
-        <capacity available="90" total="100"/>
-    </device>
-</devices>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-account-request.json b/apidocs/src/resources/samples/db-mgmt-get-usage-account-request.json
deleted file mode 100644
index adee54b..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-account-request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/mgmt/usage/tenant/1234 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-account-request.xml b/apidocs/src/resources/samples/db-mgmt-get-usage-account-request.xml
deleted file mode 100644
index ce4c76a..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-account-request.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/mgmt/usage/tenant/1234 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-account-response.json b/apidocs/src/resources/samples/db-mgmt-get-usage-account-response.json
deleted file mode 100644
index a88ef67..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-account-response.json
+++ /dev/null
@@ -1,30 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 533
-Date: Mon, 07 Jan 2013 21:50:53 GMT
-
-{
-   "usage": [
-      {
-         "dataCenter": "DEV1",
-         "dbaas:product": {
-            "memory": 512,
-            "resourceType": "MYSQL",
-            "serviceCode": "CloudDatabase",
-            "storage": 1,
-            "version": "1"
-         },
-         "endTime": "2013-01-07 16:00:00",
-         "environment": "LOCAL",
-         "id": "0f781f37-ef6d-4978-8dbc-f26d29a255a6",
-         "region": "LOCAL_DEV",
-         "resourceId": "ac019a26-acb5-4591-b337-9bbfa8e85727",
-         "resourceName": "test_instance",
-         "rootAction": "reddwarf.instance.exists",
-         "startTime": "2013-01-06 15:59:00",
-         "tenantId": "d91c1201-6136-4b1e-aa16-45380d8733b8",
-         "type": "USAGE",
-         "version": "1"
-      }
-   ]
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-account-response.xml b/apidocs/src/resources/samples/db-mgmt-get-usage-account-response.xml
deleted file mode 100644
index e63e025..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-account-response.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 1321
-Date: Mon, 07 Jan 2013 21:50:53 GMT
-
-<usage xmlns="http://docs.openstack.org/database/api/v1.0">
-    <item>
-        <dataCenter>
-            DEV1
-        </dataCenter>
-        <resourceId>
-            ac019a26-acb5-4591-b337-9bbfa8e85727
-        </resourceId>
-        <rootAction>
-            reddwarf.instance.exists
-        </rootAction>
-        <startTime>
-            2013-01-06 15:59:00
-        </startTime>
-        <resourceName>
-            test_instance
-        </resourceName>
-        <id>
-            0f781f37-ef6d-4978-8dbc-f26d29a255a6
-        </id>
-        <region>
-            LOCAL_DEV
-        </region>
-        <tenantId>
-            d91c1201-6136-4b1e-aa16-45380d8733b8
-        </tenantId>
-        <environment>
-            LOCAL
-        </environment>
-        <version>
-            1
-        </version>
-        <dbaas:product>
-            <resourceType>
-                MYSQL
-            </resourceType>
-            <version>
-                1
-            </version>
-            <storage>
-                1
-            </storage>
-            <serviceCode>
-                CloudDatabase
-            </serviceCode>
-            <memory>
-                512
-            </memory>
-        </dbaas:product>
-        <endTime>
-            2013-01-07 16:00:00
-        </endTime>
-        <type>
-            USAGE
-        </type>
-    </item>
-</usage>
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-all-response.json b/apidocs/src/resources/samples/db-mgmt-get-usage-all-response.json
deleted file mode 100644
index ee449c4..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-all-response.json
+++ /dev/null
@@ -1,31 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 533
-Date: Mon, 07 Jan 2013 21:50:53 GMT
-
-{
-   "usage": [
-      {
-         "dataCenter": "DEV1",
-         "dbaas:product": {
-            "memory": 512,
-            "resourceType": "MYSQL",
-            "serviceCode": "CloudDatabase",
-            "storage": 1,
-            "version": "1"
-         },
-         "endTime": "2013-01-07 16:00:00",
-         "environment": "LOCAL",
-         "id": "0f781f37-ef6d-4978-8dbc-f26d29a255a6",
-         "region": "LOCAL_DEV",
-         "resourceId": "ac019a26-acb5-4591-b337-9bbfa8e85727",
-         "resourceName": "test_instance",
-         "rootAction": "reddwarf.instance.exists",
-         "startTime": "2013-01-06 15:59:00",
-         "tenantId": "d91c1201-6136-4b1e-aa16-45380d8733b8",
-         "type": "USAGE",
-         "version": "1"
-      }
-   ]
-}
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-all-response.xml b/apidocs/src/resources/samples/db-mgmt-get-usage-all-response.xml
deleted file mode 100644
index ece917f..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-all-response.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 1321
-Date: Mon, 07 Jan 2013 21:50:53 GMT
-
-<usage xmlns="http://docs.openstack.org/database/api/v1.0">
-    <item>
-        <dataCenter>
-            DEV1
-        </dataCenter>
-        <resourceId>
-            ac019a26-acb5-4591-b337-9bbfa8e85727
-        </resourceId>
-        <rootAction>
-            reddwarf.instance.exists
-        </rootAction>
-        <startTime>
-            2013-01-06 15:59:00
-        </startTime>
-        <resourceName>
-            test_instance
-        </resourceName>
-        <id>
-            0f781f37-ef6d-4978-8dbc-f26d29a255a6
-        </id>
-        <region>
-            LOCAL_DEV
-        </region>
-        <tenantId>
-            d91c1201-6136-4b1e-aa16-45380d8733b8
-        </tenantId>
-        <environment>
-            LOCAL
-        </environment>
-        <version>
-            1
-        </version>
-        <dbaas:product>
-            <resourceType>
-                MYSQL
-            </resourceType>
-            <version>
-                1
-            </version>
-            <storage>
-                1
-            </storage>
-            <serviceCode>
-                CloudDatabase
-            </serviceCode>
-            <memory>
-                512
-            </memory>
-        </dbaas:product>
-        <endTime>
-            2013-01-07 16:00:00
-        </endTime>
-        <type>
-            USAGE
-        </type>
-    </item>
-</usage>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-instance-request.json b/apidocs/src/resources/samples/db-mgmt-get-usage-instance-request.json
deleted file mode 100644
index 8b9ffda..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-instance-request.json
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/mgmt/usage/instance/1234 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-instance-request.xml b/apidocs/src/resources/samples/db-mgmt-get-usage-instance-request.xml
deleted file mode 100644
index 2dda429..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-instance-request.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-GET /v1.0/1234/mgmt/usage/instance/1234 HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-instance-response.json b/apidocs/src/resources/samples/db-mgmt-get-usage-instance-response.json
deleted file mode 100644
index ee449c4..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-instance-response.json
+++ /dev/null
@@ -1,31 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 533
-Date: Mon, 07 Jan 2013 21:50:53 GMT
-
-{
-   "usage": [
-      {
-         "dataCenter": "DEV1",
-         "dbaas:product": {
-            "memory": 512,
-            "resourceType": "MYSQL",
-            "serviceCode": "CloudDatabase",
-            "storage": 1,
-            "version": "1"
-         },
-         "endTime": "2013-01-07 16:00:00",
-         "environment": "LOCAL",
-         "id": "0f781f37-ef6d-4978-8dbc-f26d29a255a6",
-         "region": "LOCAL_DEV",
-         "resourceId": "ac019a26-acb5-4591-b337-9bbfa8e85727",
-         "resourceName": "test_instance",
-         "rootAction": "reddwarf.instance.exists",
-         "startTime": "2013-01-06 15:59:00",
-         "tenantId": "d91c1201-6136-4b1e-aa16-45380d8733b8",
-         "type": "USAGE",
-         "version": "1"
-      }
-   ]
-}
-
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-instance-response.xml b/apidocs/src/resources/samples/db-mgmt-get-usage-instance-response.xml
deleted file mode 100644
index ece917f..0000000
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-instance-response.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 1321
-Date: Mon, 07 Jan 2013 21:50:53 GMT
-
-<usage xmlns="http://docs.openstack.org/database/api/v1.0">
-    <item>
-        <dataCenter>
-            DEV1
-        </dataCenter>
-        <resourceId>
-            ac019a26-acb5-4591-b337-9bbfa8e85727
-        </resourceId>
-        <rootAction>
-            reddwarf.instance.exists
-        </rootAction>
-        <startTime>
-            2013-01-06 15:59:00
-        </startTime>
-        <resourceName>
-            test_instance
-        </resourceName>
-        <id>
-            0f781f37-ef6d-4978-8dbc-f26d29a255a6
-        </id>
-        <region>
-            LOCAL_DEV
-        </region>
-        <tenantId>
-            d91c1201-6136-4b1e-aa16-45380d8733b8
-        </tenantId>
-        <environment>
-            LOCAL
-        </environment>
-        <version>
-            1
-        </version>
-        <dbaas:product>
-            <resourceType>
-                MYSQL
-            </resourceType>
-            <version>
-                1
-            </version>
-            <storage>
-                1
-            </storage>
-            <serviceCode>
-                CloudDatabase
-            </serviceCode>
-            <memory>
-                512
-            </memory>
-        </dbaas:product>
-        <endTime>
-            2013-01-07 16:00:00
-        </endTime>
-        <type>
-            USAGE
-        </type>
-    </item>
-</usage>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-host-update-request.json b/apidocs/src/resources/samples/db-mgmt-host-update-request.json
deleted file mode 100644
index 56f6ce4..0000000
--- a/apidocs/src/resources/samples/db-mgmt-host-update-request.json
+++ /dev/null
@@ -1,12 +0,0 @@
-POST /v1.0/1234/mgmt/hosts/hostname/instances/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 73d60021-96e1-4d06-843d-72d20fa5377b
-Accept: application/json
-Content-Type: application/json
-
-{
-    "update": {}
-}
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-host-update-request.xml b/apidocs/src/resources/samples/db-mgmt-host-update-request.xml
deleted file mode 100644
index 2662bd2..0000000
--- a/apidocs/src/resources/samples/db-mgmt-host-update-request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/hosts/hostname/instances/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 73d60021-96e1-4d06-843d-72d20fa5377b
-Accept: application/xml
-Content-Type: application/xml
-
-<?xml version="1.0" ?>
-<update xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-host-update-response.xml b/apidocs/src/resources/samples/db-mgmt-host-update-response.xml
deleted file mode 100644
index bcea5bf..0000000
--- a/apidocs/src/resources/samples/db-mgmt-host-update-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Tue, 07 Feb 2012 23:56:55 GMT
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-request.json b/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-request.json
deleted file mode 100644
index 201dd00..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances/44b277eb-39be-4921-be31-3d61b43651d7/diagnostics HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-request.xml b/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-request.xml
deleted file mode 100644
index 73a1cd5..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances/098653ba-218b-47ce-936a-e0b749101f81/diagnostics HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-response.json b/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-response.json
deleted file mode 100644
index 52175a9..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-response.json
+++ /dev/null
@@ -1,18 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 125
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "diagnostics": {
-        "fdSize": 64, 
-        "threads": 2, 
-        "version": "1", 
-        "vmHwm": 2872, 
-        "vmPeak": 29160, 
-        "vmRss": 2872, 
-        "vmSize": 29096
-    }
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-response.xml b/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-response.xml
deleted file mode 100644
index d444e71..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-diagnostics-response.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 159
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<diagnostics fdSize="64" threads="2" version="1" vmHwm="2872" vmPeak="29160" vmRss="2872" vmSize="29096" xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-request.json b/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-request.json
deleted file mode 100644
index 2a6d148..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances/6e038c18-902f-4a41-b2a2-5f46fa62fc1b/hwinfo HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-request.xml b/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-request.xml
deleted file mode 100644
index 7e5c94e..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances/72eed896-134e-4212-9f25-f81b4e0795e2/hwinfo HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-response.json b/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-response.json
deleted file mode 100644
index 613f82c..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-response.json
+++ /dev/null
@@ -1,13 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 48
-Date: Tue, 24 Jul 2012 19:48:33 GMT
-
-{
-    "hwinfo": {
-        "mem_total": 524288, 
-        "num_cpus": 1
-    }
-}
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-response.xml b/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-response.xml
deleted file mode 100644
index 129d41f..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-hwinfo-response.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 160
-Date: Tue, 24 Jul 2012 19:48:33 GMT
-
-<hwinfo xmlns="http://docs.openstack.org/database/api/v1.0">
-    <num_cpus>
-        1
-    </num_cpus>
-    <mem_total>
-        524288
-    </mem_total>
-</hwinfo>
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-index-request.json b/apidocs/src/resources/samples/db-mgmt-instance-index-request.json
deleted file mode 100644
index 2f998ad..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-index-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances?deleted=false HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-index-request.xml b/apidocs/src/resources/samples/db-mgmt-instance-index-request.xml
deleted file mode 100644
index f9bba5a..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-index-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/instances?deleted=false HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-index-response.json b/apidocs/src/resources/samples/db-mgmt-instance-index-response.json
deleted file mode 100644
index 1fc8be4..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-index-response.json
+++ /dev/null
@@ -1,107 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1891
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "instances": [
-        {
-            "created": "2013-03-18T19:09:17", 
-            "deleted": false, 
-            "deleted_at": null, 
-            "flavor": {
-                "id": "3", 
-                "links": [
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3", 
-                        "rel": "self"
-                    }, 
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/flavors/3", 
-                        "rel": "bookmark"
-                    }
-                ]
-            }, 
-            "id": "44b277eb-39be-4921-be31-3d61b43651d7", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "json_rack_instance", 
-            "server": {
-                "deleted": false, 
-                "deleted_at": null, 
-                "host": "hostname_1", 
-                "id": "48996795-5fd8-4bf7-8b33-3824a86f3b19", 
-                "local_id": 0, 
-                "name": "json_rack_instance", 
-                "status": "ACTIVE", 
-                "tenant_id": "3000"
-            }, 
-            "service_status": "ACTIVE", 
-            "status": "ACTIVE", 
-            "task_description": "No tasks for the instance.", 
-            "tenant_id": "3000", 
-            "updated": "2013-03-18T19:09:18", 
-            "volume": {
-                "size": 4
-            }
-        }, 
-        {
-            "created": "2013-03-18T19:09:17", 
-            "deleted": false, 
-            "deleted_at": null, 
-            "flavor": {
-                "id": "3", 
-                "links": [
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3", 
-                        "rel": "self"
-                    }, 
-                    {
-                        "href": "https://ord.databases.api.rackspacecloud.com/flavors/3", 
-                        "rel": "bookmark"
-                    }
-                ]
-            }, 
-            "id": "098653ba-218b-47ce-936a-e0b749101f81", 
-            "links": [
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81", 
-                    "rel": "self"
-                }, 
-                {
-                    "href": "https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81", 
-                    "rel": "bookmark"
-                }
-            ], 
-            "name": "xml_rack_instance", 
-            "server": {
-                "deleted": false, 
-                "deleted_at": null, 
-                "host": "hostname_1", 
-                "id": "b3aca411-ef1c-4c47-88d3-5a309096c204", 
-                "local_id": 0, 
-                "name": "xml_rack_instance", 
-                "status": "ACTIVE", 
-                "tenant_id": "3000"
-            }, 
-            "service_status": "ACTIVE", 
-            "status": "ACTIVE", 
-            "task_description": "No tasks for the instance.", 
-            "tenant_id": "3000", 
-            "updated": "2013-03-18T19:09:18", 
-            "volume": {
-                "size": 4
-            }
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-instance-index-response.xml b/apidocs/src/resources/samples/db-mgmt-instance-index-response.xml
deleted file mode 100644
index 58f52e3..0000000
--- a/apidocs/src/resources/samples/db-mgmt-instance-index-response.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 3103
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<instances xmlns="http://docs.openstack.org/database/api/v1.0">
-    <instance created="2013-03-18 19:09:17.409294" deleted="False" deleted_at="None" id="44b277eb-39be-4921-be31-3d61b43651d7" name="json_rack_instance" status="ACTIVE" task_description="No tasks for the instance." tenant_id="3000" updated="2013-03-18 19:09:18.248643">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7" rel="bookmark"/>
-        </links>
-        <server>
-            <status>
-                ACTIVE
-            </status>
-            <host>
-                hostname_1
-            </host>
-            <local_id>
-                0
-            </local_id>
-            <name>
-                json_rack_instance
-            </name>
-            <deleted>
-                False
-            </deleted>
-            <tenant_id>
-                3000
-            </tenant_id>
-            <deleted_at>
-                None
-            </deleted_at>
-            <id>
-                48996795-5fd8-4bf7-8b33-3824a86f3b19
-            </id>
-        </server>
-        <volume size="4"/>
-        <service_status>
-            ACTIVE
-        </service_status>
-        <flavor id="3">
-            <links>
-                <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3" rel="self"/>
-                <link href="https://ord.databases.api.rackspacecloud.com/flavors/3" rel="bookmark"/>
-            </links>
-        </flavor>
-    </instance>
-    <instance created="2013-03-18 19:09:17.441489" deleted="False" deleted_at="None" id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance" status="ACTIVE" task_description="No tasks for the instance." tenant_id="3000" updated="2013-03-18 19:09:18.280855">
-        <links>
-            <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="self"/>
-            <link href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81" rel="bookmark"/>
-        </links>
-        <server>
-            <status>
-                ACTIVE
-            </status>
-            <host>
-                hostname_1
-            </host>
-            <local_id>
-                0
-            </local_id>
-            <name>
-                xml_rack_instance
-            </name>
-            <deleted>
-                False
-            </deleted>
-            <tenant_id>
-                3000
-            </tenant_id>
-            <deleted_at>
-                None
-            </deleted_at>
-            <id>
-                b3aca411-ef1c-4c47-88d3-5a309096c204
-            </id>
-        </server>
-        <volume size="4"/>
-        <service_status>
-            ACTIVE
-        </service_status>
-        <flavor id="3">
-            <links>
-                <link href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3" rel="self"/>
-                <link href="https://ord.databases.api.rackspacecloud.com/flavors/3" rel="bookmark"/>
-            </links>
-        </flavor>
-    </instance>
-</instances>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-list-accounts-request.json b/apidocs/src/resources/samples/db-mgmt-list-accounts-request.json
deleted file mode 100644
index 0431422..0000000
--- a/apidocs/src/resources/samples/db-mgmt-list-accounts-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/accounts HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-list-accounts-request.xml b/apidocs/src/resources/samples/db-mgmt-list-accounts-request.xml
deleted file mode 100644
index 9265354..0000000
--- a/apidocs/src/resources/samples/db-mgmt-list-accounts-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/accounts HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-list-accounts-response.json b/apidocs/src/resources/samples/db-mgmt-list-accounts-response.json
deleted file mode 100644
index cb29539..0000000
--- a/apidocs/src/resources/samples/db-mgmt-list-accounts-response.json
+++ /dev/null
@@ -1,15 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 50
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "accounts": [
-        {
-            "id": "3000", 
-            "num_instances": 2
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-list-accounts-response.xml b/apidocs/src/resources/samples/db-mgmt-list-accounts-response.xml
deleted file mode 100644
index 7e522b1..0000000
--- a/apidocs/src/resources/samples/db-mgmt-list-accounts-response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 118
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<accounts xmlns="http://docs.openstack.org/database/api/v1.0">
-    <account id="3000" num_instances="2"/>
-</accounts>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-list-hosts-request.json b/apidocs/src/resources/samples/db-mgmt-list-hosts-request.json
deleted file mode 100644
index a385167..0000000
--- a/apidocs/src/resources/samples/db-mgmt-list-hosts-request.json
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/hosts HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/json
-Content-Type: application/json
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-list-hosts-request.xml b/apidocs/src/resources/samples/db-mgmt-list-hosts-request.xml
deleted file mode 100644
index 9f2333f..0000000
--- a/apidocs/src/resources/samples/db-mgmt-list-hosts-request.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-GET /v1.0/1234/mgmt/hosts HTTP/1.1
-User-Agent: python-reddwarfclient
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
-Accept: application/xml
-Content-Type: application/xml
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-list-hosts-response.json b/apidocs/src/resources/samples/db-mgmt-list-hosts-response.json
deleted file mode 100644
index 28de887..0000000
--- a/apidocs/src/resources/samples/db-mgmt-list-hosts-response.json
+++ /dev/null
@@ -1,19 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 101
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "hosts": [
-        {
-            "instanceCount": 0, 
-            "name": "hostname_2"
-        }, 
-        {
-            "instanceCount": 2, 
-            "name": "hostname_1"
-        }
-    ]
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-list-hosts-response.xml b/apidocs/src/resources/samples/db-mgmt-list-hosts-response.xml
deleted file mode 100644
index 7593186..0000000
--- a/apidocs/src/resources/samples/db-mgmt-list-hosts-response.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 167
-Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-<hosts xmlns="http://docs.openstack.org/database/api/v1.0">
-    <host instanceCount="0" name="hostname_2"/>
-    <host instanceCount="2" name="hostname_1"/>
-</hosts>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-request.json b/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-request.json
deleted file mode 100644
index 130324a..0000000
--- a/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-request.json
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/0617673d-a280-40c3-8151-29800a8f9d70/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 73d60021-96e1-4d06-843d-72d20fa5377b
-Accept: application/json
-Content-Type: application/json
-
-{
-   "migrate": {"host": "example-host-name"}
-}
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-request.xml b/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-request.xml
deleted file mode 100644
index 3535029..0000000
--- a/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/475baf88-53b8-4ebb-932a-a2518227a6c6/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 73d60021-96e1-4d06-843d-72d20fa5377b
-Accept: application/xml
-Content-Type: application/xml
-
-<?xml version="1.0" ?>
-<migrate xmlns="http://docs.openstack.org/database/api/v1.0" host="example-host-name"/>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-response.json b/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-response.json
deleted file mode 100644
index 2308734..0000000
--- a/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Tue, 07 Feb 2012 23:56:52 GMT
-
-   
diff --git a/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-response.xml b/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-response.xml
deleted file mode 100644
index bcea5bf..0000000
--- a/apidocs/src/resources/samples/db-mgmt-migrate-instance-force-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Tue, 07 Feb 2012 23:56:55 GMT
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-migrate-instance-request.json b/apidocs/src/resources/samples/db-mgmt-migrate-instance-request.json
deleted file mode 100644
index 95b8c99..0000000
--- a/apidocs/src/resources/samples/db-mgmt-migrate-instance-request.json
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/0617673d-a280-40c3-8151-29800a8f9d70/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 73d60021-96e1-4d06-843d-72d20fa5377b
-Accept: application/json
-Content-Type: application/json
-
-{
-   "migrate": {}
-}
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-mgmt-migrate-instance-request.xml b/apidocs/src/resources/samples/db-mgmt-migrate-instance-request.xml
deleted file mode 100644
index 0a171c7..0000000
--- a/apidocs/src/resources/samples/db-mgmt-migrate-instance-request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/475baf88-53b8-4ebb-932a-a2518227a6c6/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 73d60021-96e1-4d06-843d-72d20fa5377b
-Accept: application/xml
-Content-Type: application/xml
-
-<?xml version="1.0" ?>
-<migrate xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-migrate-instance-response.json b/apidocs/src/resources/samples/db-mgmt-migrate-instance-response.json
deleted file mode 100644
index 2308734..0000000
--- a/apidocs/src/resources/samples/db-mgmt-migrate-instance-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Tue, 07 Feb 2012 23:56:52 GMT
-
-   
diff --git a/apidocs/src/resources/samples/db-mgmt-migrate-instance-response.xml b/apidocs/src/resources/samples/db-mgmt-migrate-instance-response.xml
deleted file mode 100644
index bcea5bf..0000000
--- a/apidocs/src/resources/samples/db-mgmt-migrate-instance-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Tue, 07 Feb 2012 23:56:55 GMT
-
-
diff --git a/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-request.json b/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-request.json
deleted file mode 100644
index bb2ff17..0000000
--- a/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-request.json
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/0617673d-a280-40c3-8151-29800a8f9d70/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 73d60021-96e1-4d06-843d-72d20fa5377b
-Accept: application/json
-Content-Type: application/json
-
-{
-   "reset-task-status": {}
-}
diff --git a/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-request.xml b/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-request.xml
deleted file mode 100644
index 2e6f8c2..0000000
--- a/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-request.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-POST /v1.0/1234/mgmt/instances/475baf88-53b8-4ebb-932a-a2518227a6c6/action HTTP/1.1
-User-Agent: python-example-client
-Host: ord.databases.api.rackspacecloud.com
-X-Auth-Token: 73d60021-96e1-4d06-843d-72d20fa5377b
-Accept: application/xml
-Content-Type: application/xml
-
-<?xml version="1.0" ?>
-<reset-task-status xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
diff --git a/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-response.json b/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-response.json
deleted file mode 100644
index 2308734..0000000
--- a/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Tue, 07 Feb 2012 23:56:52 GMT
-
-   
diff --git a/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-response.xml b/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-response.xml
deleted file mode 100644
index bcea5bf..0000000
--- a/apidocs/src/resources/samples/db-mgmt-reset-instance-task-status-response.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-HTTP/1.1 202 Accepted
-Content-Type: text/plain; charset=UTF-8
-Content-Length: 58
-Date: Tue, 07 Feb 2012 23:56:55 GMT
-
-
diff --git a/apidocs/src/resources/samples/db-request-types.json b/apidocs/src/resources/samples/db-request-types.json
deleted file mode 100644
index 2cb65ac..0000000
--- a/apidocs/src/resources/samples/db-request-types.json
+++ /dev/null
@@ -1,15 +0,0 @@
-POST /v1.0/1234/instances HTTP/1.1
-Host: openstack.example.com
-Content-Type: application/json
-Accept: application/xml
-X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
-
-{
-    "instance": {
-        "name": "'my_instance_name'",
-        "flavorRef": 1,
-        "volume": {
-            "size": "2"
-        }
-    }
-}
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-response-types.xml b/apidocs/src/resources/samples/db-response-types.xml
deleted file mode 100644
index 93c4e42..0000000
--- a/apidocs/src/resources/samples/db-response-types.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 380
-Date: Thu, 17 Nov 2011 02:37:37 GMT
-
-<instance created="2011-11-03T15:57:52Z"
-    hostname="d735f61b985bb003a61dc72948dbf4e7174da12c.openstack.example.com"
-    id="00ff11ee-22dd-33cc-44bb-55aa66007799" name="orion" status="BUILD" updated="2011-11-03T15:57:55Z"
-    xmlns="http://docs.openstack.org/database/api/v1.0">
-    <links>
-        <link href="https://openstack.example.com/v1.0/1234/instances/00ff11ee-22dd-33cc-44bb-55aa66007799" rel="self"/>
-        <link href="https://openstack.example.com/instances/00ff11ee-22dd-33cc-44bb-55aa66007799" rel="bookmark"
-        />
-    </links>
-    <volume size="2"/>
-    <flavor id="2">
-        <links>
-            <link href="https://openstack.example.com/v1.0/1234/flavors/2"
-                rel="self"/>
-            <link href="https://openstack.example.com/flavors/2"
-                rel="bookmark"/>
-        </links>
-    </flavor>
-</instance>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-version-response.xml b/apidocs/src/resources/samples/db-version-response.xml
deleted file mode 100644
index 47a29a2..0000000
--- a/apidocs/src/resources/samples/db-version-response.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 218
-Date: Wed, 25 Jan 2012 21:53:04 GMT
-
-<version id="v1.0" status="CURRENT" updated="2012-01-01T00:00:00Z" xmlns="http://docs.openstack.org/database/api/v1.0">
-        <links>
-                <link href="https://ord.databases.api.rackspacecloud.com/v1.0/" rel="self"/>
-        </links>
-</version>
diff --git a/apidocs/src/resources/samples/db-instances-paged-index-request.json b/apidocs/src/samples/db-change-users-password-request-json.txt
similarity index 56%
rename from apidocs/src/resources/samples/db-instances-paged-index-request.json
rename to apidocs/src/samples/db-change-users-password-request-json.txt
index d74ea74..c42ecdf 100644
--- a/apidocs/src/resources/samples/db-instances-paged-index-request.json
+++ b/apidocs/src/samples/db-change-users-password-request-json.txt
@@ -1,8 +1,6 @@
-GET /v1.0/1234/instances?marker=369018b0-30de-2775-ab39-a19bd20006e9&limit=5 HTTP/1.1
+PUT /v1.0/1234/instances/692d8418-7a8f-47f1-8060-59846c6e024f/users HTTP/1.1
 User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-change-users-password-request.xml b/apidocs/src/samples/db-change-users-password-request-xml.txt
similarity index 61%
rename from apidocs/src/resources/samples/db-change-users-password-request.xml
rename to apidocs/src/samples/db-change-users-password-request-xml.txt
index de60894..32eb456 100644
--- a/apidocs/src/resources/samples/db-change-users-password-request.xml
+++ b/apidocs/src/samples/db-change-users-password-request-xml.txt
@@ -3,8 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-<users xmlns="http://docs.openstack.org/database/api/v1.0">
-    <user password="5" name="exampleuser"/>
-</users>
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-change-users-password-request.json b/apidocs/src/samples/db-change-users-password-request.json
new file mode 100644
index 0000000..1b77d37
--- /dev/null
+++ b/apidocs/src/samples/db-change-users-password-request.json
@@ -0,0 +1,12 @@
+{
+   "users": [
+      {
+          "name": "dbuser1",
+          "password": "newpassword"
+      },
+      {
+           "name": "dbuser2",
+           "password": "anotherpassword"
+      }
+   ]
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-change-users-password-request.xml b/apidocs/src/samples/db-change-users-password-request.xml
new file mode 100644
index 0000000..ecc1882
--- /dev/null
+++ b/apidocs/src/samples/db-change-users-password-request.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<users xmlns="http://docs.openstack.org/database/api/v1.0">
+    <user password="5" name="exampleuser"/>
+</users>
diff --git a/apidocs/src/resources/samples/db-change-users-password-response.json b/apidocs/src/samples/db-change-users-password-response-json.txt
similarity index 66%
rename from apidocs/src/resources/samples/db-change-users-password-response.json
rename to apidocs/src/samples/db-change-users-password-response-json.txt
index 79b9268..c4d2e8c 100644
--- a/apidocs/src/resources/samples/db-change-users-password-response.json
+++ b/apidocs/src/samples/db-change-users-password-response-json.txt
@@ -1,5 +1,4 @@
 HTTP/1.1 202 Accepted
 Content-Type: application/json
 Content-Length: 152
-Date: Wed, 21 Mar 2012 17:46:46 GMT
-
+Date: Wed, 21 Mar 2012 17:46:46 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-change-users-password-response.xml b/apidocs/src/samples/db-change-users-password-response-xml.txt
similarity index 65%
rename from apidocs/src/resources/samples/db-change-users-password-response.xml
rename to apidocs/src/samples/db-change-users-password-response-xml.txt
index b081e6d..bef81a1 100644
--- a/apidocs/src/resources/samples/db-change-users-password-response.xml
+++ b/apidocs/src/samples/db-change-users-password-response-xml.txt
@@ -1,6 +1,4 @@
 HTTP/1.1 202 Accepted
 Content-Type: application/xml
 Content-Length: 501
-Date: Wed, 27 Jun 2012 21:56:06 GMT
-
-
+Date: Wed, 27 Jun 2012 21:56:06 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-check-root-user-request.json b/apidocs/src/samples/db-check-root-user-request-json.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-check-root-user-request.json
rename to apidocs/src/samples/db-check-root-user-request-json.txt
index 9bfcd1a..1fab86b 100644
--- a/apidocs/src/resources/samples/db-check-root-user-request.json
+++ b/apidocs/src/samples/db-check-root-user-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-check-root-user-request.xml b/apidocs/src/samples/db-check-root-user-request-xml.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-check-root-user-request.xml
rename to apidocs/src/samples/db-check-root-user-request-xml.txt
index 1e794c2..1369312 100644
--- a/apidocs/src/resources/samples/db-check-root-user-request.xml
+++ b/apidocs/src/samples/db-check-root-user-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-check-root-user-response.json b/apidocs/src/samples/db-check-root-user-response-json.txt
similarity index 68%
rename from apidocs/src/resources/samples/db-check-root-user-response.json
rename to apidocs/src/samples/db-check-root-user-response-json.txt
index 6dc0832..d0fd061 100644
--- a/apidocs/src/resources/samples/db-check-root-user-response.json
+++ b/apidocs/src/samples/db-check-root-user-response-json.txt
@@ -3,8 +3,4 @@ Content-Type: application/json
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 21
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
-{
-    "rootEnabled": true
-}
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-check-root-user-response-xml.txt b/apidocs/src/samples/db-check-root-user-response-xml.txt
new file mode 100644
index 0000000..ceb83cd
--- /dev/null
+++ b/apidocs/src/samples/db-check-root-user-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 90
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-check-root-user-response.json b/apidocs/src/samples/db-check-root-user-response.json
new file mode 100644
index 0000000..f3990b4
--- /dev/null
+++ b/apidocs/src/samples/db-check-root-user-response.json
@@ -0,0 +1,3 @@
+{
+    "rootEnabled": true
+}
diff --git a/apidocs/src/samples/db-check-root-user-response.xml b/apidocs/src/samples/db-check-root-user-response.xml
new file mode 100644
index 0000000..f67b0f8
--- /dev/null
+++ b/apidocs/src/samples/db-check-root-user-response.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rootEnabled xmlns="http://docs.openstack.org/database/api/v1.0"
+    >True</rootEnabled>
diff --git a/apidocs/src/samples/db-create-databases-request-json.txt b/apidocs/src/samples/db-create-databases-request-json.txt
new file mode 100644
index 0000000..61deb76
--- /dev/null
+++ b/apidocs/src/samples/db-create-databases-request-json.txt
@@ -0,0 +1,6 @@
+POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases HTTP/1.1
+User-Agent: python-reddwarfclient
+Host: ord.databases.api.rackspacecloud.com
+X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
+Accept: application/json
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/samples/db-create-databases-request-xml.txt b/apidocs/src/samples/db-create-databases-request-xml.txt
new file mode 100644
index 0000000..bdf326f
--- /dev/null
+++ b/apidocs/src/samples/db-create-databases-request-xml.txt
@@ -0,0 +1,6 @@
+POST /v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/databases HTTP/1.1
+User-Agent: python-reddwarfclient
+Host: ord.databases.api.rackspacecloud.com
+X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
+Accept: application/xml
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-create-databases-request.json b/apidocs/src/samples/db-create-databases-request.json
new file mode 100644
index 0000000..b7aea0a
--- /dev/null
+++ b/apidocs/src/samples/db-create-databases-request.json
@@ -0,0 +1,15 @@
+{
+    "databases": [
+        {
+            "character_set": "utf8", 
+            "collate": "utf8_general_ci", 
+            "name": "testingdb"
+        }, 
+        {
+            "name": "anotherdb"
+        }, 
+        {
+            "name": "oneMoreDB"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-create-databases-request.xml b/apidocs/src/samples/db-create-databases-request.xml
new file mode 100644
index 0000000..5a87d11
--- /dev/null
+++ b/apidocs/src/samples/db-create-databases-request.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databases xmlns="http://docs.openstack.org/database/api/v1.0">
+    <database collate="utf8_general_ci" name="testingdb"
+        character_set="utf8"/>
+    <database name="anotherdb"/>
+    <database name="oneMoreDB"/>
+</databases>
diff --git a/apidocs/src/resources/samples/db-create-users-response.json b/apidocs/src/samples/db-create-databases-response-json.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-create-users-response.json
rename to apidocs/src/samples/db-create-databases-response-json.txt
index 7d4996b..6c2d463 100644
--- a/apidocs/src/resources/samples/db-create-users-response.json
+++ b/apidocs/src/samples/db-create-databases-response-json.txt
@@ -3,4 +3,4 @@ Content-Type: application/json
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-databases-response.xml b/apidocs/src/samples/db-create-databases-response-xml.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-delete-databases-response.xml
rename to apidocs/src/samples/db-create-databases-response-xml.txt
index ede0075..37fd35c 100644
--- a/apidocs/src/resources/samples/db-delete-databases-response.xml
+++ b/apidocs/src/samples/db-create-databases-response-xml.txt
@@ -3,4 +3,4 @@ Content-Type: application/xml
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-all-request.json b/apidocs/src/samples/db-create-instance-request-json.txt
similarity index 69%
rename from apidocs/src/resources/samples/db-mgmt-get-usage-all-request.json
rename to apidocs/src/samples/db-create-instance-request-json.txt
index 5f2d118..a8fcdfb 100644
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-all-request.json
+++ b/apidocs/src/samples/db-create-instance-request-json.txt
@@ -1,6 +1,6 @@
-GET /v1.0/1234/mgmt/usage HTTP/1.1
+POST /v1.0/1234/instances HTTP/1.1
 User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-mgmt-get-usage-all-request.xml b/apidocs/src/samples/db-create-instance-request-xml.txt
similarity index 70%
rename from apidocs/src/resources/samples/db-mgmt-get-usage-all-request.xml
rename to apidocs/src/samples/db-create-instance-request-xml.txt
index 2ac3415..554c6a5 100644
--- a/apidocs/src/resources/samples/db-mgmt-get-usage-all-request.xml
+++ b/apidocs/src/samples/db-create-instance-request-xml.txt
@@ -1,6 +1,6 @@
-GET /v1.0/1234/mgmt/usage HTTP/1.1
+POST /v1.0/1234/instances HTTP/1.1
 User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-create-instance-request.json b/apidocs/src/samples/db-create-instance-request.json
new file mode 100644
index 0000000..3f14a43
--- /dev/null
+++ b/apidocs/src/samples/db-create-instance-request.json
@@ -0,0 +1,30 @@
+{
+   "instance":{
+      "databases":[
+         {
+            "character_set":"utf8",
+            "collate":"utf8_general_ci",
+            "name":"sampledb"
+         },
+         {
+            "name":"nextround"
+         }
+      ],
+      "flavorRef":1,
+      "name":"json_rack_instance",
+      "users":[
+         {
+            "databases":[
+               {
+                  "name":"sampledb"
+               }
+            ],
+            "name":"demouser",
+            "password":"demopassword"
+         }
+      ],
+      "volume":{
+         "size":2
+      }
+   }
+}
diff --git a/apidocs/src/samples/db-create-instance-request.xml b/apidocs/src/samples/db-create-instance-request.xml
new file mode 100644
index 0000000..68ab687
--- /dev/null
+++ b/apidocs/src/samples/db-create-instance-request.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instance xmlns="http://docs.openstack.org/database/api/v1.0"
+    flavorRef="1" name="xml_rack_instance">
+    <volume size="2"/>
+    <users>
+        <user password="demopassword" name="demouser">
+            <databases>
+                <database name="sampledb"/>
+            </databases>
+        </user>
+    </users>
+    <databases>
+        <database collate="utf8_general_ci" name="sampledb"
+            character_set="utf8"/>
+        <database name="nextround"/>
+    </databases>
+</instance>
diff --git a/apidocs/src/samples/db-create-instance-response-json.txt b/apidocs/src/samples/db-create-instance-response-json.txt
new file mode 100644
index 0000000..16d5c4c
--- /dev/null
+++ b/apidocs/src/samples/db-create-instance-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 591
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-create-instance-response-xml.txt b/apidocs/src/samples/db-create-instance-response-xml.txt
new file mode 100644
index 0000000..886fb78
--- /dev/null
+++ b/apidocs/src/samples/db-create-instance-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 724
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-create-instance-response.json b/apidocs/src/samples/db-create-instance-response.json
new file mode 100644
index 0000000..9e007f5
--- /dev/null
+++ b/apidocs/src/samples/db-create-instance-response.json
@@ -0,0 +1,35 @@
+{
+   "instance":{
+      "created":"2013-03-18T19:09:17",
+      "flavor":{
+         "id":"1",
+         "links":[
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
+               "rel":"self"
+            },
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
+               "rel":"bookmark"
+            }
+         ]
+      },
+      "id":"44b277eb-39be-4921-be31-3d61b43651d7",
+      "links":[
+         {
+            "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
+            "rel":"self"
+         },
+         {
+            "href":"https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
+            "rel":"bookmark"
+         }
+      ],
+      "name":"json_rack_instance",
+      "status":"BUILD",
+      "updated":"2013-03-18T19:09:17",
+      "volume":{
+         "size":2
+      }
+   }
+}
diff --git a/apidocs/src/samples/db-create-instance-response.xml b/apidocs/src/samples/db-create-instance-response.xml
new file mode 100644
index 0000000..37194fc
--- /dev/null
+++ b/apidocs/src/samples/db-create-instance-response.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instance created="2013-03-18 19:09:17.441489"
+    id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance"
+    status="BUILD" updated="2013-03-18 19:09:17.441606"
+    xmlns="http://docs.openstack.org/database/api/v1.0">
+    <links>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81"
+            rel="self"/>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81"
+            rel="bookmark"/>
+    </links>
+    <volume size="2"/>
+    <flavor id="1">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/flavors/1"
+                rel="bookmark"/>
+        </links>
+    </flavor>
+</instance>
diff --git a/apidocs/src/samples/db-create-users-request-json.txt b/apidocs/src/samples/db-create-users-request-json.txt
new file mode 100644
index 0000000..25b79c1
--- /dev/null
+++ b/apidocs/src/samples/db-create-users-request-json.txt
@@ -0,0 +1,6 @@
+POST /v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/users HTTP/1.1
+User-Agent: python-reddwarfclient
+Host: ord.databases.api.rackspacecloud.com
+X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
+Accept: application/json
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/samples/db-create-users-request-xml.txt b/apidocs/src/samples/db-create-users-request-xml.txt
new file mode 100644
index 0000000..4e0d96d
--- /dev/null
+++ b/apidocs/src/samples/db-create-users-request-xml.txt
@@ -0,0 +1,6 @@
+POST /v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/users HTTP/1.1
+User-Agent: python-reddwarfclient
+Host: ord.databases.api.rackspacecloud.com
+X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
+Accept: application/xml
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-create-users-request.json b/apidocs/src/samples/db-create-users-request.json
new file mode 100644
index 0000000..c9661ac
--- /dev/null
+++ b/apidocs/src/samples/db-create-users-request.json
@@ -0,0 +1,26 @@
+{
+   "users":[
+      {
+         "database":"databaseA",
+         "name":"dbuser1",
+         "password":"password"
+      },
+      {
+         "databases":[
+            {
+               "name":"databaseB"
+            },
+            {
+               "name":"databaseC"
+            }
+         ],
+         "name":"dbuser2",
+         "password":"password"
+      },
+      {
+         "database":"databaseD",
+         "name":"dbuser3",
+         "password":"password"
+      }
+   ]
+}
diff --git a/apidocs/src/samples/db-create-users-request.xml b/apidocs/src/samples/db-create-users-request.xml
new file mode 100644
index 0000000..f35cb6c
--- /dev/null
+++ b/apidocs/src/samples/db-create-users-request.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<users xmlns="http://docs.openstack.org/database/api/v1.0">
+    <user password="password" name="dbuser1" database="databaseA"/>
+    <user password="password" name="dbuser2">
+        <databases>
+            <database name="databaseB"/>
+            <database name="databaseC"/>
+        </databases>
+    </user>
+    <user password="password" name="dbuser3" database="databaseD"/>
+</users>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-create-databases-response.json b/apidocs/src/samples/db-create-users-response-json.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-create-databases-response.json
rename to apidocs/src/samples/db-create-users-response-json.txt
index 7d4996b..6c2d463 100644
--- a/apidocs/src/resources/samples/db-create-databases-response.json
+++ b/apidocs/src/samples/db-create-users-response-json.txt
@@ -3,4 +3,4 @@ Content-Type: application/json
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-create-databases-response.xml b/apidocs/src/samples/db-create-users-response-xml.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-create-databases-response.xml
rename to apidocs/src/samples/db-create-users-response-xml.txt
index ede0075..37fd35c 100644
--- a/apidocs/src/resources/samples/db-create-databases-response.xml
+++ b/apidocs/src/samples/db-create-users-response-xml.txt
@@ -3,4 +3,4 @@ Content-Type: application/xml
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-databases-request.json b/apidocs/src/samples/db-delete-databases-request-json.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-delete-databases-request.json
rename to apidocs/src/samples/db-delete-databases-request-json.txt
index 995e9ba..d5dfa1e 100644
--- a/apidocs/src/resources/samples/db-delete-databases-request.json
+++ b/apidocs/src/samples/db-delete-databases-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-databases-request.xml b/apidocs/src/samples/db-delete-databases-request-xml.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-delete-databases-request.xml
rename to apidocs/src/samples/db-delete-databases-request-xml.txt
index ac2a727..2a93afd 100644
--- a/apidocs/src/resources/samples/db-delete-databases-request.xml
+++ b/apidocs/src/samples/db-delete-databases-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-databases-response.json b/apidocs/src/samples/db-delete-databases-response-json.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-delete-databases-response.json
rename to apidocs/src/samples/db-delete-databases-response-json.txt
index 7d4996b..6c2d463 100644
--- a/apidocs/src/resources/samples/db-delete-databases-response.json
+++ b/apidocs/src/samples/db-delete-databases-response-json.txt
@@ -3,4 +3,4 @@ Content-Type: application/json
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-create-users-response.xml b/apidocs/src/samples/db-delete-databases-response-xml.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-create-users-response.xml
rename to apidocs/src/samples/db-delete-databases-response-xml.txt
index ede0075..37fd35c 100644
--- a/apidocs/src/resources/samples/db-create-users-response.xml
+++ b/apidocs/src/samples/db-delete-databases-response-xml.txt
@@ -3,4 +3,4 @@ Content-Type: application/xml
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-instance-request.json b/apidocs/src/samples/db-delete-instance-request-json.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-delete-instance-request.json
rename to apidocs/src/samples/db-delete-instance-request-json.txt
index 0efdad3..d192a42 100644
--- a/apidocs/src/resources/samples/db-delete-instance-request.json
+++ b/apidocs/src/samples/db-delete-instance-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-instance-request.xml b/apidocs/src/samples/db-delete-instance-request-xml.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-delete-instance-request.xml
rename to apidocs/src/samples/db-delete-instance-request-xml.txt
index ca52067..dceebb7 100644
--- a/apidocs/src/resources/samples/db-delete-instance-request.xml
+++ b/apidocs/src/samples/db-delete-instance-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-resize-flavor-response.json b/apidocs/src/samples/db-delete-instance-response-json.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-instance-resize-flavor-response.json
rename to apidocs/src/samples/db-delete-instance-response-json.txt
index a117127..4955ecc 100644
--- a/apidocs/src/resources/samples/db-instance-resize-flavor-response.json
+++ b/apidocs/src/samples/db-delete-instance-response-json.txt
@@ -3,4 +3,4 @@ Content-Type: application/json
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-instance-response.xml b/apidocs/src/samples/db-delete-instance-response-xml.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-delete-instance-response.xml
rename to apidocs/src/samples/db-delete-instance-response-xml.txt
index 3d53e00..86306c2 100644
--- a/apidocs/src/resources/samples/db-delete-instance-response.xml
+++ b/apidocs/src/samples/db-delete-instance-response-xml.txt
@@ -3,4 +3,4 @@ Content-Type: application/xml
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-users-request.json b/apidocs/src/samples/db-delete-users-request-json.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-delete-users-request.json
rename to apidocs/src/samples/db-delete-users-request-json.txt
index 5eababe..17738c3 100644
--- a/apidocs/src/resources/samples/db-delete-users-request.json
+++ b/apidocs/src/samples/db-delete-users-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-users-request.xml b/apidocs/src/samples/db-delete-users-request-xml.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-delete-users-request.xml
rename to apidocs/src/samples/db-delete-users-request-xml.txt
index c31653d..b0ac08c 100644
--- a/apidocs/src/resources/samples/db-delete-users-request.xml
+++ b/apidocs/src/samples/db-delete-users-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-users-response.json b/apidocs/src/samples/db-delete-users-response-json.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-delete-users-response.json
rename to apidocs/src/samples/db-delete-users-response-json.txt
index 7d4996b..6c2d463 100644
--- a/apidocs/src/resources/samples/db-delete-users-response.json
+++ b/apidocs/src/samples/db-delete-users-response-json.txt
@@ -3,4 +3,4 @@ Content-Type: application/json
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-delete-users-response.xml b/apidocs/src/samples/db-delete-users-response-xml.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-delete-users-response.xml
rename to apidocs/src/samples/db-delete-users-response-xml.txt
index ede0075..37fd35c 100644
--- a/apidocs/src/resources/samples/db-delete-users-response.xml
+++ b/apidocs/src/samples/db-delete-users-response-xml.txt
@@ -3,4 +3,4 @@ Content-Type: application/xml
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-enable-root-user-request.json b/apidocs/src/samples/db-enable-root-user-request-json.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-enable-root-user-request.json
rename to apidocs/src/samples/db-enable-root-user-request-json.txt
index 314df17..463e383 100644
--- a/apidocs/src/resources/samples/db-enable-root-user-request.json
+++ b/apidocs/src/samples/db-enable-root-user-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-enable-root-user-request.xml b/apidocs/src/samples/db-enable-root-user-request-xml.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-enable-root-user-request.xml
rename to apidocs/src/samples/db-enable-root-user-request-xml.txt
index b2ccb5b..5f65168 100644
--- a/apidocs/src/resources/samples/db-enable-root-user-request.xml
+++ b/apidocs/src/samples/db-enable-root-user-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-enable-root-user-response-json.txt b/apidocs/src/samples/db-enable-root-user-response-json.txt
new file mode 100644
index 0000000..6dc4bb7
--- /dev/null
+++ b/apidocs/src/samples/db-enable-root-user-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 47
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-enable-root-user-response-xml.txt b/apidocs/src/samples/db-enable-root-user-response-xml.txt
new file mode 100644
index 0000000..2db96b8
--- /dev/null
+++ b/apidocs/src/samples/db-enable-root-user-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 89
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-enable-root-user-response.json b/apidocs/src/samples/db-enable-root-user-response.json
new file mode 100644
index 0000000..e937b90
--- /dev/null
+++ b/apidocs/src/samples/db-enable-root-user-response.json
@@ -0,0 +1,6 @@
+{
+    "user": {
+        "name": "root", 
+        "password": "12345"
+    }
+}
diff --git a/apidocs/src/samples/db-enable-root-user-response.xml b/apidocs/src/samples/db-enable-root-user-response.xml
new file mode 100644
index 0000000..4c6d9f9
--- /dev/null
+++ b/apidocs/src/samples/db-enable-root-user-response.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<user name="root" password="12345"
+    xmlns="http://docs.openstack.org/database/api/v1.0"/>
diff --git a/apidocs/src/resources/samples/db-faults-badRequest.json b/apidocs/src/samples/db-faults-badRequest.json
similarity index 55%
rename from apidocs/src/resources/samples/db-faults-badRequest.json
rename to apidocs/src/samples/db-faults-badRequest.json
index fcb4571..2b04f07 100644
--- a/apidocs/src/resources/samples/db-faults-badRequest.json
+++ b/apidocs/src/samples/db-faults-badRequest.json
@@ -1,8 +1,3 @@
-HTTP/1.1 400 None
-Content-Length: 120
-Content-Type: application/json; charset=UTF-8
-Date: Tue, 29 Nov 2011 00:33:48 GMT
-
 {
     "badRequest": {
         "code": 400,
diff --git a/apidocs/src/samples/db-faults-badRequest.xml b/apidocs/src/samples/db-faults-badRequest.xml
new file mode 100644
index 0000000..7434415
--- /dev/null
+++ b/apidocs/src/samples/db-faults-badRequest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<badRequest code="400"
+    xmlns="http://docs.openstack.org/database/api/v1.0">
+    <message> Volume 'size' needs to be a positive integer value, -1.0
+        cannot be accepted. </message>
+</badRequest>
diff --git a/apidocs/src/resources/samples/db-faults-instanceFault.json b/apidocs/src/samples/db-faults-instanceFault.json
similarity index 53%
rename from apidocs/src/resources/samples/db-faults-instanceFault.json
rename to apidocs/src/samples/db-faults-instanceFault.json
index 97299fc..e9b42d5 100644
--- a/apidocs/src/resources/samples/db-faults-instanceFault.json
+++ b/apidocs/src/samples/db-faults-instanceFault.json
@@ -1,8 +1,3 @@
-HTTP/1.1 500 Internal Server Error
-Content-Length: 120
-Content-Type: application/json; charset=UTF-8
-Date: Tue, 29 Nov 2011 00:33:48 GMT
-
 {
     "instanceFault": {
         "code": 500,
diff --git a/apidocs/src/samples/db-faults-instanceFault.xml b/apidocs/src/samples/db-faults-instanceFault.xml
new file mode 100644
index 0000000..f3aa040
--- /dev/null
+++ b/apidocs/src/samples/db-faults-instanceFault.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instanceFault code="500"
+    xmlns="http://docs.openstack.org/database/api/v1.0">
+    <message> The server has either erred or is incapable of
+        performing the requested operation. </message>
+</instanceFault>
diff --git a/apidocs/src/samples/db-faults-itemNotFound.json b/apidocs/src/samples/db-faults-itemNotFound.json
new file mode 100644
index 0000000..6c73183
--- /dev/null
+++ b/apidocs/src/samples/db-faults-itemNotFound.json
@@ -0,0 +1,6 @@
+{
+    "itemNotFound": {
+        "code": 404,
+        "message": "The resource could not be found."
+    }
+}
diff --git a/apidocs/src/samples/db-faults-itemNotFound.xml b/apidocs/src/samples/db-faults-itemNotFound.xml
new file mode 100644
index 0000000..0b5699c
--- /dev/null
+++ b/apidocs/src/samples/db-faults-itemNotFound.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itemNotFound code="404"
+    xmlns="http://docs.openstack.org/database/api/v1.0">
+    <message> The resource could not be found. </message>
+</itemNotFound>
diff --git a/apidocs/src/resources/samples/db-flavors-by-id-request.json b/apidocs/src/samples/db-flavors-by-id-request-json.txt
similarity index 85%
rename from apidocs/src/resources/samples/db-flavors-by-id-request.json
rename to apidocs/src/samples/db-flavors-by-id-request-json.txt
index 480ce63..b8c5c33 100644
--- a/apidocs/src/resources/samples/db-flavors-by-id-request.json
+++ b/apidocs/src/samples/db-flavors-by-id-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-flavors-by-id-request.xml b/apidocs/src/samples/db-flavors-by-id-request-xml.txt
similarity index 85%
rename from apidocs/src/resources/samples/db-flavors-by-id-request.xml
rename to apidocs/src/samples/db-flavors-by-id-request-xml.txt
index dab2293..97ccb7c 100644
--- a/apidocs/src/resources/samples/db-flavors-by-id-request.xml
+++ b/apidocs/src/samples/db-flavors-by-id-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-flavors-by-id-response-json.txt b/apidocs/src/samples/db-flavors-by-id-response-json.txt
new file mode 100644
index 0000000..d7fa6a7
--- /dev/null
+++ b/apidocs/src/samples/db-flavors-by-id-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 206
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-flavors-by-id-response-xml.txt b/apidocs/src/samples/db-flavors-by-id-response-xml.txt
new file mode 100644
index 0000000..7fb6d51
--- /dev/null
+++ b/apidocs/src/samples/db-flavors-by-id-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 283
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-flavors-by-id-response.json b/apidocs/src/samples/db-flavors-by-id-response.json
similarity index 71%
rename from apidocs/src/resources/samples/db-flavors-by-id-response.json
rename to apidocs/src/samples/db-flavors-by-id-response.json
index 4b6209d..66cd7ba 100644
--- a/apidocs/src/resources/samples/db-flavors-by-id-response.json
+++ b/apidocs/src/samples/db-flavors-by-id-response.json
@@ -1,10 +1,3 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 206
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
 {
     "flavor": {
         "id": 1, 
diff --git a/apidocs/src/samples/db-flavors-by-id-response.xml b/apidocs/src/samples/db-flavors-by-id-response.xml
new file mode 100644
index 0000000..de558f5
--- /dev/null
+++ b/apidocs/src/samples/db-flavors-by-id-response.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flavor id="1" name="512MB Instance" ram="512"
+    xmlns="http://docs.openstack.org/database/api/v1.0">
+    <links>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
+            rel="self"/>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/flavors/1"
+            rel="bookmark"/>
+    </links>
+</flavor>
diff --git a/apidocs/src/resources/samples/db-flavors-request.json b/apidocs/src/samples/db-flavors-request-json.txt
similarity index 84%
rename from apidocs/src/resources/samples/db-flavors-request.json
rename to apidocs/src/samples/db-flavors-request-json.txt
index cb69d13..c1b7272 100644
--- a/apidocs/src/resources/samples/db-flavors-request.json
+++ b/apidocs/src/samples/db-flavors-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-flavors-request.xml b/apidocs/src/samples/db-flavors-request-xml.txt
similarity index 85%
rename from apidocs/src/resources/samples/db-flavors-request.xml
rename to apidocs/src/samples/db-flavors-request-xml.txt
index 362f1b5..a42b20a 100644
--- a/apidocs/src/resources/samples/db-flavors-request.xml
+++ b/apidocs/src/samples/db-flavors-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-flavors-response-json.txt b/apidocs/src/samples/db-flavors-response-json.txt
new file mode 100644
index 0000000..2244dbd
--- /dev/null
+++ b/apidocs/src/samples/db-flavors-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 1186
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-flavors-response-xml.txt b/apidocs/src/samples/db-flavors-response-xml.txt
new file mode 100644
index 0000000..ab84ce3
--- /dev/null
+++ b/apidocs/src/samples/db-flavors-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 1600
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-flavors-response.json b/apidocs/src/samples/db-flavors-response.json
similarity index 94%
rename from apidocs/src/resources/samples/db-flavors-response.json
rename to apidocs/src/samples/db-flavors-response.json
index 559040f..115a2a3 100644
--- a/apidocs/src/resources/samples/db-flavors-response.json
+++ b/apidocs/src/samples/db-flavors-response.json
@@ -1,10 +1,3 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 1186
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
 {
     "flavors": [
         {
diff --git a/apidocs/src/samples/db-flavors-response.xml b/apidocs/src/samples/db-flavors-response.xml
new file mode 100644
index 0000000..75a2054
--- /dev/null
+++ b/apidocs/src/samples/db-flavors-response.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flavors xmlns="http://docs.openstack.org/database/api/v1.0">
+    <flavor id="1" name="512MB Instance" ram="512">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/flavors/1"
+                rel="bookmark"/>
+        </links>
+    </flavor>
+    <flavor id="2" name="1GB Instance" ram="1024">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/flavors/2"
+                rel="bookmark"/>
+        </links>
+    </flavor>
+    <flavor id="3" name="2GB Instance" ram="2048">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/3"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/flavors/3"
+                rel="bookmark"/>
+        </links>
+    </flavor>
+    <flavor id="4" name="4GB Instance" ram="4096">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/4"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/flavors/4"
+                rel="bookmark"/>
+        </links>
+    </flavor>
+    <flavor id="5" name="8GB Instance" ram="8192">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/5"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/flavors/5"
+                rel="bookmark"/>
+        </links>
+    </flavor>
+    <flavor id="6" name="16GB Instance" ram="16384">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/6"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/flavors/6"
+                rel="bookmark"/>
+        </links>
+    </flavor>
+</flavors>
diff --git a/apidocs/src/resources/samples/db-grant-user-access-request.json b/apidocs/src/samples/db-grant-user-access-request-json.txt
similarity index 62%
rename from apidocs/src/resources/samples/db-grant-user-access-request.json
rename to apidocs/src/samples/db-grant-user-access-request-json.txt
index fb60b90..32c7ac0 100644
--- a/apidocs/src/resources/samples/db-grant-user-access-request.json
+++ b/apidocs/src/samples/db-grant-user-access-request-json.txt
@@ -3,15 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-{
-   "databases": [
-      {
-         "name": "databaseC"
-      },
-      {
-         "name": "databaseD"
-      }
-   ]
-}
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-grant-user-access-request.xml b/apidocs/src/samples/db-grant-user-access-request-xml.txt
similarity index 64%
rename from apidocs/src/resources/samples/db-grant-user-access-request.xml
rename to apidocs/src/samples/db-grant-user-access-request-xml.txt
index 76204ea..cf2b19f 100644
--- a/apidocs/src/resources/samples/db-grant-user-access-request.xml
+++ b/apidocs/src/samples/db-grant-user-access-request-xml.txt
@@ -3,8 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-<databases xmlns="http://docs.openstack.org/database/api/v1.0">
-    <database name="extradb"/>
-</databases>
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-grant-user-access-request.json b/apidocs/src/samples/db-grant-user-access-request.json
new file mode 100644
index 0000000..4fca825
--- /dev/null
+++ b/apidocs/src/samples/db-grant-user-access-request.json
@@ -0,0 +1,10 @@
+{
+   "databases": [
+      {
+         "name": "databaseC"
+      },
+      {
+         "name": "databaseD"
+      }
+   ]
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-grant-user-access-request.xml b/apidocs/src/samples/db-grant-user-access-request.xml
new file mode 100644
index 0000000..8def258
--- /dev/null
+++ b/apidocs/src/samples/db-grant-user-access-request.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databases xmlns="http://docs.openstack.org/database/api/v1.0">
+    <database name="extradb"/>
+</databases>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-grant-user-access-response.json b/apidocs/src/samples/db-grant-user-access-response-json.txt
similarity index 66%
rename from apidocs/src/resources/samples/db-grant-user-access-response.json
rename to apidocs/src/samples/db-grant-user-access-response-json.txt
index e5f3114..af725ba 100644
--- a/apidocs/src/resources/samples/db-grant-user-access-response.json
+++ b/apidocs/src/samples/db-grant-user-access-response-json.txt
@@ -1,4 +1,4 @@
 HTTP/1.1 202 Accepted
 Content-Type: application/json
 Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT
+Date: Wed, 27 Jun 2012 23:11:19 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-grant-user-access-response.xml b/apidocs/src/samples/db-grant-user-access-response-xml.txt
similarity index 66%
rename from apidocs/src/resources/samples/db-grant-user-access-response.xml
rename to apidocs/src/samples/db-grant-user-access-response-xml.txt
index 9b6fa1d..d6be01e 100644
--- a/apidocs/src/resources/samples/db-grant-user-access-response.xml
+++ b/apidocs/src/samples/db-grant-user-access-response-xml.txt
@@ -1,4 +1,4 @@
 HTTP/1.1 202 Accepted
 Content-Type: application/xml
 Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT
+Date: Wed, 27 Jun 2012 23:11:19 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-resize-instance-request.json b/apidocs/src/samples/db-instance-resize-instance-request-json.txt
similarity index 61%
rename from apidocs/src/resources/samples/db-instance-resize-instance-request.json
rename to apidocs/src/samples/db-instance-resize-instance-request-json.txt
index ec1ef6d..c1dd4c5 100644
--- a/apidocs/src/resources/samples/db-instance-resize-instance-request.json
+++ b/apidocs/src/samples/db-instance-resize-instance-request-json.txt
@@ -3,10 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 2eeb3252-0164-40f5-8fb7-85df5faa2698
 Accept: application/json
-Content-Type: application/json
-
-{
-    "resize": {
-        "flavorRef": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2"
-    }
-}
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-resize-instance-request.xml b/apidocs/src/samples/db-instance-resize-instance-request-xml.txt
similarity index 51%
rename from apidocs/src/resources/samples/db-instance-resize-instance-request.xml
rename to apidocs/src/samples/db-instance-resize-instance-request-xml.txt
index 2488717..2f18d02 100644
--- a/apidocs/src/resources/samples/db-instance-resize-instance-request.xml
+++ b/apidocs/src/samples/db-instance-resize-instance-request-xml.txt
@@ -3,9 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 2eeb3252-0164-40f5-8fb7-85df5faa2698
 Accept: application/xml
-Content-Type: application/xml
-
-<?xml version="1.0" ?>
-<resize xmlns="http://docs.openstack.org/database/api/v1.0">
-        <flavorRef>https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2</flavorRef>
-</resize>
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-resize-instance-request.json b/apidocs/src/samples/db-instance-resize-instance-request.json
new file mode 100644
index 0000000..2345c01
--- /dev/null
+++ b/apidocs/src/samples/db-instance-resize-instance-request.json
@@ -0,0 +1,5 @@
+{
+   "resize":{
+      "flavorRef":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2"
+   }
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-resize-instance-request.xml b/apidocs/src/samples/db-instance-resize-instance-request.xml
new file mode 100644
index 0000000..a2a2aa5
--- /dev/null
+++ b/apidocs/src/samples/db-instance-resize-instance-request.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resize xmlns="http://docs.openstack.org/database/api/v1.0">
+    <flavorRef>https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/2</flavorRef>
+</resize>
diff --git a/apidocs/src/resources/samples/db-mgmt-host-update-response.json b/apidocs/src/samples/db-instance-resize-instance-response-json.txt
similarity index 68%
rename from apidocs/src/resources/samples/db-mgmt-host-update-response.json
rename to apidocs/src/samples/db-instance-resize-instance-response-json.txt
index 0574b12..3e75572 100644
--- a/apidocs/src/resources/samples/db-mgmt-host-update-response.json
+++ b/apidocs/src/samples/db-instance-resize-instance-response-json.txt
@@ -1,6 +1,4 @@
 HTTP/1.1 202 Accepted
 Content-Type: text/plain; charset=UTF-8
 Content-Length: 58
-Date: Tue, 07 Feb 2012 23:56:52 GMT
-
-
+Date: Mon, 06 Feb 2012 21:28:10 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-guest-update-response.xml b/apidocs/src/samples/db-instance-resize-instance-response-xml.txt
similarity index 68%
rename from apidocs/src/resources/samples/db-guest-update-response.xml
rename to apidocs/src/samples/db-instance-resize-instance-response-xml.txt
index 882bfb3..21728e4 100644
--- a/apidocs/src/resources/samples/db-guest-update-response.xml
+++ b/apidocs/src/samples/db-instance-resize-instance-response-xml.txt
@@ -1,6 +1,4 @@
 HTTP/1.1 202 Accepted
 Content-Type: text/plain; charset=UTF-8
 Content-Length: 58
-Date: Mon, 05 Mar 2012 23:48:47 GMT
-
-
+Date: Mon, 06 Feb 2012 21:28:11 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-restart-request.json b/apidocs/src/samples/db-instance-resize-volume-request-json.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-instance-restart-request.json
rename to apidocs/src/samples/db-instance-resize-volume-request-json.txt
index 63b55e4..ee9c9ef 100644
--- a/apidocs/src/resources/samples/db-instance-restart-request.json
+++ b/apidocs/src/samples/db-instance-resize-volume-request-json.txt
@@ -3,8 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-{
-    "restart": {}
-}
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-restart-request.xml b/apidocs/src/samples/db-instance-resize-volume-request-xml.txt
similarity index 70%
rename from apidocs/src/resources/samples/db-instance-restart-request.xml
rename to apidocs/src/samples/db-instance-resize-volume-request-xml.txt
index affa256..a8608af 100644
--- a/apidocs/src/resources/samples/db-instance-restart-request.xml
+++ b/apidocs/src/samples/db-instance-resize-volume-request-xml.txt
@@ -3,7 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-<restart xmlns="http://docs.openstack.org/database/api/v1.0"/>
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-resize-volume-request.json b/apidocs/src/samples/db-instance-resize-volume-request.json
new file mode 100644
index 0000000..de6c2c0
--- /dev/null
+++ b/apidocs/src/samples/db-instance-resize-volume-request.json
@@ -0,0 +1,7 @@
+{
+   "resize":{
+      "volume":{
+         "size":4
+      }
+   }
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-resize-volume-request.xml b/apidocs/src/samples/db-instance-resize-volume-request.xml
new file mode 100644
index 0000000..3c622db
--- /dev/null
+++ b/apidocs/src/samples/db-instance-resize-volume-request.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resize xmlns="http://docs.openstack.org/database/api/v1.0">
+    <volume size="4"/>
+</resize>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-reboot-response.json b/apidocs/src/samples/db-instance-resize-volume-response-json.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-instance-reboot-response.json
rename to apidocs/src/samples/db-instance-resize-volume-response-json.txt
index a117127..4955ecc 100644
--- a/apidocs/src/resources/samples/db-instance-reboot-response.json
+++ b/apidocs/src/samples/db-instance-resize-volume-response-json.txt
@@ -3,4 +3,4 @@ Content-Type: application/json
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-resize-flavor-response.xml b/apidocs/src/samples/db-instance-resize-volume-response-xml.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-instance-resize-flavor-response.xml
rename to apidocs/src/samples/db-instance-resize-volume-response-xml.txt
index 3d53e00..86306c2 100644
--- a/apidocs/src/resources/samples/db-instance-resize-flavor-response.xml
+++ b/apidocs/src/samples/db-instance-resize-volume-response-xml.txt
@@ -3,4 +3,4 @@ Content-Type: application/xml
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-resize-flavor-request.json b/apidocs/src/samples/db-instance-restart-request-json.txt
similarity index 74%
rename from apidocs/src/resources/samples/db-instance-resize-flavor-request.json
rename to apidocs/src/samples/db-instance-restart-request-json.txt
index fbaab40..ee9c9ef 100644
--- a/apidocs/src/resources/samples/db-instance-resize-flavor-request.json
+++ b/apidocs/src/samples/db-instance-restart-request-json.txt
@@ -3,10 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-{
-    "resize": {
-        "flavorRef": 3
-    }
-}
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-resize-flavor-request.xml b/apidocs/src/samples/db-instance-restart-request-xml.txt
similarity index 68%
rename from apidocs/src/resources/samples/db-instance-resize-flavor-request.xml
rename to apidocs/src/samples/db-instance-restart-request-xml.txt
index 93dd21e..a8608af 100644
--- a/apidocs/src/resources/samples/db-instance-resize-flavor-request.xml
+++ b/apidocs/src/samples/db-instance-restart-request-xml.txt
@@ -3,7 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-<resize xmlns="http://docs.openstack.org/database/api/v1.0" flavorRef="3"/>
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-restart-request.json b/apidocs/src/samples/db-instance-restart-request.json
new file mode 100644
index 0000000..b378a6d
--- /dev/null
+++ b/apidocs/src/samples/db-instance-restart-request.json
@@ -0,0 +1,5 @@
+{
+   "restart":{
+
+   }
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-restart-request.xml b/apidocs/src/samples/db-instance-restart-request.xml
new file mode 100644
index 0000000..e6204a4
--- /dev/null
+++ b/apidocs/src/samples/db-instance-restart-request.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<restart xmlns="http://docs.openstack.org/database/api/v1.0"/>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-resize-volume-response.json b/apidocs/src/samples/db-instance-restart-response-json.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-instance-resize-volume-response.json
rename to apidocs/src/samples/db-instance-restart-response-json.txt
index a117127..4955ecc 100644
--- a/apidocs/src/resources/samples/db-instance-resize-volume-response.json
+++ b/apidocs/src/samples/db-instance-restart-response-json.txt
@@ -3,4 +3,4 @@ Content-Type: application/json
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-resize-volume-response.xml b/apidocs/src/samples/db-instance-restart-response-xml.txt
similarity index 81%
rename from apidocs/src/resources/samples/db-instance-resize-volume-response.xml
rename to apidocs/src/samples/db-instance-restart-response-xml.txt
index 3d53e00..86306c2 100644
--- a/apidocs/src/resources/samples/db-instance-resize-volume-response.xml
+++ b/apidocs/src/samples/db-instance-restart-response-xml.txt
@@ -3,4 +3,4 @@ Content-Type: application/xml
 Via: 1.1 Repose (Repose/2.6.7)
 Content-Length: 0
 Date: Mon, 18 Mar 2013 19:09:18 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instance-status-detail-request.json b/apidocs/src/samples/db-instance-status-detail-request-json.txt
similarity index 100%
rename from apidocs/src/resources/samples/db-instance-status-detail-request.json
rename to apidocs/src/samples/db-instance-status-detail-request-json.txt
diff --git a/apidocs/src/resources/samples/db-instance-status-detail-request.xml b/apidocs/src/samples/db-instance-status-detail-request-xml.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-instance-status-detail-request.xml
rename to apidocs/src/samples/db-instance-status-detail-request-xml.txt
index 6e66e69..691a0fe 100644
--- a/apidocs/src/resources/samples/db-instance-status-detail-request.xml
+++ b/apidocs/src/samples/db-instance-status-detail-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-status-detail-response-json.txt b/apidocs/src/samples/db-instance-status-detail-response-json.txt
new file mode 100644
index 0000000..6d95ecc
--- /dev/null
+++ b/apidocs/src/samples/db-instance-status-detail-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 621
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-status-detail-response-xml.txt b/apidocs/src/samples/db-instance-status-detail-response-xml.txt
new file mode 100644
index 0000000..3624c30
--- /dev/null
+++ b/apidocs/src/samples/db-instance-status-detail-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 747
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-status-detail-response.json b/apidocs/src/samples/db-instance-status-detail-response.json
new file mode 100644
index 0000000..e22c994
--- /dev/null
+++ b/apidocs/src/samples/db-instance-status-detail-response.json
@@ -0,0 +1,36 @@
+{
+   "instance":{
+      "created":"2013-03-18T19:09:17",
+      "flavor":{
+         "id":"1",
+         "links":[
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
+               "rel":"self"
+            },
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
+               "rel":"bookmark"
+            }
+         ]
+      },
+      "id":"44b277eb-39be-4921-be31-3d61b43651d7",
+      "links":[
+         {
+            "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
+            "rel":"self"
+         },
+         {
+            "href":"https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
+            "rel":"bookmark"
+         }
+      ],
+      "name":"json_rack_instance",
+      "status":"ACTIVE",
+      "updated":"2013-03-18T19:09:17",
+      "volume":{
+         "size":2,
+         "used":0.16368598397821188
+      }
+   }
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instance-status-detail-response.xml b/apidocs/src/samples/db-instance-status-detail-response.xml
new file mode 100644
index 0000000..9a29f47
--- /dev/null
+++ b/apidocs/src/samples/db-instance-status-detail-response.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instance created="2013-03-18 19:09:17.441489"
+    id="098653ba-218b-47ce-936a-e0b749101f81" name="xml_rack_instance"
+    status="ACTIVE" updated="2013-03-18 19:09:17.513134"
+    xmlns="http://docs.openstack.org/database/api/v1.0">
+    <links>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81"
+            rel="self"/>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81"
+            rel="bookmark"/>
+    </links>
+    <volume size="2" used="0.163685983978"/>
+    <flavor id="1">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/flavors/1"
+                rel="bookmark"/>
+        </links>
+    </flavor>
+</instance>
diff --git a/apidocs/src/resources/samples/db-instances-index-pagination-request.json b/apidocs/src/samples/db-instances-index-pagination-request-json.txt
similarity index 84%
rename from apidocs/src/resources/samples/db-instances-index-pagination-request.json
rename to apidocs/src/samples/db-instances-index-pagination-request-json.txt
index ce542bf..53c74d8 100644
--- a/apidocs/src/resources/samples/db-instances-index-pagination-request.json
+++ b/apidocs/src/samples/db-instances-index-pagination-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: openstack.example.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instances-index-pagination-request.xml b/apidocs/src/samples/db-instances-index-pagination-request-xml.txt
similarity index 84%
rename from apidocs/src/resources/samples/db-instances-index-pagination-request.xml
rename to apidocs/src/samples/db-instances-index-pagination-request-xml.txt
index 293bede..2fefbfa 100644
--- a/apidocs/src/resources/samples/db-instances-index-pagination-request.xml
+++ b/apidocs/src/samples/db-instances-index-pagination-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: openstack.example.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instances-index-pagination-response.json b/apidocs/src/samples/db-instances-index-pagination-response.json
new file mode 100644
index 0000000..afe02bf
--- /dev/null
+++ b/apidocs/src/samples/db-instances-index-pagination-response.json
@@ -0,0 +1,72 @@
+{
+   "instances":[
+      {
+         "flavor":{
+            "id":"1",
+            "links":[
+               {
+                  "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
+                  "rel":"self"
+               },
+               {
+                  "href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
+                  "rel":"bookmark"
+               }
+            ]
+         },
+         "id":"098653ba-218b-47ce-936a-e0b749101f81",
+         "links":[
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81",
+               "rel":"self"
+            },
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81",
+               "rel":"bookmark"
+            }
+         ],
+         "name":"xml_rack_instance",
+         "status":"ACTIVE",
+         "volume":{
+            "size":2
+         }
+      },
+      {
+         "flavor":{
+            "id":"1",
+            "links":[
+               {
+                  "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
+                  "rel":"self"
+               },
+               {
+                  "href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
+                  "rel":"bookmark"
+               }
+            ]
+         },
+         "id":"44b277eb-39be-4921-be31-3d61b43651d7",
+         "links":[
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
+               "rel":"self"
+            },
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
+               "rel":"bookmark"
+            }
+         ],
+         "name":"json_rack_instance",
+         "status":"ACTIVE",
+         "volume":{
+            "size":2
+         }
+      }
+   ],
+   "links":[
+      {
+         "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances?marker=44b277eb-39be-4921-be31-3d61b43651d7&limit=2",
+         "rel":"next"
+      }
+   ]
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instances-index-pagination-response.xml b/apidocs/src/samples/db-instances-index-pagination-response.xml
new file mode 100644
index 0000000..edf9f37
--- /dev/null
+++ b/apidocs/src/samples/db-instances-index-pagination-response.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instances xmlns="http://docs.openstack.org/database/api/v1.0">
+    <instance id="098653ba-218b-47ce-936a-e0b749101f81"
+        name="xml_rack_instance" status="ACTIVE">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81"
+                rel="bookmark"/>
+        </links>
+        <volume size="2"/>
+        <flavor id="1">
+            <links>
+                <link
+                    href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
+                    rel="self"/>
+                <link
+                    href="https://ord.databases.api.rackspacecloud.com/flavors/1"
+                    rel="bookmark"/>
+            </links>
+        </flavor>
+    </instance>
+    <instance id="44b277eb-39be-4921-be31-3d61b43651d7"
+        name="json_rack_instance" status="ACTIVE">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7"
+                rel="bookmark"/>
+        </links>
+        <volume size="2"/>
+        <flavor id="1">
+            <links>
+                <link
+                    href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
+                    rel="self"/>
+                <link
+                    href="https://ord.databases.api.rackspacecloud.com/flavors/1"
+                    rel="bookmark"/>
+            </links>
+        </flavor>
+    </instance>
+    <links>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances?marker=44b277eb-39be-4921-be31-3d61b43651d7&amp;limit=2"
+            rel="next"/>
+    </links>
+</instances>
diff --git a/apidocs/src/resources/samples/db-instances-index-request.json b/apidocs/src/samples/db-instances-index-request-json.txt
similarity index 85%
rename from apidocs/src/resources/samples/db-instances-index-request.json
rename to apidocs/src/samples/db-instances-index-request-json.txt
index edc6ace..e9a3b9a 100644
--- a/apidocs/src/resources/samples/db-instances-index-request.json
+++ b/apidocs/src/samples/db-instances-index-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-instances-index-request.xml b/apidocs/src/samples/db-instances-index-request-xml.txt
similarity index 85%
rename from apidocs/src/resources/samples/db-instances-index-request.xml
rename to apidocs/src/samples/db-instances-index-request-xml.txt
index f3ac258..2398d1c 100644
--- a/apidocs/src/resources/samples/db-instances-index-request.xml
+++ b/apidocs/src/samples/db-instances-index-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instances-index-response-json.txt b/apidocs/src/samples/db-instances-index-response-json.txt
new file mode 100644
index 0000000..5fe59c1
--- /dev/null
+++ b/apidocs/src/samples/db-instances-index-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 1038
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instances-index-response-xml.txt b/apidocs/src/samples/db-instances-index-response-xml.txt
new file mode 100644
index 0000000..3045ab9
--- /dev/null
+++ b/apidocs/src/samples/db-instances-index-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 1380
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instances-index-response.json b/apidocs/src/samples/db-instances-index-response.json
new file mode 100644
index 0000000..3953743
--- /dev/null
+++ b/apidocs/src/samples/db-instances-index-response.json
@@ -0,0 +1,66 @@
+{
+   "instances":[
+      {
+         "flavor":{
+            "id":"1",
+            "links":[
+               {
+                  "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
+                  "rel":"self"
+               },
+               {
+                  "href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
+                  "rel":"bookmark"
+               }
+            ]
+         },
+         "id":"098653ba-218b-47ce-936a-e0b749101f81",
+         "links":[
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81",
+               "rel":"self"
+            },
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81",
+               "rel":"bookmark"
+            }
+         ],
+         "name":"xml_rack_instance",
+         "status":"ACTIVE",
+         "volume":{
+            "size":2
+         }
+      },
+      {
+         "flavor":{
+            "id":"1",
+            "links":[
+               {
+                  "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
+                  "rel":"self"
+               },
+               {
+                  "href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
+                  "rel":"bookmark"
+               }
+            ]
+         },
+         "id":"44b277eb-39be-4921-be31-3d61b43651d7",
+         "links":[
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
+               "rel":"self"
+            },
+            {
+               "href":"https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
+               "rel":"bookmark"
+            }
+         ],
+         "name":"json_rack_instance",
+         "status":"ACTIVE",
+         "volume":{
+            "size":2
+         }
+      }
+   ]
+}
\ No newline at end of file
diff --git a/apidocs/src/samples/db-instances-index-response.xml b/apidocs/src/samples/db-instances-index-response.xml
new file mode 100644
index 0000000..b8c3962
--- /dev/null
+++ b/apidocs/src/samples/db-instances-index-response.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<instances xmlns="http://docs.openstack.org/database/api/v1.0">
+    <instance id="098653ba-218b-47ce-936a-e0b749101f81"
+        name="xml_rack_instance" status="ACTIVE">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81"
+                rel="bookmark"/>
+        </links>
+        <volume size="2"/>
+        <flavor id="1">
+            <links>
+                <link
+                    href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
+                    rel="self"/>
+                <link
+                    href="https://ord.databases.api.rackspacecloud.com/flavors/1"
+                    rel="bookmark"/>
+            </links>
+        </flavor>
+    </instance>
+    <instance id="44b277eb-39be-4921-be31-3d61b43651d7"
+        name="json_rack_instance" status="ACTIVE">
+        <links>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7"
+                rel="self"/>
+            <link
+                href="https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7"
+                rel="bookmark"/>
+        </links>
+        <volume size="2"/>
+        <flavor id="1">
+            <links>
+                <link
+                    href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1"
+                    rel="self"/>
+                <link
+                    href="https://ord.databases.api.rackspacecloud.com/flavors/1"
+                    rel="bookmark"/>
+            </links>
+        </flavor>
+    </instance>
+</instances>
diff --git a/apidocs/src/resources/samples/db-list-databases-pagination-request.json b/apidocs/src/samples/db-list-databases-pagination-request-json.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-list-databases-pagination-request.json
rename to apidocs/src/samples/db-list-databases-pagination-request-json.txt
index 37f680f..fb41189 100644
--- a/apidocs/src/resources/samples/db-list-databases-pagination-request.json
+++ b/apidocs/src/samples/db-list-databases-pagination-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-databases-pagination-request.xml b/apidocs/src/samples/db-list-databases-pagination-request-xml.txt
similarity index 100%
rename from apidocs/src/resources/samples/db-list-databases-pagination-request.xml
rename to apidocs/src/samples/db-list-databases-pagination-request-xml.txt
diff --git a/apidocs/src/samples/db-list-databases-pagination-response-json.txt b/apidocs/src/samples/db-list-databases-pagination-response-json.txt
new file mode 100644
index 0000000..9ff78ab
--- /dev/null
+++ b/apidocs/src/samples/db-list-databases-pagination-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 192
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-databases-pagination-response-xml.txt b/apidocs/src/samples/db-list-databases-pagination-response-xml.txt
new file mode 100644
index 0000000..d3e545e
--- /dev/null
+++ b/apidocs/src/samples/db-list-databases-pagination-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 321
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-databases-pagination-response.json b/apidocs/src/samples/db-list-databases-pagination-response.json
new file mode 100644
index 0000000..7335ab6
--- /dev/null
+++ b/apidocs/src/samples/db-list-databases-pagination-response.json
@@ -0,0 +1,13 @@
+{
+   "databases":[
+      {
+         "name":"anotherdb"
+      }
+   ],
+   "links":[
+      {
+         "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7/databases?marker=anotherdb&limit=1",
+         "rel":"next"
+      }
+   ]
+}
diff --git a/apidocs/src/samples/db-list-databases-pagination-response.xml b/apidocs/src/samples/db-list-databases-pagination-response.xml
new file mode 100644
index 0000000..a0f12dd
--- /dev/null
+++ b/apidocs/src/samples/db-list-databases-pagination-response.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databases xmlns="http://docs.openstack.org/database/api/v1.0">
+    <database name="anotherdb"/>
+    <database name="nextround"/>
+    <links>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/databases?marker=nextround&amp;limit=2"
+            rel="next"/>
+    </links>
+</databases>
diff --git a/apidocs/src/resources/samples/db-list-databases-request.json b/apidocs/src/samples/db-list-databases-request-json.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-list-databases-request.json
rename to apidocs/src/samples/db-list-databases-request-json.txt
index 813e230..0a54f4b 100644
--- a/apidocs/src/resources/samples/db-list-databases-request.json
+++ b/apidocs/src/samples/db-list-databases-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-databases-request.xml b/apidocs/src/samples/db-list-databases-request-xml.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-list-databases-request.xml
rename to apidocs/src/samples/db-list-databases-request-xml.txt
index 10db1a0..0d8da99 100644
--- a/apidocs/src/resources/samples/db-list-databases-request.xml
+++ b/apidocs/src/samples/db-list-databases-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-databases-response-json.txt b/apidocs/src/samples/db-list-databases-response-json.txt
new file mode 100644
index 0000000..177d09d
--- /dev/null
+++ b/apidocs/src/samples/db-list-databases-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 129
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-databases-response-xml.txt b/apidocs/src/samples/db-list-databases-response-xml.txt
new file mode 100644
index 0000000..c282d91
--- /dev/null
+++ b/apidocs/src/samples/db-list-databases-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 241
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-databases-response.json b/apidocs/src/samples/db-list-databases-response.json
new file mode 100644
index 0000000..8a10ef0
--- /dev/null
+++ b/apidocs/src/samples/db-list-databases-response.json
@@ -0,0 +1,19 @@
+{
+   "databases":[
+      {
+         "name":"anotherdb"
+      },
+      {
+         "name":"nextround"
+      },
+      {
+         "name":"oneMoreDB"
+      },
+      {
+         "name":"sampledb"
+      },
+      {
+         "name":"testingdb"
+      }
+   ]
+}
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-databases-response.xml b/apidocs/src/samples/db-list-databases-response.xml
similarity index 55%
rename from apidocs/src/resources/samples/db-list-databases-response.xml
rename to apidocs/src/samples/db-list-databases-response.xml
index 1afa877..82877bf 100644
--- a/apidocs/src/resources/samples/db-list-databases-response.xml
+++ b/apidocs/src/samples/db-list-databases-response.xml
@@ -1,15 +1,8 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 241
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
+<?xml version="1.0" encoding="UTF-8"?>
 <databases xmlns="http://docs.openstack.org/database/api/v1.0">
     <database name="anotherdb"/>
     <database name="nextround"/>
     <database name="oneMoreDB"/>
     <database name="sampledb"/>
     <database name="testingdb"/>
-</databases>
-
+</databases>
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-user-access-request.json b/apidocs/src/samples/db-list-user-access-request-json.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-list-user-access-request.json
rename to apidocs/src/samples/db-list-user-access-request-json.txt
index c3999ea..1e0f1df 100644
--- a/apidocs/src/resources/samples/db-list-user-access-request.json
+++ b/apidocs/src/samples/db-list-user-access-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-user-access-request.xml b/apidocs/src/samples/db-list-user-access-request-xml.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-list-user-access-request.xml
rename to apidocs/src/samples/db-list-user-access-request-xml.txt
index 18ac3af..87c1f5b 100644
--- a/apidocs/src/resources/samples/db-list-user-access-request.xml
+++ b/apidocs/src/samples/db-list-user-access-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-user-access-response-json.txt b/apidocs/src/samples/db-list-user-access-response-json.txt
new file mode 100644
index 0000000..54cba76
--- /dev/null
+++ b/apidocs/src/samples/db-list-user-access-response-json.txt
@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Content-Length: 0
+Date: Wed, 27 Jun 2012 23:11:19 GMT
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-user-access-response-xml.txt b/apidocs/src/samples/db-list-user-access-response-xml.txt
new file mode 100644
index 0000000..7032e18
--- /dev/null
+++ b/apidocs/src/samples/db-list-user-access-response-xml.txt
@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Content-Length: 0
+Date: Wed, 27 Jun 2012 23:11:19 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-user-access-response.json b/apidocs/src/samples/db-list-user-access-response.json
similarity index 52%
rename from apidocs/src/resources/samples/db-list-user-access-response.json
rename to apidocs/src/samples/db-list-user-access-response.json
index ffc3845..4ecc9b4 100644
--- a/apidocs/src/resources/samples/db-list-user-access-response.json
+++ b/apidocs/src/samples/db-list-user-access-response.json
@@ -1,8 +1,3 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT
-
 {
    "databases": [
       {
diff --git a/apidocs/src/samples/db-list-user-access-response.xml b/apidocs/src/samples/db-list-user-access-response.xml
new file mode 100644
index 0000000..c4d5749
--- /dev/null
+++ b/apidocs/src/samples/db-list-user-access-response.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databases xmlns="http://docs.openstack.org/database/api/v1.0">
+    <database name="exampledb"/>
+</databases>
diff --git a/apidocs/src/resources/samples/db-list-user-dbs-request.json b/apidocs/src/samples/db-list-user-dbs-request-json.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-list-user-dbs-request.json
rename to apidocs/src/samples/db-list-user-dbs-request-json.txt
index 49c49f0..f6b1108 100644
--- a/apidocs/src/resources/samples/db-list-user-dbs-request.json
+++ b/apidocs/src/samples/db-list-user-dbs-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-user-dbs-request.xml b/apidocs/src/samples/db-list-user-dbs-request-xml.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-list-user-dbs-request.xml
rename to apidocs/src/samples/db-list-user-dbs-request-xml.txt
index 7a10eb9..77fbe76 100644
--- a/apidocs/src/resources/samples/db-list-user-dbs-request.xml
+++ b/apidocs/src/samples/db-list-user-dbs-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-user-dbs-response-json.txt b/apidocs/src/samples/db-list-user-dbs-response-json.txt
new file mode 100644
index 0000000..54cba76
--- /dev/null
+++ b/apidocs/src/samples/db-list-user-dbs-response-json.txt
@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Content-Length: 0
+Date: Wed, 27 Jun 2012 23:11:19 GMT
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-user-dbs-response-xml.txt b/apidocs/src/samples/db-list-user-dbs-response-xml.txt
new file mode 100644
index 0000000..7032e18
--- /dev/null
+++ b/apidocs/src/samples/db-list-user-dbs-response-xml.txt
@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Content-Length: 0
+Date: Wed, 27 Jun 2012 23:11:19 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-user-dbs-response.json b/apidocs/src/samples/db-list-user-dbs-response.json
similarity index 64%
rename from apidocs/src/resources/samples/db-list-user-dbs-response.json
rename to apidocs/src/samples/db-list-user-dbs-response.json
index 5abe793..928b773 100644
--- a/apidocs/src/resources/samples/db-list-user-dbs-response.json
+++ b/apidocs/src/samples/db-list-user-dbs-response.json
@@ -1,7 +1,3 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT
 {
    "user": {
       "name": "exampleuser",
diff --git a/apidocs/src/samples/db-list-user-dbs-response.xml b/apidocs/src/samples/db-list-user-dbs-response.xml
new file mode 100644
index 0000000..6ef9df8
--- /dev/null
+++ b/apidocs/src/samples/db-list-user-dbs-response.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<user name="testuser"
+    xmlns="http://docs.openstack.org/database/api/v1.0">
+    <databases>
+        <database name="exampledb"/>
+    </databases>
+</user>
diff --git a/apidocs/src/resources/samples/db-list-users-pagination-request.json b/apidocs/src/samples/db-list-users-pagination-request-json.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-list-users-pagination-request.json
rename to apidocs/src/samples/db-list-users-pagination-request-json.txt
index ad355ac..7a994d1 100644
--- a/apidocs/src/resources/samples/db-list-users-pagination-request.json
+++ b/apidocs/src/samples/db-list-users-pagination-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-users-pagination-request.xml b/apidocs/src/samples/db-list-users-pagination-request-xml.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-list-users-pagination-request.xml
rename to apidocs/src/samples/db-list-users-pagination-request-xml.txt
index f85426d..c423b64 100644
--- a/apidocs/src/resources/samples/db-list-users-pagination-request.xml
+++ b/apidocs/src/samples/db-list-users-pagination-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-users-pagination-response-json.txt b/apidocs/src/samples/db-list-users-pagination-response-json.txt
new file mode 100644
index 0000000..20cfabf
--- /dev/null
+++ b/apidocs/src/samples/db-list-users-pagination-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 279
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-users-pagination-response-xml.txt b/apidocs/src/samples/db-list-users-pagination-response-xml.txt
new file mode 100644
index 0000000..a0658bf
--- /dev/null
+++ b/apidocs/src/samples/db-list-users-pagination-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 461
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-users-pagination-response.json b/apidocs/src/samples/db-list-users-pagination-response.json
similarity index 77%
rename from apidocs/src/resources/samples/db-list-users-pagination-response.json
rename to apidocs/src/samples/db-list-users-pagination-response.json
index bdebea0..f1e8205 100644
--- a/apidocs/src/resources/samples/db-list-users-pagination-response.json
+++ b/apidocs/src/samples/db-list-users-pagination-response.json
@@ -1,10 +1,3 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 279
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
 {
     "links": [
         {
diff --git a/apidocs/src/samples/db-list-users-pagination-response.xml b/apidocs/src/samples/db-list-users-pagination-response.xml
new file mode 100644
index 0000000..ced95cb
--- /dev/null
+++ b/apidocs/src/samples/db-list-users-pagination-response.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<users xmlns="http://docs.openstack.org/database/api/v1.0">
+    <user name="dbuser1">
+        <databases/>
+    </user>
+    <user name="dbuser2">
+        <databases>
+            <database name="databaseB"/>
+            <database name="databaseC"/>
+        </databases>
+    </user>
+    <links>
+        <link
+            href="https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81/users?marker=dbuser2&amp;limit=2"
+            rel="next"/>
+    </links>
+</users>
diff --git a/apidocs/src/resources/samples/db-list-users-request.json b/apidocs/src/samples/db-list-users-request-json.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-list-users-request.json
rename to apidocs/src/samples/db-list-users-request-json.txt
index af9803f..eed67ef 100644
--- a/apidocs/src/resources/samples/db-list-users-request.json
+++ b/apidocs/src/samples/db-list-users-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-users-request.xml b/apidocs/src/samples/db-list-users-request-xml.txt
similarity index 87%
rename from apidocs/src/resources/samples/db-list-users-request.xml
rename to apidocs/src/samples/db-list-users-request-xml.txt
index 713d177..9eafcef 100644
--- a/apidocs/src/resources/samples/db-list-users-request.xml
+++ b/apidocs/src/samples/db-list-users-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-reddwarfclient
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-users-response-json.txt b/apidocs/src/samples/db-list-users-response-json.txt
new file mode 100644
index 0000000..1878d71
--- /dev/null
+++ b/apidocs/src/samples/db-list-users-response-json.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 228
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/samples/db-list-users-response-xml.txt b/apidocs/src/samples/db-list-users-response-xml.txt
new file mode 100644
index 0000000..e7aed7b
--- /dev/null
+++ b/apidocs/src/samples/db-list-users-response-xml.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Via: 1.1 Repose (Repose/2.6.7)
+Content-Length: 468
+Date: Mon, 18 Mar 2013 19:09:17 GMT
+Server: Jetty(8.0.y.z-SNAPSHOT)
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-list-users-response.json b/apidocs/src/samples/db-list-users-response.json
similarity index 78%
rename from apidocs/src/resources/samples/db-list-users-response.json
rename to apidocs/src/samples/db-list-users-response.json
index a72e3f2..55afb56 100644
--- a/apidocs/src/resources/samples/db-list-users-response.json
+++ b/apidocs/src/samples/db-list-users-response.json
@@ -1,10 +1,3 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 228
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
 {
     "users": [
         {
diff --git a/apidocs/src/resources/samples/db-list-users-response.xml b/apidocs/src/samples/db-list-users-response.xml
similarity index 73%
rename from apidocs/src/resources/samples/db-list-users-response.xml
rename to apidocs/src/samples/db-list-users-response.xml
index e50c9c1..1f1640f 100644
--- a/apidocs/src/resources/samples/db-list-users-response.xml
+++ b/apidocs/src/samples/db-list-users-response.xml
@@ -1,10 +1,4 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Via: 1.1 Repose (Repose/2.6.7)
-Content-Length: 468
-Date: Mon, 18 Mar 2013 19:09:17 GMT
-Server: Jetty(8.0.y.z-SNAPSHOT)
-
+<?xml version="1.0" encoding="UTF-8"?>
 <users xmlns="http://docs.openstack.org/database/api/v1.0">
     <user name="dbuser1">
         <databases/>
@@ -24,4 +18,3 @@ Server: Jetty(8.0.y.z-SNAPSHOT)
         </databases>
     </user>
 </users>
-
diff --git a/apidocs/src/resources/samples/db-revoke-user-access-request.json b/apidocs/src/samples/db-revoke-user-access-request-json.txt
similarity index 88%
rename from apidocs/src/resources/samples/db-revoke-user-access-request.json
rename to apidocs/src/samples/db-revoke-user-access-request-json.txt
index 9fd2c17..20f1065 100644
--- a/apidocs/src/resources/samples/db-revoke-user-access-request.json
+++ b/apidocs/src/samples/db-revoke-user-access-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-revoke-user-access-request.xml b/apidocs/src/samples/db-revoke-user-access-request-xml.txt
similarity index 89%
rename from apidocs/src/resources/samples/db-revoke-user-access-request.xml
rename to apidocs/src/samples/db-revoke-user-access-request-xml.txt
index 5ba4a4d..0397d7c 100644
--- a/apidocs/src/resources/samples/db-revoke-user-access-request.xml
+++ b/apidocs/src/samples/db-revoke-user-access-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-revoke-user-access-response.json b/apidocs/src/samples/db-revoke-user-access-response-json.txt
similarity index 66%
rename from apidocs/src/resources/samples/db-revoke-user-access-response.json
rename to apidocs/src/samples/db-revoke-user-access-response-json.txt
index e5f3114..af725ba 100644
--- a/apidocs/src/resources/samples/db-revoke-user-access-response.json
+++ b/apidocs/src/samples/db-revoke-user-access-response-json.txt
@@ -1,4 +1,4 @@
 HTTP/1.1 202 Accepted
 Content-Type: application/json
 Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT
+Date: Wed, 27 Jun 2012 23:11:19 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-revoke-user-access-response.xml b/apidocs/src/samples/db-revoke-user-access-response-xml.txt
similarity index 66%
rename from apidocs/src/resources/samples/db-revoke-user-access-response.xml
rename to apidocs/src/samples/db-revoke-user-access-response-xml.txt
index 9b6fa1d..d6be01e 100644
--- a/apidocs/src/resources/samples/db-revoke-user-access-response.xml
+++ b/apidocs/src/samples/db-revoke-user-access-response-xml.txt
@@ -1,4 +1,4 @@
 HTTP/1.1 202 Accepted
 Content-Type: application/xml
 Content-Length: 0
-Date: Wed, 27 Jun 2012 23:11:19 GMT
+Date: Wed, 27 Jun 2012 23:11:19 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-version-request.json b/apidocs/src/samples/db-version-request-json.txt
similarity index 83%
rename from apidocs/src/resources/samples/db-version-request.json
rename to apidocs/src/samples/db-version-request-json.txt
index 45e1b1b..ec5bec3 100644
--- a/apidocs/src/resources/samples/db-version-request.json
+++ b/apidocs/src/samples/db-version-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-version-request.xml b/apidocs/src/samples/db-version-request-xml.txt
similarity index 84%
rename from apidocs/src/resources/samples/db-version-request.xml
rename to apidocs/src/samples/db-version-request-xml.txt
index eb4ce6c..bbca2ec 100644
--- a/apidocs/src/resources/samples/db-version-request.xml
+++ b/apidocs/src/samples/db-version-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-version-response-json.txt b/apidocs/src/samples/db-version-response-json.txt
new file mode 100644
index 0000000..61dfc6a
--- /dev/null
+++ b/apidocs/src/samples/db-version-response-json.txt
@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Content-Length: 150
+Date: Wed, 25 Jan 2012 21:53:04 GMT
\ No newline at end of file
diff --git a/apidocs/src/samples/db-version-response-xml.txt b/apidocs/src/samples/db-version-response-xml.txt
new file mode 100644
index 0000000..632dc34
--- /dev/null
+++ b/apidocs/src/samples/db-version-response-xml.txt
@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Content-Length: 218
+Date: Wed, 25 Jan 2012 21:53:04 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-version-response.json b/apidocs/src/samples/db-version-response.json
similarity index 73%
rename from apidocs/src/resources/samples/db-version-response.json
rename to apidocs/src/samples/db-version-response.json
index d561870..e38dd74 100644
--- a/apidocs/src/resources/samples/db-version-response.json
+++ b/apidocs/src/samples/db-version-response.json
@@ -1,8 +1,3 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 150
-Date: Wed, 25 Jan 2012 21:53:04 GMT
-
 {
     "version": {
         "id": "v1.0", 
diff --git a/apidocs/src/samples/db-version-response.xml b/apidocs/src/samples/db-version-response.xml
new file mode 100644
index 0000000..e75f01d
--- /dev/null
+++ b/apidocs/src/samples/db-version-response.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<version id="v1.0" status="CURRENT" updated="2012-01-01T00:00:00Z"
+        xmlns="http://docs.openstack.org/database/api/v1.0">
+        <links>
+                <link
+                        href="https://ord.databases.api.rackspacecloud.com/v1.0/"
+                        rel="self"/>
+        </links>
+</version>
diff --git a/apidocs/src/resources/samples/db-versions-request.json b/apidocs/src/samples/db-versions-request-json.txt
similarity index 83%
rename from apidocs/src/resources/samples/db-versions-request.json
rename to apidocs/src/samples/db-versions-request-json.txt
index 719a556..21dd65f 100644
--- a/apidocs/src/resources/samples/db-versions-request.json
+++ b/apidocs/src/samples/db-versions-request-json.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/json
-Content-Type: application/json
-
-
+Content-Type: application/json
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-versions-request.xml b/apidocs/src/samples/db-versions-request-xml.txt
similarity index 83%
rename from apidocs/src/resources/samples/db-versions-request.xml
rename to apidocs/src/samples/db-versions-request-xml.txt
index 0b9d413..223bb81 100644
--- a/apidocs/src/resources/samples/db-versions-request.xml
+++ b/apidocs/src/samples/db-versions-request-xml.txt
@@ -3,6 +3,4 @@ User-Agent: python-example-client
 Host: ord.databases.api.rackspacecloud.com
 X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
 Accept: application/xml
-Content-Type: application/xml
-
-
+Content-Type: application/xml
\ No newline at end of file
diff --git a/apidocs/src/samples/db-versions-response-json.txt b/apidocs/src/samples/db-versions-response-json.txt
new file mode 100644
index 0000000..314c683
--- /dev/null
+++ b/apidocs/src/samples/db-versions-response-json.txt
@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+Content-Length: 153
+Date: Wed, 25 Jan 2012 21:53:04 GMT
\ No newline at end of file
diff --git a/apidocs/src/samples/db-versions-response-xml.txt b/apidocs/src/samples/db-versions-response-xml.txt
new file mode 100644
index 0000000..1e4445d
--- /dev/null
+++ b/apidocs/src/samples/db-versions-response-xml.txt
@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/xml
+Content-Length: 261
+Date: Wed, 25 Jan 2012 21:53:04 GMT
\ No newline at end of file
diff --git a/apidocs/src/resources/samples/db-versions-response.json b/apidocs/src/samples/db-versions-response.json
similarity index 76%
rename from apidocs/src/resources/samples/db-versions-response.json
rename to apidocs/src/samples/db-versions-response.json
index 0028b4e..5e4346d 100644
--- a/apidocs/src/resources/samples/db-versions-response.json
+++ b/apidocs/src/samples/db-versions-response.json
@@ -1,8 +1,3 @@
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 153
-Date: Wed, 25 Jan 2012 21:53:04 GMT
-
 {
     "versions": [
         {
diff --git a/apidocs/src/resources/samples/db-versions-response.xml b/apidocs/src/samples/db-versions-response.xml
similarity index 63%
rename from apidocs/src/resources/samples/db-versions-response.xml
rename to apidocs/src/samples/db-versions-response.xml
index 81aec42..5af9960 100644
--- a/apidocs/src/resources/samples/db-versions-response.xml
+++ b/apidocs/src/samples/db-versions-response.xml
@@ -1,12 +1,9 @@
-HTTP/1.1 200 OK
-Content-Type: application/xml
-Content-Length: 261
-Date: Wed, 25 Jan 2012 21:53:04 GMT
-
+<?xml version="1.0" encoding="UTF-8"?>
 <versions xmlns="http://docs.openstack.org/database/api/v1.0">
   <version id="v1.0" status="CURRENT" updated="2012-01-01T00:00:00Z">
     <links>
-      <link href="https://ord.databases.api.rackspacecloud.com/v1.0/" rel="self"/>
+      <link href="https://ord.databases.api.rackspacecloud.com/v1.0/"
+        rel="self"/>
     </links>
   </version>
-</versions>
\ No newline at end of file
+</versions>
diff --git a/xsd/common.ent b/apidocs/src/xsd/common.ent
similarity index 100%
rename from xsd/common.ent
rename to apidocs/src/xsd/common.ent
diff --git a/apidocs/src/xsd/dbaas.wadl b/apidocs/src/xsd/dbaas.wadl
new file mode 100644
index 0000000..9752917
--- /dev/null
+++ b/apidocs/src/xsd/dbaas.wadl
@@ -0,0 +1,2021 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application [
+    <!ENTITY % common  SYSTEM "common.ent">
+    %common;
+
+
+]>
+<application xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:dbaas="http://docs.openstack.org/database/api/v1.0">
+
+    <grammars>
+        <include href="dbaas.xsd"/>
+    </grammars>
+
+    <resources base="https://ord.databases.api.rackspacecloud.com">
+        <resource id="versions" path="">
+            <method href="#getVersions"/>
+        </resource>
+        <resource id="version" path="{version}">
+            <method href="#getVersionInfo"/>
+            <resource id="accountID" path="{accountId}">
+                <param name="accountId" style="template"
+                    type="xsd:string">
+                    <doc>The account ID of the owner of the specified
+                        instance.</doc>
+                </param>
+                <resource id="instances" path="instances">
+                    <method href="#createInstance"/>
+                    <method href="#getInstance"/>
+
+                    <resource id="instanceId" path="{instanceId}">
+                        <param name="instanceId" style="template"
+                            type="xsd:string">
+                            <doc>The instance ID for the specified
+                                database instance.</doc>
+                        </param>
+                        <method href="#getInstanceById"/>
+                        <method href="#deleteInstance"/>
+                        <resource id="instanceAction" path="action">
+                            <method href="#resizeInstance"/>
+                            <method href="#resizeVolume"/>
+                            <method href="#restartInstance"/>
+                        </resource>
+                        <resource id="databases" path="databases">
+                            <method href="#createDatabase"/>
+                            <method href="#getDatabases"/>
+                            <resource id="databaseName"
+                                path="{databaseName}">
+                                <param name="databaseName"
+                                   style="template" type="xsd:string">
+                                   <doc>The name for the specified
+                                   database.</doc>
+                                </param>
+                                <method href="#deleteDatabase"/>
+                            </resource>
+                        </resource>
+                        <resource id="users" path="users">
+                            <method href="#createUser"/>
+                            <method href="#getUsers"/>
+                            <method href="#changePass"/>
+                            <resource id="userId" path="{name}">
+                                <param name="name" style="template"
+                                   type="xsd:string">
+                                   <doc>The name for the specified
+                                   user.</doc>
+                                </param>
+                                <method href="#deleteUser"/>
+                                <method href="#listUser"/>
+                                <resource id="database"
+                                   path="databases">
+                                   <method href="#getUserAccess"/>
+                                   <method href="#grantUserAccess"/>
+                                   <resource id="dbName"
+                                   path="{databaseName}">
+                                   <param name="databaseName"
+                                   style="template" type="xsd:string">
+                                   <doc>The name for the specified
+                                   database.</doc>
+                                   </param>
+                                   <method href="#revokeUserAccess"/>
+                                   </resource>
+                                </resource>
+                            </resource>
+                        </resource>
+                        <resource id="root" path="root">
+                            <method href="#createRoot"/>
+                            <method href="#isRootEnabled"/>
+                        </resource>
+                    </resource>
+                </resource>
+                <resource id="flavors" path="flavors">
+                    <method href="#getFlavors"/>
+
+                    <resource id="flavorId" path="{flavorId}">
+                        <param name="flavorId" style="template"
+                            type="xsd:string">
+                            <doc>The flavor ID for the specified
+                                flavor.</doc>
+                        </param>
+                        <method href="#getFlavorById"/>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+
+    <!--Token Methods... -->
+    <!-- Version -->
+    <method name="GET" id="getVersionInfo">
+        <wadl:doc xml:lang="EN" title="List Version Details"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc"> Returns detailed information about
+                the specified version of the API.</para>
+            <para>This operation returns detailed information about
+                the specified version of the API.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Version
+                        Details requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-version-request-xml.txt"/>
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-version-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Version
+                        Details responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-version-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-version-response.xml"/>
+                </doc>
+            </representation>
+
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-version-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-version-response.json"/>
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="GET" id="getVersions">
+        <wadl:doc xml:lang="EN" title="List Versions"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc"> Lists information about all
+                versions of the API.</para>
+            <para>This operation lists information about all versions
+                of the API.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Versions
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-versions-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-versions-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Versions
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-versions-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-versions-response.xml"/>
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-versions-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-versions-response.json"/>
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <!-- Instance -->
+    <method name="POST" id="createInstance">
+        <wadl:doc xml:lang="EN" title="Create Database Instance"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Creates a new <glossterm>database
+                    instance</glossterm>.</para>
+            <para>This operation asynchronously provisions a new
+                database instance. This call requires the user to
+                specify a <glossterm>flavor</glossterm> and a
+                    <glossterm>volume</glossterm> size. The service
+                then provisions the instance with the requested flavor
+                and sets up a volume of the specified size, which is
+                the storage for the database instance.</para>
+            <note><title>Notes</title><itemizedlist>
+                    <listitem>
+                        <para>You can create only one database
+                            instance per <command>POST</command>
+                            request.</para>
+                    </listitem>
+                    <listitem>
+                        <para>You can create a database instance with
+                            one or more databases, and users
+                            associated to those databases.</para>
+                    </listitem>
+                    <listitem>
+                        <para>The default binding for the MySQL
+                            instance is port 3306.</para>
+                    </listitem>
+                </itemizedlist></note>
+            <para>The following table lists the required and optional
+                attributes for Create Instance:</para>
+            <table rules="all">
+                <caption>Required and Optional Attributes for Create
+                    Instance</caption>
+                <thead>
+                    <tr>
+                        <td colspan="1">Applies To</td>
+                        <td colspan="1">Name</td>
+                        <td colspan="3">Description</td>
+                        <td colspan="1">Required</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td colspan="1" rowspan="3">Instance</td>
+                        <td colspan="1">flavorRef</td>
+                        <td colspan="3"><para>Reference (href) to a
+                                flavor as specified in the response
+                                from the List Flavors API call. This
+                                is the actual URI as specified by the
+                                href field in the link. Refer to the
+                                List Flavors response examples that
+                                follow for an example of the
+                                flavorRef.</para>
+                            <note><para>Rather than the flavor URI,
+                                   you can also pass the flavor id
+                                   (integer) as the value for
+                                   flavorRef.</para></note>
+                            <para>Refer to <xref
+                                   linkend="GET_getFlavors__version___accountId__flavors_"
+                                /> for details.</para></td>
+                        <td colspan="1">Yes</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">(volume) size</td>
+                        <td colspan="3">Specifies the volume size in
+                            gigabytes (GB). The value specified must
+                            be between 1 and 50.</td>
+                        <td colspan="1">Yes</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">name</td>
+                        <td colspan="3">Name of the instance to
+                            create. The length of the name is limited
+                            to 255 characters and any characters are
+                            permitted.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1" rowspan="3">Database</td>
+                        <td colspan="1">name</td>
+                        <td colspan="3">Specifies
+                                <glossterm>database</glossterm> names
+                            for creating databases on instance
+                            creation. Refer to <xref
+                                linkend="POST_createDatabase__version___accountId__instances__instanceId__databases_"
+                            /> for the required xml/json format.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">character_set</td>
+                        <td colspan="3">Set of symbols and encodings.
+                            The default character set is
+                                <code>utf8</code>.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">collate</td>
+                        <td colspan="3">Set of rules for comparing
+                            characters in a character set. The default
+                            value for collate is
+                                <code>utf8_general_ci</code>.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1" rowspan="3">User</td>
+                        <td colspan="1">name</td>
+                        <td colspan="3">Specifies user name for the
+                            database on instance creation. Refer to
+                                <xref
+                                linkend="POST_createUser__version___accountId__instances__instanceId__users_"
+                            /> for the required xml/json format.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">password</td>
+                        <td colspan="3">Specifies password for those
+                            users on instance creation. Refer to <xref
+                                linkend="POST_createUser__version___accountId__instances__instanceId__users_"
+                            /> for the required xml/json format.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">(database) name</td>
+                        <td colspan="3">Specifies names of databases
+                            that those users can access on instance
+                            creation. Refer to <xref
+                                linkend="POST_createUser__version___accountId__instances__instanceId__users_"
+                            /> for the required xml/json format.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                </tbody>
+            </table>
+            <para>Refer to <xref linkend="database_instance_status"/>
+                for a list of possible database instance statuses that
+                may be returned.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml"
+                element="dbaas:DatabaseInstance">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Create Database
+                        Instance requests and responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-create-instance-request-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-create-instance-request.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-create-instance-request-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-create-instance-request.json"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml"
+                element="dbaas:DatabaseInstance">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-create-instance-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-create-instance-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-create-instance-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-create-instance-response.json"/>
+                    <para xmlns="http://docbook.org/ns/docbook">For
+                        convenience, notice in the response examples
+                        above that resources contain links to
+                        themselves. This allows a client to easily
+                        obtain resource URIs rather than to construct
+                        them. There are two kinds of link relations
+                        associated with resources. A <code>self</code>
+                        link contains a <emphasis>versioned</emphasis>
+                        link to the resource. These links should be
+                        used in cases where the link will be followed
+                        immediately. A <code>bookmark</code> link
+                        provides a permanent link to a resource that
+                        is appropriate for long term storage.</para>
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="DELETE" id="deleteInstance">
+        <wadl:doc xml:lang="EN" title="Delete Database Instance"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Deletes the specified database
+                instance.</para>
+            <para>This operation deletes the specified database
+                instance, including any associated data.</para>
+            <para>Refer to <xref linkend="database_instance_status"/>
+                for a list of possible database instance statuses that
+                may be returned.</para>
+            <note><para>This operation is not allowed when the
+                    instance status is
+                <code>BUILD</code>.</para></note>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Delete Database
+                        Instance requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-delete-instance-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-delete-instance-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202"/> &commonFaults; <response status="422"
+            xmlns="http://wadl.dev.java.net/2009/02">
+            <representation mediaType="application/xml"
+                element="dbaas:unprocessableEntity">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Delete Database
+                        Instance responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-delete-instance-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-delete-instance-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &getFaults; </method>
+
+    <method name="GET" id="getInstance">
+        <wadl:doc xml:lang="EN" title="List All Database Instances"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Lists the status and information
+                for all database instances.</para>
+            <para>This operation lists the status and information for
+                all database instances.</para>
+            <para>Refer to <xref linkend="database_instance_status"/>
+                for a list of possible database instance statuses that
+                may be returned.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List All Database
+                        Instances Detail requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-instances-index-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instances-index-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List All Database
+                        Instances responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-instances-index-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instances-index-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instances-index-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instances-index-response.json"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+
+    <method name="GET" id="getInstanceById">
+        <wadl:doc xml:lang="EN"
+            title="List Database Instance Status and Details"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Lists status and details for a
+                specified database instance.</para>
+            <para>This operation lists the status and details of the
+                specified database instance.</para>
+            <para>This operation lists the volume size in gigabytes
+                (GB) and the approximate GB used.</para>
+            <note><para>After instance creation, the <code>used</code>
+                    size of your volume will be greater than 0. This
+                    is expected and due to the automatic creation of
+                    non-empty transaction logs for mysql optimization.
+                    The <code>used</code> attribute is
+                        <emphasis>not</emphasis> returned in the
+                    response when the status for the instance is
+                    BUILD, REBOOT, RESIZE, or ERROR.</para>
+            </note>
+            <para>Refer to <xref linkend="database_instance_status"/>
+                for a list of possible database instance statuses that
+                may be returned.</para>
+            <para>The list operations return a DNS-resolvable hostname
+                associated with the database instance instead of an IP
+                address. Since the hostname always resolves to the
+                correct IP address of the database instance, this
+                relieves the user from the task of maintaining the
+                mapping. Note that although the IP address may likely
+                change on resizing, migrating, and so forth, the
+                hostname always resolves to the correct database
+                instance.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Database
+                        Instance Status and Details requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-instance-status-detail-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instance-status-detail-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml"
+                element="dbaas:DatabaseInstance">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Database
+                        Instance Status and Details responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-instance-status-detail-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instance-status-detail-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:DatabaseInstance">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instance-status-detail-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instance-status-detail-response.json"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <!-- Instance Actions -->
+    <method name="POST" id="restartInstance">
+        <wadl:doc xml:lang="EN" title="Restart Instance"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Restart the database service on the
+                instance.</para>
+            <para>The restart operation restarts only the MySQL
+                instance. Restarting MySQL erases any dynamic
+                configuration settings that you have made within
+                MySQL.</para>
+            <note><para>The MySQL service is unavailable until the
+                    instance restarts.</para></note>
+            <para>This operation returns a 202 Accepted
+                response.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml"
+                element="dbaas:Restart">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Restart Instance
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-instance-restart-request-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instance-restart-request.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Restart">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instance-restart-request-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instance-restart-request.json"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Restart Instance
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-instance-restart-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instance-restart-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; &postPutFaults; </method>
+
+    <method name="POST" id="resizeInstance">
+        <wadl:doc xml:lang="EN" title="Resize the Instance"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Resize the memory of the
+                instance.</para>
+            <para>This operation changes the memory size of the
+                instance, assuming a valid flavorRef is provided.
+                Restarts MySQL in the process.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml"
+                element="dbaas:Resize">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Resize Instance
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-instance-request-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-instance-request.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Resize">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-instance-request-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-instance-request.json"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Resize Instance
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-instance-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-instance-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; &postPutFaults; </method>
+
+    <method name="POST" id="resizeVolume">
+        <wadl:doc xml:lang="EN" title="Resize the Instance Volume"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Resize the
+                    <glossterm>volume</glossterm> attached to the
+                Instance.</para>
+            <para>This operation supports resizing the attached volume
+                for an instance. It supports only increasing the
+                volume size and does not support decreasing the size.
+                The volume size is in gigabytes (GB) and must be an
+                integer.</para>
+            <note><para>You cannot increase the volume to a size
+                    larger than the API volume size limit
+                    specifies.</para></note>
+            <para>This operation returns a 202 Accepted
+                response.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml"
+                element="dbaas:Resize">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Resize Instance
+                        Volume requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-volume-request-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-volume-request.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Resize">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-volume-request-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-volume-request.json"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Resize Instance
+                        Volume responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-volume-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-instance-resize-volume-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; &postPutFaults; </method>
+
+    <!-- Database -->
+    <method name="POST" id="createDatabase">
+        <wadl:doc xml:lang="EN" title="Create Database"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Creates a new
+                    <glossterm>database</glossterm> within the
+                specified instance.</para>
+            <para>This operation creates a new database within the
+                specified instance.</para>
+            <para>The <code>name</code> of the database is a required
+                attribute.</para>
+            <para>The following additional attributes can be specified
+                for each database: <code>collate</code> and
+                    <code>character_set</code>.</para>
+            <table rules="all">
+                <caption>Required and Optional Attributes for Create
+                    Database</caption>
+                <thead>
+                    <tr>
+                        <td colspan="1">Name</td>
+                        <td colspan="3">Description</td>
+                        <td colspan="1">Required</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td colspan="1">name</td>
+                        <td colspan="3">Specifies the database name
+                            for creating the database. Refer to the
+                            request examples for the required xml/json
+                            format.</td>
+                        <td colspan="1">Yes</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">character_set</td>
+                        <td colspan="3">Set of symbols and encodings.
+                            The default character set is
+                                <code>utf8</code>.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">collate</td>
+                        <td colspan="3">Set of rules for comparing
+                            characters in a character set. The default
+                            value for collate is
+                                <code>utf8_general_ci</code>.</td>
+                        <td colspan="1">No</td>
+                    </tr>
+                </tbody>
+            </table>
+            <para>See the MySQL documentation for information about
+                supported character sets and collations at <link
+                    xlink:href="http://dev.mysql.com/doc/refman/5.1/en/charset-mysql.html"
+                    >http://dev.mysql.com/doc/refman/5.1/en/charset-mysql.html</link>.</para>
+            <note><para>The following database names are reserved and
+                    cannot be used for creating databases: lost+found,
+                    information_schema, and mysql.</para></note>
+            <para>Refer to the following tables for information about
+                characters that are valid/invalid for creating
+                database names.</para>
+            <table rules="all" width="40%">
+                <caption>Valid Characters That Can Be Used in a
+                    Database Name</caption>
+                <col width="100%"/>
+                <thead>
+                    <tr>
+                        <td>Character</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Letters (upper and lower cases
+                            allowed)</td>
+                    </tr>
+                    <tr>
+                        <td>Numbers</td>
+                    </tr>
+                    <tr>
+                        <td>'@', '?', '#', and spaces are allowed, but
+                                <emphasis>not</emphasis> at the
+                            beginning and end of the database
+                            name</td>
+                    </tr>
+                    <tr>
+                        <td>'_' is allowed anywhere in the database
+                            name</td>
+                    </tr>
+                </tbody>
+            </table>
+            <table rules="all" width="40%">
+                <?dbfo keep-together="always"?>
+                <caption>Characters That <emphasis>Cannot</emphasis>
+                    Be Used in a Database Name</caption>
+                <col width="100%"/>
+                <thead>
+                    <tr>
+                        <td>Character</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Single quotes</td>
+                    </tr>
+                    <tr>
+                        <td>Double quotes</td>
+                    </tr>
+                    <tr>
+                        <td>Back quotes</td>
+                    </tr>
+                    <tr>
+                        <td>Semicolons</td>
+                    </tr>
+                    <tr>
+                        <td>Commas</td>
+                    </tr>
+                    <tr>
+                        <td>Backslashes</td>
+                    </tr>
+                    <tr>
+                        <td>Forward slashes</td>
+                    </tr>
+                </tbody>
+            </table>
+            <table rules="all">
+                <caption>Length Restrictions for Database
+                    Name</caption>
+                <thead>
+                    <tr>
+                        <td>Restriction</td>
+                        <td>Value</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Database-name maximum length</td>
+                        <td>64</td>
+                    </tr>
+                </tbody>
+            </table>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml"
+                element="dbaas:Database">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Create Database
+                        requests:<?rax-fo keep-with-next?></para>
+                    <xsdxt:code
+                        href="../samples/db-create-databases-request-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-create-databases-request.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Database">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-create-databases-request-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-create-databases-request.json"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Create Database
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-create-databases-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-create-databases-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+
+    <method name="GET" id="getDatabases">
+        <wadl:doc xml:lang="EN" title="List Databases for Instance"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Lists databases for the specified
+                instance.</para>
+            <para>This operation lists the databases for the specified
+                instance.</para>
+            <note><para>This operation returns only the user-defined
+                    databases, not the system databases. The system
+                    databases (mysql, information_schema, lost+found)
+                    can only be viewed by a database
+                    administrator.</para></note>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Databases for
+                        Instance requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-request-json.txt"
+                    />
+                </doc>
+            </representation>
+
+            <representation mediaType="application/xml">
+                <doc
+                    title="List Databases for Instance Paged Request: XML">
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the
+                            <emphasis>paginated</emphasis> List
+                        Databases for Instance requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-pagination-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc
+                    title="List Databases for Instance Paged Request: JSON">
+                    <xsdxt:code
+                        href="../samples/db-list-databases-pagination-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml"
+                element="dbaas:Databases">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Databases for
+                        Instance responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Databases">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-response.json"
+                    />
+                </doc>
+            </representation>
+
+            <representation mediaType="application/xml"
+                element="dbaas:Databases">
+                <doc
+                    title="List Databases for Instance Paged Response: XML">
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the
+                            <emphasis>paginated</emphasis> List
+                        Databases for Instance responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-pagination-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-pagination-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Databases">
+                <doc
+                    title="List Databases for Instance Paged Response: JSON">
+                    <xsdxt:code
+                        href="../samples/db-list-databases-pagination-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-databases-pagination-response.json"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="DELETE" id="deleteDatabase">
+        <wadl:doc xml:lang="EN" title="Delete Database"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Deletes the specified
+                database.</para>
+            <para>This operation deletes the requested database within
+                the specified database instance. Note that all data
+                associated with the database is also deleted.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Delete Database
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-delete-databases-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-delete-databases-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Delete Database
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-delete-databases-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-delete-databases-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <!-- User -->
+    <method name="POST" id="createUser">
+        <wadl:doc xml:lang="EN" title="Create User"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Creates a user for the specified
+                database instance.</para>
+            <para>This operation asynchronously provisions a new user
+                for the specified database instance based on the
+                configuration defined in the request object. Once the
+                request is validated and progress has started on the
+                provisioning process, a 202 Accepted response object
+                is returned.</para>
+            <remark>Writer: please add the following note back into
+                the doc once the List User Details call is added back
+                into the API: Using the identifier, the caller can
+                check on the progress of the operation by performing a
+                GET on users/name (for more details on this operation
+                see the "List User Details" section of this
+                document).</remark>
+            <para>If the corresponding request cannot be fulfilled due
+                to insufficient or invalid data, an HTTP 400 "Bad
+                Request" error response is returned with information
+                regarding the nature of the failure. Failures in the
+                validation process are non-recoverable and require the
+                caller to correct the cause of the failure and POST
+                the request again.</para>
+            <para>The following table lists the required attributes
+                for Create User. Refer to the request examples for the
+                required xml/json format:</para>
+            <table rules="all" width="500">
+                <caption>Required Attributes for Create User</caption> <thead>
+                    <tr>
+                        <td colspan="1">Applies To</td>
+                        <td colspan="1">Name</td>
+                        <td colspan="2">Description</td>
+                        <td colspan="1">Required</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td colspan="1" rowspan="3">User</td>
+                        <td colspan="1">name</td>
+                        <td colspan="2">Name of the user for the
+                            database.</td>
+                        <td colspan="1">Yes</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">password</td>
+                        <td colspan="2">User password for database
+                            access.</td>
+                        <td colspan="1">Yes</td>
+                    </tr>
+                    <tr>
+                        <td colspan="1">(database) name</td>
+                        <td colspan="2"><para>Name of the database
+                                that the user can access. One or more
+                                database names must be
+                                specified.</para></td>
+                        <td colspan="1">No</td>
+                    </tr>
+                </tbody>
+            </table>
+            <note><title>Notes</title><itemizedlist>
+                    <listitem>
+                        <para>A user is granted all privileges on the
+                            specified databases.</para>
+                    </listitem>
+                    <listitem>
+                        <para>The following user name is reserved and
+                            cannot be used for creating users:
+                            root.</para>
+                    </listitem>
+                </itemizedlist></note>
+            <para>Refer to the following tables for information about
+                characters that are valid/invalid for creating
+                database names, user names, and passwords.</para>
+            <table rules="all" width="40%">
+                <caption>Valid Characters That Can Be Used in a
+                    Database Name, User Name, and Password</caption>
+                <col width="100%"/>
+                <thead>
+                    <tr>
+                        <td>Character</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Letters (upper and lower cases
+                            allowed)</td>
+                    </tr>
+                    <tr>
+                        <td>Numbers</td>
+                    </tr>
+                    <tr>
+                        <td>'@', '?', '#', and spaces are allowed, but
+                                <emphasis>not</emphasis> at the
+                            beginning and end of the database name,
+                            user name, and password</td>
+                    </tr>
+                    <tr>
+                        <td>"_" is allowed anywhere in the database
+                            name, user name, and password</td>
+                    </tr>
+                </tbody>
+            </table>
+            <table rules="all" width="40%">
+                <caption>Characters That <emphasis>Cannot</emphasis>
+                    Be Used in a Database Name, User Name, and
+                    Password</caption>
+                <col width="100%"/>
+                <thead>
+                    <tr>
+                        <td>Character</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Single quotes</td>
+                    </tr>
+                    <tr>
+                        <td>Double quotes</td>
+                    </tr>
+                    <tr>
+                        <td>Back quotes</td>
+                    </tr>
+                    <tr>
+                        <td>Semicolons</td>
+                    </tr>
+                    <tr>
+                        <td>Commas</td>
+                    </tr>
+                    <tr>
+                        <td>Backslashes</td>
+                    </tr>
+                    <tr>
+                        <td>Forward slashes</td>
+                    </tr>
+                    <tr>
+                        <td>Spaces at the front or end of the user
+                            name or password</td>
+                    </tr>
+                </tbody>
+            </table>
+            <table rules="all">
+                <caption>Length Restrictions for Database Name, User
+                    Name, and Password</caption>
+                <thead>
+                    <tr>
+                        <td>Restriction</td>
+                        <td>Value</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Database name maximum length</td>
+                        <td>64</td>
+                    </tr>
+                    <tr>
+                        <td>User name maximum length</td>
+                        <td>16</td>
+                    </tr>
+                    <tr>
+                        <td>Password maximum length</td>
+                        <td>unlimited (no restrictions)</td>
+                    </tr>
+                </tbody>
+            </table>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml"
+                element="dbaas:Users">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Create User
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-create-users-request-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-create-users-request.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-create-users-request-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-create-users-request.json"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Create User
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-create-users-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-create-users-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+
+    <method name="GET" id="getUsers">
+        <wadl:doc xml:lang="EN"
+            title="List Users in Database Instance"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Lists the users in the specified
+                database instance.</para>
+            <para>This operation lists the users in the specified
+                database instance, along with the associated databases
+                for that user.</para>
+            <note><para>This operation does not return the system
+                    users (database administrators that administer the
+                    health of the database). Also, this operation
+                    returns the "root" user only if "root" user has
+                    been enabled.</para></note>
+            <para>The following notes apply to MySQL users:</para>
+            <itemizedlist spacing="compact">
+                <listitem>
+                    <para>User names can be up to 16 characters
+                        long.</para>
+                </listitem>
+                <listitem>
+                    <para>When you create accounts with INSERT, you
+                        must use FLUSH PRIVILEGES to tell the server
+                        to reload the grant tables.</para>
+                </listitem>
+                <listitem>
+                    <para>For additional information, refer to: <link
+                            xlink:href="http://dev.mysql.com/doc/refman/5.1/en/user-account-management.html"
+                            >http://dev.mysql.com/doc/refman/5.1/en/user-account-management.html</link></para>
+                </listitem>
+            </itemizedlist>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Users in
+                        Database Instance requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-users-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-list-users-request-json.txt"
+                    />
+                </doc>
+            </representation>
+
+            <representation mediaType="application/xml">
+                <doc
+                    title="List Users in Database Instance Paged Request: XML">
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the
+                            <emphasis>paginated</emphasis> List Users
+                        in Database Instance requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-users-pagination-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc
+                    title="List Users in Database Instance Paged Request: JSON">
+                    <xsdxt:code
+                        href="../samples/db-list-users-pagination-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml"
+                element="dbaas:Users">
+                <doc
+                    title="List Users in Database Instance Response: XML">
+                    <?hard-pagebreak?>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Users in
+                        Database Instance responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-users-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-users-response.xml"/>
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Users">
+                <doc
+                    title="List Users in Database Instance Response: JSON">
+                    <xsdxt:code
+                        href="../samples/db-list-users-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-users-response.json"
+                    />
+                </doc>
+            </representation>
+
+            <representation mediaType="application/xml"
+                element="dbaas:Users">
+                <doc
+                    title="List Users in Database Instance Paged Response: XML">
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the
+                            <emphasis>paginated</emphasis> List Users
+                        in Database Instance responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-users-pagination-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-users-pagination-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Users">
+                <doc
+                    title="List Users in Database Instance Paged Response: JSON">
+                    <xsdxt:code
+                        href="../samples/db-list-users-pagination-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-users-pagination-response.json"
+                    />
+                </doc>
+            </representation>
+
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="PUT" id="changePass">
+        <wadl:doc xml:lang="EN" title="Change User(s) Password"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Changes the MySQL password of one
+                or more users.</para>
+            <para>This operation changes the MySQL password of one or
+                more users.</para>
+            <note><para>For information about choosing a valid
+                    password, please refer to <xref
+                        linkend="POST_createUser__version___accountId__instances__instanceId__users_"
+                    /> for details.</para></note>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml"
+                element="dbaas:Users">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Change User(s)
+                        Password requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-change-users-password-request-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-change-users-password-request.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-change-users-password-request-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-change-users-password-request.json"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml"
+                element="dbaas:Users">
+                <doc>
+                    <?hard-pagebreak?>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Change User(s)
+                        Password responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-change-users-password-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Users">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-change-users-password-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+
+    <method name="DELETE" id="deleteUser">
+        <wadl:doc xml:lang="EN" title="Delete User"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Deletes the user identified by
+                {name} for the specified database instance.</para>
+            <para>This operation deletes the specified user for the
+                specified database instance.</para>
+            <warning><para>There is a bug in a python library that
+                    development is using that may cause incorrect user
+                    deletions to occur if a period (.) is used in the
+                    user name. In this case, the user name is
+                    truncated to remove the portion of the name from
+                    the period to the end, leaving only the portion
+                    from the beginning up to the period. For example,
+                    for a user named "my.userA", the bug would
+                    truncate the user name to "my", and if the user
+                    "my" exists, that user will be incorrectly
+                    deleted. To avoid the problem, do not use periods
+                    in user names.</para></warning>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Delete User
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-delete-users-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-delete-users-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Delete User
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-delete-users-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-delete-users-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="GET" id="listUser">
+        <wadl:doc xml:lang="EN" title="List User"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Lists the specified user's name and
+                a list of databases that the user can access.</para>
+            <para>This operation lists the specified user's name and a
+                list of databases that the user can access.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List User
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-user-dbs-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-list-user-dbs-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List User
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-user-dbs-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-user-dbs-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-list-user-dbs-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-user-dbs-response.json"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="GET" id="getUserAccess">
+        <wadl:doc xml:lang="EN" title="List User Access"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Shows a list of all databases a
+                user has access to.</para>
+            <para>This operation shows a list of all databases a user
+                has access to.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List User Access
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-user-access-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-list-user-access-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List User Access
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-list-user-access-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-user-access-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-list-user-access-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-list-user-access-response.json"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="PUT" id="grantUserAccess">
+        <wadl:doc xml:lang="EN" title="Grant User Access"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Grant access for the specified user
+                to one or more databases for the specified
+                instance.</para>
+            <para>This operation grants access for the specified user
+                to one or more databases for the specified instance.
+                The user is granted ALL privileges on the database.
+                Refer to the information at the beginning of <xref
+                    linkend="user_management"/> for more details on
+                access.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml"
+                element="dbaas:Database">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Grant User Access
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-grant-user-access-request-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-grant-user-access-request.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-grant-user-access-request-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-grant-user-access-request.json"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Grant User Access
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-grant-user-access-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-grant-user-access-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="DELETE" id="revokeUserAccess">
+        <wadl:doc xml:lang="EN" title="Revoke User Access"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Remove access to the specified
+                database for the specified user.</para>
+            <para>This operation removes access to the specified
+                database for the specified user.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Revoke User Access
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-revoke-user-access-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-revoke-user-access-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Revoke User Access
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-revoke-user-access-response-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-revoke-user-access-response-json.txt"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <!-- Root -->
+    <method name="POST" id="createRoot">
+        <wadl:doc xml:lang="EN" title="Enable Root User"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Enables the root user for the
+                specified database instance and returns the root
+                password.</para>
+            <para>This operation enables login from any host for the
+                root user and provides the user with a generated root
+                password.</para>
+            <note><para>Changes you make as a root user may cause
+                    detrimental effects to the database instance and
+                    unpredictable behavior for API operations. When
+                    you enable the root user, you accept the
+                    possibility that we will not be able to support
+                    your database instance. While enabling root does
+                    not prevent us from a “best effort” approach to
+                    helping you if something goes wrong with your
+                    instance, we cannot ensure that we will be able to
+                    assist you if you change core MySQL settings.
+                    These changes can be (but are not limited to)
+                    turning off binlogs, removing users that we use to
+                    access your instance, and so forth.</para></note>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Enable Root User
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-enable-root-user-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-enable-root-user-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml"
+                element="dbaas:User">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Enable Root User
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-enable-root-user-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-enable-root-user-response.xml"
+                    />
+                </doc>
+            </representation>
+
+            <representation mediaType="application/json"
+                element="dbaas:User">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-enable-root-user-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-enable-root-user-response.json"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="GET" id="isRootEnabled">
+        <wadl:doc xml:lang="EN" title="List Root-Enabled Status"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Returns true if root user is
+                enabled for the specified database instance or false
+                otherwise.</para>
+            <para>This operation checks an active specified database
+                instance to see if root access is enabled. It returns
+                True if root user is enabled for the specified
+                database instance or False otherwise.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Check Root User
+                        Access requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-check-root-user-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-check-root-user-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml"
+                element="dbaas:RootEnabled">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the Check Root User
+                        Access responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-check-root-user-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-check-root-user-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:RootEnabled">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-check-root-user-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-check-root-user-response.json"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <!-- Flavor -->
+    <method name="GET" id="getFlavors">
+        <wadl:doc xml:lang="EN" title="List Flavors"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Lists information for all available
+                    <glossterm baseform="flavor"
+                >flavors</glossterm>.</para>
+            <para>This operation lists information for all available
+                flavors.</para>
+            <para>This resource is identical to the flavors found in
+                the OpenStack Nova API, but without the disk
+                property.</para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Flavors
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-flavors-request-xml.txt"/>
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-flavors-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml"
+                element="dbaas:Flavors">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Flavors
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-flavors-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-flavors-response.xml"/>
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Flavors">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-flavors-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-flavors-response.json"/>
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+
+    <method name="GET" id="getFlavorById">
+        <wadl:doc xml:lang="EN" title="List Flavor By ID"
+            xmlns="http://docbook.org/ns/docbook">
+            <para role="shortdesc">Lists all flavor information about
+                the specified flavor ID.</para>
+            <para>This operation lists all information for the
+                specified flavor ID with details of the RAM.</para>
+            <para>This resource is identical to the flavors found in
+                the OpenStack Nova API, but without the disk
+                property.</para>
+            <note><para>The flavorId parameter should be an integer.
+                    If a floating point value is used for the flavorId
+                    parameter, the decimal portion is truncated and
+                    the integer portion is used as the value of the
+                    flavorId.</para></note>
+            <remark security="reviewer">Reviewer / Writer: need to
+                confirm that this behavior is not changed in
+                subsequent releases, and if it is prevented, remove
+                the Note above.</remark>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/xml">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Flavor By ID
+                        requests:</para>
+                    <xsdxt:code
+                        href="../samples/db-flavors-by-id-request-xml.txt"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-flavors-by-id-request-json.txt"
+                    />
+                </doc>
+            </representation>
+        </request>
+        <response status="200">
+            <representation mediaType="application/xml"
+                element="dbaas:Flavor">
+                <doc>
+                    <para xmlns="http://docbook.org/ns/docbook">The
+                        following examples show the List Flavor By ID
+                        responses:</para>
+                    <xsdxt:code
+                        href="../samples/db-flavors-by-id-response-xml.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-flavors-by-id-response.xml"
+                    />
+                </doc>
+            </representation>
+            <representation mediaType="application/json"
+                element="dbaas:Flavor">
+                <doc>
+                    <xsdxt:code
+                        href="../samples/db-flavors-by-id-response-json.txt"/>
+                    <xsdxt:code
+                        href="../samples/db-flavors-by-id-response.json"
+                    />
+                </doc>
+            </representation>
+        </response> &commonFaults; &getFaults; </method>
+</application>
diff --git a/xsd/dbaas.xsd b/apidocs/src/xsd/dbaas.xsd
similarity index 100%
rename from xsd/dbaas.xsd
rename to apidocs/src/xsd/dbaas.xsd
diff --git a/apidocs/src/resources/xslts/js/shjs/sh_java.js b/apidocs/src/xslts/js/shjs/sh_java.js
similarity index 100%
rename from apidocs/src/resources/xslts/js/shjs/sh_java.js
rename to apidocs/src/xslts/js/shjs/sh_java.js
diff --git a/apidocs/src/resources/xslts/js/shjs/sh_javascript.js b/apidocs/src/xslts/js/shjs/sh_javascript.js
similarity index 100%
rename from apidocs/src/resources/xslts/js/shjs/sh_javascript.js
rename to apidocs/src/xslts/js/shjs/sh_javascript.js
diff --git a/apidocs/src/resources/xslts/js/shjs/sh_main.js b/apidocs/src/xslts/js/shjs/sh_main.js
similarity index 100%
rename from apidocs/src/resources/xslts/js/shjs/sh_main.js
rename to apidocs/src/xslts/js/shjs/sh_main.js
diff --git a/apidocs/src/resources/xslts/js/shjs/sh_xml.js b/apidocs/src/xslts/js/shjs/sh_xml.js
similarity index 100%
rename from apidocs/src/resources/xslts/js/shjs/sh_xml.js
rename to apidocs/src/xslts/js/shjs/sh_xml.js
diff --git a/apidocs/src/resources/xslts/js/trc/schema/controller.js b/apidocs/src/xslts/js/trc/schema/controller.js
similarity index 100%
rename from apidocs/src/resources/xslts/js/trc/schema/controller.js
rename to apidocs/src/xslts/js/trc/schema/controller.js
diff --git a/apidocs/src/resources/xslts/js/trc/schema/layoutManager.js b/apidocs/src/xslts/js/trc/schema/layoutManager.js
similarity index 100%
rename from apidocs/src/resources/xslts/js/trc/schema/layoutManager.js
rename to apidocs/src/xslts/js/trc/schema/layoutManager.js
diff --git a/apidocs/src/resources/xslts/js/trc/schema/sampleManager.js b/apidocs/src/xslts/js/trc/schema/sampleManager.js
similarity index 100%
rename from apidocs/src/resources/xslts/js/trc/schema/sampleManager.js
rename to apidocs/src/xslts/js/trc/schema/sampleManager.js
diff --git a/apidocs/src/resources/xslts/js/trc/util.js b/apidocs/src/xslts/js/trc/util.js
similarity index 100%
rename from apidocs/src/resources/xslts/js/trc/util.js
rename to apidocs/src/xslts/js/trc/util.js
diff --git a/apidocs/src/resources/xslts/style/schema.css b/apidocs/src/xslts/style/schema.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/schema.css
rename to apidocs/src/xslts/style/schema.css
diff --git a/apidocs/src/resources/xslts/style/shjs/sh_acid.css b/apidocs/src/xslts/style/shjs/sh_acid.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/shjs/sh_acid.css
rename to apidocs/src/xslts/style/shjs/sh_acid.css
diff --git a/apidocs/src/resources/xslts/style/shjs/sh_darkblue.css b/apidocs/src/xslts/style/shjs/sh_darkblue.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/shjs/sh_darkblue.css
rename to apidocs/src/xslts/style/shjs/sh_darkblue.css
diff --git a/apidocs/src/resources/xslts/style/shjs/sh_emacs.css b/apidocs/src/xslts/style/shjs/sh_emacs.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/shjs/sh_emacs.css
rename to apidocs/src/xslts/style/shjs/sh_emacs.css
diff --git a/apidocs/src/resources/xslts/style/shjs/sh_night.css b/apidocs/src/xslts/style/shjs/sh_night.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/shjs/sh_night.css
rename to apidocs/src/xslts/style/shjs/sh_night.css
diff --git a/apidocs/src/resources/xslts/style/shjs/sh_pablo.css b/apidocs/src/xslts/style/shjs/sh_pablo.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/shjs/sh_pablo.css
rename to apidocs/src/xslts/style/shjs/sh_pablo.css
diff --git a/apidocs/src/resources/xslts/style/shjs/sh_print.css b/apidocs/src/xslts/style/shjs/sh_print.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/shjs/sh_print.css
rename to apidocs/src/xslts/style/shjs/sh_print.css
diff --git a/apidocs/src/resources/xslts/style/shjs/sh_style.css b/apidocs/src/xslts/style/shjs/sh_style.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/shjs/sh_style.css
rename to apidocs/src/xslts/style/shjs/sh_style.css
diff --git a/apidocs/src/resources/xslts/style/shjs/sh_whitengrey.css b/apidocs/src/xslts/style/shjs/sh_whitengrey.css
similarity index 100%
rename from apidocs/src/resources/xslts/style/shjs/sh_whitengrey.css
rename to apidocs/src/xslts/style/shjs/sh_whitengrey.css
diff --git a/apidocs/src/resources/xslts/xslt/.htaccess b/apidocs/src/xslts/xslt/.htaccess
similarity index 100%
rename from apidocs/src/resources/xslts/xslt/.htaccess
rename to apidocs/src/xslts/xslt/.htaccess
diff --git a/apidocs/src/resources/xslts/xslt/schema.xslt b/apidocs/src/xslts/xslt/schema.xslt
similarity index 100%
rename from apidocs/src/resources/xslts/xslt/schema.xslt
rename to apidocs/src/xslts/xslt/schema.xslt
diff --git a/xsd/dbaas.wadl b/xsd/dbaas.wadl
deleted file mode 100644
index 023060f..0000000
--- a/xsd/dbaas.wadl
+++ /dev/null
@@ -1,1426 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
-    %common;
-
-
-]>
-<application
-        xmlns="http://wadl.dev.java.net/2009/02"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
-        xmlns:wadl="http://wadl.dev.java.net/2009/02"
-        xmlns:dbaas="http://docs.openstack.org/database/api/v1.0">
-
-    <grammars>
-        <include href="dbaas.xsd" />
-    </grammars>
-
-    <resources base="https://ord.databases.api.rackspacecloud.com">
-        <resource id="versions" path="">
-            <method href="#getVersions" />
-        </resource>
-        <resource id="version" path="{version}">
-            <method href="#getVersionInfo" />
-            <resource id="accountID" path="{accountId}">
-                <param name="accountId" style="template"
-                    type="xsd:string">
-                    <doc>The account ID of the owner of the specified instance.</doc></param>
-                <resource id="instances" path="instances">
-                    <method href="#createInstance" />
-                    <method href="#getInstance" />
-
-                    <resource id="instanceId" path="{instanceId}">
-                        <param name="instanceId" style="template"
-                            type="xsd:string" >
-                            <doc>The instance ID for the specified database instance.</doc></param>
-                        <method href="#getInstanceById" />
-                        <method href="#deleteInstance" />
-                        <resource id="instanceAction" path="action">
-                            <method href="#resizeInstance" />
-                            <method href="#resizeVolume" />
-                            <method href="#restartInstance" />
-                        </resource>
-                        <resource id="databases" path="databases">
-                            <method href="#createDatabase" />
-                            <method href="#getDatabases" />
-                            <resource id="databaseName" path="{databaseName}">
-                                <param name="databaseName" style="template"
-                                    type="xsd:string" >
-                                    <doc>The name for the specified database.</doc></param>
-                                <method href="#deleteDatabase" />
-                            </resource>
-                        </resource>
-                        <resource id="users" path="users">
-                            <method href="#createUser" />
-                            <method href="#getUsers" />
-                            <method href="#changePass" />
-                            <resource id="userId" path="{name}">
-                                <param name="name" style="template"
-                                    type="xsd:string" >
-                                    <doc>The name for the specified user.</doc></param>
-                                <method href="#deleteUser" />
-                                <method href="#listUser" />
-                                <resource id="database" path="databases">
-                                    <method href="#getUserAccess" />
-                                    <method href="#grantUserAccess" />
-                                    <resource id="dbName" path="{databaseName}">
-                                        <param name="databaseName" style="template"
-                                            type="xsd:string" >
-                                            <doc>The name for the specified database.</doc></param>
-                                        <method href="#revokeUserAccess" />
-                                    </resource>
-                                </resource>
-                            </resource>
-                        </resource>
-                        <resource id="root" path="root">
-                            <method href="#createRoot" />
-                            <method href="#isRootEnabled" />
-                        </resource>
-                    </resource>
-                </resource>
-                <resource id="flavors" path="flavors">
-                    <method href="#getFlavors" />
-
-                    <resource id="flavorId" path="{flavorId}">
-                        <param name="flavorId" style="template" type="xsd:string" >
-                            <doc>The flavor ID for the specified flavor.</doc></param>
-                        <method href="#getFlavorById" />
-                    </resource>
-                </resource>
-            </resource>
-        </resource>
-    </resources>
-
-    <!--Token Methods... -->
-    <!-- Version -->
-    <method name="GET" id="getVersionInfo">
-        <wadl:doc xml:lang="EN" title="List Version Details" xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">
-                Returns detailed information about the specified version of the API.
-            </para>
-            <para>This operation returns detailed information about the specified version of the API.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Version Details requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-version-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-version-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202">
-            <representation mediaType="application/xml" >
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Version Details responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-version-response.xml"/>
-                </doc>
-            </representation>
-
-            <representation mediaType="application/json" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-version-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <method name="GET" id="getVersions">
-        <wadl:doc xml:lang="EN" title="List Versions" xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">
-                Lists information about all versions of the API.
-            </para>
-            <para>This operation lists information about all versions of the API.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Versions requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-versions-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-versions-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" >
-                 <doc>
-                     <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Versions responses:</para>
-                     <xsdxt:code href="../apidocs/src/resources/samples/db-versions-response.xml"/>
-                 </doc>
-            </representation>
-            <representation mediaType="application/json" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-versions-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <!-- Instance -->
-    <method name="POST" id="createInstance">
-    <wadl:doc xml:lang="EN" title="Create Database Instance"  xmlns="http://docbook.org/ns/docbook">
-        <para role="shortdesc">Creates a new <glossterm>database instance</glossterm>.</para>
-        <para>This operation asynchronously provisions a new database instance. This call requires the user to specify a <glossterm>flavor</glossterm> and a <glossterm>volume</glossterm> size. The service then provisions the instance with the requested flavor and sets up a volume of the specified size, which is the storage for the database instance.</para>
-        <note><title>Notes</title><itemizedlist>
-            <listitem>
-                <para>You can create only one database instance per <command>POST</command> request.</para>
-            </listitem>
-            <listitem>
-                <para>You can create a database instance with one or more databases, and users associated to those databases.</para>
-            </listitem>
-            <listitem>
-                <para>The default binding for the MySQL instance is port 3306.</para>
-            </listitem>
-        </itemizedlist></note>
-        <para>The following table lists the required and optional attributes for Create Instance:</para>
-        <table rules="all">
-            <caption>Required and Optional Attributes for Create Instance</caption>
-            <thead>
-                <tr>
-                    <td colspan="1">Applies To</td>
-                    <td colspan="1">Name</td>
-                    <td colspan="3">Description</td>
-                    <td colspan="1">Required</td>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td colspan="1" rowspan="3">Instance</td>
-                    <td colspan="1">flavorRef</td>
-                    <td colspan="3"><para>Reference (href) to a flavor as specified in the response from the List Flavors API call.
-                        This is the actual URI as specified by the href field in the link. Refer to the List Flavors response examples that follow for an example of the flavorRef.</para>
-                         <note><para>Rather than the flavor URI, you can also pass the flavor id (integer) as the value for flavorRef.</para></note>
-                        <para>Refer to <xref linkend="GET_getFlavors__version___accountId__flavors_"/> for details.</para></td>
-                    <td colspan="1">Yes</td>
-                </tr>
-                <tr>
-                    <td colspan="1">(volume) size</td>
-                    <td colspan="3">Specifies the volume size in gigabytes (GB). The value specified must be between 1 and 50.</td>
-                    <td colspan="1">Yes</td>
-                </tr>
-                <tr>
-                    <td colspan="1">name</td>
-                    <td colspan="3">Name of the instance to create. The length of the name is limited to 255 characters and any characters are permitted.</td>
-                    <td colspan="1">No</td>
-                </tr>
-                <tr>
-                    <td colspan="1" rowspan="3">Database</td>
-                    <td colspan="1">name</td>
-                    <td colspan="3">Specifies <glossterm>database</glossterm> names for creating databases on instance creation. Refer to <xref linkend="POST_createDatabase__version___accountId__instances__instanceId__databases_"/> for the required xml/json format.</td>
-                    <td colspan="1">No</td>
-                </tr>
-                <tr>
-                    <td colspan="1">character_set</td>
-                    <td colspan="3">Set of symbols and encodings. The default character set is <code>utf8</code>.</td>
-                    <td colspan="1">No</td>
-                </tr>
-                <tr>
-                    <td colspan="1">collate</td>
-                    <td colspan="3">Set of rules for comparing characters in a character set. The default value for collate is <code>utf8_general_ci</code>.</td>
-                    <td colspan="1">No</td>
-                </tr>
-                <tr>
-                    <td colspan="1" rowspan="3">User</td>
-                    <td colspan="1">name</td>
-                    <td colspan="3">Specifies user name for the database on instance creation. Refer to <xref linkend="POST_createUser__version___accountId__instances__instanceId__users_"/> for the required xml/json format.</td>
-                    <td colspan="1">No</td>
-                </tr>
-                <tr>
-                    <td colspan="1">password</td>
-                    <td colspan="3">Specifies password for those users on instance creation. Refer to <xref linkend="POST_createUser__version___accountId__instances__instanceId__users_"/> for the required xml/json format.</td>
-                    <td colspan="1">No</td>
-                </tr>
-                <tr>
-                    <td colspan="1">(database) name</td>
-                    <td colspan="3">Specifies names of databases that those users can access on instance creation. Refer to <xref linkend="POST_createUser__version___accountId__instances__instanceId__users_"/> for the required xml/json format.</td>
-                    <td colspan="1">No</td>
-                </tr>
-            </tbody>
-        </table>
-
-      <para>Refer to <xref linkend="database_instance_status"/> for a list of possible database instance statuses that may be returned.</para>
-    </wadl:doc>
-        <request>
-            <representation mediaType="application/xml"
-                element="dbaas:DatabaseInstance">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Create Database Instance requests and responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-instance-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-instance-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" element="dbaas:DatabaseInstance" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-instance-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-instance-response.json"/>
-                    <para xmlns="http://docbook.org/ns/docbook">For convenience, notice in the response examples above that resources contain links to themselves. This allows a client to easily obtain
-                        resource URIs rather than to construct them. There are two kinds of link relations
-                        associated with resources. A <code>self</code> link contains a <emphasis>versioned</emphasis> link to the resource. These
-                        links should be used in cases where the link will be followed immediately. A <code>bookmark</code>
-                        link provides a permanent link to a resource that is appropriate for long term storage.</para>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <method name="DELETE" id="deleteInstance">
-        <wadl:doc xml:lang="EN" title="Delete Database Instance"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Deletes the specified database instance.</para>
-            <para>This operation deletes the specified database instance, including any associated data.</para>
-            <para>Refer to <xref linkend="database_instance_status"/> for a list of possible database instance statuses that may be returned.</para>
-            <note><para>This operation is not allowed when the instance status is <code>BUILD</code>.</para></note>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Delete Database Instance requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-instance-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-instance-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202" />
-    &commonFaults;
-        <response status="422" xmlns="http://wadl.dev.java.net/2009/02">
-            <representation mediaType="application/xml" element="dbaas:unprocessableEntity">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Delete Database Instance responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-instance-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-instance-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &getFaults;
-    </method>
-
-    <method name="GET" id="getInstance">
-        <wadl:doc xml:lang="EN" title="List All Database Instances"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Lists the status and information for all database instances.</para>
-            <para>This operation lists the status and information for all database instances.</para>
-            <para>Refer to <xref linkend="database_instance_status"/> for a list of possible database instance statuses that may be returned.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List All Database Instances Detail requests:</para>
-
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instances-index-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instances-index-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml" >
-                <doc>
-                   <para xmlns="http://docbook.org/ns/docbook">The following examples show the List All Database Instances responses:</para>
-
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instances-index-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instances-index-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-
-    <method name="GET" id="getInstanceById">
-        <wadl:doc xml:lang="EN" title="List Database Instance Status and Details"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Lists status and details for a specified database instance.</para>
-            <para>This operation lists the status and details of the specified database instance.</para>
-            <para>This operation lists the volume size in gigabytes (GB) and the approximate GB used.</para>
-            <note><para>After instance creation, the <code>used</code> size of your volume will be
-                greater than 0. This is expected and due to the automatic creation of
-                non-empty transaction logs for mysql optimization. The <code>used</code> attribute is <emphasis>not</emphasis> returned
-                in the response when the status for the instance is BUILD, REBOOT, RESIZE, or ERROR.</para> </note>
-            <para>Refer to <xref linkend="database_instance_status"/> for a list of possible database instance statuses that may be returned.</para>
-            <para>The list operations return a DNS-resolvable hostname associated with the database instance instead of an IP address. Since the hostname always resolves to the correct IP address of the database instance, this relieves the user from the task of maintaining the mapping. Note that although the IP address may likely change on resizing, migrating, and so forth, the hostname always resolves to the correct database instance.</para>
-        </wadl:doc>
-        <request>
-                <representation mediaType="application/xml">
-                    <doc>
-                        <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Database Instance Status and Details requests:</para>
-                        <xsdxt:code href="../apidocs/src/resources/samples/db-instance-status-detail-request.xml"/>
-                    </doc>
-                </representation>
-                <representation mediaType="application/json">
-                    <doc>
-                        <xsdxt:code href="../apidocs/src/resources/samples/db-instance-status-detail-request.xml"/>
-                    </doc>
-                </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml"
-                element="dbaas:DatabaseInstance" >
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Database Instance Status and Details responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-status-detail-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:DatabaseInstance" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-status-detail-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <!-- Instance Actions -->
-    <method name="POST" id="restartInstance">
-        <wadl:doc xml:lang="EN" title="Restart Instance"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Restart the database service on the instance.</para>
-            <para>The restart operation will restart only the MySQL Instance. Restarting MySQL will erase any dynamic configuration settings that you have made within MySQL.</para>
-            <note><para>The MySQL service will be unavailable until the instance restarts.</para></note>
-            <para>This operation returns a 202 Accepted response.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml" element="dbaas:Restart">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Restart Instance requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-restart-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json" element="dbaas:Restart">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-restart-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202">
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Restart Instance responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-restart-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-restart-response.json"/>
-                </doc>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-        &postPutFaults;
-    </method>
-
-    <method name="POST" id="resizeInstance">
-        <wadl:doc xml:lang="EN" title="Resize the Instance"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Resize the memory of the instance.</para>
-            <para>This operation changes the memory size of the instance, assuming a valid flavorRef is provided. Restarts MySQL in the process.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml"
-                            element="dbaas:Resize">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Resize Instance requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-resize-instance-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                            element="dbaas:Resize">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-resize-instance-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202">
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Resize Instance responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-resize-instance-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-resize-instance-response.json"/>
-                </doc>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-        &postPutFaults;
-    </method>
-
-    <method name="POST" id="resizeVolume">
-        <wadl:doc xml:lang="EN" title="Resize the Instance Volume"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Resize the <glossterm>volume</glossterm> attached to the Instance.</para>
-            <para>This operation supports resizing the attached volume for an instance. It supports only increasing the volume size and does not support decreasing the size.
-                The volume size is in gigabytes (GB) and must be an integer.</para>
-            <note><para>You cannot increase the volume to a size larger than the API volume size limit specifies.</para></note>
-            <para>This operation returns a 202 Accepted response.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml"
-                            element="dbaas:Resize">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Resize Instance Volume requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-resize-volume-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                            element="dbaas:Resize">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-resize-volume-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202">
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Resize Instance Volume responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-resize-volume-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-instance-resize-volume-response.json"/>
-                </doc>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-        &postPutFaults;
-    </method>
-
-    <!-- Database -->
-    <method name="POST" id="createDatabase">
-        <wadl:doc xml:lang="EN" title="Create Database"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Creates a new <glossterm>database</glossterm> within the specified instance.</para>
-            <para>This operation creates a new database within the specified instance.</para>
-            <para>The <code>name</code> of the database is a required attribute.</para>
-            <para>The following additional attributes can be specified for each database: <code>collate</code> and <code>character_set</code>.</para>
-
-            <table rules="all">
-                <caption>Required and Optional Attributes for Create Database</caption>
-                <thead>
-                    <tr>
-                        <td colspan="1">Name</td>
-                        <td colspan="3">Description</td>
-                        <td colspan="1">Required</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td colspan="1">name</td>
-                        <td colspan="3">Specifies the database name for creating the database. Refer to the request examples for the required xml/json format.</td>
-                        <td colspan="1">Yes</td>
-                    </tr>
-                    <tr>
-                        <td colspan="1">character_set</td>
-                        <td colspan="3">Set of symbols and encodings. The default character set is <code>utf8</code>.</td>
-                        <td colspan="1">No</td>
-                    </tr>
-                    <tr>
-                        <td colspan="1">collate</td>
-                        <td colspan="3">Set of rules for comparing characters in a character set. The default value for collate is <code>utf8_general_ci</code>.</td>
-                        <td colspan="1">No</td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <para>See the MySQL documentation for information about supported character sets and collations at <link
-                xlink:href="http://dev.mysql.com/doc/refman/5.1/en/charset-mysql.html"
-                >http://dev.mysql.com/doc/refman/5.1/en/charset-mysql.html</link>.</para>
-
-
-            <note><para>The following database names are reserved and cannot be used for creating databases: lost+found, information_schema, and mysql.</para></note>
-            <para>Refer to the following tables for information about characters that are valid/invalid for creating database names.</para>
-
-            <table rules="all" width="40%">
-                <caption>Valid Characters That Can Be Used in a Database Name</caption>
-                <col width="100%"/>
-                <thead>
-                    <tr>
-                        <td>Character</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Letters (upper and lower cases allowed)</td>
-                    </tr>
-                    <tr>
-                        <td>Numbers</td>
-                    </tr>
-                    <tr>
-                        <td>'@', '?', '#', and spaces are allowed, but <emphasis>not</emphasis> at the beginning and end of the database name</td>
-                    </tr>
-                    <tr>
-                        <td>'_' is allowed anywhere in the database name</td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <table rules="all" width="40%">
-                <?dbfo keep-together="always"?>
-                <caption>Characters That <emphasis>Cannot</emphasis> Be Used in a Database Name</caption>
-                <col width="100%"/>
-                <thead>
-                    <tr>
-                        <td>Character</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Single quotes</td>
-                    </tr>
-                    <tr>
-                        <td>Double quotes</td>
-                    </tr>
-                    <tr>
-                        <td>Back quotes</td>
-                    </tr>
-                    <tr>
-                        <td>Semicolons</td>
-                    </tr>
-                    <tr>
-                        <td>Commas</td>
-                    </tr>
-                    <tr>
-                        <td>Backslashes</td>
-                    </tr>
-                    <tr>
-                        <td>Forwardslashes</td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <table rules="all">
-                <caption>Length Restrictions for Database Name</caption>
-                <thead>
-                    <tr>
-                        <td>Restriction</td>
-                        <td>Value</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Database-name maximum length</td>
-                        <td>64</td>
-                    </tr>
-                </tbody>
-            </table>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml"
-                element="dbaas:Database" >
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Create Database requests:<?rax-fo keep-with-next?></para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-databases-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:Database" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-databases-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202" >
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Create Database responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-databases-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-databases-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-
-    <method name="GET" id="getDatabases">
-        <wadl:doc xml:lang="EN" title="List Databases for Instance"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Lists databases for the specified instance.</para>
-            <para>This operation lists the databases for the specified instance.</para>
-            <note><para>This operation returns only the user-defined databases, not the system databases. The system databases (mysql,
-                information_schema, lost+found) can only be viewed by a database administrator.</para></note>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Databases for Instance requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-databases-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-databases-request.json"/>
-                </doc>
-            </representation>
-
-            <representation mediaType="application/xml">
-                <doc title="List Databases for Instance Paged Request: XML">
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the <emphasis>paginated</emphasis> List Databases for Instance requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-databases-pagination-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc title="List Databases for Instance Paged Request: JSON">
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-databases-pagination-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml"
-                element="dbaas:Databases" >
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Databases for Instance responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-databases-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:Databases" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-databases-response.json"/>
-                </doc>
-            </representation>
-
-            <representation mediaType="application/xml"
-                element="dbaas:Databases" >
-                <doc title="List Databases for Instance Paged Response: XML">
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the <emphasis>paginated</emphasis> List Databases for Instance responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-databases-pagination-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:Databases" >
-                <doc title="List Databases for Instance Paged Response: JSON">
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-databases-pagination-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <method name="DELETE" id="deleteDatabase">
-        <wadl:doc xml:lang="EN" title="Delete Database"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Deletes the specified database.</para>
-            <para>This operation deletes the requested database within the specified database instance. Note that all data associated with the database is also deleted.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Delete Database requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-databases-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-databases-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202" >
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Delete Database responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-databases-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-databases-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <!-- User -->
-    <method name="POST" id="createUser">
-        <wadl:doc xml:lang="EN" title="Create User"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Creates a user for the specified database instance.</para>
-            <para>This operation asynchronously provisions a new user for the specified database instance based on the configuration defined in the request object. Once the request is validated and progress has started on the provisioning process, a 202 Accepted response object is returned.</para>
-            <remark>Writer: please add the following note back into the doc once the List User Details call is added back into the API: Using the identifier, the caller can check on the progress of the operation by performing a GET on users/name (for more details on this operation see the "List User Details" section of this document).</remark>
-            <para>If the corresponding request cannot be fulfilled due to insufficient or invalid data, an HTTP 400 "Bad Request" error response is returned with information regarding the nature of the failure. Failures in the validation process are non-recoverable and require the caller to correct the cause of the failure and POST the request again.</para>
-
-            <para>The following table lists the required attributes for Create User. Refer to the request examples for the required xml/json format:</para>
-
-            <table rules="all" width="500">
-                <caption>Required Attributes for Create User</caption>
-
-                <thead>
-                    <tr>
-                        <td colspan="1">Applies To</td>
-                        <td colspan="1">Name</td>
-                        <td colspan="2">Description</td>
-                        <td colspan="1">Required</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td colspan="1" rowspan="3">User</td>
-                        <td colspan="1">name</td>
-                        <td colspan="2">Name of the user for the
-                            database.</td>
-                        <td colspan="1">Yes</td>
-                    </tr>
-                    <tr>
-                        <td colspan="1">password</td>
-                        <td colspan="2">User password for database
-                            access.</td>
-                        <td colspan="1">Yes</td>
-                    </tr>
-                    <tr>
-                        <td colspan="1">(database) name</td>
-                        <td colspan="2"><para>Name of the database that the user can access. One or more database names must be specified.</para></td>
-                        <td colspan="1">No</td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <note><title>Notes</title><itemizedlist>
-                <listitem>
-                    <para>A user is granted all privileges on the specified databases.</para>
-                </listitem>
-                <listitem>
-                    <para>The following user name is reserved and cannot be used for creating users: root.</para>
-                </listitem>
-            </itemizedlist></note>
-
-            <para>Refer to the following tables for information about characters that are valid/invalid for creating database names, user names, and passwords.</para>
-
-            <table rules="all" width="40%">
-                <caption>Valid Characters That Can Be Used in a Database Name, User Name, and Password</caption>
-                <col width="100%"/>
-                <thead>
-                    <tr>
-                        <td>Character</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Letters (upper and lower cases allowed)</td>
-                    </tr>
-                    <tr>
-                        <td>Numbers</td>
-                    </tr>
-                    <tr>
-                        <td>'@', '?', '#', and spaces are allowed, but <emphasis>not</emphasis> at the beginning and end of the database name, user name, and password</td>
-                    </tr>
-                    <tr>
-                        <td>"_" is allowed anywhere in the database name, user name, and password</td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <table rules="all" width="40%">
-                <caption>Characters That <emphasis>Cannot</emphasis> Be Used in a Database Name, User Name, and Password</caption>
-                <col width="100%"/>
-                <thead>
-                    <tr>
-                        <td>Character</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Single quotes</td>
-                    </tr>
-                    <tr>
-                        <td>Double quotes</td>
-                    </tr>
-                    <tr>
-                        <td>Back quotes</td>
-                    </tr>
-                    <tr>
-                        <td>Semicolons</td>
-                    </tr>
-                    <tr>
-                        <td>Commas</td>
-                    </tr>
-                    <tr>
-                        <td>Backslashes</td>
-                    </tr>
-                    <tr>
-                        <td>Forwardslashes</td>
-                    </tr>
-                    <tr>
-                        <td>Spaces at the front or end of the user name or password</td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <table rules="all">
-                <caption>Length Restrictions for Database Name, User Name, and Password</caption>
-                <thead>
-                    <tr>
-                        <td>Restriction</td>
-                        <td>Value</td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Database name maximum length</td>
-                        <td>64</td>
-                    </tr>
-                    <tr>
-                        <td>User name maximum length</td>
-                        <td>16</td>
-                    </tr>
-                    <tr>
-                        <td>Password maximum length</td>
-                        <td>unlimited (no restrictions)</td>
-                    </tr>
-                </tbody>
-            </table>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml"
-                element="dbaas:Users" >
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Create User requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-users-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-users-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202" >
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Create User responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-users-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-create-users-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-
-    <method name="GET" id="getUsers">
-        <wadl:doc xml:lang="EN" title="List Users in Database Instance"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Lists the users in the specified database instance.</para>
-            <para>This operation lists the users in the specified database instance, along with the associated databases for that user.</para>
-            <note><para>This operation does not return the system users (database administrators that administer the health of the database).
-                Also, this operation returns the "root" user only if "root" user has been enabled.</para></note>
-
-            <para>The following notes apply to MySQL users:</para>
-            <itemizedlist spacing="compact">
-                <listitem>
-                    <para>User names can be up to 16 characters long.</para>
-                </listitem>
-                <listitem>
-                    <para>When you create accounts with INSERT, you must use FLUSH PRIVILEGES to tell the server to reload the grant tables.</para>
-                </listitem>
-                <listitem>
-                    <para>For additional information, refer to: <link
-                        xlink:href="http://dev.mysql.com/doc/refman/5.1/en/user-account-management.html"
-                        >http://dev.mysql.com/doc/refman/5.1/en/user-account-management.html</link></para>
-                </listitem>
-            </itemizedlist>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Users in Database Instance requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-users-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-users-request.json"/>
-                </doc>
-            </representation>
-
-            <representation mediaType="application/xml">
-                <doc title="List Users in Database Instance Paged Request: XML">
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the <emphasis>paginated</emphasis> List Users in Database Instance requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-users-pagination-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc title="List Users in Database Instance Paged Request: JSON">
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-users-pagination-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml"
-                element="dbaas:Users" >
-                <doc title="List Users in Database Instance Response: XML">
-                    <?hard-pagebreak?>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Users in Database Instance responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-users-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:Users" >
-                <doc title="List Users in Database Instance Response: JSON">
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-users-response.json"/>
-                </doc>
-            </representation>
-
-            <representation mediaType="application/xml"
-                element="dbaas:Users" >
-                <doc title="List Users in Database Instance Paged Response: XML">
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the <emphasis>paginated</emphasis> List Users in Database Instance responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-users-pagination-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:Users" >
-                <doc title="List Users in Database Instance Paged Response: JSON">
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-users-pagination-response.json"/>
-                </doc>
-            </representation>
-
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <method name="PUT" id="changePass">
-        <wadl:doc xml:lang="EN" title="Change User(s) Password"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Changes the MySQL password of one or more users.</para>
-            <para>This operation changes the MySQL password of one or more users.</para>
-            <note><para>For information about choosing a valid password, please refer to
-                <xref linkend="POST_createUser__version___accountId__instances__instanceId__users_"/> for details.</para></note>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml" element="dbaas:Users">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Change User(s) Password requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-change-users-password-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-change-users-password-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202">
-            <representation mediaType="application/xml"
-                element="dbaas:Users" >
-                <doc>
-                    <?hard-pagebreak?>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Change User(s) Password responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-change-users-password-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:Users" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-change-users-password-response.json"/>
-                </doc>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-
-    <method name="DELETE" id="deleteUser">
-        <wadl:doc xml:lang="EN" title="Delete User"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Deletes the user identified by {name} for the specified database instance.</para>
-            <para>This operation deletes the specified user for the specified database instance.</para>
-            <warning><para>There is a bug in a python library that development is using that may cause incorrect user deletions to occur
-                if a period (.) is used in the user name. In this case, the user name is truncated to remove the portion of the
-                name from the period to the end, leaving only the portion from the beginning up to the period. For example, for a
-                user named "my.userA", the bug would truncate the user name to "my", and if the user "my" exists, that user will
-                be incorrectly deleted. To avoid the problem, do not use periods in user names.</para></warning>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Delete User requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-users-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-users-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202" >
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Delete User responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-users-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-delete-users-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <method name="GET" id="listUser">
-        <wadl:doc xml:lang="EN" title="List User"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Lists the specified user's name and a list of databases that the user can access.</para>
-            <para>This operation lists the specified user's name and a list of databases that the user can access.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List User requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-user-dbs-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-user-dbs-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200" >
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List User responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-user-dbs-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-user-dbs-response.json"/>
-                </doc>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <method name="GET" id="getUserAccess">
-        <wadl:doc xml:lang="EN" title="List User Access"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Shows a list of all databases a user has access to.</para>
-            <para>This operation shows a list of all databases a user has access to.</para>
-
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List User Access requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-user-access-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-user-access-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200" >
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List User Access responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-user-access-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-list-user-access-response.json"/>
-                </doc>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <method name="PUT" id="grantUserAccess">
-        <wadl:doc xml:lang="EN" title="Grant User Access"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Grant access for the specified user to one or more databases for the specified instance.</para>
-            <para>This operation grants access for the specified user to one or more databases for the specified instance.
-                The user is granted ALL privileges on the database. Refer to the information at the beginning of <xref linkend="user_management"/>
-                for more details on access.</para>
-
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml" element="dbaas:Database">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Grant User Access requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-grant-user-access-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-grant-user-access-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202" >
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Grant User Access responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-grant-user-access-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-grant-user-access-response.json"/>
-                </doc>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <method name="DELETE" id="revokeUserAccess">
-        <wadl:doc xml:lang="EN" title="Revoke User Access"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Remove access to the specified database for the specified user.</para>
-            <para>This operation removes access to the specified database for the specified user.</para>
-
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Revoke User Access requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-revoke-user-access-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-revoke-user-access-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="202" >
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Revoke User Access responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-revoke-user-access-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-revoke-user-access-response.json"/>
-                </doc>
-            </representation>
-        </response>
-        &commonFaults;
-        &getFaults;
-    </method>
-
-    <!-- Root -->
-    <method name="POST" id="createRoot">
-        <wadl:doc xml:lang="EN" title="Enable Root User"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Enables the root user for the specified database instance and returns the root password.</para>
-            <para>This operation enables login from any host for the root user and provides the user with a generated root password.</para>
-            <note><para>Changes you make as a root user may cause detrimental effects to the database instance and unpredictable behavior for API operations.
-                When you enable the root user, you accept the possibility that we will not be able to support your database instance.
-                While enabling root does not prevent us from a “best effort” approach to helping you if something goes wrong with your instance,
-                we cannot ensure that we will be able to assist you if you change core MySQL settings. These changes can be (but are not limited to)
-                turning off binlogs, removing users that we use to access your instance, and so forth.</para></note>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Enable Root User requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-enable-root-user-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-enable-root-user-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml"
-                element="dbaas:User">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Enable Root User responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-enable-root-user-response.xml"/>
-                </doc>
-            </representation>
-
-            <representation mediaType="application/json"
-                element="dbaas:User">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-enable-root-user-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <method name="GET" id="isRootEnabled">
-        <wadl:doc xml:lang="EN" title="List Root-Enabled Status"  xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Returns true if root user is enabled for the specified database instance or false otherwise.</para>
-            <para>This operation checks an active specified database instance to see if root access is enabled. It returns True if root user is enabled for the specified database instance or False otherwise.</para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Check Root User Access requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-check-root-user-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-check-root-user-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml"
-                element="dbaas:RootEnabled" >
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the Check Root User Access responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-check-root-user-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:RootEnabled" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-check-root-user-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-    <!-- Flavor -->
-    <method name="GET" id="getFlavors">
-        <wadl:doc xml:lang="EN" title="List Flavors" xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Lists information for all available <glossterm baseform="flavor">flavors</glossterm>.</para>
-            <para>This operation lists information for all available flavors.</para>
-            <para>This resource is identical to the flavors found in the OpenStack Nova API, but without the disk property.</para>
-
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Flavors requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-flavors-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-flavors-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml"
-                element="dbaas:Flavors" >
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Flavors responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-flavors-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:Flavors" >
-                <doc>
-                    <?hard-pagebreak?>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-flavors-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-
-
-    <method name="GET" id="getFlavorById">
-        <wadl:doc xml:lang="EN" title="List Flavor By ID" xmlns="http://docbook.org/ns/docbook">
-            <para role="shortdesc">Lists all flavor information about the specified flavor ID.</para>
-            <para>This operation lists all information for the specified flavor ID with details of the RAM.</para>
-            <para>This resource is identical to the flavors found in the OpenStack Nova API, but without the disk property.</para>
-            <note><para>The flavorId parameter should be an integer. If a floating point value is used for the flavorId parameter,
-                the decimal portion is truncated and the integer portion is used as the value of the flavorId.</para></note>
-            <remark security="reviewer">Reviewer / Writer: need to confirm that this behavior is not changed in subsequent releases, and if it is prevented, remove the Note above.</remark>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/xml">
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Flavor By ID requests:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-flavors-by-id-request.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json">
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-flavors-by-id-request.json"/>
-                </doc>
-            </representation>
-        </request>
-        <response status="200">
-            <representation mediaType="application/xml"
-                element="dbaas:Flavor" >
-                <doc>
-                    <para xmlns="http://docbook.org/ns/docbook">The following examples show the List Flavor By ID responses:</para>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-flavors-by-id-response.xml"/>
-                </doc>
-            </representation>
-            <representation mediaType="application/json"
-                element="dbaas:Flavor" >
-                <doc>
-                    <xsdxt:code href="../apidocs/src/resources/samples/db-flavors-by-id-response.json"/>
-                </doc>
-            </representation>
-        </response>
-    &commonFaults;
-    &getFaults;
-    </method>
-
-</application>