From 434db38a10f554cb2f0ddb9395fd4ffae0748440 Mon Sep 17 00:00:00 2001 From: immarvin Date: Mon, 4 Jul 2016 22:03:51 -0400 Subject: [PATCH] fix issue [FVT]Please make the priority clearly as node name can be the same with template #1471 --- docs/source/guides/admin-guides/references/man1/mkdef.1.rst | 2 +- xCAT-client/pods/man1/mkdef.1.pod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 694517181..c3849d38c 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 from. The newly created object will inherit the attributes of the template definition unless the attribute is specified in the arguments of \ **mkdef**\ command. For the details of xCAT shipped object definition templates, please 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 from. 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, please refer to the manpage of \ **-**\ **-template**\ option in lsdef(1)|lsdef.1. diff --git a/xCAT-client/pods/man1/mkdef.1.pod b/xCAT-client/pods/man1/mkdef.1.pod index ad0758101..e24a54b46 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 from. The newly created object will inherit the attributes of the template definition unless the attribute is specified in the arguments of B command. For the details of xCAT shipped object definition templates, please 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 from. 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, please refer to the manpage of B<--template> option in L. =item B<-V|--verbose>