From 9495cd830dcbf2b40ea1dba9c752463a2daacd70 Mon Sep 17 00:00:00 2001 From: zhangzs Date: Mon, 11 Jun 2018 14:11:25 +0800 Subject: [PATCH] fix typo Change-Id: I907c17443988bf7db0544b58d357f9d908e22bb6 --- doc/source/configuration/settings.rst | 6 +++--- openstack_dashboard/api/microversions.py | 2 +- .../drop-action-strings-attributes-64f0cb0323f629ee.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/configuration/settings.rst b/doc/source/configuration/settings.rst index 51fce2ccf9..45073a7050 100644 --- a/doc/source/configuration/settings.rst +++ b/doc/source/configuration/settings.rst @@ -626,7 +626,7 @@ users of Horizon. The format of the logs is configured via .. note:: If you use this feature, you need to configure the logger setting like - a outputting path for operation log in ``local_settings.py``. + an outputting path for operation log in ``local_settings.py``. OPERATION_LOG_OPTIONS --------------------- @@ -656,7 +656,7 @@ This setting controls the behavior of the operation log. * ``mask_fields`` is a list of keys of post data which should be masked from the point of view of security. Fields like ``password`` should be included. The fields specified in ``mask_fields`` are logged as ``********``. -* ``target_methods`` is a request method which is logged to a operation log. +* ``target_methods`` is a request method which is logged to an operation log. The valid methods are ``POST``, ``GET``, ``PUT``, ``DELETE``. * ``ignored_urls`` is a list of request URLs to be hidden from a log. * ``format`` defines the operation log format. @@ -828,7 +828,7 @@ SHOW_KEYSTONE_V2_RC Default: ``True`` -Controls whether the keystone v2 openrc file is accessable from the user +Controls whether the keystone v2 openrc file is accessible from the user menu and the api access panel. THEME_COLLECTION_DIR diff --git a/openstack_dashboard/api/microversions.py b/openstack_dashboard/api/microversions.py index f36482e77f..a1fba3cb48 100644 --- a/openstack_dashboard/api/microversions.py +++ b/openstack_dashboard/api/microversions.py @@ -52,7 +52,7 @@ def get_microversion_for_features(service, features, wrapper_class, """Retrieves that highest known functional microversion for features""" if not features: return None - # Convert a single feature string into a list for backward compatiblity. + # Convert a single feature string into a list for backward compatibility. if isinstance(features, str): features = [features] try: diff --git a/releasenotes/notes/drop-action-strings-attributes-64f0cb0323f629ee.yaml b/releasenotes/notes/drop-action-strings-attributes-64f0cb0323f629ee.yaml index d174c3153d..7cb5b2dab3 100644 --- a/releasenotes/notes/drop-action-strings-attributes-64f0cb0323f629ee.yaml +++ b/releasenotes/notes/drop-action-strings-attributes-64f0cb0323f629ee.yaml @@ -4,5 +4,5 @@ upgrade: String attributes ``action_present`` and ``action_past`` were dropped from ``horizon.tables.BatchAction``. ``action_present`` and ``action_past`` *methods* are the recommended way to define action labels for BatchAction. - The offical way allows us to define more complete strings for action labels + The official way allows us to define more complete strings for action labels and this also allows translators to translate more flexibily.