diff --git a/docs/source/guides/admin-guides/references/man1/mkdef.1.rst b/docs/source/guides/admin-guides/references/man1/mkdef.1.rst index 38b38dce5..41084a288 100644 --- a/docs/source/guides/admin-guides/references/man1/mkdef.1.rst +++ b/docs/source/guides/admin-guides/references/man1/mkdef.1.rst @@ -84,7 +84,7 @@ OPTIONS \ **-**\ **-template**\ \ *template-object-name*\ - Name of the xCAT shipped object definition template or an existing object, from which the new object definition will be created. The newly created object will inherit the attributes of the template definition unless the attribute is specified in the arguments of \ **mkdef**\ command. If there are an existing object and a template with the same name \ *template-object-name*\ , the existing object takes precedence over the object definition template. For the details of xCAT shipped object definition templates, refer to the manpage of \ **-**\ **-template**\ option in lsdef(1)|lsdef.1. + Name of the xCAT shipped object definition template or an existing object, from which the new object definition will be created. The newly created object will inherit the attributes of the template definition unless the attribute is specified in the arguments of \ **mkdef**\ command. If there are a template and an existing object with the same name \ *template-object-name*\ , the tempalte object takes precedence over the existing object. For the details of xCAT shipped object definition templates, refer to the manpage of \ **-**\ **-template**\ option in lsdef(1)|lsdef.1. diff --git a/docs/source/guides/admin-guides/references/man5/monitoring.5.rst b/docs/source/guides/admin-guides/references/man5/monitoring.5.rst index 6ea1f73d3..1f8176938 100644 --- a/docs/source/guides/admin-guides/references/man5/monitoring.5.rst +++ b/docs/source/guides/admin-guides/references/man5/monitoring.5.rst @@ -38,7 +38,7 @@ monitoring Attributes: \ **name**\ - The name of the monitoring plug-in module. The plug-in must be put in /lib/perl/xCAT_monitoring/. See the man page for monstart for details. + The name of the monitoring plug-in module. The plug-in must be put in /opt/xcat/lib/perl/xCAT_monitoring/. See the man page for monstart for details. diff --git a/docs/source/guides/admin-guides/references/man5/monsetting.5.rst b/docs/source/guides/admin-guides/references/man5/monsetting.5.rst index d14541ee0..6200b8925 100644 --- a/docs/source/guides/admin-guides/references/man5/monsetting.5.rst +++ b/docs/source/guides/admin-guides/references/man5/monsetting.5.rst @@ -38,7 +38,7 @@ monsetting Attributes: \ **name**\ - The name of the monitoring plug-in module. The plug-in must be put in /lib/perl/xCAT_monitoring/. See the man page for monstart for details. + The name of the monitoring plug-in module. The plug-in must be put in /opt/xcat/lib/perl/xCAT_monitoring/. See the man page for monstart for details. diff --git a/docs/source/guides/admin-guides/references/man5/taskstate.5.rst b/docs/source/guides/admin-guides/references/man5/taskstate.5.rst index 44fb0ee01..1d7fc2e4f 100644 --- a/docs/source/guides/admin-guides/references/man5/taskstate.5.rst +++ b/docs/source/guides/admin-guides/references/man5/taskstate.5.rst @@ -19,7 +19,7 @@ SYNOPSIS ******** -\ **taskstate Attributes:**\ \ *node*\ , \ *command*\ , \ *state*\ , \ *pid*\ , \ *reserve*\ +\ **taskstate Attributes:**\ \ *node*\ , \ *command*\ , \ *state*\ , \ *pid*\ , \ *reserve*\ , \ *disable*\ *********** @@ -66,6 +66,12 @@ taskstate Attributes: +\ **disable**\ + + Set to 'yes' or '1' to comment out this row. + + + ******** SEE ALSO diff --git a/docs/source/guides/admin-guides/references/man7/monitoring.7.rst b/docs/source/guides/admin-guides/references/man7/monitoring.7.rst index 8c7953e7f..8f74ca22c 100644 --- a/docs/source/guides/admin-guides/references/man7/monitoring.7.rst +++ b/docs/source/guides/admin-guides/references/man7/monitoring.7.rst @@ -53,7 +53,7 @@ monitoring Attributes: \ **name**\ (monitoring.name) - The name of the monitoring plug-in module. The plug-in must be put in /lib/perl/xCAT_monitoring/. See the man page for monstart for details. + The name of the monitoring plug-in module. The plug-in must be put in /opt/xcat/lib/perl/xCAT_monitoring/. See the man page for monstart for details. diff --git a/xCAT-client/pods/man1/mkdef.1.pod b/xCAT-client/pods/man1/mkdef.1.pod index d433869fb..8f5cdb899 100644 --- a/xCAT-client/pods/man1/mkdef.1.pod +++ b/xCAT-client/pods/man1/mkdef.1.pod @@ -50,7 +50,7 @@ A set of comma delimited object types. Use the help option to get a list of val =item B<--template> I -Name of the xCAT shipped object definition template or an existing object, from which the new object definition will be created. The newly created object will inherit the attributes of the template definition unless the attribute is specified in the arguments of B command. If there are an existing object and a template with the same name I, the existing object takes precedence over the object definition template. For the details of xCAT shipped object definition templates, refer to the manpage of B<--template> option in L. +Name of the xCAT shipped object definition template or an existing object, from which the new object definition will be created. The newly created object will inherit the attributes of the template definition unless the attribute is specified in the arguments of B command. If there are a template and an existing object with the same name I, the tempalte object takes precedence over the existing object. For the details of xCAT shipped object definition templates, refer to the manpage of B<--template> option in L. =item B<-V|--verbose>