From d6412aa3a9604d2621d185be6187b0cd50ee358c Mon Sep 17 00:00:00 2001 From: Anh Tran Date: Thu, 24 Mar 2016 13:10:17 +0700 Subject: [PATCH] Removes redundants This patch removes redundant "to" and "the". Change-Id: I6c1a9012fc331cc546c5fc39dd3fc1051a1257ff --- api-guide/source/consumers.rst | 2 +- barbican/model/repositories.py | 10 +++++----- barbican/plugin/store_crypto.py | 2 +- doc/source/api/reference/certificates.rst | 2 +- doc/source/api/reference/consumers.rst | 4 ++-- doc/source/api/reference/containers.rst | 2 +- doc/source/api/reference/secret_metadata.rst | 12 ++++++------ doc/source/api/reference/secrets.rst | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api-guide/source/consumers.rst b/api-guide/source/consumers.rst index 6f7a3498e..0c5d6d57b 100644 --- a/api-guide/source/consumers.rst +++ b/api-guide/source/consumers.rst @@ -10,7 +10,7 @@ If you need assistance with getting set up, please reference the What is a Consumer? ################### -A consumer is a way to to register as an interested party for a container. All of the registered +A consumer is a way to register as an interested party for a container. All of the registered consumers can be viewed by performing a GET on the {container_ref}/consumers. The idea being that before a container is deleted all consumers should be notified of the delete. diff --git a/barbican/model/repositories.py b/barbican/model/repositories.py index ed44d73ac..e787cec02 100755 --- a/barbican/model/repositories.py +++ b/barbican/model/repositories.py @@ -741,7 +741,7 @@ class SecretStoreMetadatumRepo(BaseRepo): """ def save(self, metadata, secret_model): - """Saves the the specified metadata for the secret. + """Saves the specified metadata for the secret. :raises NotFound if entity does not exist. """ @@ -788,7 +788,7 @@ class SecretUserMetadatumRepo(BaseRepo): """ def create_replace_user_metadata(self, secret_id, metadata): - """Creates or replaces the the specified metadata for the secret.""" + """Creates or replaces the specified metadata for the secret.""" now = timeutils.utcnow() session = get_session() @@ -1005,7 +1005,7 @@ class OrderPluginMetadatumRepo(BaseRepo): """ def save(self, metadata, order_model): - """Saves the the specified metadata for the order. + """Saves the specified metadata for the order. :raises NotFound if entity does not exist. """ @@ -1058,7 +1058,7 @@ class OrderBarbicanMetadatumRepo(BaseRepo): """ def save(self, metadata, order_model): - """Saves the the specified metadata for the order. + """Saves the specified metadata for the order. :raises NotFound if entity does not exist. """ @@ -1593,7 +1593,7 @@ class CertificateAuthorityMetadatumRepo(BaseRepo): """ def save(self, metadata, ca_model): - """Saves the the specified metadata for the CA. + """Saves the specified metadata for the CA. :raises NotFound if entity does not exist. """ diff --git a/barbican/plugin/store_crypto.py b/barbican/plugin/store_crypto.py index 6528f6253..591e94278 100644 --- a/barbican/plugin/store_crypto.py +++ b/barbican/plugin/store_crypto.py @@ -318,7 +318,7 @@ def _store_secret_and_datum( def _indicate_bind_completed(kek_meta_dto, kek_datum): """Updates the supplied kek_datum instance - Updates the the kek_datum per the contents of the supplied + Updates the kek_datum per the contents of the supplied kek_meta_dto instance. This function is typically used once plugins have had a chance to bind kek_meta_dto to their crypto systems. diff --git a/doc/source/api/reference/certificates.rst b/doc/source/api/reference/certificates.rst index 72f3c06bb..0ffe0d3b0 100644 --- a/doc/source/api/reference/certificates.rst +++ b/doc/source/api/reference/certificates.rst @@ -144,7 +144,7 @@ HTTP Status Codes | 401 | Invalid X-Auth-Token or the token doesn't have permissions to this resource | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | create an order. This can be based on the the user's role or the project's | +| | create an order. This can be based on the user's role or the project's | | | quota. | +------+-----------------------------------------------------------------------------+ | 415 | Unsupported media type | diff --git a/doc/source/api/reference/consumers.rst b/doc/source/api/reference/consumers.rst index 2be3bae80..e698b895f 100644 --- a/doc/source/api/reference/consumers.rst +++ b/doc/source/api/reference/consumers.rst @@ -200,14 +200,14 @@ HTTP Status Codes +------+-----------------------------------------------------------------------------+ | Code | Description | +======+=============================================================================+ -| 200 | OK | +| 200 | OK | +------+-----------------------------------------------------------------------------+ | 400 | Bad Request | +------+-----------------------------------------------------------------------------+ | 401 | Invalid X-Auth-Token or the token doesn't have permissions to this resource | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | create a consumer. This can be based on the the user's role or the | +| | create a consumer. This can be based on the user's role or the | | | project's quota. | +------+-----------------------------------------------------------------------------+ diff --git a/doc/source/api/reference/containers.rst b/doc/source/api/reference/containers.rst index 1ce123c2e..ffe772efd 100644 --- a/doc/source/api/reference/containers.rst +++ b/doc/source/api/reference/containers.rst @@ -238,7 +238,7 @@ HTTP Status Codes | 401 | Invalid X-Auth-Token or the token doesn't have permissions to this resource | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | create a container. This can be based on the the user's role or the | +| | create a container. This can be based on the user's role or the | | | project's quota. | +------+-----------------------------------------------------------------------------+ diff --git a/doc/source/api/reference/secret_metadata.rst b/doc/source/api/reference/secret_metadata.rst index 46b82ba1a..163765581 100644 --- a/doc/source/api/reference/secret_metadata.rst +++ b/doc/source/api/reference/secret_metadata.rst @@ -61,7 +61,7 @@ HTTP Status Codes | | resource. | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | retrieve secret metadata. This can be based on the the user's role. | +| | retrieve secret metadata. This can be based on the user's role. | +------+-----------------------------------------------------------------------------+ | 404 | Not Found | +------+-----------------------------------------------------------------------------+ @@ -128,7 +128,7 @@ HTTP Status Codes | | resource. | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | create secret metadata. This can be based on the the user's role. | +| | create secret metadata. This can be based on the user's role. | +------+-----------------------------------------------------------------------------+ .. _get_secret_metadatum: @@ -171,7 +171,7 @@ HTTP Status Codes | | resource | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | retrieve secret metadata. This can be based on the the user's role. | +| | retrieve secret metadata. This can be based on the user's role. | +------+-----------------------------------------------------------------------------+ | 404 | Not Found | +------+-----------------------------------------------------------------------------+ @@ -228,7 +228,7 @@ HTTP Status Codes | | resource. | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | create secret metadata. This can be based on the the user's role. | +| | create secret metadata. This can be based on the user's role. | +------+-----------------------------------------------------------------------------+ | 409 | Conflict. The provided metadata key already exists. | +------+-----------------------------------------------------------------------------+ @@ -286,7 +286,7 @@ HTTP Status Codes | | resource. | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | update secret metadata. This can be based on the the user's role. | +| | update secret metadata. This can be based on the user's role. | +------+-----------------------------------------------------------------------------+ | 404 | Not Found | +------+-----------------------------------------------------------------------------+ @@ -326,7 +326,7 @@ HTTP Status Codes | | resource. | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | delete secret metdata. This can be based on the the user's role. | +| | delete secret metdata. This can be based on the user's role. | +------+-----------------------------------------------------------------------------+ | 404 | Not Found | +------+-----------------------------------------------------------------------------+ diff --git a/doc/source/api/reference/secrets.rst b/doc/source/api/reference/secrets.rst index ed4cdec4c..7e34fa712 100644 --- a/doc/source/api/reference/secrets.rst +++ b/doc/source/api/reference/secrets.rst @@ -230,7 +230,7 @@ HTTP Status Codes | 401 | Invalid X-Auth-Token or the token doesn't have permissions to this resource | +------+-----------------------------------------------------------------------------+ | 403 | Forbidden. The user has been authenticated, but is not authorized to | -| | create a secret. This can be based on the the user's role or the | +| | create a secret. This can be based on the user's role or the | | | project's quota. | +------+-----------------------------------------------------------------------------+ | 415 | Unsupported media-type |