diff --git a/doc/user-guide/section_cinder_cli.xml b/doc/user-guide/section_cinder_cli.xml
deleted file mode 100644
index ab8c1def6e..0000000000
--- a/doc/user-guide/section_cinder_cli.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
- cinder commands
- The cinder client is the command-line interface for the
- OpenStack Identity API.
- For help on a specific cinder command, enter:
- $cinderCOMMAND
-
- Usage
- cinder [--version] [--debug] [--os-username <auth-user-name>]
- [--os-password <auth-password>]
- [--os-tenant-name <auth-tenant-name>]
- [--os-tenant-id <auth-tenant-id>] [--os-auth-url <auth-url>]
- [--os-region-name <region-name>] [--service-type <service-type>]
- [--service-name <service-name>]
- [--volume-service-name <volume-service-name>]
- [--endpoint-type <endpoint-type>]
- [--os-volume-api-version <compute-api-ver>]
- [--os-cacert <ca-certificate>] [--retries <retries>]
- <subcommand> ...
-
-
- Positional arguments
- <subcommand>
- absolute-limits Print a list of absolute limits for a user
- backup-create Creates a backup.
- backup-delete Remove a backup.
- backup-list List all the backups.
- backup-restore Restore a backup.
- backup-show Show details about a backup.
- create Add a new volume.
- credentials Show user credentials returned from auth.
- delete Remove a volume.
- endpoints Discover endpoints that get returned from the
- authenticate services.
- extra-specs-list Print a list of current 'volume types and extra specs'
- (Admin Only).
- force-delete Attempt forced removal of a volume, regardless of its
- state.
- list List all the volumes.
- metadata Set or Delete metadata on a volume.
- quota-class-show List the quotas for a quota class.
- quota-class-update Update the default quotas for a quota class.
- quota-defaults List the default quotas for a tenant.
- quota-show List the quotas for a tenant.
- quota-update Update the quotas for a tenant.
- rate-limits Print a list of rate limits for a user
- rename Rename a volume.
- show Show details about a volume.
- snapshot-create Add a new snapshot.
- snapshot-delete Remove a snapshot.
- snapshot-list List all the snapshots.
- snapshot-rename Rename a snapshot.
- snapshot-show Show details about a snapshot.
- type-create Create a new volume type.
- type-delete Delete a specific volume type.
- type-key Set or unset extra_spec for a volume type.
- type-list Print a list of available 'volume types'.
- upload-to-image Upload volume to image service as image.
- bash-completion Print arguments for bash_completion.
- help Display help about this program or one of its
- subcommands.
- list-extensions List all the os-api extensions that are available.
-
-
- Optional arguments
- --version show program's version number and exit
- --debug Print debugging output
- --os-username <auth-user-name>
- Defaults to env[OS_USERNAME].
- --os-password <auth-password>
- Defaults to env[OS_PASSWORD].
- --os-tenant-name <auth-tenant-name>
- Defaults to env[OS_TENANT_NAME].
- --os-tenant-id <auth-tenant-id>
- Defaults to env[OS_TENANT_ID].
- --os-auth-url <auth-url>
- Defaults to env[OS_AUTH_URL].
- --os-region-name <region-name>
- Defaults to env[OS_REGION_NAME].
- --service-type <service-type>
- Defaults to compute for most actions
- --service-name <service-name>
- Defaults to env[CINDER_SERVICE_NAME]
- --volume-service-name <volume-service-name>
- Defaults to env[CINDER_VOLUME_SERVICE_NAME]
- --endpoint-type <endpoint-type>
- Defaults to env[CINDER_ENDPOINT_TYPE] or publicURL.
- --os-volume-api-version <compute-api-ver>
- Accepts 1 or 2,defaults to env[OS_VOLUME_API_VERSION].
- --os-cacert <ca-certificate>
- Specify a CA bundle file to use in verifying a TLS
- (https) server certificate. Defaults to env[OS_CACERT]
- --retries <retries> Number of retries.
-
-
diff --git a/doc/user-guide/section_glance_cli.xml b/doc/user-guide/section_glance_cli.xml
deleted file mode 100644
index 2562e26166..0000000000
--- a/doc/user-guide/section_glance_cli.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
- glance commands
- The glance client is the command-line interface (CLI) for the
- OpenStack Image Service API.
- For help on a specific glance command, enter:
- $glanceCOMMAND
-
- Usage
- glance [--version] [-d] [-v] [-k] [--cert-file CERT_FILE]
- [--key-file KEY_FILE] [--os-cacert <ca-certificate-file>]
- [--ca-file OS_CACERT] [--timeout TIMEOUT] [--no-ssl-compression]
- [-f] [--dry-run] [--ssl] [-H ADDRESS] [-p PORT]
- [--os-username OS_USERNAME] [-I OS_USERNAME]
- [--os-password OS_PASSWORD] [-K OS_PASSWORD]
- [--os-tenant-id OS_TENANT_ID] [--os-tenant-name OS_TENANT_NAME]
- [-T OS_TENANT_NAME] [--os-auth-url OS_AUTH_URL] [-N OS_AUTH_URL]
- [--os-region-name OS_REGION_NAME] [-R OS_REGION_NAME]
- [--os-auth-token OS_AUTH_TOKEN] [-A OS_AUTH_TOKEN]
- [--os-image-url OS_IMAGE_URL] [-U OS_IMAGE_URL]
- [--os-image-api-version OS_IMAGE_API_VERSION]
- [--os-service-type OS_SERVICE_TYPE]
- [--os-endpoint-type OS_ENDPOINT_TYPE] [-S OS_AUTH_STRATEGY]
- <subcommand> ...
-
-
- Positional arguments
- <subcommand>
- add DEPRECATED! Use image-create instead.
- clear DEPRECATED!
- delete DEPRECATED! Use image-delete instead.
- details DEPRECATED! Use image-list instead.
- image-create Create a new image.
- image-delete Delete specified image(s).
- image-download Download a specific image.
- image-list List images you can access.
- image-members DEPRECATED! Use member-list instead.
- image-show Describe a specific image.
- image-update Update a specific image.
- index DEPRECATED! Use image-list instead.
- member-add DEPRECATED! Use member-create instead.
- member-create Share a specific image with a tenant.
- member-delete Remove a shared image from a tenant.
- member-images DEPRECATED! Use member-list instead.
- member-list Describe sharing permissions by image or tenant.
- members-replace DEPRECATED!
- show DEPRECATED! Use image-show instead.
- update DEPRECATED! Use image-update instead.
- help Display help about this program or one of its
- subcommands.
-
-
- Optional arguments
- --version show program's version number and exit
- -d, --debug Defaults to env[GLANCECLIENT_DEBUG]
- -v, --verbose Print more verbose output
- -k, --insecure Explicitly allow glanceclient to perform "insecure
- SSL" (https) requests. The server's certificate will
- not be verified against any certificate authorities.
- This option should be used with caution.
- --cert-file CERT_FILE
- Path of certificate file to use in SSL connection.
- This file can optionally be prepended with the private
- key.
- --key-file KEY_FILE Path of client key to use in SSL connection. This
- option is not necessary if your key is prepended to
- your cert file.
- --os-cacert <ca-certificate-file>
- Path of CA TLS certificate(s) used to verify the
- remote server's certificate. Without this option
- glance looks for the default system CA certificates.
- --ca-file OS_CACERT DEPRECATED! Use --os-cacert.
- --timeout TIMEOUT Number of seconds to wait for a response
- --no-ssl-compression Disable SSL compression when using https.
- -f, --force Prevent select actions from requesting user
- confirmation.
- --dry-run DEPRECATED! Only used for deprecated legacy commands.
- --ssl DEPRECATED! Send a fully-formed endpoint using --os-
- image-url instead.
- -H ADDRESS, --host ADDRESS
- DEPRECATED! Send a fully-formed endpoint using --os-
- image-url instead.
- -p PORT, --port PORT DEPRECATED! Send a fully-formed endpoint using --os-
- image-url instead.
- --os-username OS_USERNAME
- Defaults to env[OS_USERNAME]
- -I OS_USERNAME DEPRECATED! Use --os-username.
- --os-password OS_PASSWORD
- Defaults to env[OS_PASSWORD]
- -K OS_PASSWORD DEPRECATED! Use --os-password.
- --os-tenant-id OS_TENANT_ID
- Defaults to env[OS_TENANT_ID]
- --os-tenant-name OS_TENANT_NAME
- Defaults to env[OS_TENANT_NAME]
- -T OS_TENANT_NAME DEPRECATED! Use --os-tenant-name.
- --os-auth-url OS_AUTH_URL
- Defaults to env[OS_AUTH_URL]
- -N OS_AUTH_URL DEPRECATED! Use --os-auth-url.
- --os-region-name OS_REGION_NAME
- Defaults to env[OS_REGION_NAME]
- -R OS_REGION_NAME DEPRECATED! Use --os-region-name.
- --os-auth-token OS_AUTH_TOKEN
- Defaults to env[OS_AUTH_TOKEN]
- -A OS_AUTH_TOKEN, --auth_token OS_AUTH_TOKEN
- DEPRECATED! Use --os-auth-token.
- --os-image-url OS_IMAGE_URL
- Defaults to env[OS_IMAGE_URL]
- -U OS_IMAGE_URL, --url OS_IMAGE_URL
- DEPRECATED! Use --os-image-url.
- --os-image-api-version OS_IMAGE_API_VERSION
- Defaults to env[OS_IMAGE_API_VERSION] or 1
- --os-service-type OS_SERVICE_TYPE
- Defaults to env[OS_SERVICE_TYPE]
- --os-endpoint-type OS_ENDPOINT_TYPE
- Defaults to env[OS_ENDPOINT_TYPE]
- -S OS_AUTH_STRATEGY, --os_auth_strategy OS_AUTH_STRATEGY
- DEPRECATED! This option is completely ignored.
-
-
diff --git a/doc/user-guide/section_neutron_cli.xml b/doc/user-guide/section_neutron_cli.xml
deleted file mode 100644
index b635357270..0000000000
--- a/doc/user-guide/section_neutron_cli.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
- neutron commands
- The neutron client is the command-line interface (CLI) for the
- OpenStack Networking API.
- For help on a specific neutron command, enter:
- $neutronCOMMAND
-
- Usage
-
- neutron [--version] [-v] [-q] [-h] [--debug]
- [--os-auth-strategy <auth-strategy>] [--os-auth-url <auth-url>]
- [--os-tenant-name <auth-tenant-name>]
- [--os-username <auth-username>] [--os-password <auth-password>]
- [--os-region-name <auth-region-name>] [--os-token <token>]
- [--endpoint-type <endpoint-type>] [--os-url <url>] [--insecure]
-
-
- Optional arguments
-
- --version show program's version number and exit
- -v, --verbose Increase verbosity of output. Can be repeated.
- -q, --quiet suppress output except warnings and errors
- -h, --help show this help message and exit
- --debug show tracebacks on errors
- --os-auth-strategy <auth-strategy>
- Authentication strategy (Env: OS_AUTH_STRATEGY,
- default keystone). For now, any other value will
- disable the authentication
- --os-auth-url <auth-url>
- Authentication URL (Env: OS_AUTH_URL)
- --os-tenant-name <auth-tenant-name>
- Authentication tenant name (Env: OS_TENANT_NAME)
- --os-username <auth-username>
- Authentication username (Env: OS_USERNAME)
- --os-password <auth-password>
- Authentication password (Env: OS_PASSWORD)
- --os-region-name <auth-region-name>
- Authentication region name (Env: OS_REGION_NAME)
- --os-token <token> Defaults to env[OS_TOKEN]
- --endpoint-type <endpoint-type>
- Defaults to env[OS_ENDPOINT_TYPE] or publicURL.
- --os-url <url> Defaults to env[OS_URL]
- --insecure Explicitly allow neutronclient to perform "insecure"
- SSL (https) requests. The server's certificate will
- not be verified against any certificate authorities.
- This option should be used with caution.
-
-
- Commands
-
-
- agent-delete Delete a given agent.
- agent-list List agents.
- agent-show Show information of a given agent.
- agent-update Update a given agent.
- dhcp-agent-list-hosting-net List DHCP agents hosting a network.
- dhcp-agent-network-add Add a network to a DHCP agent.
- dhcp-agent-network-remove Remove a network from a DHCP agent.
- ext-list List all extensions.
- ext-show Show information of a given resource.
- floatingip-associate Create a mapping between a floating ip and a fixed ip.
- floatingip-create Create a floating ip for a given tenant.
- floatingip-delete Delete a given floating ip.
- floatingip-disassociate Remove a mapping from a floating ip to a fixed ip.
- floatingip-list List floating ips that belong to a given tenant.
- floatingip-show Show information of a given floating ip.
- help print detailed help for another command
- l3-agent-list-hosting-router List L3 agents hosting a router.
- l3-agent-router-add Add a router to a L3 agent.
- l3-agent-router-remove Remove a router from a L3 agent.
- lb-healthmonitor-associate Create a mapping between a health monitor and a pool.
- lb-healthmonitor-create Create a healthmonitor.
- lb-healthmonitor-delete Delete a given healthmonitor.
- lb-healthmonitor-disassociate Remove a mapping from a health monitor to a pool.
- lb-healthmonitor-list List healthmonitors that belong to a given tenant.
- lb-healthmonitor-show Show information of a given healthmonitor.
- lb-healthmonitor-update Update a given healthmonitor.
- lb-member-create Create a member.
- lb-member-delete Delete a given member.
- lb-member-list List members that belong to a given tenant.
- lb-member-show Show information of a given member.
- lb-member-update Update a given member.
- lb-pool-create Create a pool.
- lb-pool-delete Delete a given pool.
- lb-pool-list List pools that belong to a given tenant.
- lb-pool-show Show information of a given pool.
- lb-pool-stats Retrieve stats for a given pool.
- lb-pool-update Update a given pool.
- lb-vip-create Create a vip.
- lb-vip-delete Delete a given vip.
- lb-vip-list List vips that belong to a given tenant.
- lb-vip-show Show information of a given vip.
- lb-vip-update Update a given vip.
- net-create Create a network for a given tenant.
- net-delete Delete a given network.
- net-external-list List external networks that belong to a given tenant.
- net-gateway-connect Add an internal network interface to a router.
- net-gateway-create Create a network gateway.
- net-gateway-delete Delete a given network gateway.
- net-gateway-disconnect Remove a network from a network gateway.
- net-gateway-list List network gateways for a given tenant.
- net-gateway-show Show information of a given network gateway.
- net-gateway-update Update the name for a network gateway.
- net-list List networks that belong to a given tenant.
- net-list-on-dhcp-agent List the networks on a DHCP agent.
- net-show Show information of a given network.
- net-update Update network's information.
- port-create Create a port for a given tenant.
- port-delete Delete a given port.
- port-list List ports that belong to a given tenant.
- port-show Show information of a given port.
- port-update Update port's information.
- queue-create Create a queue.
- queue-delete Delete a given queue.
- queue-list List queues that belong to a given tenant.
- queue-show Show information of a given queue.
- quota-delete Delete defined quotas of a given tenant.
- quota-list List defined quotas of all tenants.
- quota-show Show quotas of a given tenant
- quota-update Define tenant's quotas not to use defaults.
- router-create Create a router for a given tenant.
- router-delete Delete a given router.
- router-gateway-clear Remove an external network gateway from a router.
- router-gateway-set Set the external network gateway for a router.
- router-interface-add Add an internal network interface to a router.
- router-interface-delete Remove an internal network interface from a router.
- router-list List routers that belong to a given tenant.
- router-list-on-l3-agent List the routers on a L3 agent.
- router-port-list List ports that belong to a given tenant, with specified router.
- router-show Show information of a given router.
- router-update Update router's information.
- security-group-create Create a security group.
- security-group-delete Delete a given security group.
- security-group-list List security groups that belong to a given tenant.
- security-group-rule-create Create a security group rule.
- security-group-rule-delete Delete a given security group rule.
- security-group-rule-list List security group rules that belong to a given tenant.
- security-group-rule-show Show information of a given security group rule.
- security-group-show Show information of a given security group.
- security-group-update Update a given security group.
- subnet-create Create a subnet for a given tenant.
- subnet-delete Delete a given subnet.
- subnet-list List networks that belong to a given tenant.
- subnet-show Show information of a given subnet.
- subnet-update Update subnet's information.
-
-