Merge branch 'master' of https://github.com/mitchellh/packer

website/source/docs/builders/openstack.html.markdown

@@ -103,6 +103,9 @@ builder.
 -   `metadata` (object of key/value strings) - Glance metadata that will be
     applied to the image.
 
+-   `config_drive` (boolean) - Whether or not nova should use ConfigDrive for
+     cloud-init metadata.
+
 ## Basic Example: Rackspace public cloud
 
 Here is a basic example. This is a working example to build a Ubuntu 12.04 LTS

website/source/docs/provisioners/file.html.markdown

@@ -44,7 +44,7 @@ The available configuration options are listed below. All elements are required.
 
 -   `direction` (string) - The direction of the file transfer. This defaults to
     "upload." If it is set to "download" then the file "source" in the machine
-    wll be downloaded locally to "destination"
+    will be downloaded locally to "destination"
 
 ## Directory Uploads