Skip to content

Commit

Permalink
Spelling fixes (#2571)
Browse files Browse the repository at this point in the history
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
  • Loading branch information
scop authored and aiordache committed Aug 10, 2020
1 parent 75ed0ec commit 687f23a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker/api/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ def stats(self, container, decode=None, stream=True):
else:
if decode:
raise errors.InvalidArgument(
"decode is only available in conjuction with stream=True"
"decode is only available in conjunction with stream=True"
)
return self._result(self._get(url, params={'stream': False}),
json=True)
Expand Down
4 changes: 2 additions & 2 deletions docs/change-log.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Change log

### Bugfixes

* Fix base_url to keep TCP protocol on utils.py by letting the responsability of changing the
* Fix base_url to keep TCP protocol on utils.py by letting the responsibility of changing the
protocol to `parse_host` afterwards, letting `base_url` with the original value.
* XFAIL test_attach_stream_and_cancel on TLS

Expand Down Expand Up @@ -1237,7 +1237,7 @@ like the others
(`Client.volumes`, `Client.create_volume`, `Client.inspect_volume`,
`Client.remove_volume`).
* Added support for the `group_add` parameter in `create_host_config`.
* Added support for the CPU CFS (`cpu_quota` and `cpu_period`) parameteres
* Added support for the CPU CFS (`cpu_quota` and `cpu_period`) parameters
in `create_host_config`.
* Added support for the archive API endpoint (`Client.get_archive`,
`Client.put_archive`).
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/utils_build_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ def test_parent_directory(self):
# Dockerignore reference stipulates that absolute paths are
# equivalent to relative paths, hence /../foo should be
# equivalent to ../foo. It also stipulates that paths are run
# through Go's filepath.Clean, which explicitely "replace
# through Go's filepath.Clean, which explicitly "replace
# "/.." by "/" at the beginning of a path".
assert exclude_paths(
base,
Expand Down

0 comments on commit 687f23a

Please sign in to comment.