Browse code

Fix spelling in comments, strings and documentation

Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
(cherry picked from commit 644a7426cc31c338fedb6574d2b88d1cc2f43a08)
Signed-off-by: Tibor Vass <tibor@docker.com>

Otto Kekäläinen authored on 2016/07/04 02:58:11
Showing 19 changed files
... ...
@@ -1018,7 +1018,7 @@ by another client (#15489)
1018 1018
 #### Security
1019 1019
 - Fix tar breakout vulnerability
1020 1020
 * Extractions are now sandboxed chroot
1021
-- Security options are no longer committed to images
1021
+- Security options are no longer comitted to images
1022 1022
 
1023 1023
 #### Runtime
1024 1024
 - Fix deadlock in `docker ps -f exited=1`
... ...
@@ -1444,7 +1444,7 @@ by another client (#15489)
1444 1444
 * Update issue filing instructions
1445 1445
 * Warn against the use of symlinks for Docker's storage folder
1446 1446
 * Replace the Firefox example with an IceWeasel example
1447
-* Rewrite the PostgresSQL example using a Dockerfile and add more details to it
1447
+* Rewrite the PostgreSQL example using a Dockerfile and add more details to it
1448 1448
 * Improve the OS X documentation
1449 1449
 
1450 1450
 #### Remote API
... ...
@@ -421,7 +421,7 @@ func (b *Builder) processImageFrom(img builder.Image) error {
421 421
 		fmt.Fprintf(b.Stderr, "# Executing %d build %s...\n", nTriggers, word)
422 422
 	}
423 423
 
424
-	// Copy the ONBUILD triggers, and remove them from the config, since the config will be committed.
424
+	// Copy the ONBUILD triggers, and remove them from the config, since the config will be comitted.
425 425
 	onBuildTriggers := b.runConfig.OnBuild
426 426
 	b.runConfig.OnBuild = []string{}
427 427
 
... ...
@@ -1031,7 +1031,7 @@ func getNetwork(ctx context.Context, c swarmapi.ControlClient, input string) (*s
1031 1031
 		}
1032 1032
 
1033 1033
 		if l := len(rl.Networks); l > 1 {
1034
-			return nil, fmt.Errorf("network %s is ambigious (%d matches found)", input, l)
1034
+			return nil, fmt.Errorf("network %s is ambiguous (%d matches found)", input, l)
1035 1035
 		}
1036 1036
 
1037 1037
 		return rl.Networks[0], nil
... ...
@@ -42,7 +42,7 @@ func getNode(ctx context.Context, c swarmapi.ControlClient, input string) (*swar
42 42
 		}
43 43
 
44 44
 		if l := len(rl.Nodes); l > 1 {
45
-			return nil, fmt.Errorf("node %s is ambigious (%d matches found)", input, l)
45
+			return nil, fmt.Errorf("node %s is ambiguous (%d matches found)", input, l)
46 46
 		}
47 47
 
48 48
 		return rl.Nodes[0], nil
... ...
@@ -70,7 +70,7 @@ func getService(ctx context.Context, c swarmapi.ControlClient, input string) (*s
70 70
 		}
71 71
 
72 72
 		if l := len(rl.Services); l > 1 {
73
-			return nil, fmt.Errorf("service %s is ambigious (%d matches found)", input, l)
73
+			return nil, fmt.Errorf("service %s is ambiguous (%d matches found)", input, l)
74 74
 		}
75 75
 
76 76
 		return rl.Services[0], nil
... ...
@@ -99,7 +99,7 @@ func getTask(ctx context.Context, c swarmapi.ControlClient, input string) (*swar
99 99
 		}
100 100
 
101 101
 		if l := len(rl.Tasks); l > 1 {
102
-			return nil, fmt.Errorf("task %s is ambigious (%d matches found)", input, l)
102
+			return nil, fmt.Errorf("task %s is ambiguous (%d matches found)", input, l)
103 103
 		}
104 104
 
105 105
 		return rl.Tasks[0], nil
... ...
@@ -271,7 +271,7 @@ func getConflictFreeConfiguration(configFile string, flags *flag.FlagSet) (*Conf
271 271
 		}
272 272
 
273 273
 		// Override flag values to make sure the values set in the config file with nullable values, like `false`,
274
-		// are not overriden by default truthy values from the flags that were not explicitly set.
274
+		// are not overridden by default truthy values from the flags that were not explicitly set.
275 275
 		// See https://github.com/docker/docker/issues/20289 for an example.
276 276
 		//
277 277
 		// TODO: Rewrite configuration logic to avoid same issue with other nullable values, like numbers.
... ...
@@ -365,7 +365,7 @@ func (daemon *Daemon) registerLink(parent, child *container.Container, alias str
365 365
 	return nil
366 366
 }
367 367
 
368
-// SetClusterProvider sets a component for quering the current cluster state.
368
+// SetClusterProvider sets a component for querying the current cluster state.
369 369
 func (daemon *Daemon) SetClusterProvider(clusterProvider cluster.Provider) {
370 370
 	daemon.clusterProvider = clusterProvider
371 371
 	daemon.netController.SetClusterProvider(clusterProvider)
... ...
@@ -34,7 +34,7 @@ Otherwise, the user must specify which project to log to using the `--gcp-projec
34 34
 log option and Docker will attempt to obtain credentials from the
35 35
 <a href="https://developers.google.com/identity/protocols/application-default-credentials" target="_blank">Google Application Default Credential</a>.
36 36
 The `--gcp-project` takes precedence over information discovered from the metadata server
37
-so a Docker daemon running in a Google Cloud Project can be overriden to log to a different
37
+so a Docker daemon running in a Google Cloud Project can be overridden to log to a different
38 38
 Google Cloud Project using `--gcp-project`.
39 39
 
40 40
 ## gcplogs options
... ...
@@ -155,7 +155,7 @@ option is ignored if the address protocol is not `tcp+tls`.
155 155
 is ignored if the address protocol is not `tcp+tls`.
156 156
 
157 157
 `syslog-tls-skip-verify` configures the TLS verification. This verification is
158
-enabled by default, but it can be overriden by setting this option to `true`.
158
+enabled by default, but it can be overridden by setting this option to `true`.
159 159
 This option is ignored if the address protocol is not `tcp+tls`.
160 160
 
161 161
 `tag` configures a string that is appended to the APP-NAME in the syslog
... ...
@@ -502,7 +502,7 @@ default is `/bin/sh -c` on Linux or `cmd /S /C` on Windows)
502 502
 - `RUN ["executable", "param1", "param2"]` (*exec* form)
503 503
 
504 504
 The `RUN` instruction will execute any commands in a new layer on top of the
505
-current image and commit the results. The resulting committed image will be
505
+current image and commit the results. The resulting comitted image will be
506 506
 used for the next step in the `Dockerfile`.
507 507
 
508 508
 Layering `RUN` instructions and generating commits conforms to the core
... ...
@@ -544,7 +544,7 @@ RUN /bin/bash -c 'source $HOME/.bashrc ; echo $HOME'
544 544
 >
545 545
 > **Note**:
546 546
 > In the *JSON* form, it is necessary to escape backslashes. This is
547
-> particularly relevant on Windows where the backslash is the path seperator.
547
+> particularly relevant on Windows where the backslash is the path separator.
548 548
 > The following line would otherwise be treated as *shell* form due to not
549 549
 > being valid JSON, and fail in an unexpected way:
550 550
 > `RUN ["c:\windows\system32\tasklist.exe"]`
... ...
@@ -49,7 +49,7 @@ This example displays images with a name containing 'busybox':
49 49
     ofayau/busybox-libc32            Busybox with 32 bits (and 64 bits) libs         1                    [OK]
50 50
     peelsky/zulu-openjdk-busybox                                                     1                    [OK]
51 51
     skomma/busybox-data              Docker image suitable for data volume cont...   1                    [OK]
52
-    elektritter/busybox-teamspeak    Leightweight teamspeak3 container based on...   1                    [OK]
52
+    elektritter/busybox-teamspeak    Lightweight teamspeak3 container based on...    1                    [OK]
53 53
     socketplane/busybox                                                              1                    [OK]
54 54
     oveits/docker-nginx-busybox      This is a tiny NginX docker image based on...   0                    [OK]
55 55
     ggtools/busybox-ubuntu           Busybox ubuntu version with extra goodies       0                    [OK]
... ...
@@ -39,7 +39,7 @@ ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER
39 39
 ### `--auto-accept value`
40 40
 
41 41
 This flag controls node acceptance into the cluster. By default, `worker` nodes are
42
-automatically accepted by the cluster. This can be changed by specifing what kinds of nodes
42
+automatically accepted by the cluster. This can be changed by specifying what kinds of nodes
43 43
 can be auto-accepted into the cluster. If auto-accept is not turned on, then
44 44
 [node accept](node_accept.md) can be used to explicitly accept a node into the cluster.
45 45
 
... ...
@@ -312,7 +312,7 @@ assumes that the Docker daemon is in the `stopped` state.
312 312
 
313 313
 14. Configure the Docker daemon with specific devicemapper options.
314 314
 
315
-	There are two ways to do this. You can set options on the commmand line if you start the daemon there:
315
+	There are two ways to do this. You can set options on the command line if you start the daemon there:
316 316
 
317 317
 	```bash
318 318
 	--storage-driver=devicemapper --storage-opt=dm.thinpooldev=/dev/mapper/docker-thinpool --storage-opt dm.use_deferred_removal=true
... ...
@@ -627,7 +627,7 @@ docker network  create  -d ipvlan \
627 627
 
628 628
 
629 629
 # Start a few of containers on the network (ipnet110) 
630
-# in seperate terminals and check connectivity
630
+# in separate terminals and check connectivity
631 631
 docker run --net=ipnet110 -it --rm alpine /bin/sh
632 632
 # Start a second container specifying the v6 address
633 633
 docker run --net=ipnet110 --ip6=2001:db8:abc6::10 -it --rm alpine /bin/sh
... ...
@@ -1,7 +1,7 @@
1 1
 #!/bin/bash
2 2
 set -e
3 3
 
4
-# This script exists as backwards compatiblity for CI
4
+# This script exists as backwards compatibility for CI
5 5
 (
6 6
     DEST="${DEST}-client"
7 7
     ABS_DEST="${ABS_DEST}-client"
... ...
@@ -573,7 +573,7 @@ these directories contains 3 files:
573 573
  * `json` - The legacy JSON metadata for an image layer. In this version of
574 574
     the image specification, layers don't have JSON metadata, but in
575 575
     [version 1](v1.md), they did. A file is created for each layer in the
576
-    v1 format for backward compatiblity.
576
+    v1 format for backward compatibility.
577 577
  * `layer.tar` - The Tar archive of the filesystem changeset for an image
578 578
    layer.
579 579
 
... ...
@@ -1432,7 +1432,7 @@ func (s *DockerSuite) TestPostContainersCreateWithOomScoreAdjInvalidRange(c *che
1432 1432
 	}
1433 1433
 }
1434 1434
 
1435
-// test case for #22210 where an emtpy container name caused panic.
1435
+// test case for #22210 where an empty container name caused panic.
1436 1436
 func (s *DockerSuite) TestContainerApiDeleteWithEmptyName(c *check.C) {
1437 1437
 	status, out, err := sockRequest("DELETE", "/containers/", nil)
1438 1438
 	c.Assert(err, checker.IsNil)
... ...
@@ -4915,7 +4915,7 @@ func (s *DockerSuite) TestBuildRenamedDockerfile(c *check.C) {
4915 4915
 	}
4916 4916
 
4917 4917
 	if expected := fmt.Sprintf("The Dockerfile (%s) must be within the build context (.)", nonDockerfileFile); !strings.Contains(out, expected) {
4918
-		c.Fatalf("wrong error messsage:%v\nexpected to contain=%v", out, expected)
4918
+		c.Fatalf("wrong error message:%v\nexpected to contain=%v", out, expected)
4919 4919
 	}
4920 4920
 
4921 4921
 	out, _, err = dockerCmdInDir(c, filepath.Join(ctx.Dir, "files"), "build", "-f", filepath.Join("..", "Dockerfile"), "-t", "test6", "..")
... ...
@@ -359,7 +359,7 @@ func (s *DockerExternalGraphdriverSuite) testExternalGraphDriver(name string, ex
359 359
 
360 360
 	out, err = s.d.Cmd("diff", "graphtest")
361 361
 	c.Assert(err, check.IsNil, check.Commentf(out))
362
-	c.Assert(strings.Contains(out, "A /hello"), check.Equals, true, check.Commentf("diff ouput: %s", out))
362
+	c.Assert(strings.Contains(out, "A /hello"), check.Equals, true, check.Commentf("diff output: %s", out))
363 363
 
364 364
 	out, err = s.d.Cmd("rm", "-f", "graphtest")
365 365
 	c.Assert(err, check.IsNil, check.Commentf(out))
... ...
@@ -1260,7 +1260,7 @@ func daemonTime(c *check.C) time.Time {
1260 1260
 	return dt
1261 1261
 }
1262 1262
 
1263
-// daemonUnixTime returns the current time on the daemon host with nanoseconds precission.
1263
+// daemonUnixTime returns the current time on the daemon host with nanoseconds precision.
1264 1264
 // It return the time formatted how the client sends timestamps to the server.
1265 1265
 func daemonUnixTime(c *check.C) string {
1266 1266
 	return parseEventTime(daemonTime(c))