diff --git a/CHANGELOG.md b/CHANGELOG.md index ffdeccfb0f739..56704185ad147 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1721,7 +1721,7 @@ With the ongoing changes to the networking and execution subsystems of docker te + Add -rm to docker run for removing a container on exit - Remove error messages which are not actually errors - Fix `docker rm` with volumes -- Fix some error cases where a HTTP body might not be closed +- Fix some error cases where an HTTP body might not be closed - Fix panic with wrong dockercfg file - Fix the attach behavior with -i * Record termination time in state. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 26ce62b5c093b..5d2038368595a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -121,7 +121,7 @@ However, there might be a way to implement that feature *on top of* Docker. The docker-dev group is for contributors and other people contributing to the Docker project. - You can join them without an google account by sending an email to + You can join them without a google account by sending an email to docker-dev+subscribe@googlegroups.com. After receiving the join-request message, you can simply reply to that to confirm the subscribtion. diff --git a/api/client/trust.go b/api/client/trust.go index 3a0f334c89304..aa2c4a8d51f69 100644 --- a/api/client/trust.go +++ b/api/client/trust.go @@ -117,7 +117,7 @@ func (scs simpleCredentialStore) SetRefreshToken(*url.URL, string, string) { // getNotaryRepository returns a NotaryRepository which stores all the // information needed to operate on a notary repository. -// It creates a HTTP transport providing authentication support. +// It creates an HTTP transport providing authentication support. func (cli *DockerCli) getNotaryRepository(repoInfo *registry.RepositoryInfo, authConfig types.AuthConfig, actions ...string) (*client.NotaryRepository, error) { server, err := trustServer(repoInfo.Index) if err != nil { diff --git a/api/server/httputils/httputils.go b/api/server/httputils/httputils.go index e86405f1708c3..3b0f7a0dc0ac9 100644 --- a/api/server/httputils/httputils.go +++ b/api/server/httputils/httputils.go @@ -19,7 +19,7 @@ const APIVersionKey = "api-version" const UAStringKey = "upstream-user-agent" // APIFunc is an adapter to allow the use of ordinary functions as Docker API endpoints. -// Any function that has the appropriate signature can be registered as a API endpoint (e.g. getVersion). +// Any function that has the appropriate signature can be registered as an API endpoint (e.g. getVersion). type APIFunc func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error // HijackConnection interrupts the http response writer to get the diff --git a/daemon/graphdriver/driver.go b/daemon/graphdriver/driver.go index 79f6789f99807..668594ab295a9 100644 --- a/daemon/graphdriver/driver.go +++ b/daemon/graphdriver/driver.go @@ -123,7 +123,7 @@ func init() { drivers = make(map[string]InitFunc) } -// Register registers a InitFunc for the driver. +// Register registers an InitFunc for the driver. func Register(name string, initFunc InitFunc) error { if _, exists := drivers[name]; exists { return fmt.Errorf("Name already registered %s", name) diff --git a/daemon/graphdriver/graphtest/graphtest_unix.go b/daemon/graphdriver/graphtest/graphtest_unix.go index 1da3d7896f0f7..df8d08879e4be 100644 --- a/daemon/graphdriver/graphtest/graphtest_unix.go +++ b/daemon/graphdriver/graphtest/graphtest_unix.go @@ -94,7 +94,7 @@ func cleanup(t *testing.T, d *Driver) { os.RemoveAll(d.root) } -// GetDriver create a new driver with given name or return a existing driver with the name updating the reference count. +// GetDriver create a new driver with given name or return an existing driver with the name updating the reference count. func GetDriver(t *testing.T, name string) graphdriver.Driver { if drv == nil { drv = newDriver(t, name) @@ -172,7 +172,7 @@ func readDir(dir string) ([]os.FileInfo, error) { return b, nil } -// DriverTestCreateEmpty creates an new image and verifies it is empty and the right metadata +// DriverTestCreateEmpty creates a new image and verifies it is empty and the right metadata func DriverTestCreateEmpty(t *testing.T, drivername string) { driver := GetDriver(t, drivername) defer PutDriver(t) diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go index 56325ae7bc5ab..d01bd8bfa36dd 100644 --- a/daemon/graphdriver/overlay/overlay.go +++ b/daemon/graphdriver/overlay/overlay.go @@ -74,8 +74,8 @@ func (d *naiveDiffDriverWithApply) ApplyDiff(id, parent string, diff archive.Rea // layer in the overlay. The overlay itself is mounted in the "merged" // directory, and the "work" dir is needed for overlay to work. -// When a overlay layer is created there are two cases, either the -// parent has a "root" dir, then we start out with a empty "upper" +// When an overlay layer is created there are two cases, either the +// parent has a "root" dir, then we start out with an empty "upper" // directory overlaid on the parents root. This is typically the // case with the init layer of a container which is based on an image. // If there is no "root" in the parent, we inherit the lower-id from @@ -103,7 +103,7 @@ func init() { // Init returns the NaiveDiffDriver, a native diff driver for overlay filesystem. // If overlay filesystem is not supported on the host, graphdriver.ErrNotSupported is returned as error. -// If a overlay filesystem is not supported over a existing filesystem then error graphdriver.ErrIncompatibleFS is returned. +// If an overlay filesystem is not supported over an existing filesystem then error graphdriver.ErrIncompatibleFS is returned. func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) { if err := supportsOverlay(); err != nil { @@ -265,7 +265,7 @@ func (d *Driver) Create(id, parent, mountLabel string, storageOpt map[string]str return err } - // If parent has a root, just do a overlay to it + // If parent has a root, just do an overlay to it parentRoot := path.Join(parentDir, "root") if s, err := os.Lstat(parentRoot); err == nil { @@ -386,7 +386,7 @@ func (d *Driver) Put(id string) error { return nil } -// ApplyDiff applies the new layer on top of the root, if parent does not exist with will return a ErrApplyDiffFallback error. +// ApplyDiff applies the new layer on top of the root, if parent does not exist with will return an ErrApplyDiffFallback error. func (d *Driver) ApplyDiff(id string, parent string, diff archive.Reader) (size int64, err error) { dir := d.dir(id) diff --git a/daemon/graphdriver/zfs/zfs.go b/daemon/graphdriver/zfs/zfs.go index b06ccbe47649f..3b41ff8b48b92 100644 --- a/daemon/graphdriver/zfs/zfs.go +++ b/daemon/graphdriver/zfs/zfs.go @@ -40,7 +40,7 @@ func (*Logger) Log(cmd []string) { } // Init returns a new ZFS driver. -// It takes base mount path and a array of options which are represented as key value pairs. +// It takes base mount path and an array of options which are represented as key value pairs. // Each option is in the for key=value. 'zfs.fsname' is expected to be a valid key in the options. func Init(base string, opt []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) { var err error diff --git a/daemon/logger/etwlogs/etwlogs_windows.go b/daemon/logger/etwlogs/etwlogs_windows.go index de128a2e93d07..ab3ff1f2bd90c 100644 --- a/daemon/logger/etwlogs/etwlogs_windows.go +++ b/daemon/logger/etwlogs/etwlogs_windows.go @@ -8,7 +8,7 @@ // 3. logman stop -ets DockerContainerLogs // 4. You can then convert the etl log file to XML using: tracerpt -y trace.etl // -// Each container log message generates a ETW event that also contains: +// Each container log message generates an ETW event that also contains: // the container name and ID, the timestamp, and the stream type. package etwlogs diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index 3af7130139ed3..e238640fb9397 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -305,7 +305,7 @@ func setNamespaces(daemon *Daemon, s *specs.Spec, c *container.Container) error ns.Path = fmt.Sprintf("/proc/%d/ns/pid", pc.State.GetPID()) setNamespace(s, ns) if userNS { - // to share an PID namespace, they must also share a user namespace + // to share a PID namespace, they must also share a user namespace nsUser := specs.Namespace{Type: "user"} nsUser.Path = fmt.Sprintf("/proc/%d/ns/user", pc.State.GetPID()) setNamespace(s, nsUser) diff --git a/distribution/registry.go b/distribution/registry.go index 7366a4dd1e9b9..b2f3b52617aa5 100644 --- a/distribution/registry.go +++ b/distribution/registry.go @@ -34,7 +34,7 @@ func (dcs dumbCredentialStore) RefreshToken(*url.URL, string) string { func (dcs dumbCredentialStore) SetRefreshToken(*url.URL, string, string) { } -// NewV2Repository returns a repository (v2 only). It creates a HTTP transport +// NewV2Repository returns a repository (v2 only). It creates an HTTP transport // providing timeout settings and authentication support, and also verifies the // remote API version. func NewV2Repository(ctx context.Context, repoInfo *registry.RepositoryInfo, endpoint registry.APIEndpoint, metaHeaders http.Header, authConfig *types.AuthConfig, actions ...string) (repo distribution.Repository, foundVersion bool, err error) { diff --git a/docs/admin/configuring.md b/docs/admin/configuring.md index 3e10ab88b94ca..0fe4b6cf50307 100644 --- a/docs/admin/configuring.md +++ b/docs/admin/configuring.md @@ -48,7 +48,7 @@ Some of the daemon's options are: | `--tls=false` | Enable or disable TLS. By default, this is false. | -Here is a an example of running the `docker` daemon with configuration options: +Here is an example of running the `docker` daemon with configuration options: $ dockerd -D --tls=true --tlscert=/var/docker/server.pem --tlskey=/var/docker/serverkey.pem -H tcp://192.168.59.3:2376 diff --git a/docs/admin/logging/fluentd.md b/docs/admin/logging/fluentd.md index 21d4b74c56b02..238bd06a40a42 100644 --- a/docs/admin/logging/fluentd.md +++ b/docs/admin/logging/fluentd.md @@ -89,7 +89,7 @@ and [its documents](http://docs.fluentd.org/). To use this logging driver, start the `fluentd` daemon on a host. We recommend that you use [the Fluentd docker image](https://hub.docker.com/r/fluent/fluentd/). This image is -especially useful if you want to aggregate multiple container logs on a each +especially useful if you want to aggregate multiple container logs on each host then, later, transfer the logs to another Fluentd node to create an aggregate store. diff --git a/docs/admin/systemd.md b/docs/admin/systemd.md index ef44e8e9eedcf..03283cce8d0b2 100644 --- a/docs/admin/systemd.md +++ b/docs/admin/systemd.md @@ -123,7 +123,7 @@ If you fail to specify an empty configuration, Docker reports an error such as: This example overrides the default `docker.service` file. -If you are behind a HTTP proxy server, for example in corporate settings, +If you are behind an HTTP proxy server, for example in corporate settings, you will need to add this configuration in the Docker systemd service file. First, create a systemd drop-in directory for the docker service: diff --git a/docs/examples/running_redis_service.md b/docs/examples/running_redis_service.md index 82daaa7830205..66d852206e870 100644 --- a/docs/examples/running_redis_service.md +++ b/docs/examples/running_redis_service.md @@ -1,7 +1,7 @@