From 6bbb16fc34f6fc7ddc745745ea10158407546357 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 25 Aug 2015 10:44:16 -0400 Subject: [PATCH] A few spelling/wording enhancements. --- README.md | 2 +- lib/vagrant-libvirt/action/create_domain.rb | 2 +- lib/vagrant-libvirt/action/destroy_domain.rb | 4 ++-- lib/vagrant-libvirt/action/remove_libvirt_image.rb | 2 +- locales/en.yml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c5e5a1c..0fe208a 100644 --- a/README.md +++ b/README.md @@ -374,7 +374,7 @@ You can create and attach additional disks to a VM via `libvirt.storage :file`. * `type` - Type of disk image to create. Defaults to *qcow2*. * `bus` - Type of bus to connect device to. Defaults to *virtio*. * `cache` - Cache mode to use, e.g. `none`, `writeback`, `writethrough` (see the [libvirt documentation for possible values](http://libvirt.org/formatdomain.html#elementsDisks) or [here](https://www.suse.com/documentation/sles11/book_kvm/data/sect1_chapter_book_kvm.html) for a fuller explanation). Defaults to *default*. -* `allow_existing` - Set to true if you want to allow the VM to use a pre-existing disk. This is useful for sharing disks between VMs, e.g. in order to simulate shared SAN storage. Shared disks removed only manualy.If not exists - will created. If exists - using existed. +* `allow_existing` - Set to true if you want to allow the VM to use a pre-existing disk. This is useful for sharing disks between VMs, e.g. in order to simulate shared SAN storage. Shared disks removed only manually. If not exists - will created. If exists - using existed. The following example creates two additional disks. diff --git a/lib/vagrant-libvirt/action/create_domain.rb b/lib/vagrant-libvirt/action/create_domain.rb index 523199b..461fd57 100644 --- a/lib/vagrant-libvirt/action/create_domain.rb +++ b/lib/vagrant-libvirt/action/create_domain.rb @@ -162,7 +162,7 @@ module VagrantPlugins @disks.each do |disk| msg = " -- Disk(#{disk[:device]}): #{disk[:absolute_path]}" - msg += ' (shared. Remove only manualy)' if disk[:allow_existing] + msg += ' (shared. Remove only manually)' if disk[:allow_existing] msg += ' Not created - using existed.' if disk[:preexisting] env[:ui].info(msg) end diff --git a/lib/vagrant-libvirt/action/destroy_domain.rb b/lib/vagrant-libvirt/action/destroy_domain.rb index 1312f5e..52caa18 100644 --- a/lib/vagrant-libvirt/action/destroy_domain.rb +++ b/lib/vagrant-libvirt/action/destroy_domain.rb @@ -37,10 +37,10 @@ module VagrantPlugins domain.destroy(destroy_volumes: false) env[:machine].provider_config.disks.each do |disk| - # shared disks remove only manualy or ??? + # shared disks remove only manually or ??? next if disk[:allow_existing] diskname = libvirt_domain.name + '-' + disk[:device] + '.' + disk[:type].to_s - # diskname is uniq + # diskname is unique libvirt_disk = domain.volumes.select do |x| x.name == diskname end.first diff --git a/lib/vagrant-libvirt/action/remove_libvirt_image.rb b/lib/vagrant-libvirt/action/remove_libvirt_image.rb index 554f0a7..4fd6649 100644 --- a/lib/vagrant-libvirt/action/remove_libvirt_image.rb +++ b/lib/vagrant-libvirt/action/remove_libvirt_image.rb @@ -11,7 +11,7 @@ module VagrantPlugins def call(env) env[:ui].info("Vagrant-libvirt plugin removed box only from you LOCAL ~/.vagrant/boxes directory") - env[:ui].info("From libvirt storage pool you have to delete image manualy(virsh, virt-manager or by any other tool)") + env[:ui].info("From libvirt storage pool you have to delete image manually(virsh, virt-manager or by any other tool)") @app.call(env) end end diff --git a/locales/en.yml b/locales/en.yml index 315b6ff..b11d46b 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -56,7 +56,7 @@ en: the minimum box image size of '%{box_virtual_size}'. errors: - package_not_supported: Not support package for libvirt. Create box manualy. + package_not_supported: No support for package with libvirt. Create box manually. fog_error: |- There was an error talking to Libvirt. The error message is shown below: @@ -79,7 +79,7 @@ en: Interface adapter number is already in use. Please specify other adapter number. rsync_error: |- - There was an error when attemping to rsync a share folder. + There was an error when attempting to rsync a share folder. Please inspect the error message below for more info. Host path: %{hostpath} @@ -123,7 +123,7 @@ en: Network %{network_name} exists but does not have dhcp %{requested}. Please fix your configuration and run vagrant again. create_network_error: |- - Error occured while creating new network: %{error_message}. + Error occurred while creating new network: %{error_message}. network_not_available_error: |- Network %{network_name} is not available. Specify available network name, or an ip address if you want to create a new network.