Merge "Replace Chinese punctuation with English punctuation"

api-ref/source/v3-ext/oauth.inc

@@ -22,7 +22,7 @@ Definitions
   the User, and exchanged with an OAuth Verifier for an Access Token.
 
 - *Access Token:* A token used by the Consumer to request new Identity API
-  tokens on behalf of the authorizing User, instead of using the User’s
+  tokens on behalf of the authorizing User, instead of using the User's
   credentials.
 
 - *Token Key:* A key used by the token to identify itself. Both Request Tokens

api-ref/source/v3-ext/parameters.yaml

@@ -168,7 +168,7 @@ impersonation:
     If set to `true`, then the user attribute of tokens generated based on the
     trust will represent that of the ``trustor`` rather than the ``trustee``,
     thus allowing the ``trustee`` to impersonate the ``trustor``. If impersonation
-    is set to `false`, then the token’s user attribute will represent that of the
+    is set to `false`, then the token's user attribute will represent that of the
     ``trustee``.
   in: body
   required: true
@@ -492,12 +492,12 @@ trust_project_id:
   type: string
 trust_roles:
   description: |
-    Specifies the subset of the trustor’s roles on the ``project_id`` to be granted
+    Specifies the subset of the trustor's roles on the ``project_id`` to be granted
     to the ``trustee`` when the token is consumed. The ``trustor`` must already be
     granted these roles in the project referenced by the ``project_id`` attribute.
     If redelegation is used (when trust-scoped token is used and consumed trust has
     ``allow_redelegation`` set to `true`) this parameter should contain redelegated
-    trust’s roles only.
+    trust's roles only.
 
     Roles are only provided when the trust is created, and are subsequently available
     as a separate read-only collection. Each role can be specified by either ``id`` or
@@ -513,7 +513,7 @@ trustee_user_id:
   type: string
 trustor_user_id:
   description: |
-    Represents the user who created the trust, and who’s authorization is being delegated.
+    Represents the user who created the trust, and who's authorization is being delegated.
   in: body
   required: true
   type: string

api-ref/source/v3-ext/revoke.inc

@@ -8,7 +8,7 @@ This API provides a list of token revocations. Each event expresses a set of
 criteria which describes a set of tokens that are no longer valid.
 Requires v3.2+ of the Identity API.
 
-What’s New in v1.1
+What's New in v1.1
 ==================
 
 * Use of expires_at has been deprecated in favor of using audit_id and audit_chain_id.

api-ref/source/v3-ext/trust.inc

@@ -12,14 +12,14 @@ API Resources
 Trusts
 ------
 
-A trust represents a user’s (the `trustor`) authorization to delegate
+A trust represents a user's (the `trustor`) authorization to delegate
 roles to another user (the `trustee`), and optionally allow the trustee
 to impersonate the trustor. After the trustor has created a trust, the
-trustee can specify the trust’s id attribute as part of an authentication
+trustee can specify the trust's id attribute as part of an authentication
 request to then create a token representing the delegated authority of the trustor.
 
 The trust contains constraints on the delegated attributes. A token created
-based on a trust will convey a subset of the trustor’s roles on the specified
+based on a trust will convey a subset of the trustor's roles on the specified
 project. Optionally, the trust may only be valid for a specified time period,
 as defined by ``expires_at``. If no ``expires_at`` is specified, then the trust is
 valid until it is explicitly revoked.
@@ -56,11 +56,11 @@ Consuming a trust
 Consuming a trust effectively assumes the scope as delegated in the trust. No
 other scope attributes may be specified.
 
-The user specified by authentication must match the trust’s ``trustee_user_id``
+The user specified by authentication must match the trust's ``trustee_user_id``
 attribute.
 
 If the trust has the ``impersonation`` attribute set to `true`, then the resulting
-token’s user attribute will also represent the trustor, rather than the
+token's user attribute will also represent the trustor, rather than the
 authenticating user (the trustee).
 
 Request Example

api-ref/source/v3/project-tags.inc

@@ -13,7 +13,7 @@ Tags for projects have the following restrictions:
 .. Note::
 
    - Tags are case sensitive
-   - Forward Slash ‘/’ is not allowed to be in a tag name
+   - Forward Slash '/' is not allowed to be in a tag name
    - Commas ',' are not allowed to be in a tag name in order
      to simplify requests that specify lists of tags
    - Each project can have a maximum of 80 tags

doc/source/contributor/testing-keystone.rst

@@ -132,7 +132,7 @@ Identity module.
 Testing Schema Migrations
 -------------------------
 
-The application of schema migrations can be tested using SQLAlchemy Migrate’s
+The application of schema migrations can be tested using SQLAlchemy Migrate's
 built-in test runner, one migration at a time.
 
 .. WARNING::