From 33cceb42f3de3eec665e044af959c02b4443d0da Mon Sep 17 00:00:00 2001 From: jolie Date: Mon, 6 Mar 2017 11:45:56 +0800 Subject: [PATCH] Fix some typo in releasenotes These changes have already merged in master branch. However, cherry pick failed because of merge conflict. So submit these changes again in stable/ocata branch to revise releasenotes. Change-Id: I1faa518e071558011fd0e2ad3a685174be7627ba --- releasenotes/notes/bp-shadow-mapping-06fc7c71a401d707.yaml | 2 +- .../notes/bp-support-federated-attr-94084d4073f50280.yaml | 2 +- releasenotes/notes/bug-1636950-8fa1a47fce440977.yaml | 4 ++-- releasenotes/notes/integrate-osprofiler-ad0e16a542b12899.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/releasenotes/notes/bp-shadow-mapping-06fc7c71a401d707.yaml b/releasenotes/notes/bp-shadow-mapping-06fc7c71a401d707.yaml index 9571b91ce7..428edd46e5 100644 --- a/releasenotes/notes/bp-shadow-mapping-06fc7c71a401d707.yaml +++ b/releasenotes/notes/bp-shadow-mapping-06fc7c71a401d707.yaml @@ -4,7 +4,7 @@ features: [`blueprint manage-migration `_] The federated identity mapping engine now supports the ability to automatically provision ``projects`` for ``federated users``. A role assignment - will automatically be created for the user on the specificed proejct. If the + will automatically be created for the user on the specified project. If the project specified within the mapping does not exist, it will be automatically created in the ``domain`` associated with the ``identity provider``. This behavior can be triggered using a specific syntax within the ``local`` diff --git a/releasenotes/notes/bp-support-federated-attr-94084d4073f50280.yaml b/releasenotes/notes/bp-support-federated-attr-94084d4073f50280.yaml index 5d2711b40a..a5e977aa9f 100644 --- a/releasenotes/notes/bp-support-federated-attr-94084d4073f50280.yaml +++ b/releasenotes/notes/bp-support-federated-attr-94084d4073f50280.yaml @@ -3,5 +3,5 @@ features: - > [`blueprint support-federated-attr `_] Added new filters to the `list user` API (``GET /v3/users``) to support - querying federted identity atttributes: ``idp_id``, ``protocol_id``, and + querying federated identity attributes: ``idp_id``, ``protocol_id``, and ``unique_id``. diff --git a/releasenotes/notes/bug-1636950-8fa1a47fce440977.yaml b/releasenotes/notes/bug-1636950-8fa1a47fce440977.yaml index 4756311dd4..b1635c1c70 100644 --- a/releasenotes/notes/bug-1636950-8fa1a47fce440977.yaml +++ b/releasenotes/notes/bug-1636950-8fa1a47fce440977.yaml @@ -5,6 +5,6 @@ fixes: New option ``[ldap] connection_timeout`` allows a deployer to set a ``OPT_NETWORK_TIMEOUT`` value to use with the LDAP server. This allows the LDAP server to return a ``SERVER_DOWN`` exception, - if the LDAP URL is incorrect if there is a connection failure. By default, + if the LDAP URL is incorrect or if there is a connection failure. By default, the value for ``[ldap] connection_timeout`` is -1, meaning it is disabled. - Set a postive value (in seconds) to enable the option. + Set a positive value (in seconds) to enable the option. diff --git a/releasenotes/notes/integrate-osprofiler-ad0e16a542b12899.yaml b/releasenotes/notes/integrate-osprofiler-ad0e16a542b12899.yaml index 534844509a..560a0f0886 100644 --- a/releasenotes/notes/integrate-osprofiler-ad0e16a542b12899.yaml +++ b/releasenotes/notes/integrate-osprofiler-ad0e16a542b12899.yaml @@ -4,7 +4,7 @@ features: allows to trace various requests through all OpenStack services that support it. To initiate OpenStack request tracing `--profile ` option needs to be added to - the CLI command. Configuration and usage details can be foung in + the CLI command. Configuration and usage details can be found in [`OSProfiler documentation `_] upgrade: - OSprofiler support was introduced. To allow its usage the