From 51853e2e8a1de7eb6cce46ed66c2c6ad5e259893 Mon Sep 17 00:00:00 2001 From: John Bender Date: Thu, 25 Mar 2010 23:07:10 -0700 Subject: [PATCH] updated links on error messages and keys readme to reflect forthcoming windows documentation --- keys/README.md | 4 ++-- templates/errors.yml | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/keys/README.md b/keys/README.md index 443b63c69..91bb5268e 100644 --- a/keys/README.md +++ b/keys/README.md @@ -13,5 +13,5 @@ and configure the private key in the Vagrantfile with If you are using Vagrant on windows, the .ppk file contained here, in the keys directory, has been generated from the private key and should be used to connect Putty to any VMs that -are leveraging the default key pair. See [TODO LINK]() in the documentation for more details on -using Putty with Vagrant. \ No newline at end of file +are leveraging the default key pair. See [guide](http://vagrantup.com/docs/getting-started/windows.html) +in the documentation for more details on using Putty with Vagrant. \ No newline at end of file diff --git a/templates/errors.yml b/templates/errors.yml index e474c6b3b..d20f50810 100644 --- a/templates/errors.yml +++ b/templates/errors.yml @@ -85,12 +85,20 @@ <%= key_path %> :ssh_unavailable_windows: |- - `vagrant ssh` isn't available on the Windows platform. The vagrant.ppk - file is available at <%= key_path %>.ppk - for use with Putty. To do this create a new Putty session for vagrant@localhost on - port <%= ssh_port %>, in the Connection>SSH>Auth configuration section navigate - to the vagrant.ppk file, select it, save the session for later use, and connect. - For a more detailed guide please consult TODO LINK. + `vagrant ssh` isn't available on the Windows platform. The + vagrant.ppk file is available at + + <%= key_path %>.ppk + + for use with Putty. To do this create a new Putty session for + vagrant@localhost on port <%= ssh_port %>, in the Connection>SSH>Auth + configuration section navigate to the vagrant.ppk file, + select it, save the session for later use, and connect. + + For a more detailed guide please consult: + + http://vagrantup.com/docs/getting-started/windows.html + :virtualbox_import_failure: |- The VM import failed! Try running `VBoxManage import` on the box file manually for more verbose error output. :virtualbox_invalid_version: |-