Skip to content

Commit 39bcaee

Browse files
jsorefthaJeztah
authored andcommitted
Spelling fixes
* additional * ambiguous * anonymous * anything * application * because * before * building * capabilities * circumstances * commit * committer * compresses * concatenated * config * container * container's * current * definition * delimiter * disassociates * discovery * distributed * doesnotexist * downloads * duplicates * either * enhancing * enumerate * escapable * exactly * expect * expectations * expected * explicitly * false * filesystem * following * forbidden * git with * healthcheck * ignore * independent * inheritance * investigating * irrelevant * it * logging * looking * membership * mimic * minimum * modify * mountpoint * multiline * notifier * outputting * outside * overridden * override * parsable * plugins * precedence * propagation * provided * provides * registries * repositories * returning * settings * should * signals * someone * something * specifically * successfully * synchronize * they've * thinking * uninitialized * unintentionally * unmarshaling * unnamed * unreferenced * verify Signed-off-by: Josh Soref <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent acd20d8 commit 39bcaee

File tree

72 files changed

+129
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+129
-129
lines changed

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ be found.
190190
* Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe [#31666](https://github.com/docker/docker/pull/31666)
191191
* Ignore cgroup2 mountpoints [opencontainers/runc#1266](https://github.com/opencontainers/runc/pull/1266)
192192
* Update containerd to 4ab9917febca54791c5f071a9d1f404867857fcc [#31662](https://github.com/docker/docker/pull/31662) [#31852](https://github.com/docker/docker/pull/31852)
193-
* Register healtcheck service before calling restore() [docker/containerd#609](https://github.com/docker/containerd/pull/609)
193+
* Register healthcheck service before calling restore() [docker/containerd#609](https://github.com/docker/containerd/pull/609)
194194
* Fix `docker exec` not working after unattended upgrades that reload apparmor profiles [#31773](https://github.com/docker/docker/pull/31773)
195195
* Fix unmounting layer without merge dir with Overlay2 [#31069](https://github.com/docker/docker/pull/31069)
196196
* Do not ignore "volume in use" errors when force-delete [#31450](https://github.com/docker/docker/pull/31450)
@@ -1087,12 +1087,12 @@ installing docker, please make sure to update them accordingly.
10871087
+ Add security options to `docker info` output [#21172](https://github.com/docker/docker/pull/21172) [#23520](https://github.com/docker/docker/pull/23520)
10881088
+ Add insecure registries to `docker info` output [#20410](https://github.com/docker/docker/pull/20410)
10891089
+ Extend Docker authorization with TLS user information [#21556](https://github.com/docker/docker/pull/21556)
1090-
+ devicemapper: expose Mininum Thin Pool Free Space through `docker info` [#21945](https://github.com/docker/docker/pull/21945)
1090+
+ devicemapper: expose Minimum Thin Pool Free Space through `docker info` [#21945](https://github.com/docker/docker/pull/21945)
10911091
* API now returns a JSON object when an error occurs making it more consistent [#22880](https://github.com/docker/docker/pull/22880)
10921092
- Prevent `docker run -i --restart` from hanging on exit [#22777](https://github.com/docker/docker/pull/22777)
10931093
- Fix API/CLI discrepancy on hostname validation [#21641](https://github.com/docker/docker/pull/21641)
10941094
- Fix discrepancy in the format of sizes in `stats` from HumanSize to BytesSize [#21773](https://github.com/docker/docker/pull/21773)
1095-
- authz: when request is denied return forbbiden exit code (403) [#22448](https://github.com/docker/docker/pull/22448)
1095+
- authz: when request is denied return forbidden exit code (403) [#22448](https://github.com/docker/docker/pull/22448)
10961096
- Windows: fix tty-related displaying issues [#23878](https://github.com/docker/docker/pull/23878)
10971097

10981098
### Runtime
@@ -1887,7 +1887,7 @@ by another client (#15489)
18871887

18881888
#### Remote API
18891889

1890-
- Fix unmarshalling of Command and Entrypoint
1890+
- Fix unmarshaling of Command and Entrypoint
18911891
- Set limit for minimum client version supported
18921892
- Validate port specification
18931893
- Return proper errors when attach/reattach fail
@@ -2572,7 +2572,7 @@ With the ongoing changes to the networking and execution subsystems of docker te
25722572
- Fix ADD caching issue with . prefixed path
25732573
- Fix docker build on devicemapper by reverting sparse file tar option
25742574
- Fix issue with file caching and prevent wrong cache hit
2575-
* Use same error handling while unmarshalling CMD and ENTRYPOINT
2575+
* Use same error handling while unmarshaling CMD and ENTRYPOINT
25762576

25772577
#### Documentation
25782578

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ RUN set -x \
9393
&& rm -rf "$SECCOMP_PATH"
9494

9595
# Install Go
96-
# We don't have official binary golang 1.7.5 tarballs for ARM64, eigher for Go or
96+
# We don't have official binary golang 1.7.5 tarballs for ARM64, either for Go or
9797
# bootstrap, so we use golang-go (1.6) as bootstrap to build Go from source code.
9898
# We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because
9999
# not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8.

api/server/router/container/container_routes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (s *containerRouter) getContainersLogs(ctx context.Context, w http.Response
102102
}
103103

104104
// doesn't matter what version the client is on, we're using this internally only
105-
// also do we need size? i'm thinkin no we don't
105+
// also do we need size? i'm thinking no we don't
106106
raw, err := s.backend.ContainerInspect(containerName, false, api.DefaultVersion)
107107
if err != nil {
108108
return err

api/swagger.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1637,7 +1637,7 @@ definitions:
16371637
may not be applied if the version number has changed from the last read. In other words,
16381638
if two update requests specify the same base version, only one of the requests can succeed.
16391639
As a result, two separate update requests that happen at the same time will not
1640-
unintentially overwrite each other.
1640+
unintentionally overwrite each other.
16411641
type: "object"
16421642
properties:
16431643
Index:

api/types/filters/parse_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func TestArgsMatch(t *testing.T) {
228228
"created": {"tod": true}},
229229
}: "created",
230230
{map[string]map[string]bool{
231-
"created": {"anyting": true, "to*": true}},
231+
"created": {"anything": true, "to*": true}},
232232
}: "created",
233233
}
234234

api/types/swarm/swarm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package swarm
22

33
import "time"
44

5-
// ClusterInfo represents info about the cluster for outputing in "info"
5+
// ClusterInfo represents info about the cluster for outputting in "info"
66
// it contains the same information as "Swarm", but without the JoinTokens
77
type ClusterInfo struct {
88
ID string

builder/dockerfile/buildargs_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ func TestGetAllAllowed(t *testing.T) {
2020
})
2121

2222
buildArgs.AddMetaArg("ArgFromMeta", strPtr("frommeta1"))
23-
buildArgs.AddMetaArg("ArgFromMetaOverriden", strPtr("frommeta2"))
23+
buildArgs.AddMetaArg("ArgFromMetaOverridden", strPtr("frommeta2"))
2424
buildArgs.AddMetaArg("ArgFromMetaNotUsed", strPtr("frommeta3"))
2525

2626
buildArgs.AddArg("ArgOverriddenByOptions", strPtr("fromdockerfile2"))
2727
buildArgs.AddArg("ArgWithDefaultInDockerfile", strPtr("fromdockerfile1"))
2828
buildArgs.AddArg("ArgNoDefaultInDockerfile", nil)
2929
buildArgs.AddArg("ArgNoDefaultInDockerfileFromOptions", nil)
3030
buildArgs.AddArg("ArgFromMeta", nil)
31-
buildArgs.AddArg("ArgFromMetaOverriden", strPtr("fromdockerfile3"))
31+
buildArgs.AddArg("ArgFromMetaOverridden", strPtr("fromdockerfile3"))
3232

3333
all := buildArgs.GetAllAllowed()
3434
expected := map[string]string{
@@ -37,7 +37,7 @@ func TestGetAllAllowed(t *testing.T) {
3737
"ArgWithDefaultInDockerfile": "fromdockerfile1",
3838
"ArgNoDefaultInDockerfileFromOptions": "fromopt3",
3939
"ArgFromMeta": "frommeta1",
40-
"ArgFromMetaOverriden": "fromdockerfile3",
40+
"ArgFromMetaOverridden": "fromdockerfile3",
4141
}
4242
assert.Equal(t, expected, all)
4343
}

client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ type Client struct {
9191
// CheckRedirect specifies the policy for dealing with redirect responses:
9292
// If the request is non-GET return `ErrRedirect`. Otherwise use the last response.
9393
//
94-
// Go 1.8 changes behavior for HTTP redirects (specificlaly 301, 307, and 308) in the client .
94+
// Go 1.8 changes behavior for HTTP redirects (specifically 301, 307, and 308) in the client .
9595
// The Docker client (and by extension docker API client) can be made to to send a request
9696
// like POST /containers//start where what would normally be in the name section of the URL is empty.
9797
// This triggers an HTTP 301 from the daemon.

client/container_wait.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// indicated by the given condition, either "not-running" (default),
1515
// "next-exit", or "removed".
1616
//
17-
// If this client's API version is beforer 1.30, condition is ignored and
17+
// If this client's API version is before 1.30, condition is ignored and
1818
// ContainerWait will return immediately with the two channels, as the server
1919
// will wait as if the condition were "not-running".
2020
//
@@ -23,7 +23,7 @@ import (
2323
// then returns two channels on which the caller can wait for the exit status
2424
// of the container or an error if there was a problem either beginning the
2525
// wait request or in getting the response. This allows the caller to
26-
// sychronize ContainerWait with other calls, such as specifying a
26+
// synchronize ContainerWait with other calls, such as specifying a
2727
// "next-exit" condition before issuing a ContainerStart request.
2828
func (cli *Client) ContainerWait(ctx context.Context, containerID string, condition container.WaitCondition) (<-chan container.ContainerWaitOKBody, <-chan error) {
2929
if versions.LessThan(cli.ClientVersion(), "1.30") {

container/container_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfi
269269
cResources := &container.HostConfig.Resources
270270

271271
// validate NanoCPUs, CPUPeriod, and CPUQuota
272-
// Becuase NanoCPU effectively updates CPUPeriod/CPUQuota,
272+
// Because NanoCPU effectively updates CPUPeriod/CPUQuota,
273273
// once NanoCPU is already set, updating CPUPeriod/CPUQuota will be blocked, and vice versa.
274274
// In the following we make sure the intended update (resources) does not conflict with the existing (cResource).
275275
if resources.NanoCPUs > 0 && cResources.CPUPeriod > 0 {

container/state.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ const (
185185
// timeouts, and avoiding goroutine leaks. Wait must be called without holding
186186
// the state lock. Returns a channel from which the caller will receive the
187187
// result. If the container exited on its own, the result's Err() method will
188-
// be nil and its ExitCode() method will return the conatiners exit code,
188+
// be nil and its ExitCode() method will return the container's exit code,
189189
// otherwise, the results Err() method will return an error indicating why the
190190
// wait operation failed.
191191
func (s *State) Wait(ctx context.Context, condition WaitCondition) <-chan StateStatus {

daemon/cluster/executor/container/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ func (r *controller) Shutdown(ctx context.Context) error {
343343
}
344344

345345
// add a delay for gossip converge
346-
// TODO(dongluochen): this delay shoud be configurable to fit different cluster size and network delay.
346+
// TODO(dongluochen): this delay should be configurable to fit different cluster size and network delay.
347347
time.Sleep(defaultGossipConvergeDelay)
348348
}
349349

daemon/discovery/discovery_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ func TestDiscoveryOpts(t *testing.T) {
8787
t.Fatalf("Heartbeat - Expected : %v, Actual : %v", expected, heartbeat)
8888
}
8989

90-
discaveryTTL := fmt.Sprintf("%d", defaultDiscoveryTTLFactor-1)
91-
clusterOpts = map[string]string{"discovery.ttl": discaveryTTL}
90+
discoveryTTL := fmt.Sprintf("%d", defaultDiscoveryTTLFactor-1)
91+
clusterOpts = map[string]string{"discovery.ttl": discoveryTTL}
9292
heartbeat, ttl, err = discoveryOpts(clusterOpts)
9393
if err == nil && heartbeat == 0 {
9494
t.Fatal("discovery.heartbeat must be positive")

daemon/events/events_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func TestLoadBufferedEventsOnlyFromPast(t *testing.T) {
247247
}
248248

249249
// #13753
250-
func TestIngoreBufferedWhenNoTimes(t *testing.T) {
250+
func TestIgnoreBufferedWhenNoTimes(t *testing.T) {
251251
m1, err := eventstestutils.Scan("2016-03-07T17:28:03.022433271+02:00 container die 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)")
252252
if err != nil {
253253
t.Fatal(err)

daemon/graphdriver/devmapper/device_setup.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,27 +174,27 @@ func writeLVMConfig(root string, cfg directLVMConfig) error {
174174
func setupDirectLVM(cfg directLVMConfig) error {
175175
pvCreate, err := exec.LookPath("pvcreate")
176176
if err != nil {
177-
return errors.Wrap(err, "error lookuping up command `pvcreate` while setting up direct lvm")
177+
return errors.Wrap(err, "error looking up command `pvcreate` while setting up direct lvm")
178178
}
179179

180180
vgCreate, err := exec.LookPath("vgcreate")
181181
if err != nil {
182-
return errors.Wrap(err, "error lookuping up command `vgcreate` while setting up direct lvm")
182+
return errors.Wrap(err, "error looking up command `vgcreate` while setting up direct lvm")
183183
}
184184

185185
lvCreate, err := exec.LookPath("lvcreate")
186186
if err != nil {
187-
return errors.Wrap(err, "error lookuping up command `lvcreate` while setting up direct lvm")
187+
return errors.Wrap(err, "error looking up command `lvcreate` while setting up direct lvm")
188188
}
189189

190190
lvConvert, err := exec.LookPath("lvconvert")
191191
if err != nil {
192-
return errors.Wrap(err, "error lookuping up command `lvconvert` while setting up direct lvm")
192+
return errors.Wrap(err, "error looking up command `lvconvert` while setting up direct lvm")
193193
}
194194

195195
lvChange, err := exec.LookPath("lvchange")
196196
if err != nil {
197-
return errors.Wrap(err, "error lookuping up command `lvchange` while setting up direct lvm")
197+
return errors.Wrap(err, "error looking up command `lvchange` while setting up direct lvm")
198198
}
199199

200200
if cfg.AutoExtendPercent == 0 {

daemon/graphdriver/driver_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func GetFSMagic(rootpath string) (FsMagic, error) {
9595
return FsMagic(buf.Type), nil
9696
}
9797

98-
// NewFsChecker returns a checker configured for the provied FsMagic
98+
// NewFsChecker returns a checker configured for the provided FsMagic
9999
func NewFsChecker(t FsMagic) Checker {
100100
return &fsChecker{
101101
t: t,

daemon/graphdriver/driver_solaris.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (c *fsChecker) IsMounted(path string) bool {
5454
return m
5555
}
5656

57-
// NewFsChecker returns a checker configured for the provied FsMagic
57+
// NewFsChecker returns a checker configured for the provided FsMagic
5858
func NewFsChecker(t FsMagic) Checker {
5959
return &fsChecker{
6060
t: t,

daemon/graphdriver/quota/projectquota.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func makeBackingFsDev(home string) (string, error) {
328328
}
329329

330330
backingFsBlockDev := path.Join(home, "backingFsBlockDev")
331-
// Re-create just in case comeone copied the home directory over to a new device
331+
// Re-create just in case someone copied the home directory over to a new device
332332
syscall.Unlink(backingFsBlockDev)
333333
stat := fileinfo.Sys().(*syscall.Stat_t)
334334
if err := syscall.Mknod(backingFsBlockDev, syscall.S_IFBLK|0600, int(stat.Dev)); err != nil {

daemon/graphdriver/windows/windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ func (d *Driver) Remove(id string) error {
300300
//
301301
// TODO @jhowardmsft - For RS3, we can remove the retries. Also consider
302302
// using platform APIs (if available) to get this more succinctly. Also
303-
// consider enlighting the Remove() interface to have context of why
303+
// consider enhancing the Remove() interface to have context of why
304304
// the remove is being called - that could improve efficiency by not
305305
// enumerating compute systems during a remove of a container as it's
306306
// not required.

daemon/logger/awslogs/cloudwatchlogs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ var newTicker = func(freq time.Duration) *time.Ticker {
363363
// awslogs-datetime-format options have been configured, multiline processing
364364
// is enabled, where log messages are stored in an event buffer until a multiline
365365
// pattern match is found, at which point the messages in the event buffer are
366-
// pushed to CloudWatch logs as a single log event. Multline messages are processed
366+
// pushed to CloudWatch logs as a single log event. Multiline messages are processed
367367
// according to the maximumBytesPerPut constraint, and the implementation only
368368
// allows for messages to be buffered for a maximum of 2*batchPublishFrequency
369369
// seconds. When events are ready to be processed for submission to CloudWatch

daemon/logger/ring.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func (r *RingLogger) run() {
121121

122122
type messageRing struct {
123123
mu sync.Mutex
124-
// singals callers of `Dequeue` to wake up either on `Close` or when a new `Message` is added
124+
// signals callers of `Dequeue` to wake up either on `Close` or when a new `Message` is added
125125
wait *sync.Cond
126126

127127
sizeBytes int64 // current buffer size

daemon/oci_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
5555
}
5656

5757
// If the container has not been started, and has configs or secrets
58-
// secrets, create symlinks to each confing and secret. If it has been
58+
// secrets, create symlinks to each config and secret. If it has been
5959
// started before, the symlinks should have already been created. Also, it
6060
// is important to not mount a Hyper-V container that has been started
6161
// before, to protect the host from the container; for example, from

daemon/reload.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (daemon *Daemon) Reload(conf *config.Config) (err error) {
3939

4040
daemon.reloadPlatform(conf, attributes)
4141
daemon.reloadDebug(conf, attributes)
42-
daemon.reloadMaxConcurrentDowloadsAndUploads(conf, attributes)
42+
daemon.reloadMaxConcurrentDownloadsAndUploads(conf, attributes)
4343
daemon.reloadShutdownTimeout(conf, attributes)
4444

4545
if err := daemon.reloadClusterDiscovery(conf, attributes); err != nil {
@@ -74,9 +74,9 @@ func (daemon *Daemon) reloadDebug(conf *config.Config, attributes map[string]str
7474
attributes["debug"] = fmt.Sprintf("%t", daemon.configStore.Debug)
7575
}
7676

77-
// reloadMaxConcurrentDowloadsAndUploads updates configuration with max concurrent
77+
// reloadMaxConcurrentDownloadsAndUploads updates configuration with max concurrent
7878
// download and upload options and updates the passed attributes
79-
func (daemon *Daemon) reloadMaxConcurrentDowloadsAndUploads(conf *config.Config, attributes map[string]string) {
79+
func (daemon *Daemon) reloadMaxConcurrentDownloadsAndUploads(conf *config.Config, attributes map[string]string) {
8080
// If no value is set for max-concurrent-downloads we assume it is the default value
8181
// We always "reset" as the cost is lightweight and easy to maintain.
8282
if conf.IsValueSet("max-concurrent-downloads") && conf.MaxConcurrentDownloads != nil {

daemon/volumes_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func TestBackportMountSpec(t *testing.T) {
206206
BindOptions: &mounttypes.BindOptions{Propagation: "shared"},
207207
},
208208
},
209-
comment: "bind mount with read/write + shared propgation",
209+
comment: "bind mount with read/write + shared propagation",
210210
},
211211
{
212212
mp: &volume.MountPoint{

distribution/metadata/v2_metadata_service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func (serv *v2MetadataService) TagAndAdd(diffID layer.DiffID, hmacKey []byte, me
203203
return serv.Add(diffID, meta)
204204
}
205205

206-
// Remove unassociates a metadata entry from a layer DiffID.
206+
// Remove disassociates a metadata entry from a layer DiffID.
207207
func (serv *v2MetadataService) Remove(metadata V2Metadata) error {
208208
if serv.store == nil {
209209
// Support a service which has no backend storage, in this case

distribution/push_v2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func TestLayerAlreadyExists(t *testing.T) {
185185
expectedRequests: []string{"apple"},
186186
},
187187
{
188-
name: "not matching reposies",
188+
name: "not matching repositories",
189189
targetRepo: "busybox",
190190
maxExistenceChecks: 3,
191191
metadata: []metadata.V2Metadata{

dockerversion/useragent.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ func escapeStr(s string, charsToEscape string) string {
5252
var ret string
5353
for _, currRune := range s {
5454
appended := false
55-
for _, escapeableRune := range charsToEscape {
56-
if currRune == escapeableRune {
55+
for _, escapableRune := range charsToEscape {
56+
if currRune == escapableRune {
5757
ret += `\` + string(currRune)
5858
appended = true
5959
break

docs/api/v1.24.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ Get `stdout` and `stderr` logs from the container ``id``
826826

827827
**Query parameters**:
828828

829-
- **details** - 1/True/true or 0/False/flase, Show extra details provided to logs. Default `false`.
829+
- **details** - 1/True/true or 0/False/false, Show extra details provided to logs. Default `false`.
830830
- **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
831831
- **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
832832
- **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.

hack/Jenkins/W2L/setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SCRIPT_VER="Wed Apr 20 18:30:19 UTC 2016"
1313
# - Error if running 32-bit posix tools. Probably can take from bash --version and check contains "x86_64"
1414
# - Warn if the CI directory cannot be deleted afterwards. Otherwise turdlets are left behind
1515
# - Use %systemdrive% ($SYSTEMDRIVE) rather than hard code to c: for TEMP
16-
# - Consider cross builing the Windows binary and copy across. That's a bit of a heavy lift. Only reason
16+
# - Consider cross building the Windows binary and copy across. That's a bit of a heavy lift. Only reason
1717
# for doing that is that it mirrors the actual release process for docker.exe which is cross-built.
1818
# However, should absolutely not be a problem if built natively, so nit-picking.
1919
# - Tidy up of images and containers. Either here, or in the teardown script.
@@ -116,7 +116,7 @@ fi
116116
# Get the commit has and verify we have something
117117
if [ $ec -eq 0 ]; then
118118
export COMMITHASH=$(git rev-parse --short HEAD)
119-
echo INFO: Commmit hash is $COMMITHASH
119+
echo INFO: Commit hash is $COMMITHASH
120120
if [ -z $COMMITHASH ]; then
121121
echo "ERROR: Failed to get commit hash. Are you sure this is a docker repository?"
122122
ec=1

hack/integration-cli-on-swarm/host/enumerate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func enumerateTestsForBytes(b []byte) ([]string, error) {
2424
return tests, nil
2525
}
2626

27-
// enumareteTests enumerates valid `-check.f` strings for all the test functions.
27+
// enumerateTests enumerates valid `-check.f` strings for all the test functions.
2828
// Note that we use regexp rather than parsing Go files for performance reason.
2929
// (Try `TESTFLAGS=-check.list make test-integration-cli` to see the slowness of parsing)
3030
// The files needs to be `gofmt`-ed

0 commit comments

Comments
 (0)