Merge pull request #4389 from vlajos/typofixes-20140825
typofixes - https://github.com/vlajos/misspell_fixer
This commit is contained in:
commit
4ff097fe93
|
@ -2055,7 +2055,7 @@ Note: 0.8.3 and 0.8.4 was yanked due to RubyGems encoding issue.
|
|||
`localhost` is not always loopback.
|
||||
- New `shell` provisioner which simply uploads and executes a script as
|
||||
root on the VM.
|
||||
- Gentoo host only networking no longer fails if alrady setup. [GH-286]
|
||||
- Gentoo host only networking no longer fails if already setup. [GH-286]
|
||||
- Set the host name of your guest OS with `config.vm.host_name` [GH-273]
|
||||
- `vagrant ssh-config` now outputs the configured `config.ssh.host`
|
||||
|
||||
|
|
|
@ -122,7 +122,7 @@ module Vagrant
|
|||
end
|
||||
end
|
||||
|
||||
# This is pulled out into a seperate method so that users can
|
||||
# This is pulled out into a separate method so that users can
|
||||
# subclass and implement custom behavior if they'd like to work around
|
||||
# this step.
|
||||
def run_provisioner(env)
|
||||
|
|
|
@ -5,7 +5,7 @@ module Vagrant
|
|||
# within a machine that Vagrant manages. There are some portions of
|
||||
# Vagrant which are OS-specific such as mountaing shared folders and
|
||||
# halting the machine, and this abstraction allows the implementation
|
||||
# for these to be seperate from the core of Vagrant.
|
||||
# for these to be separate from the core of Vagrant.
|
||||
class Guest
|
||||
class BaseError < Errors::VagrantError
|
||||
error_namespace("vagrant.guest.base")
|
||||
|
|
|
@ -59,7 +59,7 @@ module VagrantPlugins
|
|||
"ANSIBLE_FORCE_COLOR" => "true",
|
||||
"ANSIBLE_HOST_KEY_CHECKING" => "#{config.host_key_checking}",
|
||||
|
||||
# Ensure Ansible output isn't buffered so that we receive ouput
|
||||
# Ensure Ansible output isn't buffered so that we receive output
|
||||
# on a task-by-task basis.
|
||||
"PYTHONUNBUFFERED" => 1
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ describe Vagrant::Machine do
|
|||
end
|
||||
|
||||
describe "provider initialization" do
|
||||
# This is a helper that generates a test for provider intialization.
|
||||
# This is a helper that generates a test for provider initialization.
|
||||
# This is a separate helper method because it takes a block that can
|
||||
# be used to have additional tests on the received machine.
|
||||
#
|
||||
|
|
|
@ -129,7 +129,7 @@ have three choices out of the box for synced folders: VM shared folders,
|
|||
NFS, or rsync.
|
||||
|
||||
NFS and VM shared folders are _not deprecated in any way_ and will be
|
||||
fully supported and improved for the forseeable future. Vagrant has always
|
||||
fully supported and improved for the foreseeable future. Vagrant has always
|
||||
been about choice and working with the technologies that work best for you
|
||||
and your team and rsync is now another really great choice Vagrant offers you.
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ no dependency resolution took place:
|
|||
* Plugin A depends on "foo >= 1.0, < 1.5".
|
||||
* Plugin B depends on "foo = 1.1"
|
||||
* When Plugin A is loaded, it would load the latest version satisfying
|
||||
its contraints. This might be "foo 1.4".
|
||||
its constraints. This might be "foo 1.4".
|
||||
* When Plugin B is loaded, it would try to load "foo 1.1" but since
|
||||
"foo 1.4" is already loaded, it would fail!
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ Vagrant is able to communicate with Windows over either **SSH** or
|
|||
**WinRM**. WinRM is more conventional, but if you have Cygwin installed with
|
||||
an SSH server, Vagrant is able to use that too.
|
||||
|
||||
The support for WinRM is new in 1.6. For backwards compatibily reasons,
|
||||
The support for WinRM is new in 1.6. For backwards compatibility reasons,
|
||||
you must explicitly tell Vagrant when to use WinRM:
|
||||
|
||||
```
|
||||
|
|
Loading…
Reference in New Issue