diff --git a/doc/common/tables/glance-api.xml b/doc/common/tables/glance-api.xml
index f65257a05f..2753ff4c77 100644
--- a/doc/common/tables/glance-api.xml
+++ b/doc/common/tables/glance-api.xml
@@ -11,7 +11,7 @@
Configuration option=Default value
- (Type) Description
+ Description
Configuration option=Default value | +Description | +
cinder_catalog_info=volume:cinder:publicURL | +(StrOpt) Info to match when looking for cinder in the service catalog. Format is : separated values of the form: <service_type>:<service_name>:<endpoint_type> | +
cinder_ca_certificates_file=None | +(StrOpt) Location of ca certicates file to use for cinder client requests. | +
cinder_http_retries=3 | +(IntOpt) Number of cinderclient retries on failed http calls | +
cinder_endpoint_template=None | +(StrOpt) Override service catalog lookup with template for cinder endpoint e.g. http://localhost:8776/v1/%(project_id)s | +
cinder_api_insecure=False | +(BoolOpt) Allow to perform insecure SSL requests to cinder | +
Configuration option=Default value | +Description | +
mongodb_store_uri=None | +(StrOpt) Hostname or IP address of the instance to connect to, or a mongodb URI, or a list of hostnames / mongodb URIs. If host is an IPv6 literal it must be enclosed in '[' and ']' characters following the RFC2732 URL syntax (e.g. '[::1]' for localhost) | +
mongodb_store_db=None | +(StrOpt) Database to use | +
Configuration option=Default value | -(Type) Description | -
admin_password=None | -(StrOpt) The administrators password. | -
admin_tenant_name=None | -(StrOpt) The tenant name of the administrative - user. | -
admin_user=None | -(StrOpt) The administrators user name. | -
auth_region=None | -(StrOpt) The region for the authentication - service. | -
auth_strategy=noauth | -(StrOpt) The strategy to use for - authentication. | -
auth_url=None | -(StrOpt) The URL to the keystone service. | -
registry_client_ca_file=None | -(StrOpt) The path to the certifying authority cert - file to use in SSL connections to the registry - server. | -
registry_client_cert_file=None | -(StrOpt) The path to the cert file to use in SSL - connections to the registry server. | -
registry_client_insecure=False | -(BoolOpt) When using SSL in connections to the - registry server, do not require validation via a - certifying authority. | -
registry_client_key_file=None | -(StrOpt) The path to the key file to use in SSL - connections to the registry server. | -
registry_client_protocol=http | -(StrOpt) The protocol to use for communication - with the registry server. Either http or - https. | -
registry_client_timeout=600 | -(IntOpt) The period of time, in seconds, that the - API server will wait for a registry request to - complete. A value of 0 implies no timeout. | -
registry_host=0.0.0.0 | -(StrOpt) Address to find the registry server. | -
registry_port=9191 | -(IntOpt) Port the registry server is listening - on. | -
Configuration option=Default value | +Description | +
admin_password=None | +(StrOpt) The administrators password. | +
admin_tenant_name=None | +(StrOpt) The tenant name of the adminstrative user. | +
admin_user=None | +(StrOpt) The administrators user name. | +
auth_region=None | +(StrOpt) The region for the authentication service. | +
auth_strategy=noauth | +(StrOpt) The strategy to use for authentication. | +
auth_url=None | +(StrOpt) The URL to the keystone service. | +
registry_client_ca_file=None | +(StrOpt) The path to the certifying authority cert file to use in SSL connections to the registry server. | +
registry_client_cert_file=None | +(StrOpt) The path to the cert file to use in SSL connections to the registry server. | +
registry_client_insecure=False | +(BoolOpt) When using SSL in connections to the registry server, do not require validation via a certifying authority. | +
registry_client_key_file=None | +(StrOpt) The path to the key file to use in SSL connections to the registry server. | +
registry_client_protocol=http | +(StrOpt) The protocol to use for communication with the registry server. Either http or https. | +
registry_client_timeout=600 | +(IntOpt) The period of time, in seconds, that the API server will wait for a registry request to complete. A value of 0 implies no timeout. | +
registry_host=0.0.0.0 | +(StrOpt) Address to find the registry server. | +
registry_port=9191 | +(IntOpt) Port the registry server is listening on. | +
Configuration option=Default value | +Description | +
allowed_rpc_exception_modules=openstack.common.exception,glance.common.exception,exceptions | +(ListOpt) Modules of exceptions that are permitted to be recreatedupon receiving exception data from an rpc call. | +
Configuration option=Default value | -(Type) Description | -
s3_store_access_key=None | -(StrOpt) The S3 query token access key. | -
s3_store_bucket=None | -(StrOpt) The S3 bucket to be used to store the - Glance data. | -
s3_store_bucket_url_format=subdomain | -(StrOpt) The S3 calling format used to determine - the bucket. Either subdomain or path can be - used. | -
s3_store_create_bucket_on_put=False | -(BoolOpt) A boolean to determine if the S3 bucket - should be created on upload if it does not exist - or if an error should be returned to the - user. | -
s3_store_host=None | -(StrOpt) The host where the S3 server is - listening. | -
s3_store_object_buffer_dir=None | -(StrOpt) The local directory where uploads will be - staged before they are transferred into S3. | -
s3_store_secret_key=None | -(StrOpt) The S3 query token secret key. | -
Configuration option=Default value | +Description | +
s3_store_access_key=None | +(StrOpt) The S3 query token access key. | +
s3_store_bucket=None | +(StrOpt) The S3 bucket to be used to store the Glance data. | +
s3_store_bucket_url_format=subdomain | +(StrOpt) The S3 calling format used to determine the bucket. Either subdomain or path can be used. | +
s3_store_create_bucket_on_put=False | +(BoolOpt) A boolean to determine if the S3 bucket should be created on upload if it does not exist or if an error should be returned to the user. | +
s3_store_host=None | +(StrOpt) The host where the S3 server is listening. | +
s3_store_object_buffer_dir=None | +(StrOpt) The local directory where uploads will be staged before they are transfered into S3. | +
s3_store_secret_key=None | +(StrOpt) The S3 query token secret key. | +
Configuration option=Default value | +Description | +
sheepdog_store_chunk_size=64 | +(IntOpt) Images will be chunked into objects of this size (in megabytes). For best performance, this should be a power of two. | +
sheepdog_store_address=localhost | +(StrOpt) IP address of sheep daemon. | +
sheepdog_store_port=7000 | +(StrOpt) Port of sheep daemon. | +