Skip to content

Commit

Permalink
Merge pull request docker#696 from alexwlchan/master
Browse files Browse the repository at this point in the history
Fix a few typos in the docs
  • Loading branch information
shin- committed Jul 29, 2015
2 parents 70dd654 + 78ccfc8 commit 07a99ea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions docs/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ the entire backlog.
* container (str): The container to attach to
* stdout (bool): Get STDOUT
* stderr (bool): Get STDERR
* stream (bool): Return an interator
* stream (bool): Return an iterator
* logs (bool): Get all previous output

**Returns** (generator or str): The logs or output for the image
Expand Down Expand Up @@ -70,7 +70,7 @@ correct value (e.g `gzip`).
- memory (int): set memory limit for build
- memswap (int): Total memory (memory + swap), -1 to disable swap
- cpushares (int): CPU shares (relative weight)
- cpusetcpus (str): CPUs in which to allow exection, e.g., `"0-3"`, `"0,1"`
- cpusetcpus (str): CPUs in which to allow execution, e.g., `"0-3"`, `"0,1"`
* decode (bool): If set to `True`, the returned stream will be decoded into
dicts on the fly. Default `False`.

Expand Down Expand Up @@ -123,7 +123,7 @@ Identical to the `docker commit` command.
* tag (str): The tag to push
* message (str): A commit message
* author (str): The name of the author
* conf (dict): The configuraton for the container. See the [Docker remote api](
* conf (dict): The configuration for the container. See the [Docker remote api](
https://docs.docker.com/reference/api/docker_remote_api/) for full details.

## containers
Expand Down Expand Up @@ -397,7 +397,7 @@ src will be treated as a URL instead to fetch the image from. You can also pass
an open file handle as 'src', in which case the data will be read from that
file.

If `src` is unset but `image` is set, the `image` paramater will be taken as
If `src` is unset but `image` is set, the `image` parameter will be taken as
the name of an existing image to import from.

**Params**:
Expand Down
2 changes: 1 addition & 1 deletion docs/change_log.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Change Log
* 404 API status now raises `docker.errors.NotFound`. This exception inherits
`APIError` which was used previously.
* Docs fixes
* Test ixes
* Test fixes

1.3.0
-----
Expand Down

0 comments on commit 07a99ea

Please sign in to comment.