diff options
author | Zuul <zuul@review.openstack.org> | 2019-01-22 20:01:11 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-01-22 20:01:11 +0000 |
commit | ce8e8264a317e8f528657a3ab8dde74c26f9b17a (patch) | |
tree | 98f53b8430686d293359deb52432291cb4657bc7 | |
parent | d2941999eb0d93e6fb63d577fd0a43e184f29a64 (diff) | |
parent | 7b40eb190f8e01a12ffb6fc9ab4760316185cdc9 (diff) |
Merge "fix typos in API.rst & output.py"
-rw-r--r-- | doc/source/API.rst | 4 | ||||
-rw-r--r-- | src/bin/shipyard_client/shipyard_client/cli/help/output.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/API.rst b/doc/source/API.rst index f463b67..42bab95 100644 --- a/doc/source/API.rst +++ b/doc/source/API.rst | |||
@@ -104,9 +104,9 @@ collections, rather than individually. At any point in time, there will | |||
104 | be several versions of documents in a site that are accessible via this API: | 104 | be several versions of documents in a site that are accessible via this API: |
105 | 105 | ||
106 | - The "Committed Documents" version, which represents the last version of | 106 | - The "Committed Documents" version, which represents the last version of |
107 | documents that were successfully commited with a commit_configdocs action. | 107 | documents that were successfully committed with a commit_configdocs action. |
108 | - The "Shipyard Buffer" version, which represents the collection of documents | 108 | - The "Shipyard Buffer" version, which represents the collection of documents |
109 | that have been ingested by this API since the last commited version. Note | 109 | that have been ingested by this API since the last committed version. Note |
110 | that only one set of documents maybe posted to the buffer at a time by | 110 | that only one set of documents maybe posted to the buffer at a time by |
111 | default. (This behavior can be overridden by query parameters issued by the | 111 | default. (This behavior can be overridden by query parameters issued by the |
112 | user of Shipyard) | 112 | user of Shipyard) |
diff --git a/src/bin/shipyard_client/shipyard_client/cli/help/output.py b/src/bin/shipyard_client/shipyard_client/cli/help/output.py index a896ca3..7955c6c 100644 --- a/src/bin/shipyard_client/shipyard_client/cli/help/output.py +++ b/src/bin/shipyard_client/shipyard_client/cli/help/output.py | |||
@@ -41,7 +41,7 @@ update_site: Triggers the update to a deployment of a site, using the latest | |||
41 | committed configuration documents. | 41 | committed configuration documents. |
42 | 42 | ||
43 | update_software: Starts an update that only exercises the software portion of | 43 | update_software: Starts an update that only exercises the software portion of |
44 | the commited configuration documents. | 44 | the committed configuration documents. |
45 | 45 | ||
46 | redeploy_server: Using parameters to indicate which server(s), triggers a | 46 | redeploy_server: Using parameters to indicate which server(s), triggers a |
47 | redeployment of servers to the last committed design and | 47 | redeployment of servers to the last committed design and |