diff --git a/cinder/api/openstack/rest_api_version_history.rst b/cinder/api/openstack/rest_api_version_history.rst index b343cdb0fb1..f7fc6f37f3b 100644 --- a/cinder/api/openstack/rest_api_version_history.rst +++ b/cinder/api/openstack/rest_api_version_history.rst @@ -77,7 +77,7 @@ user documentation. Added /clusters endpoint to list/show/update clusters. Show endpoint requires the cluster name and optionally the binary as a URL - paramter (default is "cinder-volume"). Returns: + parameter (default is "cinder-volume"). Returns: .. code-block:: json @@ -204,7 +204,7 @@ user documentation. 3.17 ---- os-snapshot-manage and os-volume-manage now support ``cluster`` parameter on - listings (summay and detailed). Both location parameters, ``cluster`` and + listings (summary and detailed). Both location parameters, ``cluster`` and ``host`` are exclusive and only one should be provided. 3.18 diff --git a/doc/source/devref/groups.rst b/doc/source/devref/groups.rst index 6cc522c729f..1f175bccbfc 100644 --- a/doc/source/devref/groups.rst +++ b/doc/source/devref/groups.rst @@ -125,7 +125,7 @@ support consistent group snapshot: - delete_group_snapshot(context, group_snapshot, snapshots) -Here is an example that add CG capabitilty to generic volume groups [3]. +Here is an example that add CG capability to generic volume groups [3]. Details of driver interfaces are as follows. **create_group** diff --git a/doc/source/devref/i18n.rst b/doc/source/devref/i18n.rst index a829fe2ade2..e9f6a4ead52 100644 --- a/doc/source/devref/i18n.rst +++ b/doc/source/devref/i18n.rst @@ -2,7 +2,7 @@ Internationalization ==================== For internationalization guidelines, see the -`oslo.i18n documention `_. +`oslo.i18n documentation `_. The information below can be used to get started. Cinder uses `gettext `_ so that diff --git a/doc/source/upgrade.rst b/doc/source/upgrade.rst index 64361c7547f..6e7a226bcf5 100644 --- a/doc/source/upgrade.rst +++ b/doc/source/upgrade.rst @@ -49,7 +49,7 @@ Online Data Migrations To make DB schema migrations less painful to execute, since Liberty, all data migrations are banned from schema migration scripts. Instead, the migrations -should be done by backgroud process in a manner that doesn't interrupt running +should be done by background process in a manner that doesn't interrupt running services (you can also execute online data migrations with services turned off if you're doing a cold upgrade). In Ocata a new ``cinder-manage db online-data-migrations`` utility was added for that purpose. Before upgrading