From ba146e4eeb16ae1d1d6dfe7cbd35bcb862205ac9 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 1 Oct 2015 15:41:47 +0000 Subject: [PATCH] fix restructuredtext formatting errors Change-Id: I5693f2aa1670bf0e782f231bdaba2bc342bbe9ff --- doc/source/configuring.rst | 6 ++++++ doc/source/man/general_options.rst | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/source/configuring.rst b/doc/source/configuring.rst index db5a602a3b..fb3be5e1cb 100644 --- a/doc/source/configuring.rst +++ b/doc/source/configuring.rst @@ -292,36 +292,42 @@ To prevent failures with token expiration during big files upload, it is recommended to set this parameter to False. * ``admin_user=USER`` + If 'use_user_token' is not in effect then admin credentials can be specified. Use this parameter to specify the username. Optional. Default: None * ``admin_password=PASSWORD`` + If 'use_user_token' is not in effect then admin credentials can be specified. Use this parameter to specify the password. Optional. Default: None * ``admin_tenant_name=TENANTNAME`` + If 'use_user_token' is not in effect then admin credentials can be specified. Use this parameter to specify the tenant name. Optional. Default: None * ``auth_url=URL`` + If 'use_user_token' is not in effect then admin credentials can be specified. Use this parameter to specify the Keystone endpoint. Optional. Default: None * ``auth_strategy=STRATEGY`` + If 'use_user_token' is not in effect then admin credentials can be specified. Use this parameter to specify the auth strategy. Optional. Default: keystone * ``auth_region=REGION`` + If 'use_user_token' is not in effect then admin credentials can be specified. Use this parameter to specify the region. diff --git a/doc/source/man/general_options.rst b/doc/source/man/general_options.rst index c61d02793c..71aa842e4e 100644 --- a/doc/source/man/general_options.rst +++ b/doc/source/man/general_options.rst @@ -42,8 +42,7 @@ --config-file --config-file . Values in latter files take precedence. - **--log-config-append PATH** - **--log-config PATH** + **--log-config-append PATH** **--log-config PATH** The name of logging configuration file. It does not disable existing loggers, but just appends specified logging configuration to any other existing logging