diff --git a/api-guide/source/server_concepts.rst b/api-guide/source/server_concepts.rst index 3fd607db01..ab605e26ac 100644 --- a/api-guide/source/server_concepts.rst +++ b/api-guide/source/server_concepts.rst @@ -204,7 +204,7 @@ There are also some speical query options: - ``deleted`` returns (or excludes) deleted servers -- ``soft_deleted`` modifies behavior of ‘deleted’ to either include or exclude +- ``soft_deleted`` modifies behavior of 'deleted' to either include or exclude instances whose vm_state is SOFT_DELETED - ``all_tenants`` is an administrator query option, which allows the diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index 335b15e566..bad7cae451 100644 --- a/api-ref/source/parameters.yaml +++ b/api-ref/source/parameters.yaml @@ -3646,7 +3646,7 @@ key_name_rebuild_req: .. note:: Users within the same project are able to rebuild other user's instances in that project with a new keypair. Keys - are owned by users (which is the only resource that’s true + are owned by users (which is the only resource that's true of). Servers are owned by projects. Because of this a rebuild with a key_name is looking up the keypair by the user calling rebuild. diff --git a/doc/source/admin/configuration/schedulers.rst b/doc/source/admin/configuration/schedulers.rst index 6967b5d8ab..b44cf68fcd 100644 --- a/doc/source/admin/configuration/schedulers.rst +++ b/doc/source/admin/configuration/schedulers.rst @@ -768,7 +768,7 @@ advantage of this filter, the requester must pass a scheduler hint, using ImagePropertiesFilter --------------------- -Filters cells based on properties defined on the instance’s image. This +Filters cells based on properties defined on the instance's image. This filter works specifying the hypervisor required in the image metadata and the supported hypervisor version in cell capabilities. diff --git a/nova/api/openstack/compute/rest_api_version_history.rst b/nova/api/openstack/compute/rest_api_version_history.rst index ae405c0cd8..71cdeb190b 100644 --- a/nova/api/openstack/compute/rest_api_version_history.rst +++ b/nova/api/openstack/compute/rest_api_version_history.rst @@ -462,7 +462,7 @@ API response. ---- Optional query parameters ``limit`` and ``marker`` were added to the -``os-simple-tenant-usage`` endpoints for pagination. If a limit isn’t +``os-simple-tenant-usage`` endpoints for pagination. If a limit isn't provided, the configurable ``max_limit`` will be used which currently defaults to 1000. @@ -471,7 +471,7 @@ defaults to 1000. GET /os-simple-tenant-usage?limit={limit}&marker={instance_uuid} GET /os-simple-tenant-usage/{tenant_id}?limit={limit}&marker={instance_uuid} -A tenant’s usage statistics may span multiple pages when the number of +A tenant's usage statistics may span multiple pages when the number of instances exceeds limit, and API consumers will need to stitch together the aggregate results if they still want totals for all instances in a specific time window, grouped by tenant.