openstack/glance
Code Issues Proposed changes

fix restructuredtext formatting errors

Browse Source 
Change-Id: I5693f2aa1670bf0e782f231bdaba2bc342bbe9ff
This commit is contained in:
Doug Hellmann 2015-10-01 15:41:47 +00:00
parent 04776634a2
commit ba146e4eeb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/configuring.rst
View File

@ -292,36 +292,42 @@ To prevent failures with token expiration during big files upload,
it is recommended to set this parameter to False. it is recommended to set this parameter to False.
* ``admin_user=USER`` * ``admin_user=USER``
If 'use_user_token' is not in effect then admin credentials can be If 'use_user_token' is not in effect then admin credentials can be
specified. Use this parameter to specify the username. specified. Use this parameter to specify the username.
Optional. Default: None Optional. Default: None
* ``admin_password=PASSWORD`` * ``admin_password=PASSWORD``
If 'use_user_token' is not in effect then admin credentials can be If 'use_user_token' is not in effect then admin credentials can be
specified. Use this parameter to specify the password. specified. Use this parameter to specify the password.
Optional. Default: None Optional. Default: None
* ``admin_tenant_name=TENANTNAME`` * ``admin_tenant_name=TENANTNAME``
If 'use_user_token' is not in effect then admin credentials can be If 'use_user_token' is not in effect then admin credentials can be
specified. Use this parameter to specify the tenant name. specified. Use this parameter to specify the tenant name.
Optional. Default: None Optional. Default: None
* ``auth_url=URL`` * ``auth_url=URL``
If 'use_user_token' is not in effect then admin credentials can be If 'use_user_token' is not in effect then admin credentials can be
specified. Use this parameter to specify the Keystone endpoint. specified. Use this parameter to specify the Keystone endpoint.
Optional. Default: None Optional. Default: None
* ``auth_strategy=STRATEGY`` * ``auth_strategy=STRATEGY``
If 'use_user_token' is not in effect then admin credentials can be If 'use_user_token' is not in effect then admin credentials can be
specified. Use this parameter to specify the auth strategy. specified. Use this parameter to specify the auth strategy.
Optional. Default: keystone Optional. Default: keystone
* ``auth_region=REGION`` * ``auth_region=REGION``
If 'use_user_token' is not in effect then admin credentials can be If 'use_user_token' is not in effect then admin credentials can be
specified. Use this parameter to specify the region. specified. Use this parameter to specify the region.

3
doc/source/man/general_options.rst
View File

@ -42,8 +42,7 @@
--config-file <file1> --config-file <file2>. Values in latter --config-file <file1> --config-file <file2>. Values in latter
files take precedence. files take precedence.
**--log-config-append PATH** **--log-config-append PATH** **--log-config PATH**
**--log-config PATH**
The name of logging configuration file. It does not The name of logging configuration file. It does not
disable existing loggers, but just appends specified disable existing loggers, but just appends specified
logging configuration to any other existing logging logging configuration to any other existing logging