Skip to content

Commit 81e6dfa

Browse files
authored
Merge pull request #13731 from survivant/main
Fix typos and linguistic errors in documentation / hacktoberfest
1 parent 342afc2 commit 81e6dfa

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

bin/vagrant

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if Thread.respond_to?(:report_on_exception=)
1010
Thread.report_on_exception = false
1111
end
1212

13-
# Split arguments by "--" if its there, we'll recombine them later
13+
# Split arguments by "--" if it's there, we'll recombine them later
1414
argv = ARGV.dup
1515
argv_extra = []
1616

builtin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ and they are executed via subprocess just like a real plugin would be.
66

77
The difference is that these plugins are linked directly into the single
88
command binary. We do this currently for ease of development of the project.
9-
In future we will split these out into standalone repositories and
9+
In the future we will split these out into standalone repositories and
1010
binaries.

lib/vagrant/action/builder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def insert_after(idx_or_item, middleware, *args, **keywords, &block)
160160
insert(index + 1, middleware, *args, &block)
161161
end
162162

163-
# Replaces the given middlware object or index with the new
163+
# Replaces the given middleware object or index with the new
164164
# middleware.
165165
def replace(index, middleware, *args, **keywords, &block)
166166
if index.is_a?(Integer)

lib/vagrant/action/builtin/call.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module Vagrant
55
module Action
66
module Builtin
77
# This middleware class allows a sort of "conditional" run within
8-
# a single middlware sequence. It takes another middleware runnable,
8+
# a single middleware sequence. It takes another middleware runnable,
99
# runs it with the same environment, then yields the resulting env to a block,
1010
# allowing that block to determine the next course of action in the
1111
# middleware sequence.

lib/vagrant/environment.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ def config_loader
523523

524524
# Loads another environment for the given Vagrantfile, sharing as much
525525
# useful state from this Environment as possible (such as UI and paths).
526-
# Any initialization options can be overidden using the opts hash.
526+
# Any initialization options can be overridden using the opts hash.
527527
#
528528
# @param [String] vagrantfile Path to a Vagrantfile
529529
# @return [Environment]
@@ -567,7 +567,7 @@ def host
567567

568568
# Determine the host class to use. ":detect" is an old Vagrant config
569569
# that shouldn't be valid anymore, but we respect it here by assuming
570-
# its old behavior. No need to deprecate this because I thin it is
570+
# its old behavior. No need to deprecate this because I think it is
571571
# fairly harmless.
572572
host_klass = vagrantfile.config.vagrant.host
573573
host_klass = nil if host_klass == :detect
@@ -883,7 +883,7 @@ def setup_home_path
883883

884884
# Create the version file that we use to track the structure of
885885
# the home directory. If we have an old version, we need to explicitly
886-
# upgrade it. Otherwise, we just mark that its the current version.
886+
# upgrade it. Otherwise, we just mark that it's the current version.
887887
version_file = @home_path.join("setup_version")
888888
if version_file.file?
889889
version = version_file.read.chomp
@@ -1059,7 +1059,7 @@ def process_configured_plugins
10591059
end
10601060
ui.info("\n")
10611061
# Force halt after installation and require command to be run again. This
1062-
# will proper load any new locally installed plugins which are now available.
1062+
# will properly load any new locally installed plugins which are now available.
10631063
ui.warn(I18n.t("vagrant.plugins.local.install_rerun_command"))
10641064
exit(-1)
10651065
end

lib/vagrant/plugin/v1/config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def upgrade(new)
104104
#
105105
# @param [Environment] env Vagrant::Environment object of the
106106
# environment that this configuration has been loaded into. This
107-
# gives you convenient access to things like the the root path
107+
# gives you convenient access to things like the root path
108108
# and so on.
109109
# @param [ErrorRecorder] errors
110110
def validate(env, errors)

plugins/commands/version/command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def execute
3939
"vagrant.version_latest", version: latest))
4040
@env.ui.machine("version-latest", latest)
4141

42-
# Determine if its a new version, and if so, output some more
42+
# Determine if it's a new version, and if so, output some more
4343
# information.
4444
current = Gem::Version.new(Vagrant::VERSION)
4545
latest = Gem::Version.new(latest)

plugins/providers/docker/driver.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def build(dir, **opts, &block)
3232
# from standard docker
3333
matches = result.scan(/writing image .+:([^\s]+)/i).last
3434
if !matches
35-
# Check for outout of docker using containerd backend store
35+
# Check for output of docker using containerd backend store
3636
matches = result.scan(/exporting manifest list .+:([^\s]+)/i).last
3737
end
3838
if !matches
@@ -263,12 +263,12 @@ def docker_bridge_ip_fallback
263263
if output =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
264264
return $1.to_s
265265
else
266-
# TODO: Raise an user friendly message
266+
# TODO: Raise a user-friendly message
267267
raise 'Unable to fetch docker bridge IP!'
268268
end
269269
end
270270

271-
# @param [String] network - name of network to connect conatiner to
271+
# @param [String] network - name of network to connect container to
272272
# @param [String] cid - container id
273273
# @param [Array] opts - An array of flags used for listing networks
274274
def connect_network(network, cid, opts=nil)

plugins/provisioners/puppet/provisioner/puppet.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def configure(root_config)
6161
end
6262

6363
def parse_environment_metadata
64-
# Parse out the environment manifest path since puppet apply doesnt do that for us.
64+
# Parse out the environment manifest path since puppet apply doesn't do that for us.
6565
environment_conf = File.join(environments_guest_path, @config.environment, "environment.conf")
6666
if @machine.communicate.test("test -e #{environment_conf}", sudo: true)
6767
@machine.communicate.sudo("cat #{environment_conf}") do | type, data|

test/vagrant-spec/readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ variable to point to the proper test directory inside of the Vagrant source.
6868
### How to run specific tests
6969

7070
Sometimes when debugging, it's useful to only run a small subset of tests, instead of
71-
waiting for evetything to run. This can be achieved by passing along arugments
71+
waiting for everything to run. This can be achieved by passing along arguments
7272
using the `VAGRANT_SPEC_ARGS` environment variable:
7373

7474
For example, here is what you could set to only run cli tests
7575

7676
```shell
77-
VAGRANT__SPEC_ARGS="--component cli"
77+
VAGRANT_SPEC_ARGS="--component cli"
7878
```
7979

8080
Or with the full command....

0 commit comments

Comments
 (0)