From 1e3ce72f090376ecf013ec979f6374b36232aadc Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 6 Oct 2016 13:00:44 -0400
Subject: [PATCH] Changes after review

---
 docs/source/guides/admin-guides/references/man1/mkvm.1.rst | 4 ++--
 xCAT-client/pods/man1/mkvm.1.pod                           | 4 ++--
 xCAT-server/lib/xcat/plugins/kvm.pm                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/mkvm.1.rst b/docs/source/guides/admin-guides/references/man1/mkvm.1.rst
index 5e289a76a..970519f99 100644
--- a/docs/source/guides/admin-guides/references/man1/mkvm.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkvm.1.rst
@@ -55,7 +55,7 @@ For KVM:
 \ **mkvm**\  \ *noderange*\  [\ **-s|-**\ **-size**\  \ *disksize*\ ] [\ **-**\ **-mem**\  \ *memsize*\ ] [\ **-**\ **-cpus**\  \ *cpucount*\ ] [\ **-f|-**\ **-force**\ ]
 
 
-For Vmware:
+For VMware:
 ===========
 
 
@@ -99,7 +99,7 @@ With option \ *full*\ , a partition using all the resources on a normal power ma
 If no option is specified, a partition using the parameters specified with attributes such as 'vmcpus', 'vmmory', 'vmphyslots', 'vmothersetting', 'vmnics', 'vmstorage' will be created. Those attributes can either be specified with '\*def' commands running before or be specified with this command.
 
 
-For KVM and Vmware:
+For KVM and VMware:
 ===================
 
 
diff --git a/xCAT-client/pods/man1/mkvm.1.pod b/xCAT-client/pods/man1/mkvm.1.pod
index b04811dac..c3d02232c 100644
--- a/xCAT-client/pods/man1/mkvm.1.pod
+++ b/xCAT-client/pods/man1/mkvm.1.pod
@@ -28,7 +28,7 @@ B<mkvm> I<noderange> [B<vmcpus=> I<min/req/max>] [B<vmmemory=> I<min/req/max>] [
 
 B<mkvm> I<noderange> [B<-s|--size> I<disksize>] [B<--mem> I<memsize>] [B<--cpus> I<cpucount>] [B<-f|--force>]
 
-=head2 For Vmware:
+=head2 For VMware:
 
 B<mkvm> I<noderange> [B<-s>|B<--size> I<disksize>] [B<--mem> I<memsize>] [B<--cpus> I<cpucount>]
 
@@ -56,7 +56,7 @@ With option I<full>, a partition using all the resources on a normal power machi
 
 If no option is specified, a partition using the parameters specified with attributes such as 'vmcpus', 'vmmory', 'vmphyslots', 'vmothersetting', 'vmnics', 'vmstorage' will be created. Those attributes can either be specified with '*def' commands running before or be specified with this command.
 
-=head2 For KVM and Vmware:
+=head2 For KVM and VMware:
 
 The B<mkvm> command creates new virtual machine(s) with the I<disksize> size of hard disk, I<memsize> size of memory and I<cpucount> number of cpu. 
 
diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index 0cf92c3a7..a7c53d8b2 100755
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -1761,7 +1761,7 @@ sub rmvm {
     } else {
         $currxml = $confdata->{kvmnodedata}->{$node}->[0]->{xml};
         unless ($currxml) {
-            xCAT::SvrUtils::sendmsg([ 1, "Cannot remove guest, no such vm" ], $callback, $node);
+            xCAT::SvrUtils::sendmsg([ 1, "Cannot remove guest vm, no such vm found" ], $callback, $node);
             return;
         }
     }
@@ -3053,7 +3053,7 @@ sub mkvm {
             };
             if ($@) {
                 if ($@ =~ /Path (\S+) already exists at /) {
-                    return 1, "Storage creation request conflicts with existing file(s) $1 (use mkvm with -f argument to remove)";
+                    return 1, "Storage creation request conflicts with existing file(s) $1. To force remove the existing storage file, rerun mkvm with the -f option.";
 
                 } else {
                     return 1, "Unknown issue $@";