From 950073aabb305db6156709ea8509b1f72ff06f3b Mon Sep 17 00:00:00 2001 From: bin liu Date: Tue, 21 Jun 2016 15:28:30 +0800 Subject: [PATCH] fix some typos Signed-off-by: bin liu --- api/client/container/diff.go | 2 +- api/client/container/restart.go | 2 +- api/client/container/rm.go | 2 +- api/client/container/top.go | 2 +- api/client/container/wait.go | 2 +- api/client/registry.go | 2 +- api/client/utils.go | 2 +- daemon/cluster/executor/container/adapter.go | 2 +- daemon/cluster/provider/network.go | 2 +- daemon/oci_linux.go | 2 +- docs/getstarted/step_one.md | 4 ++-- docs/installation/cloud/cloud-ex-machine-ocean.md | 2 +- docs/swarm/swarm-tutorial/delete-service.md | 2 +- integration-cli/docker_cli_daemon_test.go | 8 ++++---- layer/layer.go | 2 +- pkg/archive/archive.go | 2 +- restartmanager/restartmanager.go | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api/client/container/diff.go b/api/client/container/diff.go index 2eb860b390..5fdaeadd38 100644 --- a/api/client/container/diff.go +++ b/api/client/container/diff.go @@ -15,7 +15,7 @@ type diffOptions struct { container string } -// NewDiffCommand creats a new cobra.Command for `docker diff` +// NewDiffCommand creates a new cobra.Command for `docker diff` func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command { var opts diffOptions diff --git a/api/client/container/restart.go b/api/client/container/restart.go index 04544e4b97..4e80e1250a 100644 --- a/api/client/container/restart.go +++ b/api/client/container/restart.go @@ -18,7 +18,7 @@ type restartOptions struct { containers []string } -// NewRestartCommand creats a new cobra.Command for `docker restart` +// NewRestartCommand creates a new cobra.Command for `docker restart` func NewRestartCommand(dockerCli *client.DockerCli) *cobra.Command { var opts restartOptions diff --git a/api/client/container/rm.go b/api/client/container/rm.go index 4b04e10b04..2ccc6c21ff 100644 --- a/api/client/container/rm.go +++ b/api/client/container/rm.go @@ -20,7 +20,7 @@ type rmOptions struct { containers []string } -// NewRmCommand creats a new cobra.Command for `docker rm` +// NewRmCommand creates a new cobra.Command for `docker rm` func NewRmCommand(dockerCli *client.DockerCli) *cobra.Command { var opts rmOptions diff --git a/api/client/container/top.go b/api/client/container/top.go index 29b4336f7a..e31a903adc 100644 --- a/api/client/container/top.go +++ b/api/client/container/top.go @@ -18,7 +18,7 @@ type topOptions struct { args []string } -// NewTopCommand creats a new cobra.Command for `docker top` +// NewTopCommand creates a new cobra.Command for `docker top` func NewTopCommand(dockerCli *client.DockerCli) *cobra.Command { var opts topOptions diff --git a/api/client/container/wait.go b/api/client/container/wait.go index e92bf6238c..4b6be886e8 100644 --- a/api/client/container/wait.go +++ b/api/client/container/wait.go @@ -15,7 +15,7 @@ type waitOptions struct { containers []string } -// NewWaitCommand creats a new cobra.Command for `docker wait` +// NewWaitCommand creates a new cobra.Command for `docker wait` func NewWaitCommand(dockerCli *client.DockerCli) *cobra.Command { var opts waitOptions diff --git a/api/client/registry.go b/api/client/registry.go index 339a67bfe1..26a8c8f268 100644 --- a/api/client/registry.go +++ b/api/client/registry.go @@ -110,7 +110,7 @@ func (cli *DockerCli) ConfigureAuth(flUser, flPassword, serverAddress string, is if flUser = strings.TrimSpace(flUser); flUser == "" { if isDefaultRegistry { - // if this is a defauly registry (docker hub), then display the following message. + // if this is a default registry (docker hub), then display the following message. fmt.Fprintln(cli.out, "Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.") } cli.promptWithDefault("Username", authconfig.Username) diff --git a/api/client/utils.go b/api/client/utils.go index 043444eae5..99b0f86189 100644 --- a/api/client/utils.go +++ b/api/client/utils.go @@ -134,7 +134,7 @@ func CopyToFile(outfile string, r io.Reader) error { return nil } -// ForwardAllSignals forwards signals to the contianer +// ForwardAllSignals forwards signals to the container // TODO: this can be unexported again once all container commands are under // api/client/container func (cli *DockerCli) ForwardAllSignals(ctx context.Context, cid string) chan os.Signal { diff --git a/daemon/cluster/executor/container/adapter.go b/daemon/cluster/executor/container/adapter.go index 17bf903210..5691e44652 100644 --- a/daemon/cluster/executor/container/adapter.go +++ b/daemon/cluster/executor/container/adapter.go @@ -163,7 +163,7 @@ func (c *containerAdapter) inspect(ctx context.Context) (types.ContainerJSON, er // events issues a call to the events API and returns a channel with all // events. The stream of events can be shutdown by cancelling the context. // -// A chan struct{} is returned that will be closed if the event procressing +// A chan struct{} is returned that will be closed if the event processing // fails and needs to be restarted. func (c *containerAdapter) wait(ctx context.Context) error { return c.backend.ContainerWaitWithContext(ctx, c.container.name()) diff --git a/daemon/cluster/provider/network.go b/daemon/cluster/provider/network.go index a383343d7c..d99c2f7294 100644 --- a/daemon/cluster/provider/network.go +++ b/daemon/cluster/provider/network.go @@ -13,7 +13,7 @@ type NetworkCreateResponse struct { ID string `json:"Id"` } -// VirtualAddress represents a virtual adress. +// VirtualAddress represents a virtual address. type VirtualAddress struct { IPv4 string IPv6 string diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index 9492c17249..4459d02fca 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -459,7 +459,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c userMounts[m.Destination] = struct{}{} } - // Filter out mounts that are overriden by user supplied mounts + // Filter out mounts that are overridden by user supplied mounts var defaultMounts []specs.Mount _, mountDev := userMounts["/dev"] for _, m := range s.Mounts { diff --git a/docs/getstarted/step_one.md b/docs/getstarted/step_one.md index f9464dead9..b39a0d1692 100644 --- a/docs/getstarted/step_one.md +++ b/docs/getstarted/step_one.md @@ -25,7 +25,7 @@ weight = 1 ### Docker for Mac -Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses xhyve to virutalize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. +Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses xhyve to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. Get Docker for Mac @@ -47,7 +47,7 @@ See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docke ### Docker for Windows -Docker for Windows is our newest offering for PCs. It runs as a native Windows application and uses Hyper-V to virutalize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. +Docker for Windows is our newest offering for PCs. It runs as a native Windows application and uses Hyper-V to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. Get Docker for Windows diff --git a/docs/installation/cloud/cloud-ex-machine-ocean.md b/docs/installation/cloud/cloud-ex-machine-ocean.md index ac00a84c2a..ddcc956281 100644 --- a/docs/installation/cloud/cloud-ex-machine-ocean.md +++ b/docs/installation/cloud/cloud-ex-machine-ocean.md @@ -126,7 +126,7 @@ To generate your access token: default - virtualbox Running tcp://192.168.99.100:2376 docker-sandbox * digitalocean Running tcp://45.55.222.72:2376 -6. Run some `docker-machine` commands to inspect the remote host. For example, `docker-machine ip ` gets the host IP adddress and `docker-machine inspect ` lists all the details. +6. Run some `docker-machine` commands to inspect the remote host. For example, `docker-machine ip ` gets the host IP address and `docker-machine inspect ` lists all the details. $ docker-machine ip docker-sandbox 104.131.43.236 diff --git a/docs/swarm/swarm-tutorial/delete-service.md b/docs/swarm/swarm-tutorial/delete-service.md index ee1e1c805a..d641484171 100644 --- a/docs/swarm/swarm-tutorial/delete-service.md +++ b/docs/swarm/swarm-tutorial/delete-service.md @@ -28,7 +28,7 @@ run your manager node. For example, the tutorial uses a machine named helloworld ``` -3. Run `docker service inspect ` to veriy that the swarm manager +3. Run `docker service inspect ` to verify that the swarm manager removed the service. The CLI returns a message that the service is not found: ``` diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index f5f05319c9..80cdbbcaaa 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -2408,7 +2408,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) { out, err := s.d.Cmd("run", "--rm", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) - // Run with default runtime explicitely + // Run with default runtime explicitly out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) @@ -2491,7 +2491,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) { c.Assert(err, check.NotNil, check.Commentf(out)) c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory") - // Run with default runtime explicitely + // Run with default runtime explicitly out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) } @@ -2504,7 +2504,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) { out, err := s.d.Cmd("run", "--rm", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) - // Run with default runtime explicitely + // Run with default runtime explicitly out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) @@ -2553,7 +2553,7 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) { c.Assert(err, check.NotNil, check.Commentf(out)) c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory") - // Run with default runtime explicitely + // Run with default runtime explicitly out, err = s.d.Cmd("run", "--rm", "--runtime=default", "busybox", "ls") c.Assert(err, check.IsNil, check.Commentf(out)) } diff --git a/layer/layer.go b/layer/layer.go index 86261e0ea1..3881447b64 100644 --- a/layer/layer.go +++ b/layer/layer.go @@ -51,7 +51,7 @@ var ( // greater than the 125 max. ErrMaxDepthExceeded = errors.New("max depth exceeded") - // ErrNotSupported is used when the action is not supppoted + // ErrNotSupported is used when the action is not supported // on the current platform ErrNotSupported = errors.New("not support on this platform") ) diff --git a/pkg/archive/archive.go b/pkg/archive/archive.go index 4f0b4ffefe..4f8db0b36e 100644 --- a/pkg/archive/archive.go +++ b/pkg/archive/archive.go @@ -100,7 +100,7 @@ const ( ) const ( - // AUFSWhiteoutFormat is the default format for whitesouts + // AUFSWhiteoutFormat is the default format for whiteouts AUFSWhiteoutFormat WhiteoutFormat = iota // OverlayWhiteoutFormat formats whiteout according to the overlay // standard. diff --git a/restartmanager/restartmanager.go b/restartmanager/restartmanager.go index 8041af1260..9893183a2a 100644 --- a/restartmanager/restartmanager.go +++ b/restartmanager/restartmanager.go @@ -65,7 +65,7 @@ func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped if rm.active { return false, nil, fmt.Errorf("invalid call on active restartmanager") } - // if the container ran for more than 10s, reguardless of status and policy reset the + // if the container ran for more than 10s, regardless of status and policy reset the // the timeout back to the default. if executionDuration.Seconds() >= 10 { rm.timeout = 0