docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6948 from squarejaw/master 

Fix typos
This commit is contained in:
Sven Dowideit 2014-07-10 09:05:48 +00:00
parent 439d7ea701 1df4049e17
commit 1c50f3797c
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CHANGELOG.md
View File

@ -304,7 +304,7 @@
- Add newlines to the JSON stream functions. - Add newlines to the JSON stream functions.
#### Runtime #### Runtime
* Do not ping the registry from the CLI. All requests to registres flow through the daemon. * Do not ping the registry from the CLI. All requests to registries flow through the daemon.
- Check for nil information return in the lxc driver. This fixes panics with older lxc versions. - Check for nil information return in the lxc driver. This fixes panics with older lxc versions.
- Devicemapper: cleanups and fix for unmount. Fixes two problems which were causing unmount to fail intermittently. - Devicemapper: cleanups and fix for unmount. Fixes two problems which were causing unmount to fail intermittently.
- Devicemapper: remove directory when removing device. Directories don't get left behind when removing the device. - Devicemapper: remove directory when removing device. Directories don't get left behind when removing the device.
@ -896,7 +896,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
+ Add domainname support + Add domainname support
+ Implement image filtering with path.Match + Implement image filtering with path.Match
* Remove unnecesasry warnings * Remove unnecessary warnings
* Remove os/user dependency * Remove os/user dependency
* Only mount the hostname file when the config exists * Only mount the hostname file when the config exists
* Handle signals within the `docker login` command * Handle signals within the `docker login` command
@ -919,7 +919,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
+ Hack: Vendor all dependencies + Hack: Vendor all dependencies
* Remote API: Bump to v1.5 * Remote API: Bump to v1.5
* Packaging: Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc. * Packaging: Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc.
* Documentation: General improvments * Documentation: General improvements
## 0.6.1 (2013-08-23) ## 0.6.1 (2013-08-23)
@ -1189,7 +1189,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
* Prevent rm of running containers * Prevent rm of running containers
* Use go1.1 cookiejar * Use go1.1 cookiejar
- Fix issue detaching from running TTY container - Fix issue detaching from running TTY container
- Forbid parralel push/pull for a single image/repo. Fixes #311 - Forbid parallel push/pull for a single image/repo. Fixes #311
- Fix race condition within Run command when attaching. - Fix race condition within Run command when attaching.
#### Client #### Client
@ -1305,7 +1305,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
+ Add caching to docker builder + Add caching to docker builder
+ Add support for docker builder with native API as top level command + Add support for docker builder with native API as top level command
+ Implement ENV within docker builder + Implement ENV within docker builder
- Check the command existance prior create and add Unit tests for the case - Check the command existence prior create and add Unit tests for the case
* use any whitespaces instead of tabs * use any whitespaces instead of tabs
#### Runtime #### Runtime
@ -1344,13 +1344,13 @@ With the ongoing changes to the networking and execution subsystems of docker te
#### Runtime #### Runtime
- Fix the command existance check - Fix the command existence check
- strings.Split may return an empty string on no match - strings.Split may return an empty string on no match
- Fix an index out of range crash if cgroup memory is not - Fix an index out of range crash if cgroup memory is not
#### Documentation #### Documentation
* Various improvments * Various improvements
+ New example: sharing data between 2 couchdb databases + New example: sharing data between 2 couchdb databases
#### Other #### Other
@ -1380,7 +1380,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
## 0.2.0 (2013-04-23) ## 0.2.0 (2013-04-23)
- Runtime: ghost containers can be killed and waited for - Runtime: ghost containers can be killed and waited for
* Documentation: update install intructions * Documentation: update install instructions
- Packaging: fix Vagrantfile - Packaging: fix Vagrantfile
- Development: automate releasing binaries and ubuntu packages - Development: automate releasing binaries and ubuntu packages
+ Add a changelog + Add a changelog

4
daemon/graphdriver/devmapper/README.md
View File

