haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'docs' into gh-pages

This commit is contained in:
Mitchell Hashimoto 2010-04-15 20:55:37 -07:00
parent ab983d5862 16fcb6056d
commit 3a65384512
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes/changes_02x_03x.md
View File

@ -16,7 +16,7 @@ Vagrant now officially supports Windows as a host machine. Web developers stuck
Windows can now develop in linux environments while continuing to use RubyMine or
any text editor you prefer on Windows.
**Windows support is new very beta. Its known to work on Windows XP and Windows 7. Windows Vista is untested.**
**Windows support is very beta. Its known to work on Windows XP and Windows 7. Windows Vista is untested.**
For a quick-start guide on Windows, see our [Windows setup guide](/docs/getting-started/setup/windows.html).

4
docs/provisioners/chef_solo.md
View File

@ -122,9 +122,9 @@ By default, Vagrant JSON configuration looks like the following:
This JSON configuration is specifically thought out such that the `instance_role`
key could be used so that cookbooks could be shared between production and development,
possibly tweaking paths or configuration based on the `instance_role`. And
`project_directory` is useful if you're setting up a VirtualHost for a web server,
`directory` is useful if you're setting up a VirtualHost for a web server,
for example, and need to set the path to the public directory within your
`project_directory`.
`directory`.
But sometimes, cookbooks need additional, custom JSON configuration. For this
you can specify additional JSON data in the Vagrantfile: