From ea2dd4b5d0b41552d047814d9e39ddaa3662ab41 Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Wed, 21 Dec 2016 11:03:39 +0800 Subject: [PATCH] duplicated the Signed-off-by: Jie Luo typo Signed-off-by: Jie Luo fix some typos Signed-off-by: Jie Luo --- api/swagger.yaml | 2 +- daemon/graphdriver/devmapper/devmapper_test.go | 2 +- experimental/vlan-networks.md | 2 +- integration-cli/daemon/daemon.go | 2 +- integration-cli/docker_cli_exec_unix_test.go | 2 +- integration-cli/docker_cli_pull_test.go | 2 +- pkg/httputils/httputils_test.go | 8 ++++---- pkg/locker/README.md | 2 +- pkg/plugins/pluginrpc-gen/README.md | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index 09881f0073..0fdd94e4d2 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -3907,7 +3907,7 @@ paths: default: false - name: "stream" in: "query" - description: "Stream attached streams from the the time the request was made onwards" + description: "Stream attached streams from the time the request was made onwards" type: "boolean" default: false - name: "stdin" diff --git a/daemon/graphdriver/devmapper/devmapper_test.go b/daemon/graphdriver/devmapper/devmapper_test.go index 5c2abcefcb..006450adcc 100644 --- a/daemon/graphdriver/devmapper/devmapper_test.go +++ b/daemon/graphdriver/devmapper/devmapper_test.go @@ -12,7 +12,7 @@ import ( ) func init() { - // Reduce the size the the base fs and loopback for the tests + // Reduce the size of the base fs and loopback for the tests defaultDataLoopbackSize = 300 * 1024 * 1024 defaultMetaDataLoopbackSize = 200 * 1024 * 1024 defaultBaseFsSize = 300 * 1024 * 1024 diff --git a/experimental/vlan-networks.md b/experimental/vlan-networks.md index caec6d6c6b..c2bddef320 100644 --- a/experimental/vlan-networks.md +++ b/experimental/vlan-networks.md @@ -216,7 +216,7 @@ ip a show eth0 inet 192.168.1.250/24 brd 192.168.1.255 scope global eth0 ``` --A traditional gateway doesn't mean much to an L3 mode Ipvlan interface since there is no broadcast traffic allowed. Because of that, the container default gateway simply point the the containers `eth0` device. See below for CLI output of `ip route` or `ip -6 route` from inside an L3 container for details. +-A traditional gateway doesn't mean much to an L3 mode Ipvlan interface since there is no broadcast traffic allowed. Because of that, the container default gateway simply points to the containers `eth0` device. See below for CLI output of `ip route` or `ip -6 route` from inside an L3 container for details. The mode ` -o ipvlan_mode=l3` must be explicitly specified since the default ipvlan mode is `l2`. diff --git a/integration-cli/daemon/daemon.go b/integration-cli/daemon/daemon.go index 7e1caff8fd..0b1c2651b3 100644 --- a/integration-cli/daemon/daemon.go +++ b/integration-cli/daemon/daemon.go @@ -627,7 +627,7 @@ func (d *Daemon) SockRequestRaw(method, endpoint string, data io.Reader, ct stri return SockRequestRawToDaemon(method, endpoint, data, ct, d.Sock()) } -// LogFileName returns the path the the daemon's log file +// LogFileName returns the path the daemon's log file func (d *Daemon) LogFileName() string { return d.logFile.Name() } diff --git a/integration-cli/docker_cli_exec_unix_test.go b/integration-cli/docker_cli_exec_unix_test.go index 5f691196f1..3fbfcb2333 100644 --- a/integration-cli/docker_cli_exec_unix_test.go +++ b/integration-cli/docker_cli_exec_unix_test.go @@ -69,7 +69,7 @@ func (s *DockerSuite) TestExecTTY(c *check.C) { c.Assert(bytes.Contains(buf, []byte("hello")), checker.Equals, true, check.Commentf(string(buf[:read]))) } -// Test the the TERM env var is set when -t is provided on exec +// Test the TERM env var is set when -t is provided on exec func (s *DockerSuite) TestExecWithTERM(c *check.C) { testRequires(c, DaemonIsLinux, SameHostDaemon) out, _ := dockerCmd(c, "run", "-id", "busybox", "/bin/cat") diff --git a/integration-cli/docker_cli_pull_test.go b/integration-cli/docker_cli_pull_test.go index a0118a8e95..10c641fb11 100644 --- a/integration-cli/docker_cli_pull_test.go +++ b/integration-cli/docker_cli_pull_test.go @@ -110,7 +110,7 @@ func (s *DockerHubPullSuite) TestPullNonExistingImage(c *check.C) { } // TestPullFromCentralRegistryImplicitRefParts pulls an image from the central registry and verifies -// that pulling the same image with different combinations of implicit elements of the the image +// that pulling the same image with different combinations of implicit elements of the image // reference (tag, repository, central registry url, ...) doesn't trigger a new pull nor leads to // multiple images. func (s *DockerHubPullSuite) TestPullFromCentralRegistryImplicitRefParts(c *check.C) { diff --git a/pkg/httputils/httputils_test.go b/pkg/httputils/httputils_test.go index d35d082156..d03c569ef4 100644 --- a/pkg/httputils/httputils_test.go +++ b/pkg/httputils/httputils_test.go @@ -24,7 +24,7 @@ func TestDownload(t *testing.T) { response.Body.Close() if err != nil || string(actual) != expected { - t.Fatalf("Expected the response %q, got err:%v, response:%v, actual:%s", expected, err, response, string(actual)) + t.Fatalf("Expected the response %q, got err:%q, response:%q, actual:%q", expected, err, response, string(actual)) } } @@ -37,13 +37,13 @@ func TestDownload400Errors(t *testing.T) { defer ts.Close() // Expected status code = 403 if _, err := Download(ts.URL); err == nil || err.Error() != expectedError { - t.Fatalf("Expected the the error %q, got %v", expectedError, err) + t.Fatalf("Expected the error %q, got %q", expectedError, err) } } func TestDownloadOtherErrors(t *testing.T) { if _, err := Download("I'm not an url.."); err == nil || !strings.Contains(err.Error(), "unsupported protocol scheme") { - t.Fatalf("Expected an error with 'unsupported protocol scheme', got %v", err) + t.Fatalf("Expected an error with 'unsupported protocol scheme', got %q", err) } } @@ -59,7 +59,7 @@ func TestNewHTTPRequestError(t *testing.T) { t.Fatal(err) } if err := NewHTTPRequestError(errorMessage, httpResponse); err.Error() != errorMessage { - t.Fatalf("Expected err to be %q, got %v", errorMessage, err) + t.Fatalf("Expected err to be %q, got %q", errorMessage, err) } } diff --git a/pkg/locker/README.md b/pkg/locker/README.md index e84a815cc5..5c1edc8fc7 100644 --- a/pkg/locker/README.md +++ b/pkg/locker/README.md @@ -59,7 +59,7 @@ function (or before doing anything with the underlying state), this ensures any other function that is dealing with the same name will block. When needing to modify the underlying data, use the global lock to ensure nothing -else is modfying it at the same time. +else is modifying it at the same time. Since name lock is already in place, no reads will occur while the modification is being performed. diff --git a/pkg/plugins/pluginrpc-gen/README.md b/pkg/plugins/pluginrpc-gen/README.md index 0418a3e00a..5f6a421f19 100644 --- a/pkg/plugins/pluginrpc-gen/README.md +++ b/pkg/plugins/pluginrpc-gen/README.md @@ -30,7 +30,7 @@ Where: - `--type` is the name of the interface to use - `--name` is the subsystem that the plugin "Implements" - `-i` is the input file containing the interface definition -- `-o` is the output file where the the generated code should go +- `-o` is the output file where the generated code should go **Note**: The generated code will use the same package name as the one defined in the input file