From b0de75027feb77e0149d1e1226ab96e04ffdb005 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Fri, 13 May 2016 17:07:26 -0400 Subject: [PATCH] Remove --master from mkvm man page and usage --- docs/source/guides/admin-guides/references/man1/lsvm.1.rst | 2 +- docs/source/guides/admin-guides/references/man1/mkvm.1.rst | 2 +- perl-xCAT/xCAT/Usage.pm | 2 +- xCAT-client/pods/man1/mkvm.1.pod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsvm.1.rst b/docs/source/guides/admin-guides/references/man1/lsvm.1.rst index cae3ee788..ee8b7bf31 100644 --- a/docs/source/guides/admin-guides/references/man1/lsvm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsvm.1.rst @@ -83,7 +83,7 @@ For KVM and VMware ================== -The virtual machines that defined in the hypervisor \ *noderange*\ will be displayed. \ *noderange*\ only can be hypervisor. +The virtual machines that defined in the hypervisor \ *noderange*\ will be displayed. \ *noderange*\ can only be hypervisor. Note: Only the virtual machine which is in power on state can be listed by lsvm command. 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 050834c54..6791a9ce4 100644 --- a/docs/source/guides/admin-guides/references/man1/mkvm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkvm.1.rst @@ -52,7 +52,7 @@ For KVM: ======== -\ **mkvm**\ \ *noderange*\ [\ **-m|-**\ **-master**\ \ *mastername*\ ] [\ **-s|-**\ **-size**\ \ *disksize*\ ] [\ **-**\ **-mem**\ \ *memsize*\ ] [\ **-**\ **-cpus**\ \ *cpucount*\ ] [\ **-f|-**\ **-force**\ ] +\ **mkvm**\ \ *noderange*\ [\ **-s|-**\ **-size**\ \ *disksize*\ ] [\ **-**\ **-mem**\ \ *memsize*\ ] [\ **-**\ **-cpus**\ \ *cpucount*\ ] [\ **-f|-**\ **-force**\ ] For Vmware: diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm index f7c60288e..14054ca94 100755 --- a/perl-xCAT/xCAT/Usage.pm +++ b/perl-xCAT/xCAT/Usage.pm @@ -215,7 +215,7 @@ my %usage = ( [vmphyslots=drc_index1,drc_index2...] [vmothersetting=hugepage:N,bsr:N] [vmnics=vlan1,vlan2] [vmstorage=] [--vios] For KVM - mkvm noderange -m|--master mastername -s|--size disksize -f|--force + mkvm noderange [-s|--size disksize] [--mem memsize] [--cpus cpucount] [-f|--force] For zVM mkvm noderange directory_entry_file_path mkvm noderange source_virtual_machine pool=disk_pool pw=multi_password", diff --git a/xCAT-client/pods/man1/mkvm.1.pod b/xCAT-client/pods/man1/mkvm.1.pod index 232598754..b4d4f0e19 100644 --- a/xCAT-client/pods/man1/mkvm.1.pod +++ b/xCAT-client/pods/man1/mkvm.1.pod @@ -26,7 +26,7 @@ B I [B I] [B I] [ =head2 For KVM: -B I [B<-m|--master> I] [B<-s|--size> I] [B<--mem> I] [B<--cpus> I] [B<-f|--force>] +B I [B<-s|--size> I] [B<--mem> I] [B<--cpus> I] [B<-f|--force>] =head2 For Vmware: