Browse code

fix some typos from module contrib to man

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>

Aaron.L.Xu authored on 2017/02/16 21:08:57
Showing 18 changed files
... ...
@@ -20,7 +20,7 @@ static int child_exec(void *stuff)
20 20
 {
21 21
 	struct clone_args *args = (struct clone_args *)stuff;
22 22
 	if (execvp(args->argv[0], args->argv) != 0) {
23
-		fprintf(stderr, "failed to execvp argments %s\n",
23
+		fprintf(stderr, "failed to execvp arguments %s\n",
24 24
 			strerror(errno));
25 25
 		exit(-1);
26 26
 	}
... ...
@@ -20,7 +20,7 @@ static int child_exec(void *stuff)
20 20
 {
21 21
 	struct clone_args *args = (struct clone_args *)stuff;
22 22
 	if (execvp(args->argv[0], args->argv) != 0) {
23
-		fprintf(stderr, "failed to execvp argments %s\n",
23
+		fprintf(stderr, "failed to execvp arguments %s\n",
24 24
 			strerror(errno));
25 25
 		exit(-1);
26 26
 	}
... ...
@@ -10,7 +10,7 @@ import (
10 10
 	gogotypes "github.com/gogo/protobuf/types"
11 11
 )
12 12
 
13
-func networkAttachementFromGRPC(na *swarmapi.NetworkAttachment) types.NetworkAttachment {
13
+func networkAttachmentFromGRPC(na *swarmapi.NetworkAttachment) types.NetworkAttachment {
14 14
 	if na != nil {
15 15
 		return types.NetworkAttachment{
16 16
 			Network:   networkFromGRPC(na.Network),
... ...
@@ -179,7 +179,7 @@ func ServiceSpecToGRPC(s types.ServiceSpec) (swarmapi.ServiceSpec, error) {
179 179
 		case types.UpdateFailureActionContinue:
180 180
 			failureAction = swarmapi.UpdateConfig_CONTINUE
181 181
 		default:
182
-			return swarmapi.ServiceSpec{}, fmt.Errorf("unrecongized update failure action %s", s.UpdateConfig.FailureAction)
182
+			return swarmapi.ServiceSpec{}, fmt.Errorf("unrecognized update failure action %s", s.UpdateConfig.FailureAction)
183 183
 		}
184 184
 		spec.Update = &swarmapi.UpdateConfig{
185 185
 			Parallelism:     s.UpdateConfig.Parallelism,
... ...
@@ -60,7 +60,7 @@ func TaskFromGRPC(t swarmapi.Task) types.Task {
60 60
 
61 61
 	// NetworksAttachments
62 62
 	for _, na := range t.Networks {
63
-		task.NetworksAttachments = append(task.NetworksAttachments, networkAttachementFromGRPC(na))
63
+		task.NetworksAttachments = append(task.NetworksAttachments, networkAttachmentFromGRPC(na))
64 64
 	}
65 65
 
66 66
 	if t.Status.PortStatus == nil {
... ...
@@ -22,7 +22,7 @@ func NewRefCounter(c Checker) *RefCounter {
22 22
 	}
23 23
 }
24 24
 
25
-// Increment increaes the ref count for the given id and returns the current count
25
+// Increment increases the ref count for the given id and returns the current count
26 26
 func (c *RefCounter) Increment(path string) int {
27 27
 	c.mu.Lock()
28 28
 	m := c.counts[path]
... ...
@@ -30,7 +30,7 @@ var (
30 30
 
31 31
 	// ErrNotSupported returned when driver is not supported.
32 32
 	ErrNotSupported = errors.New("driver not supported")
33
-	// ErrPrerequisites retuned when driver does not meet prerequisites.
33
+	// ErrPrerequisites returned when driver does not meet prerequisites.
34 34
 	ErrPrerequisites = errors.New("prerequisites for driver not satisfied (wrong filesystem?)")
35 35
 	// ErrIncompatibleFS returned when file system is not supported.
36 36
 	ErrIncompatibleFS = fmt.Errorf("backing file system is unsupported for this graph driver")
... ...
@@ -171,7 +171,7 @@ func (daemon *Daemon) Images(imageFilters filters.Args, all bool, withExtraAttrs
171 171
 		}
172 172
 
173 173
 		if withExtraAttrs {
174
-			// lazyly init variables
174
+			// lazily init variables
175 175
 			if imagesMap == nil {
176 176
 				allContainers = daemon.List()
177 177
 				allLayers = daemon.layerStore.Map()
... ...
@@ -87,7 +87,7 @@ func initGCP() {
87 87
 			// These will fail on instances if the metadata service is
88 88
 			// down or the client is compiled with an API version that
89 89
 			// has been removed. Since these are not vital, let's ignore
90
-			// them and make their fields in the dockeLogEntry ,omitempty
90
+			// them and make their fields in the dockerLogEntry ,omitempty
91 91
 			projectID, _ = metadata.ProjectID()
92 92
 			zone, _ = metadata.Zone()
93 93
 			instanceName, _ = metadata.InstanceName()
... ...
@@ -111,7 +111,7 @@ func New(info logger.Info) (logger.Logger, error) {
111 111
 		project = projectID
112 112
 	}
113 113
 	if project == "" {
114
-		return nil, fmt.Errorf("No project was specified and couldn't read project from the meatadata server. Please specify a project")
114
+		return nil, fmt.Errorf("No project was specified and couldn't read project from the metadata server. Please specify a project")
115 115
 	}
116 116
 
117 117
 	// Issue #29344: gcplogs segfaults (static binary)
... ...
@@ -104,7 +104,7 @@ func TestRingClose(t *testing.T) {
104 104
 		t.Fatal("expected empty queue")
105 105
 	}
106 106
 	if m, err := r.Dequeue(); err == nil || m != nil {
107
-		t.Fatal("exepcted err on Dequeue after close")
107
+		t.Fatal("expected err on Dequeue after close")
108 108
 	}
109 109
 
110 110
 	ls := r.Drain()
... ...
@@ -74,7 +74,7 @@ func rfc5424formatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content
74 74
 }
75 75
 
76 76
 // The timestamp field in rfc5424 is derived from rfc3339. Whereas rfc3339 makes allowances
77
-// for multiple syntaxes, there are further restrictions in rfc5424, i.e., the maximium
77
+// for multiple syntaxes, there are further restrictions in rfc5424, i.e., the maximum
78 78
 // resolution is limited to "TIME-SECFRAC" which is 6 (microsecond resolution)
79 79
 func rfc5424microformatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content string) string {
80 80
 	timestamp := time.Now().Format("2006-01-02T15:04:05.999999Z07:00")
... ...
@@ -253,7 +253,7 @@ func backportMountSpec(container *container.Container) error {
253 253
 			m.Type = mounttypes.TypeVolume
254 254
 			m.Spec.Type = mounttypes.TypeVolume
255 255
 
256
-			// make sure this is not an anyonmous volume before setting the spec source
256
+			// make sure this is not an anonymous volume before setting the spec source
257 257
 			if _, exists := container.Config.Volumes[target]; !exists {
258 258
 				m.Spec.Source = m.Name
259 259
 			}
... ...
@@ -12,7 +12,7 @@ import (
12 12
 // setupMounts configures the mount points for a container by appending each
13 13
 // of the configured mounts on the container to the OCI mount structure
14 14
 // which will ultimately be passed into the oci runtime during container creation.
15
-// It also ensures each of the mounts are lexographically sorted.
15
+// It also ensures each of the mounts are lexicographically sorted.
16 16
 
17 17
 // BUGBUG TODO Windows containerd. This would be much better if it returned
18 18
 // an array of runtime spec mounts, not container mounts. Then no need to
... ...
@@ -585,7 +585,7 @@ func getMaxMountAndExistenceCheckAttempts(layer PushLayer) (maxMountAttempts, ma
585 585
 }
586 586
 
587 587
 // getRepositoryMountCandidates returns an array of v2 metadata items belonging to the given registry. The
588
-// array is sorted from youngest to oldest. If requireReigstryMatch is true, the resulting array will contain
588
+// array is sorted from youngest to oldest. If requireRegistryMatch is true, the resulting array will contain
589 589
 // only metadata entries having registry part of SourceRepository matching the part of repoInfo.
590 590
 func getRepositoryMountCandidates(
591 591
 	repoInfo reference.Named,
... ...
@@ -679,7 +679,7 @@ Use `df <source-dir>` to figure out the source mount and then use
679 679
 `findmnt -o TARGET,PROPAGATION <source-mount-dir>` to figure out propagation
680 680
 properties of source mount. If `findmnt` utility is not available, then one
681 681
 can look at mount entry for source mount point in `/proc/self/mountinfo`. Look
682
-at `optional fields` and see if any propagaion properties are specified.
682
+at `optional fields` and see if any propagation properties are specified.
683 683
 `shared:X` means mount is `shared`, `master:X` means mount is `slave` and if
684 684
 nothing is there that means mount is `private`.
685 685
 
... ...
@@ -31,5 +31,5 @@ docker create --device-cgroup-rule='c 42:* rmw' -name my-container my-image
31 31
 Then, a user could ask `udev` to execute a script that would `docker exec my-container mknod newDevX c 42 <minor>`
32 32
 the required device when it is added.
33 33
 
34
-NOTE: initially present devices still need to be explicitely added to
34
+NOTE: initially present devices still need to be explicitly added to
35 35
 the create/run command
... ...
@@ -60,7 +60,7 @@ Use `df <source-dir>` to figure out the source mount and then use
60 60
 `findmnt -o TARGET,PROPAGATION <source-mount-dir>` to figure out propagation
61 61
 properties of source mount. If `findmnt` utility is not available, then one
62 62
 can look at mount entry for source mount point in `/proc/self/mountinfo`. Look
63
-at `optional fields` and see if any propagaion properties are specified.
63
+at `optional fields` and see if any propagation properties are specified.
64 64
 `shared:X` means mount is `shared`, `master:X` means mount is `slave` and if
65 65
 nothing is there that means mount is `private`.
66 66
 
... ...
@@ -36,7 +36,7 @@ Filter output based on these conditions:
36 36
     ID                  NAME                                    DESCRIPTION                         ENABLED
37 37
     869080b57404        tiborvass/sample-volume-plugin:latest   A sample volume plugin for Docker   true
38 38
 
39
-## Display plguins with `volumedriver` capability
39
+## Display plugins with `volumedriver` capability
40 40
 
41 41
     $ docker plugin ls --filter capability=volumedriver --format "table {{.ID}}\t{{.Name}}"
42 42
     ID                  Name