diff --git a/docs/source/guides/admin-guides/references/man1/nodestat.1.rst b/docs/source/guides/admin-guides/references/man1/nodestat.1.rst index f45dc3aa1..f51b0d015 100644 --- a/docs/source/guides/admin-guides/references/man1/nodestat.1.rst +++ b/docs/source/guides/admin-guides/references/man1/nodestat.1.rst @@ -59,7 +59,7 @@ Keywords to use: .. code-block:: perl - apps -- a list of comma separated application names whose status will be queried. For how to get the status of each app, look for app name in the key filed in a different row. + apps -- a list of comma separated application names whose status will be queried. For how to get the status of each app, look for app name in the key field in a different row. port -- the application daemon port number, if not specified, use internal list, then /etc/services. group -- the name of a node group that needs to get the application status from. If not specified, assume all the nodes in the nodelist table. To specify more than one groups, use group=a,group=b format. cmd -- the command that will be run locally on mn or sn. diff --git a/docs/source/guides/admin-guides/references/man1/rmvm.1.rst b/docs/source/guides/admin-guides/references/man1/rmvm.1.rst index 4fbe488f4..f3fc52f98 100644 --- a/docs/source/guides/admin-guides/references/man1/rmvm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rmvm.1.rst @@ -11,7 +11,7 @@ NAME **** -\ **rmvm**\ - Removes HMC-, DFM-, IVM-, KVM-, Vmware- and zVM-managed partitions or virtual machines. +\ **rmvm**\ - Removes HMC-, DFM-, IVM-, KVM-, VMware- and zVM-managed partitions or virtual machines. ******** @@ -25,18 +25,18 @@ SYNOPSIS \ **rmvm [-V| -**\ **-verbose]**\ \ *noderange*\ \ **[-r] [-**\ **-service]**\ -For KVM and Vmware: +For KVM and VMware: =================== -\ **rmvm [-p] [-f]**\ +\ **rmvm [-p] [-f]**\ \ *noderange*\ PPC (using Direct FSP Management) specific: =========================================== -\ **rmvm**\ \ *noderange*\ +\ **rmvm [-p]**\ \ *noderange*\ @@ -65,9 +65,7 @@ OPTIONS \ **-**\ **-service**\ Remove the service partitions of the specified CECs. -\ **-p**\ Purge the existence of the VM from persistant storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. - -\ **-p|-**\ **-part**\ Remove the specified partiton on normal power machine. +\ **-p**\ KVM: Purge the existence of the VM from persistant storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. PPC: Remove the specified partiton on normal power machine. \ **-f**\ Force remove the VM, even if the VM appears to be online. This will bring down a live VM if requested. diff --git a/xCAT-client/pods/man1/nodestat.1.pod b/xCAT-client/pods/man1/nodestat.1.pod index caf39cdde..42a0dc5f0 100644 --- a/xCAT-client/pods/man1/nodestat.1.pod +++ b/xCAT-client/pods/man1/nodestat.1.pod @@ -37,7 +37,7 @@ The following is an example of the settings in the B table: Keywords to use: - apps -- a list of comma separated application names whose status will be queried. For how to get the status of each app, look for app name in the key filed in a different row. + apps -- a list of comma separated application names whose status will be queried. For how to get the status of each app, look for app name in the key field in a different row. port -- the application daemon port number, if not specified, use internal list, then /etc/services. group -- the name of a node group that needs to get the application status from. If not specified, assume all the nodes in the nodelist table. To specify more than one groups, use group=a,group=b format. cmd -- the command that will be run locally on mn or sn. diff --git a/xCAT-client/pods/man1/rmvm.1.pod b/xCAT-client/pods/man1/rmvm.1.pod index 0dbba6788..959a350d8 100644 --- a/xCAT-client/pods/man1/rmvm.1.pod +++ b/xCAT-client/pods/man1/rmvm.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Removes HMC-, DFM-, IVM-, KVM-, Vmware- and zVM-managed partitions or virtual machines. +B - Removes HMC-, DFM-, IVM-, KVM-, VMware- and zVM-managed partitions or virtual machines. =head1 SYNOPSIS @@ -10,13 +10,13 @@ B B I B<[-r] [--service]> -=head2 For KVM and Vmware: +=head2 For KVM and VMware: -B +B I =head2 PPC (using Direct FSP Management) specific: -B I +B I =head1 DESCRIPTION @@ -37,9 +37,7 @@ B<-r> Retain the data object definitions of the nodes. B<--service> Remove the service partitions of the specified CECs. -B<-p> Purge the existence of the VM from persistant storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. - -B<-p|--part> Remove the specified partiton on normal power machine. +B<-p> KVM: Purge the existence of the VM from persistant storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. PPC: Remove the specified partiton on normal power machine. B<-f> Force remove the VM, even if the VM appears to be online. This will bring down a live VM if requested. diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm index e9089c564..c2ba52cd6 100644 --- a/xCAT-server/lib/perl/xCAT/Template.pm +++ b/xCAT-server/lib/perl/xCAT/Template.pm @@ -1577,7 +1577,7 @@ sub tabdb if ($rep) { return tabdb($rep->[0], $rep->[1], $rep->[2]); } else { - $tmplerr="Unable to find requested filed <$field> from table <$table>, with key <$key>" + $tmplerr="Unable to find requested field <$field> from table <$table>, with key <$key>" } } return ""; @@ -1586,7 +1586,7 @@ sub tabdb # check for site.xcatdebugmode if (($table =~ /site/) and ($key =~ /xcatdebugmode/)) { if ((($ent->{$field}) ne "0") and (($ent->{$field}) ne "1") and (($ent->{$field}) ne "2")) { - $tmplerr="Unable to recognise filed <$field> from table <$table>, with key <$key>. Please enter '0' '1' or '2'" + $tmplerr="Unable to recognise field <$field> from table <$table>, with key <$key>. Please enter '0' '1' or '2'" } } } diff --git a/xCAT-server/lib/xcat/monitoring/xcatmon.pm b/xCAT-server/lib/xcat/monitoring/xcatmon.pm index 61db830a0..02228ba80 100644 --- a/xCAT-server/lib/xcat/monitoring/xcatmon.pm +++ b/xCAT-server/lib/xcat/monitoring/xcatmon.pm @@ -418,7 +418,7 @@ sub getDescription { ping-interval: the number of minutes between each nmap/fping operation. The default value is 3. apps: a list of comma separated application names whose status will be queried. - For how to get the status of each app, look for app name in the key filed + For how to get the status of each app, look for app name in the key field in a different row. port: the application daemon port number, if not specified, use internal list, then /etc/services.