From 2fd0570fab765189e2ae452186f6149223b03a23 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Fri, 1 Dec 2017 11:05:17 -0500 Subject: [PATCH] Some sentence modify for makeconservercf -C|--cleanup --- .../guides/admin-guides/references/man8/makeconservercf.8.rst | 4 ++-- xCAT-client/pods/man8/makeconservercf.8.pod | 4 ++-- xCAT-server/lib/xcat/plugins/conserver.pm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst b/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst index c9b88f817..249be78f4 100644 --- a/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst +++ b/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst @@ -44,7 +44,7 @@ does not have nodehm.cons set, it will not be written to the file. If \ **-d**\ is specified, \ **makeconservercf**\ will remove specified nodes from /etc/conserver.cf file. If \ *noderange*\ is not specified, all xCAT nodes will be removed from /etc/conserver.cf file. -If \ **-C|-**\ **-cleanup**\ is specified, \ **makeconservercf**\ will remove console configuration entries from /etc/conserver.cf for the nodes whose definition have been removed from xCATdb. \ **Don't**\ specify any noderange. +If \ **-C|-**\ **-cleanup**\ is specified, \ **makeconservercf**\ will remove console configuration entries from /etc/conserver.cf for the nodes whose definitions have been removed from xCATdb. \ **Don't**\ specify any noderange. In the case of a hierarchical cluster (i.e. one with service nodes) \ **makeconservercf**\ will determine which nodes will have their consoles accessed from the management node and which from a service node @@ -66,7 +66,7 @@ OPTIONS \ **-C|-**\ **-cleanup**\ - Remove the entries for the nodes whose definition have been removed from xCAT db. + Remove the entries for the nodes whose definitions have been removed from xCAT db. diff --git a/xCAT-client/pods/man8/makeconservercf.8.pod b/xCAT-client/pods/man8/makeconservercf.8.pod index a7cb00bca..036c28757 100644 --- a/xCAT-client/pods/man8/makeconservercf.8.pod +++ b/xCAT-client/pods/man8/makeconservercf.8.pod @@ -26,7 +26,7 @@ does not have nodehm.cons set, it will not be written to the file. If B<-d> is specified, B will remove specified nodes from /etc/conserver.cf file. If I is not specified, all xCAT nodes will be removed from /etc/conserver.cf file. -If B<-C|--cleanup> is specified, B will remove console configuration entries from /etc/conserver.cf for the nodes whose definition have been removed from xCATdb. B specify any noderange. +If B<-C|--cleanup> is specified, B will remove console configuration entries from /etc/conserver.cf for the nodes whose definitions have been removed from xCATdb. B specify any noderange. In the case of a hierarchical cluster (i.e. one with service nodes) B will determine which nodes will have their consoles accessed from the management node and which from a service node @@ -44,7 +44,7 @@ Delete rather than add or refresh the nodes specified as a noderange. =item B<-C|--cleanup> -Remove the entries for the nodes whose definition have been removed from xCAT db. +Remove the entries for the nodes whose definitions have been removed from xCAT db. =item B<-c|--conserver> diff --git a/xCAT-server/lib/xcat/plugins/conserver.pm b/xCAT-server/lib/xcat/plugins/conserver.pm index 594064d75..d54cbe10d 100644 --- a/xCAT-server/lib/xcat/plugins/conserver.pm +++ b/xCAT-server/lib/xcat/plugins/conserver.pm @@ -29,7 +29,7 @@ my $usage_string = The default goes down to all the conservers on the server nodes and set them up -d|--delete Conserver has the relevant entries for the given noderange removed immediately from configuration - -C|--cleanup To remove the entries for the nodes not exists in xCAT db + -C|--cleanup To remove the entries for the nodes that do not exist in xCAT db -t|--trust Add additional trusted hosts. -h|--help Display this usage statement. -V|--verbose Verbose mode.