From c787341fed8e55ad316e56d106b311977b7e67ba Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Thu, 29 Sep 2016 21:13:33 -0400 Subject: [PATCH] update the .rst files from the changes in the code --- .../guides/admin-guides/references/man1/xcattest.1.rst | 6 +++--- .../guides/admin-guides/references/man5/linuximage.5.rst | 7 +++---- .../guides/admin-guides/references/man5/monitoring.5.rst | 2 +- .../guides/admin-guides/references/man5/monsetting.5.rst | 2 +- docs/source/guides/admin-guides/references/man5/site.5.rst | 1 - .../guides/admin-guides/references/man7/monitoring.7.rst | 2 +- .../guides/admin-guides/references/man7/osimage.7.rst | 5 ++--- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/xcattest.1.rst b/docs/source/guides/admin-guides/references/man1/xcattest.1.rst index eaa39e7e3..e09fd2e9e 100644 --- a/docs/source/guides/admin-guides/references/man1/xcattest.1.rst +++ b/docs/source/guides/admin-guides/references/man1/xcattest.1.rst @@ -58,7 +58,7 @@ OPTIONS \ **-b**\ \ *case bundle list*\ - Comma separated list of test cases bundle files, each test cases bundle can contain multiple lines and each line for one test case name.The bundle files should be listed in: /opt/xcat/share/xcat/tools/autotest/bundle. + Comma separated list of test cases bundle files, each test cases bundle can contain multiple lines and each line for one test case name. @@ -136,7 +136,7 @@ EXAMPLES .. code-block:: perl - xcattest -f /tmp/config -c rpower + xcattest -c /tmp/config -c rpower @@ -148,7 +148,7 @@ EXAMPLES .. code-block:: perl - xcattest -l > /opt/xcat/share/xcat/tools/autotest/bundle/custom.bundle + xcattest -l > /tmp/custom.bundle Modify custom.bundle xcattest -b custom.bundle diff --git a/docs/source/guides/admin-guides/references/man5/linuximage.5.rst b/docs/source/guides/admin-guides/references/man5/linuximage.5.rst index 94a53b574..e89b345d5 100644 --- a/docs/source/guides/admin-guides/references/man5/linuximage.5.rst +++ b/docs/source/guides/admin-guides/references/man5/linuximage.5.rst @@ -92,10 +92,9 @@ linuximage Attributes: \ **postinstall**\ - Only supported in diskless image only. The fully qualified name of the scripts running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be speperated with comma ",". A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts :: - + Only supported in diskless image only. The fully qualified name of the scripts running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be speperated with comma ",". A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts: IMG_ARCH(The architecture of the osimage, such as "ppc64le","x86_64"), - IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"), + IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"), IMG_OSVER(The os release of the osimage, such as "rhels7.3","sles11.4"), IMG_PROFILE(the profile of the osimage, such as "service","compute"), IMG_PKGLIST(the "pkglist" attribute of the osimage), @@ -103,7 +102,7 @@ linuximage Attributes: IMG_OTHERPKGLIST(the "otherpkglist" attribute of the osimage), IMG_OTHERPKGDIR(the "otherpkgdir" attribute of the osimage), IMG_ROOTIMGDIR(the "rootimgdir" attribute of the osimage) - + \ **rootimgdir**\ 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 1f8176938..6ea1f73d3 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 /opt/xcat/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 /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 6200b8925..d14541ee0 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 /opt/xcat/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 /lib/perl/xCAT_monitoring/. See the man page for monstart for details. diff --git a/docs/source/guides/admin-guides/references/man5/site.5.rst b/docs/source/guides/admin-guides/references/man5/site.5.rst index 6adab15b4..35c59d2b7 100644 --- a/docs/source/guides/admin-guides/references/man5/site.5.rst +++ b/docs/source/guides/admin-guides/references/man5/site.5.rst @@ -259,7 +259,6 @@ site Attributes: them. installdir: The local directory name used to hold the node deployment packages. - It must be the full path including the leading '/'. installloc: The location from which the service nodes should mount the deployment packages in the format hostname:/path. If hostname is 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 8f74ca22c..8c7953e7f 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 /opt/xcat/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 /lib/perl/xCAT_monitoring/. See the man page for monstart for details. diff --git a/docs/source/guides/admin-guides/references/man7/osimage.7.rst b/docs/source/guides/admin-guides/references/man7/osimage.7.rst index 48f8a0de6..6c318a877 100644 --- a/docs/source/guides/admin-guides/references/man7/osimage.7.rst +++ b/docs/source/guides/admin-guides/references/man7/osimage.7.rst @@ -313,10 +313,9 @@ osimage Attributes: \ **postinstall**\ (linuximage.postinstall) - Only supported in diskless image only. The fully qualified name of the scripts running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be speperated with comma ",". A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts :: - + Only supported in diskless image only. The fully qualified name of the scripts running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be speperated with comma ",". A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts: IMG_ARCH(The architecture of the osimage, such as "ppc64le","x86_64"), - IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"), + IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"), IMG_OSVER(The os release of the osimage, such as "rhels7.3","sles11.4"), IMG_PROFILE(the profile of the osimage, such as "service","compute"), IMG_PKGLIST(the "pkglist" attribute of the osimage),