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

I'm going to wish I didn't do this 

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
This commit is contained in:
SvenDowideit 2014-07-02 10:30:25 +10:00 committed by Tibor Vass
parent 0db5ead653
commit 6f03f597ad
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/zsh/_docker
View File

@ -1,6 +1,6 @@
#compdef docker #compdef docker
# #
# zsh completion for docker (http://docker.io) # zsh completion for docker (http://docker.com)
# #
# version: 0.2.2 # version: 0.2.2
# author: Felix Riedel # author: Felix Riedel

8
docs/README.md
View File

@ -3,7 +3,7 @@
The source for Docker documentation is here under `sources/` and uses extended The source for Docker documentation is here under `sources/` and uses extended
Markdown, as implemented by [MkDocs](http://mkdocs.org). Markdown, as implemented by [MkDocs](http://mkdocs.org).
The HTML files are built and hosted on `https://docs.docker.io`, and update The HTML files are built and hosted on `https://docs.docker.com`, and update
automatically after each change to the master or release branch of [Docker on automatically after each change to the master or release branch of [Docker on
GitHub](https://github.com/dotcloud/docker) thanks to post-commit hooks. The GitHub](https://github.com/dotcloud/docker) thanks to post-commit hooks. The
`docs` branch maps to the "latest" documentation and the `master` (unreleased `docs` branch maps to the "latest" documentation and the `master` (unreleased
@ -21,14 +21,14 @@ In the rare case where your change is not forward-compatible, you may need to
base your changes on the `docs` branch. base your changes on the `docs` branch.
Also, now that we have a `docs` branch, we can keep the Also, now that we have a `docs` branch, we can keep the
[http://docs.docker.io](http://docs.docker.io) docs up to date with any bugs [http://docs.docker.com](http://docs.docker.com) docs up to date with any bugs
found between Docker code releases. found between Docker code releases.
**Warning**: When *reading* the docs, the **Warning**: When *reading* the docs, the
[http://beta-docs.docker.io](http://beta-docs.docker.io) documentation may [http://docs-stage.docker.com](http://docs-stage.docker.com) documentation may
include features not yet part of any official Docker release. The `beta-docs` include features not yet part of any official Docker release. The `beta-docs`
site should be used only for understanding bleeding-edge development and site should be used only for understanding bleeding-edge development and
`docs.docker.io` (which points to the `docs` branch`) should be used for the `docs.docker.com` (which points to the `docs` branch`) should be used for the
latest official release. latest official release.
## Contributing ## Contributing

2
docs/sources/reference/run.md
View File

@ -240,7 +240,7 @@ to access to all devices on the host as well as set some configuration
in AppArmor to allow the container nearly all the same access to the in AppArmor to allow the container nearly all the same access to the
host as processes running outside containers on the host. Additional host as processes running outside containers on the host. Additional
information about running with `--privileged` is available on the information about running with `--privileged` is available on the
[Docker Blog](http://blog.docker.io/2013/09/docker-can-now-run-within-docker/). [Docker Blog](http://blog.docker.com/2013/09/docker-can-now-run-within-docker/).
If the Docker daemon was started using the `lxc` exec-driver If the Docker daemon was started using the `lxc` exec-driver
(`docker -d --exec-driver=lxc`) then the operator can also specify LXC options (`docker -d --exec-driver=lxc`) then the operator can also specify LXC options