Gilles Cornu a3c077cbe0 Merge branch 'gildegoma/ansible-force-ssh-user' ...

Resolved conflicts in
  plugins/provisioners/ansible/config.rb
  plugins/provisioners/ansible/provisioner.rb
  test/unit/plugins/provisioners/ansible/provisioner_test.rb
  website/docs/source/v2/provisioning/ansible.html.md

ref #6348

2015-11-08 14:01:23 +01:00

..

boxes

website/docs: Link to Atlas docs for base boxes

2015-08-17 11:14:26 -04:00

cli

website: update docs for --install-provider flag

2015-11-05 13:59:08 -08:00

docker

providers/docker: pull setting, default false [GH-5932]

2015-07-15 11:08:01 -07:00

getting-started

website: fix docs typo [GH-4885]

2015-07-06 23:14:48 -06:00

hyperv

Hyper-V set mac address

2015-09-22 11:35:55 +01:00

installation

website/docs: clearer about uninstall for mac [GH-4043]

2014-08-07 11:56:09 -07:00

multi-machine

Fix typo in multi-machine doc

2014-05-31 13:40:33 +02:00

networking

website/docs: IPv6

2015-10-01 08:55:03 -04:00

other

Revert heading change and add note about CHECKPOINT_DISABLE

2015-08-20 14:34:23 -07:00

plugins

website/www: fix typo in plugins/hosts doc

2014-12-17 15:07:30 +00:00

providers

website: clarify default provider

2014-10-23 16:41:12 -07:00

provisioning

Merge branch 'gildegoma/ansible-force-ssh-user'

2015-11-08 14:01:23 +01:00

push

fix command on vagrant push website sample script

2015-02-12 14:58:04 +13:00

share

Update typos in SSH sharing docs

2015-09-16 11:35:17 +01:00

synced-folders

website/docs: note Vagrant version for NFS aliases [GH-5942]

2015-07-13 08:42:35 -07:00

vagrantfile

Update docs to say Vagrant 1.5+ is required

2015-08-06 15:51:20 -04:00

virtualbox

Fix typo.

2015-07-16 13:23:57 +02:00

vmware

Bump VMware information

2015-08-25 12:41:53 -04:00

why-vagrant

website/docs: phrasal verbs [GH-2644]

2013-12-12 15:42:01 -08:00

boxes.html.md

docs: link to the atlas box search page instead of homepage

2014-12-11 10:17:38 -08:00

index.html.md

website: add docs back to the main Vagrant repo

2013-09-03 11:08:28 -07:00