diff --git a/NEWS b/NEWS index 250d4bf36c67fedb9f02016f3b1f79690d6f06e4..1f7b52d9a2af998d0d927c38c7ca20071eab907f 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ documents those changes that are of interest to users and admins. -- Srun to use env vars for SLURM_PROLOG, SLURM_EPILOG, SLURM_TASK_PROLOG, and SLURM_TASK_EPILOG. patch.1.2.0-pre11.070201.envproepilog from Dan Palermo, HP. + -- Documenation update. patch.1.2.0-pre11.070201.mchtml from Dan Palermo, HP. * Changes in SLURM 1.2.0-pre15 ============================== diff --git a/doc/html/mc_support.shtml b/doc/html/mc_support.shtml index 37bad9efda956f31e918ffb4e12c368d65afe144..74197368b58a0b7d7eb9b5c862689c889d7dc137 100644 --- a/doc/html/mc_support.shtml +++ b/doc/html/mc_support.shtml @@ -69,7 +69,7 @@ by their application. Table 1 summarizes the new multi-core flags. <td>Number of sockets in a node to dedicate to a job (minimum or range) </td></tr> <tr> - <td> --cores-per-cpu=<i>C</i></td> + <td> --cores-per-socket=<i>C</i></td> <td> Number of cores in a CPU to dedicate to a job (minimum or range) </td></tr> <tr> @@ -1045,7 +1045,7 @@ using NodeName: </PRE> <!--------------------------------------------------------------------------> -<p style="text-align:center;">Last modified 9 October 2006</p> +<p style="text-align:center;">Last modified 2 February 2007</p> <!--#include virtual="footer.txt"-->