diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2020-08-07 15:33:19 +0300 |
|---|---|---|
| committer | aiordache <anca.iordache@docker.com> | 2020-08-10 18:09:07 +0200 |
| commit | 687f23afe4fcbff6f343d795e4d1272599e714c8 (patch) | |
| tree | 10eca1b8b75be3339791159f7255af3afa91c1b7 | |
| parent | 75ed0ecf5a6cbfa519889e024bd3d35ab031ff5a (diff) | |
| download | docker-py-687f23afe4fcbff6f343d795e4d1272599e714c8.tar.gz | |
Spelling fixes (#2571)
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
| -rw-r--r-- | docker/api/container.py | 2 | ||||
| -rw-r--r-- | docs/change-log.md | 4 | ||||
| -rw-r--r-- | tests/unit/utils_build_test.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docker/api/container.py b/docker/api/container.py index 2ba08e5..ee3b4c3 100644 --- a/docker/api/container.py +++ b/docker/api/container.py @@ -1125,7 +1125,7 @@ class ContainerApiMixin(object): 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) diff --git a/docs/change-log.md b/docs/change-log.md index e1b9e5d..3f61690 100644 --- a/docs/change-log.md +++ b/docs/change-log.md @@ -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 @@ -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`). diff --git a/tests/unit/utils_build_test.py b/tests/unit/utils_build_test.py index 012f15b..bc6fb5f 100644 --- a/tests/unit/utils_build_test.py +++ b/tests/unit/utils_build_test.py @@ -335,7 +335,7 @@ class ExcludePathsTest(unittest.TestCase): # 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, |