From e254dfae003ec61ccfe2d878b3f5e9a65d7048c7 Mon Sep 17 00:00:00 2001 From: liyanhang Date: Tue, 25 Oct 2016 23:38:29 +0800 Subject: [PATCH] Change "Openstack" to "OpenStack" According to the word choice convention in http://docs.openstack.org/contributor-guide/writing-style/word-choice.html We should use OpenStack instead of Openstack. Change-Id: I834055528e6f343c113c96a70a7a2f265a0a1703 --- README.rst | 4 ++-- doc/source/user/freezer-agent.rst | 6 +++--- specs/python-freezerclient.rst | 2 +- specs/tenant_based_backups.rst | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 785b877a..6859b456 100644 --- a/README.rst +++ b/README.rst @@ -728,7 +728,7 @@ related to the storage Example: ssh-username, ssh-port For swift storage you should provide additional parameter called 'osrc' -Osrc should be a path to file with Openstack Credentials like:: +Osrc should be a path to file with OpenStack Credentials like:: unset OS_DOMAIN_NAME export OS_AUTH_URL=http://url:5000/v3 @@ -1087,7 +1087,7 @@ optional arguments: --noverbose The inverse of --verbose --nowatch-log-file The inverse of --watch-log-file --os-identity-api-version OS_IDENTITY_API_VERSION, --os_auth_ver OS_IDENTITY_API_VERSION - Openstack identity api version, can be 1, 2, 2.0 or 3 + OpenStack identity api version, can be 1, 2, 2.0 or 3 --overwrite With overwrite removes files from restore path before restore. --path-to-backup PATH_TO_BACKUP, -F PATH_TO_BACKUP diff --git a/doc/source/user/freezer-agent.rst b/doc/source/user/freezer-agent.rst index 1c768306..ea812a5b 100644 --- a/doc/source/user/freezer-agent.rst +++ b/doc/source/user/freezer-agent.rst @@ -422,7 +422,7 @@ Example: ssh-username, ssh-port For swift storage you should provide additional parameter called 'osrc' Osrc -should be a path to file with Openstack Credentials like: +should be a path to file with OpenStack Credentials like: .. code:: bash @@ -795,7 +795,7 @@ Optional Arguments --noverbose The inverse of --verbose --nowatch-log-file The inverse of --watch-log-file --os-identity-api-version OS_IDENTITY_API_VERSION, --os_auth_ver OS_IDENTITY_API_VERSION - Openstack identity api version, can be 1, 2, 2.0 or 3 + OpenStack identity api version, can be 1, 2, 2.0 or 3 --overwrite With overwrite removes files from restore path before restore. --path-to-backup PATH_TO_BACKUP, -F PATH_TO_BACKUP @@ -918,4 +918,4 @@ release does not support env markers which further complicated the installation. Copyright --------- -The Freezer logo is released under the licence Attribution 3.0 Unported (CC BY3.0). \ No newline at end of file +The Freezer logo is released under the licence Attribution 3.0 Unported (CC BY3.0). diff --git a/specs/python-freezerclient.rst b/specs/python-freezerclient.rst index c8b88753..6cc9a74a 100644 --- a/specs/python-freezerclient.rst +++ b/specs/python-freezerclient.rst @@ -13,7 +13,7 @@ Include the URL of your launchpad blueprint: * https://blueprints.launchpad.net/freezer/+spec/freezerclient -Freezer needs to align to the other Openstack projects and have a dedicated +Freezer needs to align to the other OpenStack projects and have a dedicated repo/client to communicate with the API and the storage media. Problem description diff --git a/specs/tenant_based_backups.rst b/specs/tenant_based_backups.rst index 82915c86..a2b165e7 100644 --- a/specs/tenant_based_backups.rst +++ b/specs/tenant_based_backups.rst @@ -128,7 +128,7 @@ Possible options: - We can add an additional option called data_input_type, setting the default to fs (file system) or stream and use tenant as backup mode -- When restoring, would probably good to recreate the tenant resources with a tenant name provided by the user (i.e. provided by Openstack environment variable like the OS_TENANT_NAME var). This has the advantage to recreate the resources with a different tenant in case is needed. +- When restoring, would probably good to recreate the tenant resources with a tenant name provided by the user (i.e. provided by OpenStack environment variable like the OS_TENANT_NAME var). This has the advantage to recreate the resources with a different tenant in case is needed. - Does the Cinder volumes needs to be attached to the VMs, in case they were when the backup was taken?