@ -22,7 +22,7 @@ inode number of the $graph directory.
On the thin pool docker automatically creates a base thin device, On the thin pool docker automatically creates a base thin device,
called something like `docker-0:33-19478248-base` of a fixed called something like `docker-0:33-19478248-base` of a fixed
size. This is automatically formated on creation and contains just an size. This is automatically formatted on creation and contains just an
empty filesystem. This device is the base of all docker images and empty filesystem. This device is the base of all docker images and
containers. All base images are snapshots of this device and those containers. All base images are snapshots of this device and those
images are then in turn used as snapshots for other images and images are then in turn used as snapshots for other images and
@ -32,7 +32,7 @@ eventually containers.
The devicemapper backend supports some options that you can specify The devicemapper backend supports some options that you can specify
when starting the docker daemon using the --storage-opt flags. when starting the docker daemon using the --storage-opt flags.
This uses the `dm` prefix and would be used somthing like `docker -d --storage-opt dm.foo=bar`. This uses the `dm` prefix and would be used something like `docker -d --storage-opt dm.foo=bar`.
Here is the list of supported options: Here is the list of supported options:

2
docs/man/Dockerfile.5.md
View File

@ -96,7 +96,7 @@ or
If you use the shell form of the CMD, the <command> executes in /bin/sh -c: If you use the shell form of the CMD, the <command> executes in /bin/sh -c:
**FROM ubuntu** **FROM ubuntu**
**CMD echo "This is a test." | wc -** **CMD echo "This is a test." | wc -**
If you run <command> wihtout a shell, then you must express the command as a If you run <command> without a shell, then you must express the command as a
JSON arry and give the full path to the executable. This array form is the JSON arry and give the full path to the executable. This array form is the
preferred form of CMD. All additional parameters must be individually expressed preferred form of CMD. All additional parameters must be individually expressed
as strings in the array: as strings in the array:

2
docs/man/docker-run.1.md
View File

@ -338,7 +338,7 @@ fedora-data image:
Multiple --volumes-from parameters will bring together multiple data volumes from Multiple --volumes-from parameters will bring together multiple data volumes from
multiple containers. And it's possible to mount the volumes that came from the multiple containers. And it's possible to mount the volumes that came from the
DATA container in yet another container via the fedora-container1 intermidiery DATA container in yet another container via the fedora-container1 intermediary
container, allowing to abstract the actual data source from users of that data: container, allowing to abstract the actual data source from users of that data:
# docker run --volumes-from=fedora-container1 --name=fedora-container2 -i -t fedora bash # docker run --volumes-from=fedora-container1 --name=fedora-container2 -i -t fedora bash

2
docs/man/docker-tag.1.md
View File

@ -29,7 +29,7 @@ separated by a ':'
**TAG** **TAG**
The tag you are assigning to the image. Though this is arbitrary it is The tag you are assigning to the image. Though this is arbitrary it is
recommended to be used for a version to disinguish images with the same name. recommended to be used for a version to distinguish images with the same name.
Note that here TAG is a part of the overall name or "tag". Note that here TAG is a part of the overall name or "tag".
# OPTIONS # OPTIONS

2
docs/sources/articles/runmetrics.md
View File

@ -365,7 +365,7 @@ container, we need to:
Please review [*Enumerating Cgroups*](#enumerating-cgroups) to learn how to find Please review [*Enumerating Cgroups*](#enumerating-cgroups) to learn how to find
the cgroup of a pprocess running in the container of which you want to the cgroup of a pprocess running in the container of which you want to
measure network usage. From there, you can examine the pseudo-file named measure network usage. From there, you can examine the pseudo-file named
`tasks`, which containes the PIDs that are in the `tasks`, which contains the PIDs that are in the
control group (i.e. in the container). Pick any one of them. control group (i.e. in the container). Pick any one of them.
Putting everything together, if the "short ID" of a container is held in Putting everything together, if the "short ID" of a container is held in

4
docs/sources/reference/api/docker_remote_api.md
View File

@ -100,7 +100,7 @@ after timestamp.
`GET /containers/(id)/logs` `GET /containers/(id)/logs`
This url is prefered method for getting container logs now. This url is preferred method for getting container logs now.
## v1.10 ## v1.10
@ -284,7 +284,7 @@ output is now generated in the client, using the
**New!** **New!**
You can now split stderr from stdout. This is done by You can now split stderr from stdout. This is done by
prefixing a header to each transmition. See prefixing a header to each transmission. See
[`POST /containers/(id)/attach`]( [`POST /containers/(id)/attach`](
/reference/api/docker_remote_api_v1.9/#post--containers-(id)-attach "POST /containers/(id)/attach"). /reference/api/docker_remote_api_v1.9/#post--containers-(id)-attach "POST /containers/(id)/attach").
The WebSocket attach is unchanged. Note that attach calls on the The WebSocket attach is unchanged. Note that attach calls on the