diff --git a/CHANGELOG.md b/CHANGELOG.md index 0894d62f1e..3aba88bb81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ - Prohibit mount of /sys #### Runtime -- Update Apparmor policy to not allow mounts +- Update AppArmor policy to not allow mounts ## 1.6.0 (2015-04-07) @@ -309,7 +309,7 @@ #### Hack * Clean up "go test" output from "make test" to be much more readable/scannable. -* Excluse more "definitely not unit tested Go source code" directories from hack/make/test. +* Exclude more "definitely not unit tested Go source code" directories from hack/make/test. + Generate md5 and sha256 hashes when building, and upload them via hack/release.sh. - Include contributed completions in Ubuntu PPA. + Add cli integration tests. @@ -589,7 +589,7 @@ With the ongoing changes to the networking and execution subsystems of docker te * The ADD instruction now supports caching, which avoids unnecessarily re-uploading the same source content again and again when it hasn’t changed * The new ONBUILD instruction adds to your image a “trigger” instruction to be executed at a later time, when the image is used as the base for another build * Docker now ships with an experimental storage driver which uses the BTRFS filesystem for copy-on-write -* Docker is officially supported on Mac OSX +* Docker is officially supported on Mac OS X * The Docker daemon supports systemd socket activation ## 0.7.6 (2014-01-14) @@ -643,12 +643,12 @@ With the ongoing changes to the networking and execution subsystems of docker te - Fix ADD caching issue with . prefixed path - Fix docker build on devicemapper by reverting sparse file tar option - Fix issue with file caching and prevent wrong cache hit -* Use same error handling while unmarshalling CMD and ENTRYPOINT +* Use same error handling while unmarshalling CMD and ENTRYPOINT #### Documentation * Simplify and streamline Amazon Quickstart -* Install instructions use unprefixed fedora image +* Install instructions use unprefixed Fedora image * Update instructions for mtu flag for Docker on GCE + Add Ubuntu Saucy to installation - Fix for wrong version warning on master instead of latest @@ -823,7 +823,7 @@ With the ongoing changes to the networking and execution subsystems of docker te * Improve unit tests * The test suite now runs all tests even if one fails * Refactor C in Go (Devmapper) -- Fix OSX compilation +- Fix OS X compilation ## 0.7.0 (2013-11-25) @@ -841,7 +841,7 @@ With the ongoing changes to the networking and execution subsystems of docker te #### Runtime -* Improve stability, fixes some race conditons +* Improve stability, fixes some race conditions * Skip the volumes mounted when deleting the volumes of container. * Fix layer size computation: handle hard links correctly * Use the work Path for docker cp CONTAINER:PATH diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd16f98d81..fab92f6ca0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -220,7 +220,7 @@ set of patches that should be reviewed together: for example, upgrading the version of a vendored dependency and taking advantage of its now available new feature constitute two separate units of work. Implementing a new function and calling it in another file constitute a single logical unit of work. The very -high majory of submissions should have a single commit, so if in doubt: squash +high majority of submissions should have a single commit, so if in doubt: squash down to one. After every commit, [make sure the test suite passes] diff --git a/Dockerfile b/Dockerfile index 820a5866a6..bbefb47afb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ # -e GPG_PASSPHRASE=gloubiboulga \ # docker hack/release.sh # -# Note: Apparmor used to mess with privileged mode, but this is no longer +# Note: AppArmor used to mess with privileged mode, but this is no longer # the case. Therefore, you don't have to disable it anymore. # diff --git a/README.md b/README.md index 87149c9e66..4c6e38831b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ security@docker.com and not by creating a github issue. A common method for distributing applications and sandboxing their execution is to use virtual machines, or VMs. Typical VM formats are -VMware's vmdk, Oracle Virtualbox's vdi, and Amazon EC2's ami. In theory +VMWare's vmdk, Oracle VirtualBox's vdi, and Amazon EC2's ami. In theory these formats should allow every developer to automatically package their application into a "machine" for easy distribution and deployment. In practice, that almost never happens, for a few reasons: diff --git a/builder/parser/testfiles/docker/Dockerfile b/builder/parser/testfiles/docker/Dockerfile index de6ebca8f7..4a35625415 100644 --- a/builder/parser/testfiles/docker/Dockerfile +++ b/builder/parser/testfiles/docker/Dockerfile @@ -19,7 +19,7 @@ # -e GPG_PASSPHRASE=gloubiboulga \ # docker hack/release.sh # -# Note: Apparmor used to mess with privileged mode, but this is no longer +# Note: AppArmor used to mess with privileged mode, but this is no longer # the case. Therefore, you don't have to disable it anymore. # diff --git a/contrib/syntax/textmate/README.md b/contrib/syntax/textmate/README.md index e78b76af45..8a6b8e5670 100644 --- a/contrib/syntax/textmate/README.md +++ b/contrib/syntax/textmate/README.md @@ -1,16 +1,16 @@ # Docker.tmbundle -Dockerfile syntaxt highlighting for TextMate and Sublime Text. +Dockerfile syntax highlighting for TextMate and Sublime Text. ## Install ### Sublime Text -Available for Sublime Text under [package control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting). +Available for Sublime Text under [Package Control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting). Search for *Dockerfile Syntax Highlighting* ### TextMate 2 -Copy the directory `Docker.tmbundle` (showed as a Package in OSX) to `~/Library/Application Support/TextMate/Managed/Bundles` +Copy the directory `Docker.tmbundle` (shown as a Package in OS X) to `~/Library/Application Support/TextMate/Managed/Bundles` -enjoy. +Enjoy. diff --git a/daemon/graphdriver/devmapper/README.md b/daemon/graphdriver/devmapper/README.md index 2b6e5e2e64..e8e14094b0 100644 --- a/daemon/graphdriver/devmapper/README.md +++ b/daemon/graphdriver/devmapper/README.md @@ -262,7 +262,7 @@ Here is the list of supported options: device. And devices automatically goes away when last user of device exits. - For example, when contianer exits, its associated thin device is + For example, when container exits, its associated thin device is removed. If that devices has leaked into some other mount namespace can can't be removed now, container exit will still be successful and this option will just schedule device for deferred removal and diff --git a/docs/README.md b/docs/README.md index 9cdb20984a..f22ae49efa 100755 --- a/docs/README.md +++ b/docs/README.md @@ -288,3 +288,4 @@ project. + diff --git a/docs/sources/articles/security.md b/docs/sources/articles/security.md index b3174c3c54..995a7ce124 100644 --- a/docs/sources/articles/security.md +++ b/docs/sources/articles/security.md @@ -262,7 +262,7 @@ Docker containers are, by default, quite secure; especially if you take care of running your processes inside the containers as non-privileged users (i.e., non-`root`). -You can add an extra layer of safety by enabling Apparmor, SELinux, +You can add an extra layer of safety by enabling AppArmor, SELinux, GRSEC, or your favorite hardening solution. Last but not least, if you see interesting security features in other diff --git a/docs/sources/docker-hub-enterprise/release-notes.md b/docs/sources/docker-hub-enterprise/release-notes.md index d710f7fc81..9b07b19cbf 100644 --- a/docs/sources/docker-hub-enterprise/release-notes.md +++ b/docs/sources/docker-hub-enterprise/release-notes.md @@ -22,8 +22,8 @@ page_keywords: docker, documentation, about, technology, understanding, enterpri ### CS Docker Engine 1.6.2-cs5 (21 May 2015) -For customers running Docker Engine on [supported versions of RedHat Enterprise -Linux](https://www.docker.com/enterprise/support/) with [SELinux +For customers running Docker Engine on [supported versions of Red Hat Enterprise +Linux (RHEL)](https://www.docker.com/enterprise/support/) with [SELinux enabled](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/ 6/html/Security-Enhanced_Linux/sect-Security-Enhanced_Linux-Working_with_SELinux -Enabling_and_Disabling_SELinux.html), the `docker build` and `docker run` diff --git a/docs/sources/docker-hub/builds.md b/docs/sources/docker-hub/builds.md index 9263e0e59b..7173a175be 100644 --- a/docs/sources/docker-hub/builds.md +++ b/docs/sources/docker-hub/builds.md @@ -225,7 +225,7 @@ Follow the steps below to configure the GitHub Service hooks for your Automated 1. - Log in to Github.com, and go to your Repository page. Click on "Settings" on + Log in to GitHub.com, and go to your Repository page. Click on "Settings" on the right side of the page. You must have admin privileges to the repository in order to do this. diff --git a/docs/sources/installation/binaries.md b/docs/sources/installation/binaries.md index a9a96bec0d..fc497867c1 100644 --- a/docs/sources/installation/binaries.md +++ b/docs/sources/installation/binaries.md @@ -87,7 +87,7 @@ To set the file's execute bit on Linux and OS X: $ chmod +x docker -To get the list of stable release version numbers from Github, view the +To get the list of stable release version numbers from GitHub, view the `docker/docker` [releases page](https://github.com/docker/docker/releases). > **Note** diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md index f326e0cb0d..a27d042324 100644 --- a/docs/sources/installation/mac.md +++ b/docs/sources/installation/mac.md @@ -346,7 +346,7 @@ Use `boot2docker help` to list the full command line reference. For more information about using SSH or SCP to access the Boot2Docker VM, see the README at [Boot2Docker repository](https://github.com/boot2docker/boot2docker). -Thanks to Chris Jones whose [blog](http://goo.gl/Be6cCk) inspired me to redo -this page. +Thanks to Chris Jones whose [blog](http://viget.com/extend/how-to-use-docker-on-os-x-the-missing-guide) +inspired me to redo this page. Continue with the [Docker User Guide](/userguide/). diff --git a/docs/sources/installation/softlayer.md b/docs/sources/installation/softlayer.md index d594896a92..5a11a47f49 100644 --- a/docs/sources/installation/softlayer.md +++ b/docs/sources/installation/softlayer.md @@ -1,5 +1,5 @@ page_title: Installation on IBM SoftLayer -page_description: Installation instructions for Docker on IBM Softlayer. +page_description: Installation instructions for Docker on IBM SoftLayer. page_keywords: IBM SoftLayer, virtualization, cloud, docker, documentation, installation # IBM SoftLayer diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index ef47786a6e..e56ad3abce 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -130,7 +130,7 @@ to you using: boot2docker ip -Typically, it is 192.168.59.103, but it could get changed by Virtualbox's DHCP +Typically, it is 192.168.59.103, but it could get changed by VirtualBox's DHCP implementation. For further information or to report issues, please see the [Boot2Docker site](http://boot2docker.io) diff --git a/docs/sources/project/advanced-contributing.md b/docs/sources/project/advanced-contributing.md index 7ee7a86cbe..6337a9588f 100644 --- a/docs/sources/project/advanced-contributing.md +++ b/docs/sources/project/advanced-contributing.md @@ -147,6 +147,6 @@ Making a pull request with a design proposal simplifies this process: * you can leave comments on specific design proposal line * replies around line are easy to track * as a proposal changes and is updated, pages reset as line items resolve -* Github maintains the entire history +* GitHub maintains the entire history While proposals in pull requests do not end up merged into a master repository, they provide a convenient tool for managing the design process. diff --git a/docs/sources/project/doc-style.md b/docs/sources/project/doc-style.md index 0aa0f419a3..db9c59429c 100644 --- a/docs/sources/project/doc-style.md +++ b/docs/sources/project/doc-style.md @@ -207,7 +207,7 @@ Text taken from a GUI (e.g., menu text or button text) should appear in "double quotes". The text should take the exact same capitalisation, etc. as appears in the GUI. E.g., Click "Continue" to save the settings. -Text that refers to a keyboard command or hotkey is capitalized (e.g., Ctrl-D). +Text that refers to a keyboard command or hotkey is capitalized (e.g., Ctrl-D). When writing CLI examples, give the user hints by making the examples resemble exactly what they see in their shell: diff --git a/docs/sources/project/set-up-git.md b/docs/sources/project/set-up-git.md index d67ff817c6..63e8b17fcf 100644 --- a/docs/sources/project/set-up-git.md +++ b/docs/sources/project/set-up-git.md @@ -225,7 +225,7 @@ the branch to your fork on GitHub: * [new branch] dry-run-test -> dry-run-test Branch dry-run-test set up to track remote branch dry-run-test from origin. -9. Open your browser to Github. +9. Open your browser to GitHub. 10. Navigate to your Docker fork. diff --git a/docs/sources/project/software-req-win.md b/docs/sources/project/software-req-win.md index 38cd73d10f..8dfd75fa46 100644 --- a/docs/sources/project/software-req-win.md +++ b/docs/sources/project/software-req-win.md @@ -191,8 +191,8 @@ In this section, you install the Go language. Then, you build the source so that ## Get the Docker repository -In this step, you start a Git `bash` terminal and get the Docker source code from -Github. +In this step, you start a Git `bash` terminal and get the Docker source code +from GitHub. 1. Locate the **Git Bash** program and start it. diff --git a/docs/sources/reference/api/docker_remote_api_v1.6.md b/docs/sources/reference/api/docker_remote_api_v1.6.md index cd8a730884..cca20b9cca 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.6.md +++ b/docs/sources/reference/api/docker_remote_api_v1.6.md @@ -178,7 +178,7 @@ Status Codes: "Warnings":[] } - **Second, start (using the ID returned above) the image we jus + **Second, start (using the ID returned above) the image we just created, mapping the ssh port 22 to something on the host**: POST /containers/e90e34656806/start HTTP/1.1 @@ -190,7 +190,7 @@ Status Codes: **Example response**: - HTTP/1.1 204 No Conten + HTTP/1.1 204 No Content Content-Type: text/plain; charset=utf-8 Content-Length: 0 diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index 3b98c6fcd9..7f632e149a 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -698,13 +698,13 @@ to any of the files in the context. For example, your build can use an [*ADD*](/reference/builder/#add) instruction to reference a file in the context. -The `URL` parameter can specify the location of a Git repository; the -repository acts as the build context. The system recursively clones the -repository and its submodules using a `git clone --depth 1 --recursive` -command. This command runs in a temporary directory on your local host. After -the command succeeds, the directory is sent to the Docker daemon as the -context. Local clones give you the ability to access private repositories using -local user credentials, VPN's, and so forth. +The `URL` parameter can specify the location of a Git repository; the repository +acts as the build context. The system recursively clones the repository and its +submodules using a `git clone --depth 1 --recursive` command. This command runs +in a temporary directory on your local host. After the command succeeds, the +directory is sent to the Docker daemon as the context. Local clones give you the +ability to access private repositories using local user credentials, VPNs, and +so forth. Git URLs accept context configuration in their fragment section, separated by a colon `:`. The first part represents the reference that Git will check out, diff --git a/docs/sources/reference/glossary.md b/docs/sources/reference/glossary.md index d33d015693..c04f27d548 100644 --- a/docs/sources/reference/glossary.md +++ b/docs/sources/reference/glossary.md @@ -90,7 +90,7 @@ Docker and its components. It provides the following services: - Docker image hosting - User authentication - Automated image builds and work-flow tools such as build triggers and web hooks -- Integration with GitHub and BitBucket +- Integration with GitHub and Bitbucket ## Dockerfile diff --git a/docs/sources/release-notes.md b/docs/sources/release-notes.md index 1c0fe0acf6..39d360ecde 100644 --- a/docs/sources/release-notes.md +++ b/docs/sources/release-notes.md @@ -40,7 +40,7 @@ repository](https://github.com/docker/docker/issues/). An idiosyncrasy in AUFS prevented permissions from propagating predictably between upper and lower layers. This caused issues with accessing private keys, database instances, etc. This issue was closed in this release: -[Github Issue 783](https://github.com/docker/docker/issues/783). +[GitHub Issue 783](https://github.com/docker/docker/issues/783). * *Docker Hub incompatible with Safari 8* diff --git a/docs/sources/userguide/dockerhub.md b/docs/sources/userguide/dockerhub.md index 2f7170d64f..1f11830a0a 100644 --- a/docs/sources/userguide/dockerhub.md +++ b/docs/sources/userguide/dockerhub.md @@ -16,7 +16,7 @@ most out of Docker. To do this, it provides services such as: * User authentication. * Automated image builds and work-flow tools such as build triggers and web hooks. -* Integration with GitHub and BitBucket. +* Integration with GitHub and Bitbucket. In order to use Docker Hub, you will first need to register and create an account. Don't worry, creating an account is simple and free. diff --git a/docs/sources/userguide/dockerrepos.md b/docs/sources/userguide/dockerrepos.md index 1fc1fc48f5..ec1358676f 100644 --- a/docs/sources/userguide/dockerrepos.md +++ b/docs/sources/userguide/dockerrepos.md @@ -118,16 +118,16 @@ manage private repositories. You can learn how to create and manage an organizat ### Automated Builds Automated Builds automate the building and updating of images from -[GitHub](https://www.github.com) or [BitBucket](http://bitbucket.com), directly on Docker -Hub. It works by adding a commit hook to your selected GitHub or BitBucket repository, +[GitHub](https://www.github.com) or [Bitbucket](http://bitbucket.com), directly on Docker +Hub. It works by adding a commit hook to your selected GitHub or Bitbucket repository, triggering a build and update when you push a commit. #### To setup an Automated Build 1. Create a [Docker Hub account](https://hub.docker.com/) and login. -2. Link your GitHub or BitBucket account through the ["Link Accounts"](https://registry.hub.docker.com/account/accounts/) menu. +2. Link your GitHub or Bitbucket account through the ["Link Accounts"](https://registry.hub.docker.com/account/accounts/) menu. 3. [Configure an Automated Build](https://registry.hub.docker.com/builds/add/). -4. Pick a GitHub or BitBucket project that has a `Dockerfile` that you want to build. +4. Pick a GitHub or Bitbucket project that has a `Dockerfile` that you want to build. 5. Pick the branch you want to build (the default is the `master` branch). 6. Give the Automated Build a name. 7. Assign an optional Docker tag to the Build. @@ -135,7 +135,7 @@ triggering a build and update when you push a commit. Once the Automated Build is configured it will automatically trigger a build and, in a few minutes, you should see your new Automated Build on the [Docker Hub](https://hub.docker.com) -Registry. It will stay in sync with your GitHub and BitBucket repository until you +Registry. It will stay in sync with your GitHub and Bitbucket repository until you deactivate the Automated Build. If you want to see the status of your Automated Builds, you can go to your @@ -144,7 +144,7 @@ and it will show you the status of your builds and their build history. Once you've created an Automated Build you can deactivate or delete it. You cannot, however, push to an Automated Build with the `docker push` command. -You can only manage it by committing code to your GitHub or BitBucket +You can only manage it by committing code to your GitHub or Bitbucket repository. You can create multiple Automated Builds per repository and configure them diff --git a/docs/sources/userguide/dockervolumes.md b/docs/sources/userguide/dockervolumes.md index c7126d7c33..ecca5823f4 100644 --- a/docs/sources/userguide/dockervolumes.md +++ b/docs/sources/userguide/dockervolumes.md @@ -80,9 +80,9 @@ directory from your Docker daemon's host into a container. > **Note:** > If you are using Boot2Docker, your Docker daemon only has limited access to -> your OSX/Windows filesystem. Boot2Docker tries to auto-share your `/Users` -> (OSX) or `C:\Users` (Windows) directory - and so you can mount files or directories -> using `docker run -v /Users/:/ ...` (OSX) or +> your OS X/Windows filesystem. Boot2Docker tries to auto-share your `/Users` +> (OS X) or `C:\Users` (Windows) directory - and so you can mount files or directories +> using `docker run -v /Users/:/ ...` (OS X) or > `docker run -v /c/Users/:/ come from the Boot2Docker virtual machine's filesystem. diff --git a/docs/sources/userguide/level2.md b/docs/sources/userguide/level2.md index 96e91a1c6c..3f255f52c1 100644 --- a/docs/sources/userguide/level2.md +++ b/docs/sources/userguide/level2.md @@ -74,7 +74,7 @@ RUN apt-get install -y
cd redis-stable && make && make install
# launch redis when starting the image ["redis-server"]
-# run as user dameon +# run as user daemon daemon
# expose port 6379 6379 diff --git a/experimental/README.md b/experimental/README.md index c8a02cb9b2..b129ec72d0 100644 --- a/experimental/README.md +++ b/experimental/README.md @@ -4,7 +4,7 @@ This page contains a list of features in the Docker engine which are experimental. Experimental features are **not** ready for production. They are provided for test and evaluation in your sandbox environments. -The information below describes each feature and the Github pull requests and +The information below describes each feature and the GitHub pull requests and issues associated with it. If necessary, links are provided to additional documentation on an issue. As an active Docker user and community member, please feel free to provide any feedback on these features you wish. diff --git a/image/spec/v1.md b/image/spec/v1.md index 52d6334c19..f2c29155c3 100644 --- a/image/spec/v1.md +++ b/image/spec/v1.md @@ -52,7 +52,7 @@ This specification uses the following terms:
Each layer is given an ID upon its creation. It is - represented as a hexidecimal encoding of 256 bits, e.g., + represented as a hexadecimal encoding of 256 bits, e.g., a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9. Image IDs should be sufficiently random so as to be globally unique. 32 bytes read from /dev/urandom is sufficient for all @@ -109,7 +109,7 @@ This specification uses the following terms: characters [._-], however it MAY contain additional / and : characters for organizational purposes, with the last : character being interpreted - dividing the repository component of the name from the tag suffic + dividing the repository component of the name from the tag suffix component.
diff --git a/man/docker-build.1.md b/man/docker-build.1.md index 7a5ceab0e2..089091789e 100644 --- a/man/docker-build.1.md +++ b/man/docker-build.1.md @@ -200,9 +200,9 @@ into account Docker community conventions. ## Building an image using a URL -This will clone the specified Github repository from the URL and use it +This will clone the specified GitHub repository from the URL and use it as context. The Dockerfile at the root of the repository is used as -Dockerfile. This only works if the Github repository is a dedicated +Dockerfile. This only works if the GitHub repository is a dedicated repository. docker build github.com/scollier/Fedora-Dockerfiles/tree/master/apache diff --git a/man/docker-create.1.md b/man/docker-create.1.md index 939fcbc1cf..3882fbf031 100644 --- a/man/docker-create.1.md +++ b/man/docker-create.1.md @@ -91,7 +91,7 @@ The initial status of the container created with **docker create** is 'created'. **--cgroup-parent**="" Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist. -**--cpu-peroid**=0 +**--cpu-period**=0 Limit the CPU CFS (Completely Fair Scheduler) period **--cpuset-cpus**="" diff --git a/pkg/tarsum/tarsum_spec.md b/pkg/tarsum/tarsum_spec.md index 7a6f8edc7c..51e9537394 100644 --- a/pkg/tarsum/tarsum_spec.md +++ b/pkg/tarsum/tarsum_spec.md @@ -167,7 +167,7 @@ order ( and the corresponding representation of its value): * 'devmajor' - string of the integer * 'devminor' - string of the integer -For >= Version1, the extented attribute headers ("SCHILY.xattr." prefixed pax +For >= Version1, the extended attribute headers ("SCHILY.xattr." prefixed pax headers) included after the above list. These xattrs key/values are first sorted by the keys. diff --git a/project/IRC-ADMINISTRATION.md b/project/IRC-ADMINISTRATION.md index 3cec9f7580..824a14bd51 100644 --- a/project/IRC-ADMINISTRATION.md +++ b/project/IRC-ADMINISTRATION.md @@ -16,7 +16,7 @@ with "access" privileges for a particular channel. A similar command is used to give someone a particular access level. For example, to add a new maintainer to the `#docker-maintainers` access list so -that they can contribute to the dicsussions (after they've been merged +that they can contribute to the discussions (after they've been merged appropriately in a `MAINTAINERS` file, of course), one would use `/msg ChanServ ACCESS #docker-maintainers ADD maintainer`. diff --git a/project/ISSUE-TRIAGE.md b/project/ISSUE-TRIAGE.md index be87cd81ed..84bbf0faab 100644 --- a/project/ISSUE-TRIAGE.md +++ b/project/ISSUE-TRIAGE.md @@ -1,4 +1,4 @@ -Triaging of issue +Triaging of issues ------------------ Triage provides an important way to contribute to an open source project. Triage helps ensure issues resolve quickly by: @@ -9,7 +9,7 @@ Triage provides an important way to contribute to an open source project. Triag - Lowering the issue count by preventing duplicate issues. -- Streamling the development process by preventing duplicate discussions. +- Streamlining the development process by preventing duplicate discussions. If you don't have time to code, consider helping with triage. The community will thank you for saving them time by spending some of yours. diff --git a/project/ROADMAP.md b/project/ROADMAP.md index bee2ea83a6..551ab34439 100644 --- a/project/ROADMAP.md +++ b/project/ROADMAP.md @@ -3,7 +3,7 @@ This document is a high-level overview of where we want to take Docker. It is a curated selection of planned improvements which are either important, difficult, or both. -For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/docker/issues). +For a more complete view of planned and requested improvements, see [the GitHub issues](https://github.com/docker/docker/issues). To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request. diff --git a/vendor/src/github.com/Sirupsen/logrus/README.md b/vendor/src/github.com/Sirupsen/logrus/README.md index 3578deaec0..72e7a78288 100644 --- a/vendor/src/github.com/Sirupsen/logrus/README.md +++ b/vendor/src/github.com/Sirupsen/logrus/README.md @@ -324,7 +324,7 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) { #### Logger as an `io.Writer` -Logrus can be transormed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it. +Logrus can be transformed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it. ```go w := logger.Writer() diff --git a/vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md b/vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md index 667cc5a63f..c848f4dbcb 100644 --- a/vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md +++ b/vendor/src/github.com/docker/libcontainer/CONTRIBUTING.md @@ -24,21 +24,21 @@ The following packages are required to compile libcontainer natively. - git - cgutils -You can develop on OSX, but you are limited to Dockerfile-based builds only. +You can develop on OS X, but you are limited to Dockerfile-based builds only. ### Building libcontainer from Dockerfile make all This is the easiest way of building libcontainer. -As this build is done using Docker, you can even run this from [OSX](https://github.com/boot2docker/boot2docker) +As this build is done using Docker, you can even run this from [OS X](https://github.com/boot2docker/boot2docker) ### Testing changes with "nsinit" make sh This will create an container that runs `nsinit exec sh` on a busybox rootfs with the configuration from ['minimal.json'](https://github.com/docker/libcontainer/blob/master/sample_configs/minimal.json). -Like the previous command, you can run this on OSX too! +Like the previous command, you can run this on OS X too! ### Building libcontainer directly diff --git a/vendor/src/github.com/docker/libcontainer/ROADMAP.md b/vendor/src/github.com/docker/libcontainer/ROADMAP.md index f59035351a..7412460ef8 100644 --- a/vendor/src/github.com/docker/libcontainer/ROADMAP.md +++ b/vendor/src/github.com/docker/libcontainer/ROADMAP.md @@ -3,7 +3,7 @@ This document is a high-level overview of where we want to take libcontainer next. It is a curated selection of planned improvements which are either important, difficult, or both. -For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/libcontainer/issues). +For a more complete view of planned and requested improvements, see [the GitHub issues](https://github.com/docker/libcontainer/issues). To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request. diff --git a/vendor/src/github.com/docker/libcontainer/SPEC.md b/vendor/src/github.com/docker/libcontainer/SPEC.md index 5d37fe935a..39ccd68eae 100644 --- a/vendor/src/github.com/docker/libcontainer/SPEC.md +++ b/vendor/src/github.com/docker/libcontainer/SPEC.md @@ -60,7 +60,7 @@ are required to be mounted within the rootfs that the runtime will setup. After a container's filesystems are mounted within the newly created mount namespace `/dev` will need to be populated with a set of device nodes. It is expected that a rootfs does not need to have any device nodes specified -for `/dev` witin the rootfs as the container will setup the correct devices +for `/dev` within the rootfs as the container will setup the correct devices that are required for executing a container's process. | Path | Mode | Access | diff --git a/vendor/src/github.com/docker/libcontainer/console_linux.go b/vendor/src/github.com/docker/libcontainer/console_linux.go index 5eaf03169b..d5fec6fd6e 100644 --- a/vendor/src/github.com/docker/libcontainer/console_linux.go +++ b/vendor/src/github.com/docker/libcontainer/console_linux.go @@ -44,7 +44,7 @@ func newConsoleFromPath(slavePath string) *linuxConsole { } } -// linuxConsole is a linux psuedo TTY for use within a container. +// linuxConsole is a linux pseudo TTY for use within a container. type linuxConsole struct { master *os.File slavePath string diff --git a/vendor/src/github.com/docker/libcontainer/nsenter/README.md b/vendor/src/github.com/docker/libcontainer/nsenter/README.md index d1a60ef985..7da6dbe9a2 100644 --- a/vendor/src/github.com/docker/libcontainer/nsenter/README.md +++ b/vendor/src/github.com/docker/libcontainer/nsenter/README.md @@ -18,7 +18,7 @@ which will give the process of the container that should be joined. Namespaces f be found from `/proc/[pid]/ns` and set by `setns` syscall. And then get the pipe number from `_LIBCONTAINER_INITPIPE`, error message could -be transfered through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will +be transferred through it. If tty is added, `_LIBCONTAINER_CONSOLE_PATH` will have value and start a console for output. Finally, `nsexec()` will clone a child process , exit the parent process and let diff --git a/vendor/src/github.com/docker/libtrust/util.go b/vendor/src/github.com/docker/libtrust/util.go index 4d5a6200a8..153f7b462c 100644 --- a/vendor/src/github.com/docker/libtrust/util.go +++ b/vendor/src/github.com/docker/libtrust/util.go @@ -16,7 +16,7 @@ import ( ) // joseBase64UrlEncode encodes the given data using the standard base64 url -// encoding format but with all trailing '=' characters ommitted in accordance +// encoding format but with all trailing '=' characters omitted in accordance // with the jose specification. // http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31#section-2 func joseBase64UrlEncode(b []byte) string { diff --git a/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md b/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md index f1880c19e5..849323a5f1 100644 --- a/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md +++ b/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md @@ -4,7 +4,7 @@ We always welcome contributions to help make `go-zfs` better. Please take a mome ### Reporting issues ### -We use [Github issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests. +We use [GitHub issues](https://github.com/mistifyio/go-zfs/issues) to track bug reports, feature requests, and submitting pull requests. If you find a bug: diff --git a/vendor/src/github.com/mistifyio/go-zfs/README.md b/vendor/src/github.com/mistifyio/go-zfs/README.md index 2515e588e0..fef80d727b 100644 --- a/vendor/src/github.com/mistifyio/go-zfs/README.md +++ b/vendor/src/github.com/mistifyio/go-zfs/README.md @@ -29,7 +29,7 @@ The tests have decent examples for most functions. ```go //assuming a zpool named test -//error handling ommitted +//error handling omitted f, err := zfs.CreateFilesystem("test/snapshot-test", nil) diff --git a/vendor/src/github.com/vishvananda/netlink/README.md b/vendor/src/github.com/vishvananda/netlink/README.md index 555f886523..734384cfcd 100644 --- a/vendor/src/github.com/vishvananda/netlink/README.md +++ b/vendor/src/github.com/vishvananda/netlink/README.md @@ -8,7 +8,7 @@ the kernel. It can be used to add and remove interfaces, set ip addresses and routes, and configure ipsec. Netlink communication requires elevated privileges, so in most cases this code needs to be run as root. Since low-level netlink messages are inscrutable at best, the library attempts -to provide an api that is loosely modeled on the CLI provied by iproute2. +to provide an api that is loosely modeled on the CLI provided by iproute2. Actions like `ip link add` will be accomplished via a similarly named function like AddLink(). This library began its life as a fork of the netlink functionality in diff --git a/vendor/src/github.com/vishvananda/netns/README.md b/vendor/src/github.com/vishvananda/netns/README.md index 24a4003ae6..57d195f2c7 100644 --- a/vendor/src/github.com/vishvananda/netns/README.md +++ b/vendor/src/github.com/vishvananda/netns/README.md @@ -38,7 +38,7 @@ func main() { newns, _ := netns.New() defer newns.Close() - // Do something with tne network namespace + // Do something with the network namespace ifaces, _ := net.Interfaces() fmt.Printf("Interfaces: %v\n", ifaces)