From bd3a2417fdde5e5c1a1c130a9cfd1baf0aac7b6a Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 17 Mar 2010 21:49:28 -0700 Subject: [PATCH] Remove unnecessary newlines from errors.yml --- templates/errors.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/errors.yml b/templates/errors.yml index 5ba5fd958..3039d0e3d 100644 --- a/templates/errors.yml +++ b/templates/errors.yml @@ -3,7 +3,7 @@ :box_add_already_exists: "A box with the name '<%= box_name %>' already exists, please use another name or use `vagrant box remove <%= box_name %>`" :box_download_unknown_type: "Unknown URI type for box download." :box_remove_doesnt_exist: "The box you're attempting to remove does not exist!" -:box_specified_doesnt_exist: "Specified box `<%= box_name %>` does not exist!\n +:box_specified_doesnt_exist: "Specified box `<%= box_name %>` does not exist! \nThe box must be added through the `vagrant box add` command. Please view \nthe documentation associated with the command for more information." @@ -59,25 +59,25 @@ :virtualbox_not_detected: "Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed. \nIf VirtualBox is installed, you may need to tweak the paths to the `VBoxManage` \napplication which ships with VirtualBox and the path to the global XML configuration - \nwhich VirtualBox typically stores somewhere in your home directory.\n + \nwhich VirtualBox typically stores somewhere in your home directory. \nThe following shows how to configure VirtualBox. This can be done in the \nVagrantfile. Note that 90% of the time, you shouldn't need to do this if VirtualBox \nis installed. Please use the various Vagrant support lines to request more information - \nif you can't get this working.\n + \nif you can't get this working. \nVirtualBox::Command.vboxmanage = \"/path/to/my/VBoxManage\" \nVirtualBox::Global.vboxconfig = \"~/path/to/VirtualBox.xml\"" -:virtualbox_xml_not_detected: "Vagrant couldn't find your global VirtualBox.xml file!\n +:virtualbox_xml_not_detected: "Vagrant couldn't find your global VirtualBox.xml file! \nIf you just recently installed VirtualBox, make sure you've launched \nit at least once, since the initial launch will typically create this - \nfile.\n + \nfile. \nOtherwise, you may need to set the path to the VirtualBox.xml file \nmanually. Note that 90% of people should never have to do this, so \ndon't be afraid to use the various Vagrant support lines to ask for - \nhelp. To set the path manually:\n + \nhelp. To set the path manually: \nVirtualBox::Global.vboxconfig = \"/path/to/VirtualBox.xml\"" :vm_failed_to_boot: "Failed to connect to VM! Failed to boot?" @@ -87,10 +87,10 @@ :vm_port_collision: "Vagrant cannot forward the specified ports on this VM, since they \nwould collide with another VirtualBox virtual machine's forwarded \nports! The \"<%= name %>\" forwarded port (<%= hostport %>) is already in use on the host - \nmachine.\n + \nmachine. \nTo fix this, modify your current projects Vagrantfile to use another - \nport. Example, where '1234' would be replaced by a unique host port:\n + \nport. Example, where '1234' would be replaced by a unique host port: \nconfig.vm.forward_port(\"<%= name %>\", <%= guestport %>, 1234)" :vm_power_off_to_move_hd: "The virtual machine must be powered off to move its disk." @@ -98,12 +98,12 @@ :vm_mount_fail: "Failed to mount shared folders. vboxsf was not available." :vm_ssh_auth_failed: "SSH authentication failed! While this could be due to a variety of reasons, \nthe two most common are: private key path is incorrect or you're using a box - \nwhich was built for Vagrant 0.1.x.\n + \nwhich was built for Vagrant 0.1.x. \nVagrant 0.2.x dropped support for password-based authentication. If you're \ntring to `vagrant up` a box which does not support Vagrant's private/public \nkeypair, then this error will be raised. To resolve this, read the guide - \non converting base boxes from password-based to keypairs here:\n + \non converting base boxes from password-based to keypairs here: \nhttp://vagrantup.com/docs/converting_password_to_key_ssh.html