Browse code

Merge pull request #15420 from vlajos/typofixes-vlajos-20150807

typofix - https://github.com/vlajos/misspell_fixer

Arnaud Porterie authored on 2015/08/08 17:08:49
Showing 39 changed files
... ...
@@ -309,7 +309,7 @@ made through a pull request.
309 309
 	#	- If the pull request has some small problems that need to be changed, make
310 310
 	#	  a comment adressing the issues.
311 311
 	#	- If the changes needed to a PR are small, you can add a "LGTM once the
312
-	#	  following comments are adressed..." this will reduce needless back and
312
+	#	  following comments are addressed..." this will reduce needless back and
313 313
 	#	  forth.
314 314
 	#	- If the PR only needs a few changes before being merged, any MAINTAINER can
315 315
 	#	  make a replacement PR that incorporates the existing commits and fixes the
... ...
@@ -134,7 +134,7 @@ We won't accept patches expanding the surface of `docker exec`, which we intend
134 134
 
135 135
 ## 2.2 Dockerfile syntax
136 136
 
137
-The Dockerfile syntax as we know it is simple, and has proven succesful in supporting all our
137
+The Dockerfile syntax as we know it is simple, and has proven successful in supporting all our
138 138
 [official images](https://github.com/docker-library/official-images). Although this is *not* a
139 139
 definitive move, we temporarily won't accept more patches to the Dockerfile syntax for several
140 140
 reasons:
... ...
@@ -131,7 +131,7 @@ func (s *Server) getContainersLogs(version version.Version, w http.ResponseWrite
131 131
 
132 132
 	outStream := ioutils.NewWriteFlusher(w)
133 133
 	// write an empty chunk of data (this is to ensure that the
134
-	// HTTP Response is sent immediatly, even if the container has
134
+	// HTTP Response is sent immediately, even if the container has
135 135
 	// not yet produced any data)
136 136
 	outStream.Write(nil)
137 137
 
... ...
@@ -42,7 +42,7 @@ var (
42 42
 func init() {
43 43
 	// Dispatch Table. see line_parsers.go for the parse functions.
44 44
 	// The command is parsed and mapped to the line parser. The line parser
45
-	// recieves the arguments but not the command, and returns an AST after
45
+	// receives the arguments but not the command, and returns an AST after
46 46
 	// reformulating the arguments according to the rules in the parser
47 47
 	// functions. Errors are propagated up by Parse() and the resulting AST can
48 48
 	// be incorporated directly into the existing AST as a next.
... ...
@@ -31,7 +31,7 @@
31 31
  *
32 32
  * This sample list was compiled as a combination of all the syscalls
33 33
  * available on i386 and amd64 on Ubuntu Precise, as such it may not contain
34
- * everything and not everything may be relevent for your system.  This
34
+ * everything and not everything may be relevant for your system.  This
35 35
  * shouldn't be a problem.
36 36
  */
37 37
 
... ...
@@ -95,7 +95,7 @@ func (container *Container) resolvePath(path string) (resolvedPath, absPath stri
95 95
 }
96 96
 
97 97
 // statPath is the unexported version of StatPath. Locks and mounts should
98
-// be aquired before calling this method and the given path should be fully
98
+// be acquired before calling this method and the given path should be fully
99 99
 // resolved to a path on the host corresponding to the given absolute path
100 100
 // inside the container.
101 101
 func (container *Container) statPath(resolvedPath, absPath string) (stat *types.ContainerPathStat, err error) {
... ...
@@ -810,7 +810,7 @@ func (container *Container) Exec(execConfig *execConfig) error {
810 810
 	}
811 811
 
812 812
 	// We use a callback here instead of a goroutine and an chan for
813
-	// syncronization purposes
813
+	// synchronization purposes
814 814
 	cErr := promise.Go(func() error { return container.monitorExec(execConfig, callback) })
815 815
 
816 816
 	// Exec should not return until the process is actually running
... ...
@@ -840,7 +840,7 @@ func (container *Container) AllocateNetwork() error {
840 840
 
841 841
 	if service == "" {
842 842
 		// dot character "." has a special meaning to support SERVICE[.NETWORK] format.
843
-		// For backward compatiblity, replacing "." with "-", instead of failing
843
+		// For backward compatibility, replacing "." with "-", instead of failing
844 844
 		service = strings.Replace(container.Name, ".", "-", -1)
845 845
 		// Service names dont like "/" in them. removing it instead of failing for backward compatibility
846 846
 		service = strings.Replace(service, "/", "", -1)
... ...
@@ -92,7 +92,7 @@ func TweakCapabilities(basics, adds, drops []string) ([]string, error) {
92 92
 
93 93
 	if !stringutils.InSlice(drops, "all") {
94 94
 		for _, cap := range basics {
95
-			// skip `all` aready handled above
95
+			// skip `all` already handled above
96 96
 			if strings.ToLower(cap) == "all" {
97 97
 				continue
98 98
 			}
... ...
@@ -105,7 +105,7 @@ func TweakCapabilities(basics, adds, drops []string) ([]string, error) {
105 105
 	}
106 106
 
107 107
 	for _, cap := range adds {
108
-		// skip `all` aready handled above
108
+		// skip `all` already handled above
109 109
 		if strings.ToLower(cap) == "all" {
110 110
 			continue
111 111
 		}
... ...
@@ -70,8 +70,8 @@ type devInfo struct {
70 70
 	//
71 71
 	// WARNING: In order to avoid AB-BA deadlocks when releasing
72 72
 	// the global lock while holding the per-device locks all
73
-	// device locks must be aquired *before* the device lock, and
74
-	// multiple device locks should be aquired parent before child.
73
+	// device locks must be acquired *before* the device lock, and
74
+	// multiple device locks should be acquired parent before child.
75 75
 	lock sync.Mutex
76 76
 }
77 77
 
... ...
@@ -31,7 +31,7 @@ func InitLoopbacks() error {
31 31
 	if err != nil {
32 32
 		return err
33 33
 	}
34
-	// create atleast 8 loopback files, ya, that is a good number
34
+	// create at least 8 loopback files, ya, that is a good number
35 35
 	for i := 0; i < 8; i++ {
36 36
 		loopPath := fmt.Sprintf("/dev/loop%d", i)
37 37
 		// only create new loopback files if they don't exist
... ...
@@ -21,7 +21,7 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *runconfig.HostConf
21 21
 		return fmt.Errorf("Container already started")
22 22
 	}
23 23
 
24
-	// Windows does not have the backwards compatibilty issue here.
24
+	// Windows does not have the backwards compatibility issue here.
25 25
 	if runtime.GOOS != "windows" {
26 26
 		// This is kept for backward compatibility - hostconfig should be passed when
27 27
 		// creating a container, not during start.
... ...
@@ -314,7 +314,7 @@ func shutdownDaemon(d *daemon.Daemon, timeout time.Duration) {
314 314
 	}()
315 315
 	select {
316 316
 	case <-ch:
317
-		logrus.Debug("Clean shutdown succeded")
317
+		logrus.Debug("Clean shutdown succeeded")
318 318
 	case <-time.After(timeout * time.Second):
319 319
 		logrus.Error("Force shutdown daemon")
320 320
 	}
... ...
@@ -1086,7 +1086,7 @@ Status Codes:
1086 1086
 `HEAD /containers/(id)/archive`
1087 1087
 
1088 1088
 See the description of the `X-Docker-Container-Path-Stat` header in the
1089
-folowing section.
1089
+following section.
1090 1090
 
1091 1091
 ### Get an archive of a filesystem resource in a container
1092 1092
 
... ...
@@ -1086,7 +1086,7 @@ Status Codes:
1086 1086
 `HEAD /containers/(id)/archive`
1087 1087
 
1088 1088
 See the description of the `X-Docker-Container-Path-Stat` header in the
1089
-folowing section.
1089
+following section.
1090 1090
 
1091 1091
 ### Get an archive of a filesystem resource in a container
1092 1092
 
... ...
@@ -18,7 +18,7 @@ Understand the policies
18 18
 
19 19
 The `docker-default` profile the default for running
20 20
 containers. It is moderately protective while
21
-providing wide application compatability.
21
+providing wide application compatibility.
22 22
 
23 23
 The system's standard `unconfined` profile inherits all
24 24
 system-wide policies, applying path-based policies
... ...
@@ -99,7 +99,7 @@ Assuming we want to publish a service from container `a0ebc12d3e48` on network `
99 99
 
100 100
 This would make the container `a0ebc12d3e48` accessible as `my-service` on network `foo`. Any other container in network `foo` can use DNS to resolve the address of `my-service`
101 101
 
102
-This can also be acheived by using the `--publish-service` flag for `docker run`:
102
+This can also be achieved by using the `--publish-service` flag for `docker run`:
103 103
 
104 104
         docker run -itd --publish-service db.foo postgres
105 105
 
... ...
@@ -17,7 +17,7 @@ set -e
17 17
 : ${DOCKER_RELEASE_DIR:=$DEST}
18 18
 YUMDIR=$DOCKER_RELEASE_DIR/yum/repo
19 19
 
20
-# manage the repos for each distribution seperately
20
+# manage the repos for each distribution separately
21 21
 distros=( fedora centos oraclelinux )
22 22
 
23 23
 # get the release
... ...
@@ -39,7 +39,7 @@ for distro in "${distros[@]}"; do
39 39
 		version="$(basename "$dir")"
40 40
 		suite="${version##*-}"
41 41
 
42
-		# if the directory does not exist, intialize the yum repo
42
+		# if the directory does not exist, initialize the yum repo
43 43
 		if [[ ! -d $REPO/$suite/Packages ]]; then
44 44
 			mkdir -p "$REPO/$suite/Packages"
45 45
 
... ...
@@ -31,7 +31,7 @@ bundle_test_unit() {
31 31
 			( IFS=$'\n'; echo "${BUILDFLAGS[*]}" ) > "$BUILDFLAGS_FILE"
32 32
 
33 33
 			if command -v parallel &> /dev/null; then
34
-				# accomodate parallel to be able to access variables
34
+				# accommodate parallel to be able to access variables
35 35
 				export SHELL="$BASH"
36 36
 				export HOME="$(mktemp -d)"
37 37
 				mkdir -p "$HOME/.parallel"
... ...
@@ -1804,8 +1804,8 @@ func (s *DockerSuite) TestBuildForceRm(c *check.C) {
1804 1804
 // * Run a 1-year-long sleep from a docker build.
1805 1805
 // * When docker events sees container start, close the "docker build" command
1806 1806
 // * Wait for docker events to emit a dying event.
1807
-func (s *DockerSuite) TestBuildCancelationKillsSleep(c *check.C) {
1808
-	name := "testbuildcancelation"
1807
+func (s *DockerSuite) TestBuildCancellationKillsSleep(c *check.C) {
1808
+	name := "testbuildcancellation"
1809 1809
 
1810 1810
 	// (Note: one year, will never finish)
1811 1811
 	ctx, err := fakeContext("FROM busybox\nRUN sleep 31536000", nil)
... ...
@@ -306,7 +306,7 @@ func (s *DockerSuite) TestCpFromSymlinkToDirectory(c *check.C) {
306 306
 	os.Remove(expectedPath)
307 307
 
308 308
 	// This copy command should resolve the symlink (note the trailing
309
-	// seperator), copying the target into the temporary directory.
309
+	// separator), copying the target into the temporary directory.
310 310
 	dockerCmd(c, "cp", cleanedContainerID+":"+"/dir_link/", testDir)
311 311
 
312 312
 	// It *should not* have copied the directory using the target's name, but
... ...
@@ -397,7 +397,7 @@ func (s *DockerSuite) TestCpToSymlinkToDirectory(c *check.C) {
397 397
 	os.Remove(expectedPath)
398 398
 
399 399
 	// This copy command should resolve the symlink (note the trailing
400
-	// seperator), copying the target into the test volume directory in the
400
+	// separator), copying the target into the test volume directory in the
401 401
 	// container.
402 402
 	dockerCmd(c, "cp", localLink+"/", cleanedContainerID+":/testVol")
403 403
 
... ...
@@ -633,7 +633,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeIP(c *check.C) {
633 633
 	// 3. Check if the bip config has taken effect using ifconfig and iptables commands
634 634
 	// 4. Launch a Container and make sure the IP-Address is in the expected subnet
635 635
 	// 5. Delete the docker0 Bridge
636
-	// 6. Restart the Docker Daemon (via defered action)
636
+	// 6. Restart the Docker Daemon (via deferred action)
637 637
 	//    This Restart takes care of bringing docker0 interface back to auto-assigned IP
638 638
 
639 639
 	defaultNetworkBridge := "docker0"
... ...
@@ -20,7 +20,7 @@ func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) {
20 20
 	image := "busybox"
21 21
 
22 22
 	// Start stopwatch, generate an event
23
-	time.Sleep(time.Second) // so that we don't grab events from previous test occured in the same second
23
+	time.Sleep(time.Second) // so that we don't grab events from previous test occurred in the same second
24 24
 	start := daemonTime(c)
25 25
 	time.Sleep(time.Second) // remote API precision is only a second, wait a while before creating an event
26 26
 	dockerCmd(c, "tag", image, "timestamptest:1")
... ...
@@ -184,7 +184,7 @@ func (s *DockerSuite) TestLogsSince(c *check.C) {
184 184
 	out, _ := dockerCmd(c, "run", "--name="+name, "busybox", "/bin/sh", "-c", "for i in $(seq 1 3); do sleep 2; echo `date +%s` log$i; done")
185 185
 
186 186
 	log2Line := strings.Split(strings.Split(out, "\n")[1], " ")
187
-	t, err := strconv.ParseInt(log2Line[0], 10, 64) // the timestamp log2 is writen
187
+	t, err := strconv.ParseInt(log2Line[0], 10, 64) // the timestamp log2 is written
188 188
 	c.Assert(err, check.IsNil)
189 189
 	since := t + 1 // add 1s so log1 & log2 doesn't show up
190 190
 	out, _ = dockerCmd(c, "logs", "-t", fmt.Sprintf("--since=%v", since), name)
... ...
@@ -1032,7 +1032,7 @@ func (s *DockerSuite) TestRunDnsOptionsBasedOnHostResolvConf(c *check.C) {
1032 1032
 }
1033 1033
 
1034 1034
 // Test to see if a non-root user can resolve a DNS name and reach out to it. Also
1035
-// check if the container resolv.conf file has atleast 0644 perm.
1035
+// check if the container resolv.conf file has at least 0644 perm.
1036 1036
 func (s *DockerSuite) TestRunNonRootUserResolvName(c *check.C) {
1037 1037
 	testRequires(c, SameHostDaemon, Network)
1038 1038
 
... ...
@@ -1050,7 +1050,7 @@ func (s *DockerSuite) TestRunNonRootUserResolvName(c *check.C) {
1050 1050
 	}
1051 1051
 
1052 1052
 	if (finfo.Mode() & fmode) != fmode {
1053
-		c.Fatalf("Expected container resolv.conf mode to be atleast %s, instead got %s", fmode.String(), finfo.Mode().String())
1053
+		c.Fatalf("Expected container resolv.conf mode to be at least %s, instead got %s", fmode.String(), finfo.Mode().String())
1054 1054
 	}
1055 1055
 }
1056 1056
 
... ...
@@ -105,7 +105,7 @@ func (s *DockerSuite) TestTagWithPrefixHyphen(c *check.C) {
105 105
 	if err == nil || !strings.Contains(out, "repository name component must match") {
106 106
 		c.Fatal("tag a name begin with '-' should failed")
107 107
 	}
108
-	// test index name begin wiht '-'
108
+	// test index name begin with '-'
109 109
 	out, _, err = dockerCmdWithError("tag", "busybox:latest", "-index:5000/busybox:test")
110 110
 	if err == nil || !strings.Contains(out, "Invalid index name (-index:5000). Cannot begin or end with a hyphen") {
111 111
 		c.Fatal("tag a name begin with '-' should failed")
... ...
@@ -32,7 +32,7 @@ import (
32 32
 // Daemon represents a Docker daemon for the testing framework.
33 33
 type Daemon struct {
34 34
 	// Defaults to "daemon"
35
-	// Useful to set to --daemon or -d for checking backwards compatability
35
+	// Useful to set to --daemon or -d for checking backwards compatibility
36 36
 	Command     string
37 37
 	GlobalFlags []string
38 38
 
... ...
@@ -306,7 +306,7 @@ func PrepareArchiveCopy(srcContent Reader, srcInfo, dstInfo CopyInfo) (dstDir st
306 306
 }
307 307
 
308 308
 // rebaseArchiveEntries rewrites the given srcContent archive replacing
309
-// an occurance of oldBase with newBase at the beginning of entry names.
309
+// an occurrence of oldBase with newBase at the beginning of entry names.
310 310
 func rebaseArchiveEntries(srcContent Reader, oldBase, newBase string) Archive {
311 311
 	if oldBase == string(os.PathSeparator) {
312 312
 		// If oldBase specifies the root directory, use an empty string as
... ...
@@ -58,7 +58,7 @@ func UnpackLayer(dest string, layer Reader) (size int64, err error) {
58 58
 		// TODO Windows. Once the registry is aware of what images are Windows-
59 59
 		// specific or Linux-specific, this warning should be changed to an error
60 60
 		// to cater for the situation where someone does manage to upload a Linux
61
-		// image but have it tagged as Windows inadvertantly.
61
+		// image but have it tagged as Windows inadvertently.
62 62
 		if runtime.GOOS == "windows" {
63 63
 			if strings.Contains(hdr.Name, ":") {
64 64
 				logrus.Warnf("Windows: Ignoring %s (is this a Linux image?)", hdr.Name)
... ...
@@ -307,7 +307,7 @@ func (db *Database) Parents(name string) ([]string, error) {
307 307
 	return db.parents(e)
308 308
 }
309 309
 
310
-// Refs returns the refrence count for a specified id.
310
+// Refs returns the reference count for a specified id.
311 311
 func (db *Database) Refs(id string) int {
312 312
 	db.mux.RLock()
313 313
 	defer db.mux.RUnlock()
... ...
@@ -243,7 +243,7 @@ func TestAddSelfAsChild(t *testing.T) {
243 243
 	}
244 244
 }
245 245
 
246
-func TestAddChildToNonExistantRoot(t *testing.T) {
246
+func TestAddChildToNonExistentRoot(t *testing.T) {
247 247
 	db, dbpath := newTestDb(t)
248 248
 	defer destroyTestDb(dbpath)
249 249
 
... ...
@@ -233,7 +233,7 @@ func HashData(src io.Reader) (string, error) {
233 233
 }
234 234
 
235 235
 // OnEOFReader wraps a io.ReadCloser and a function
236
-// the fuction will run at the end of file or close the file.
236
+// the function will run at the end of file or close the file.
237 237
 type OnEOFReader struct {
238 238
 	Rc io.ReadCloser
239 239
 	Fn func()
... ...
@@ -1094,7 +1094,7 @@ func (fs *FlagSet) ParseFlags(args []string, withHelp bool) error {
1094 1094
 }
1095 1095
 
1096 1096
 // ReportError is a utility method that prints a user-friendly message
1097
-// containing the error that occured during parsing and a suggestion to get help
1097
+// containing the error that occurred during parsing and a suggestion to get help
1098 1098
 func (fs *FlagSet) ReportError(str string, withHelp bool) {
1099 1099
 	if withHelp {
1100 1100
 		if os.Args[0] == fs.Name() {
... ...
@@ -107,7 +107,7 @@ var (
107 107
 		// Homi J Bhabha - was an Indian nuclear physicist, founding director, and professor of physics at the Tata Institute of Fundamental Research. Colloquially known as "father of Indian nuclear programme"- https://en.wikipedia.org/wiki/Homi_J._Bhabha
108 108
 		"bhabha",
109 109
 
110
-		// Bhaskara II - Ancient Indian mathematician-astronomer whose work on calculus predates Newton and Leibniz by over half a millenium - https://en.wikipedia.org/wiki/Bh%C4%81skara_II#Calculus
110
+		// Bhaskara II - Ancient Indian mathematician-astronomer whose work on calculus predates Newton and Leibniz by over half a millennium - https://en.wikipedia.org/wiki/Bh%C4%81skara_II#Calculus
111 111
 		"bhaskara",
112 112
 
113 113
 		// Elizabeth Blackwell - American doctor and first American woman to receive a medical degree - https://en.wikipedia.org/wiki/Elizabeth_Blackwell
... ...
@@ -45,7 +45,7 @@ func TestWrite(t *testing.T) {
45 45
 		t.Fatalf("Error while writing with StdWrite")
46 46
 	}
47 47
 	if n != len(data) {
48
-		t.Fatalf("Write should have writen %d byte but wrote %d.", len(data), n)
48
+		t.Fatalf("Write should have written %d byte but wrote %d.", len(data), n)
49 49
 	}
50 50
 }
51 51
 
... ...
@@ -1,4 +1,4 @@
1
-// Package tailfile provides helper functinos to read the nth lines of any
1
+// Package tailfile provides helper functions to read the nth lines of any
2 2
 // ReadSeeker.
3 3
 package tailfile
4 4
 
... ...
@@ -86,7 +86,7 @@ func (ar *ansiReader) Read(p []byte) (int, error) {
86 86
 		ar.buffer = keyBytes[len(p):]
87 87
 		keyBytes = keyBytes[:len(p)]
88 88
 	} else if len(keyBytes) == 0 {
89
-		logger.Debug("No key bytes returned from the translater")
89
+		logger.Debug("No key bytes returned from the translator")
90 90
 		return 0, nil
91 91
 	}
92 92
 
... ...
@@ -7,7 +7,7 @@ Labels are carefully picked to optimize for:
7 7
 
8 8
  - Readability: maintainers must immediately know the state of a PR
9 9
  - Filtering simplicity: different labels represent many different aspects of
10
-   the reviewing work, and can even be targetted at different maintainers groups.
10
+   the reviewing work, and can even be targeted at different maintainers groups.
11 11
 
12 12
 A pull request should only be attributed labels documented in this section: other labels that may
13 13
 exist on the repository should apply to issues.
... ...
@@ -28,7 +28,7 @@ func NewService(options *Options) *Service {
28 28
 }
29 29
 
30 30
 // Auth contacts the public registry with the provided credentials,
31
-// and returns OK if authentication was sucessful.
31
+// and returns OK if authentication was successful.
32 32
 // It can be used to verify the validity of a client's credentials.
33 33
 func (s *Service) Auth(authConfig *cliconfig.AuthConfig) (string, error) {
34 34
 	addr := authConfig.ServerAddress