From 83f647ed846a3ee65581e63a028e239380d9e89f Mon Sep 17 00:00:00 2001 From: Ben Barnard Date: Tue, 11 Oct 2016 15:31:40 -0400 Subject: [PATCH] Replace "the the" with "the" in documentation and comments --- client/alloc_runner_test.go | 2 +- client/allocdir/alloc_dir.go | 2 +- client/task_runner.go | 2 +- command/plan.go | 6 +++--- command/run.go | 4 ++-- nomad/pool.go | 2 +- nomad/structs/structs.go | 2 +- nomad/worker.go | 4 ++-- scheduler/util.go | 4 ++-- vendor/github.com/davecgh/go-spew/spew/config.go | 2 +- vendor/github.com/davecgh/go-spew/spew/doc.go | 2 +- vendor/github.com/davecgh/go-spew/spew/format.go | 2 +- .../hashicorp/consul/consul/structs/prepared_query.go | 2 +- vendor/github.com/hashicorp/serf/serf/coalesce_user.go | 2 +- vendor/github.com/hashicorp/vault/api/client.go | 2 +- vendor/github.com/miekg/dns/labels.go | 4 ++-- vendor/golang.org/x/sys/unix/mksyscall.pl | 6 +++--- vendor/gopkg.in/fsnotify.v1/fen.go | 2 +- vendor/gopkg.in/fsnotify.v1/kqueue.go | 2 +- vendor/gopkg.in/fsnotify.v1/windows.go | 2 +- website/source/docs/agent/config.html.md | 2 +- website/source/docs/commands/plan.html.md.erb | 10 +++++----- website/source/docs/commands/run.html.md.erb | 4 ++-- website/source/docs/jobspec/environment.html.md | 4 ++-- .../docs/operating-a-job/submitting-jobs.html.md | 4 ++-- .../docs/operating-a-job/update-strategies.html.md | 2 +- website/source/intro/getting-started/jobs.html.md | 4 ++-- 27 files changed, 43 insertions(+), 43 deletions(-) diff --git a/client/alloc_runner_test.go b/client/alloc_runner_test.go index be4b656f4..8ed69eb93 100644 --- a/client/alloc_runner_test.go +++ b/client/alloc_runner_test.go @@ -68,7 +68,7 @@ func TestAllocRunner_SimpleRun(t *testing.T) { } // TestAllocRuner_RetryArtifact ensures that if one task in a task group is -// retrying fetching an artifact, other tasks in the the group should be able +// retrying fetching an artifact, other tasks in the group should be able // to proceed. func TestAllocRunner_RetryArtifact(t *testing.T) { ctestutil.ExecCompatible(t) diff --git a/client/allocdir/alloc_dir.go b/client/allocdir/alloc_dir.go index 8c52c01bf..c0db9477d 100644 --- a/client/allocdir/alloc_dir.go +++ b/client/allocdir/alloc_dir.go @@ -47,7 +47,7 @@ var ( // regardless of driver. TaskLocal = "local" - // TaskSecrets is the the name of the secret directory inside each task + // TaskSecrets is the name of the secret directory inside each task // directory TaskSecrets = "secrets" diff --git a/client/task_runner.go b/client/task_runner.go index 4367e8dab..116bfeb10 100644 --- a/client/task_runner.go +++ b/client/task_runner.go @@ -28,7 +28,7 @@ const ( // killing a task. killBackoffBaseline = 5 * time.Second - // killBackoffLimit is the the limit of the exponential backoff for killing + // killBackoffLimit is the limit of the exponential backoff for killing // the task. killBackoffLimit = 2 * time.Minute diff --git a/command/plan.go b/command/plan.go index 412a3e3e6..90d3e8135 100644 --- a/command/plan.go +++ b/command/plan.go @@ -18,7 +18,7 @@ const ( nomad run -check-index %d %s When running the job with the check-index flag, the job will only be run if the -server side version matches the the job modify index returned. If the index has +server side version matches the job modify index returned. If the index has changed, another user has modified the job and the plan's results are potentially invalid.` ) @@ -51,7 +51,7 @@ Usage: nomad plan [options] give insight into what the scheduler will attempt to do and why. If the job has specified the region, the -region flag and NOMAD_REGION - environment variable are overridden and the the job's region is used. + environment variable are overridden and the job's region is used. Plan will return one of the following exit codes: * 0: No allocations created or destroyed. @@ -226,7 +226,7 @@ func formatDryRun(resp *api.JobPlanResponse, job *structs.Job) string { return out } -// formatJobDiff produces an annoted diff of the the job. If verbose mode is +// formatJobDiff produces an annoted diff of the job. If verbose mode is // set, added or deleted task groups and tasks are expanded. func formatJobDiff(job *api.JobDiff, verbose bool) string { marker, _ := getDiffString(job.Type) diff --git a/command/run.go b/command/run.go index f1cb8aefa..c8fa5bade 100644 --- a/command/run.go +++ b/command/run.go @@ -50,7 +50,7 @@ Usage: nomad run [options] issues or internal errors, are indicated by exit code 1. If the job has specified the region, the -region flag and NOMAD_REGION - environment variable are overridden and the the job's region is used. + environment variable are overridden and the job's region is used. The run command will set the vault_token of the job based on the following precedence, going from highest to lowest: the -vault-token flag, the @@ -63,7 +63,7 @@ General Options: Run Options: -check-index - If set, the job is only registered or updated if the the passed + If set, the job is only registered or updated if the passed job modify index matches the server side version. If a check-index value of zero is passed, the job is only registered if it does not yet exist. If a non-zero value is passed, it ensures that the job is being updated from a diff --git a/nomad/pool.go b/nomad/pool.go index 7ef7acf59..c00a601b6 100644 --- a/nomad/pool.go +++ b/nomad/pool.go @@ -179,7 +179,7 @@ func (p *ConnPool) Shutdown() error { // pooled or to return a new connection func (p *ConnPool) acquire(region string, addr net.Addr, version int) (*Conn, error) { // Check to see if there's a pooled connection available. This is up - // here since it should the the vastly more common case than the rest + // here since it should the vastly more common case than the rest // of the code here. p.Lock() c := p.pool[addr.String()] diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go index a4975e19f..6f23a71bd 100644 --- a/nomad/structs/structs.go +++ b/nomad/structs/structs.go @@ -2225,7 +2225,7 @@ var ( // Template represents a template configuration to be rendered for a given task type Template struct { - // SourcePath is the the path to the template to be rendered + // SourcePath is the path to the template to be rendered SourcePath string `mapstructure:"source"` // DestPath is the path to where the template should be rendered diff --git a/nomad/worker.go b/nomad/worker.go index b6a23ce1f..e64a2b036 100644 --- a/nomad/worker.go +++ b/nomad/worker.go @@ -112,7 +112,7 @@ func (w *Worker) run() { return } - // Wait for the the raft log to catchup to the evaluation + // Wait for the raft log to catchup to the evaluation if err := w.waitForIndex(eval.ModifyIndex, raftSyncLimit); err != nil { w.sendAck(eval.ID, token, false) continue @@ -327,7 +327,7 @@ SUBMIT: // allocations. var state scheduler.State if result.RefreshIndex != 0 { - // Wait for the the raft log to catchup to the evaluation + // Wait for the raft log to catchup to the evaluation w.logger.Printf("[DEBUG] worker: refreshing state to index %d for %q", result.RefreshIndex, plan.EvalID) if err := w.waitForIndex(result.RefreshIndex, raftSyncLimit); err != nil { return nil, nil, err diff --git a/scheduler/util.go b/scheduler/util.go index 12d359c88..8583a2c9b 100644 --- a/scheduler/util.go +++ b/scheduler/util.go @@ -520,7 +520,7 @@ func inplaceUpdate(ctx Context, eval *structs.Evaluation, job *structs.Job, } // evictAndPlace is used to mark allocations for evicts and add them to the -// placement queue. evictAndPlace modifies both the the diffResult and the +// placement queue. evictAndPlace modifies both the diffResult and the // limit. It returns true if the limit has been reached. func evictAndPlace(ctx Context, diff *diffResult, allocs []allocTuple, desc string, limit *int) bool { n := len(allocs) @@ -538,7 +538,7 @@ func evictAndPlace(ctx Context, diff *diffResult, allocs []allocTuple, desc stri } // markLostAndPlace is used to mark allocations as lost and add them to the -// placement queue. evictAndPlace modifies both the the diffResult and the +// placement queue. evictAndPlace modifies both the diffResult and the // limit. It returns true if the limit has been reached. func markLostAndPlace(ctx Context, diff *diffResult, allocs []allocTuple, desc string, limit *int) bool { n := len(allocs) diff --git a/vendor/github.com/davecgh/go-spew/spew/config.go b/vendor/github.com/davecgh/go-spew/spew/config.go index ee1ab07b3..c31762867 100644 --- a/vendor/github.com/davecgh/go-spew/spew/config.go +++ b/vendor/github.com/davecgh/go-spew/spew/config.go @@ -219,7 +219,7 @@ types similar to the standard %v format specifier. The custom formatter only responds to the %v (most compact), %+v (adds pointer addresses), %#v (adds types), and %#+v (adds types and pointer addresses) verb -combinations. Any other verbs such as %x and %q will be sent to the the +combinations. Any other verbs such as %x and %q will be sent to the standard fmt package for formatting. In addition, the custom formatter ignores the width and precision arguments (however they will still work on the format specifiers not handled by the custom formatter). diff --git a/vendor/github.com/davecgh/go-spew/spew/doc.go b/vendor/github.com/davecgh/go-spew/spew/doc.go index 5be0c4060..05238028d 100644 --- a/vendor/github.com/davecgh/go-spew/spew/doc.go +++ b/vendor/github.com/davecgh/go-spew/spew/doc.go @@ -156,7 +156,7 @@ standard %v format specifier. The custom formatter only responds to the %v (most compact), %+v (adds pointer addresses), %#v (adds types), or %#+v (adds types and pointer addresses) verb -combinations. Any other verbs such as %x and %q will be sent to the the +combinations. Any other verbs such as %x and %q will be sent to the standard fmt package for formatting. In addition, the custom formatter ignores the width and precision arguments (however they will still work on the format specifiers not handled by the custom formatter). diff --git a/vendor/github.com/davecgh/go-spew/spew/format.go b/vendor/github.com/davecgh/go-spew/spew/format.go index ecf3b80e2..04118979a 100644 --- a/vendor/github.com/davecgh/go-spew/spew/format.go +++ b/vendor/github.com/davecgh/go-spew/spew/format.go @@ -405,7 +405,7 @@ types similar to the standard %v format specifier. The custom formatter only responds to the %v (most compact), %+v (adds pointer addresses), %#v (adds types), or %#+v (adds types and pointer addresses) verb -combinations. Any other verbs such as %x and %q will be sent to the the +combinations. Any other verbs such as %x and %q will be sent to the standard fmt package for formatting. In addition, the custom formatter ignores the width and precision arguments (however they will still work on the format specifiers not handled by the custom formatter). diff --git a/vendor/github.com/hashicorp/consul/consul/structs/prepared_query.go b/vendor/github.com/hashicorp/consul/consul/structs/prepared_query.go index 5e9c31847..509df54f2 100644 --- a/vendor/github.com/hashicorp/consul/consul/structs/prepared_query.go +++ b/vendor/github.com/hashicorp/consul/consul/structs/prepared_query.go @@ -211,7 +211,7 @@ type PreparedQueryExecuteRemoteRequest struct { Limit int // QueryOptions (unfortunately named here) controls the consistency - // settings for the the service lookups. + // settings for the service lookups. QueryOptions } diff --git a/vendor/github.com/hashicorp/serf/serf/coalesce_user.go b/vendor/github.com/hashicorp/serf/serf/coalesce_user.go index 1551b6c52..58131e50f 100644 --- a/vendor/github.com/hashicorp/serf/serf/coalesce_user.go +++ b/vendor/github.com/hashicorp/serf/serf/coalesce_user.go @@ -36,7 +36,7 @@ func (c *userEventCoalescer) Coalesce(e Event) { return } - // If the the same age, save it + // If the same age, save it if latest.LTime == user.LTime { latest.Events = append(latest.Events, e) } diff --git a/vendor/github.com/hashicorp/vault/api/client.go b/vendor/github.com/hashicorp/vault/api/client.go index e548eb964..179d2bdc9 100644 --- a/vendor/github.com/hashicorp/vault/api/client.go +++ b/vendor/github.com/hashicorp/vault/api/client.go @@ -104,7 +104,7 @@ func DefaultConfig() *Config { return config } -// ConfigureTLS takes a set of TLS configurations and applies those to the the HTTP client. +// ConfigureTLS takes a set of TLS configurations and applies those to the HTTP client. func (c *Config) ConfigureTLS(t *TLSConfig) error { if c.HttpClient == nil { diff --git a/vendor/github.com/miekg/dns/labels.go b/vendor/github.com/miekg/dns/labels.go index cb549fc67..bfd8cf561 100644 --- a/vendor/github.com/miekg/dns/labels.go +++ b/vendor/github.com/miekg/dns/labels.go @@ -88,7 +88,7 @@ func CompareDomainName(s1, s2 string) (n int) { return } -// CountLabel counts the the number of labels in the string s. +// CountLabel counts the number of labels in the string s. // s must be a syntactically valid domain name. func CountLabel(s string) (labels int) { if s == "." { @@ -107,7 +107,7 @@ func CountLabel(s string) (labels int) { // Split splits a name s into its label indexes. // www.miek.nl. returns []int{0, 4, 9}, www.miek.nl also returns []int{0, 4, 9}. -// The root name (.) returns nil. Also see SplitDomainName. +// The root name (.) returns nil. Also see SplitDomainName. // s must be a syntactically valid domain name. func Split(s string) []int { if s == "." { diff --git a/vendor/golang.org/x/sys/unix/mksyscall.pl b/vendor/golang.org/x/sys/unix/mksyscall.pl index b1e7766da..9e0395c64 100644 --- a/vendor/golang.org/x/sys/unix/mksyscall.pl +++ b/vendor/golang.org/x/sys/unix/mksyscall.pl @@ -112,7 +112,7 @@ while(<>) { my @out = parseparamlist($out); # Try in vain to keep people from editing this file. - # The theory is that they jump into the middle of the file + # theory is that they jump into the middle of the file # without reading the header. $text .= "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n"; @@ -185,7 +185,7 @@ while(<>) { } } elsif($type eq "int64" && $_32bit ne "") { if(@args % 2 && $arm) { - # arm abi specifies 64-bit argument uses + # arm abi specifies 64-bit argument uses # (even, odd) pair push @args, "0" } @@ -282,7 +282,7 @@ while(<>) { $text .= "\t$use\n"; } $text .= $body; - + if ($plan9 && $ret[2] eq "e1") { $text .= "\tif int32(r0) == -1 {\n"; $text .= "\t\terr = e1\n"; diff --git a/vendor/gopkg.in/fsnotify.v1/fen.go b/vendor/gopkg.in/fsnotify.v1/fen.go index ced39cb88..1eb1ab372 100644 --- a/vendor/gopkg.in/fsnotify.v1/fen.go +++ b/vendor/gopkg.in/fsnotify.v1/fen.go @@ -31,7 +31,7 @@ func (w *Watcher) Add(name string) error { return nil } -// Remove stops watching the the named file or directory (non-recursively). +// Remove stops watching the named file or directory (non-recursively). func (w *Watcher) Remove(name string) error { return nil } diff --git a/vendor/gopkg.in/fsnotify.v1/kqueue.go b/vendor/gopkg.in/fsnotify.v1/kqueue.go index c2b4acb18..98777ccc5 100644 --- a/vendor/gopkg.in/fsnotify.v1/kqueue.go +++ b/vendor/gopkg.in/fsnotify.v1/kqueue.go @@ -104,7 +104,7 @@ func (w *Watcher) Add(name string) error { return err } -// Remove stops watching the the named file or directory (non-recursively). +// Remove stops watching the named file or directory (non-recursively). func (w *Watcher) Remove(name string) error { name = filepath.Clean(name) w.mu.Lock() diff --git a/vendor/gopkg.in/fsnotify.v1/windows.go b/vendor/gopkg.in/fsnotify.v1/windows.go index 09436f31d..a6b296df9 100644 --- a/vendor/gopkg.in/fsnotify.v1/windows.go +++ b/vendor/gopkg.in/fsnotify.v1/windows.go @@ -81,7 +81,7 @@ func (w *Watcher) Add(name string) error { return <-in.reply } -// Remove stops watching the the named file or directory (non-recursively). +// Remove stops watching the named file or directory (non-recursively). func (w *Watcher) Remove(name string) error { in := &input{ op: opRemoveWatch, diff --git a/website/source/docs/agent/config.html.md b/website/source/docs/agent/config.html.md index f16c64b85..13d914c3f 100644 --- a/website/source/docs/agent/config.html.md +++ b/website/source/docs/agent/config.html.md @@ -493,7 +493,7 @@ documentation [here](/docs/drivers/index.html) * `Administrator` * `user.checked_drivers`: An operator specifiable list of drivers to enforce - the the `user.blacklist`. For drivers using containers, this enforcement often + the `user.blacklist`. For drivers using containers, this enforcement often doesn't make sense and as such the default is set to: * `exec` diff --git a/website/source/docs/commands/plan.html.md.erb b/website/source/docs/commands/plan.html.md.erb index c000113a9..e47194992 100644 --- a/website/source/docs/commands/plan.html.md.erb +++ b/website/source/docs/commands/plan.html.md.erb @@ -42,7 +42,7 @@ A structured diff between the local and remote job is displayed to give insight into what the scheduler will attempt to do and why. If the job has specified the region, the `-region` flag and `NOMAD_REGION` -environment variable are overridden and the the job's region is used. +environment variable are overridden and the job's region is used. Plan will return one of the following exit codes: @@ -81,7 +81,7 @@ To submit the job with version verification run: nomad run -check-index 0 example.nomad When running the job with the check-index flag, the job will only be run if the -server side version matches the the job modify index returned. If the index has +server side version matches the job modify index returned. If the index has changed, another user has modified the job and the plan's results are potentially invalid. ``` @@ -108,7 +108,7 @@ To submit the job with version verification run: nomad run -check-index 15 example.nomad When running the job with the check-index flag, the job will only be run if the -server side version matches the the job modify index returned. If the index has +server side version matches the job modify index returned. If the index has changed, another user has modified the job and the plan's results are potentially invalid. ``` @@ -135,7 +135,7 @@ To submit the job with version verification run: nomad run -check-index 7 example.nomad When running the job with the check-index flag, the job will only be run if the -server side version matches the the job modify index returned. If the index has +server side version matches the job modify index returned. If the index has changed, another user has modified the job and the plan's results are potentially invalid. ``` @@ -194,7 +194,7 @@ To submit the job with version verification run: nomad run -check-index 7 example.nomad When running the job with the check-index flag, the job will only be run if the -server side version matches the the job modify index returned. If the index has +server side version matches the job modify index returned. If the index has changed, another user has modified the job and the plan's results are potentially invalid. ``` diff --git a/website/source/docs/commands/run.html.md.erb b/website/source/docs/commands/run.html.md.erb index da3743c51..303fb7a37 100644 --- a/website/source/docs/commands/run.html.md.erb +++ b/website/source/docs/commands/run.html.md.erb @@ -37,7 +37,7 @@ exhaustion, etc), then the exit code will be 2. Any other errors, including client connection issues or internal errors, are indicated by exit code 1. If the job has specified the region, the -region flag and NOMAD_REGION -environment variable are overridden and the the job's region is used. +environment variable are overridden and the job's region is used. The run command will set the `vault_token` of the job based on the following precedence, going from highest to lowest: the `-vault-token` flag, the @@ -50,7 +50,7 @@ precedence, going from highest to lowest: the `-vault-token` flag, the ## Run Options * `-check-index`: If set, the job is only registered or - updated if the the passed job modify index matches the server side version. + updated if the passed job modify index matches the server side version. If a check-index value of zero is passed, the job is only registered if it does not yet exist. If a non-zero value is passed, it ensures that the job is being updated from a known state. The use of this flag is most common in conjunction diff --git a/website/source/docs/jobspec/environment.html.md b/website/source/docs/jobspec/environment.html.md index 3b264d1df..d28c40c9e 100644 --- a/website/source/docs/jobspec/environment.html.md +++ b/website/source/docs/jobspec/environment.html.md @@ -54,7 +54,7 @@ environment variables. `NOMAD_IP_