note that slurm reservations, resource limits, and multifactor plugins

are not compatable with Moab or Maui.

doc/html/maui.shtml

@@ -97,7 +97,7 @@ SchedulerAuth=42 (for Slurm version 1.1 and earlier only)
 authentication key specified when Maui was configured above. 
 Just make sure the numbers match.</p>
 
-<p>For Slurm version 1.2 or higher, the authentication key 
+<p>For SLURM version 1.2 or higher, the authentication key 
 is stored in a file specific to the wiki-plugin named 
 <i>wiki.conf</i>.
 This file should be protected from reading by users.
@@ -110,6 +110,18 @@ includes a description of keywords presently only
 supported by the sched/wiki2 plugin for use with the 
 Moab Scheduler.</p>
 
+<p>SLURM version 2.0 and higher have internal scheduling capabilities
+that are not compatable with Maui.
+<ol>
+<li>Do not configure SLURM to use the "priority/multifactor" plugin 
+as it would set job priorities which conflict with those set by Maui.</li>
+<li>Do not use SLURM's <a href="reservations.html">reservation</a> 
+mechanism, but use that offered by Maui.</li>
+<li>Do not use SLURM's <a href="resource_limits.html">resource limits</a>
+as those may conflict with those managed by Maui.</li>
+</ol></p>
+
+
 <p>The wiki.conf keywords currently supported by Maui include:</p>
 
 <p><b>AuthKey</b> is a DES based encryption key used to sign 
@@ -162,6 +174,6 @@ HidePartitionJobs=debug
 
 <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 4 November 2008</p>
+<p style="text-align:center;">Last modified 12 February 2009</p>
 
 <!--#include virtual="footer.txt"-->

doc/html/moab.shtml

@@ -36,6 +36,17 @@ partition configuration specifications.</p>
 
 <p>The default value of <i>SchedulerPort</i> is 7321.</p>
 
+<p>SLURM version 2.0 and higher have internal scheduling capabilities
+that are not compatable with Moab.
+<ol>
+<li>Do not configure SLURM to use the "priority/multifactor" plugin 
+as it would set job priorities which conflict with those set by Moab.</li>
+<li>Do not use SLURM's <a href="reservations.html">reservation</a> 
+mechanism, but use that offered by Moab.</li>
+<li>Do not use SLURM's <a href="resource_limits.html">resource limits</a>
+as those may conflict with those managed by Moab.</li>
+</ol></p>
+
 <h4>SLURM commands</h4>
 <p> Note that the <i>srun --immediate</i> option is not compatible 
 with Moab. 
@@ -259,6 +270,6 @@ Write the output to a file with the same name as the user in the
 
 <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 10 July 2008</p>
+<p style="text-align:center;">Last modified 12 February 2009</p>
 
 <!--#include virtual="footer.txt"-->

doc/html/reservations.shtml

@@ -16,6 +16,10 @@ The <i>scontrol</i>, <i>smap</i> and <i>sview</i> commands can be used
 to view reservations. 
 The man pages for the various commands contain details.</p>
 
+<p>Note for users of Maui or Moab schedulers: <br>
+Maui and Moab are not integrated with SLURM's resource reservation system,
+but should use their own advanced reservation system.</p>
+
 <h2>Reservation Creation</h2>
 
 <p>One common mode of operation for a reservation would be to reserve
@@ -151,7 +155,7 @@ made more flexible to accept multiple features with AND or OR operators.</li>
 </ol>
 
 
-<p style="text-align: center;">Last modified 10 February 2009</p>
+<p style="text-align: center;">Last modified 12 February 2009</p>
 
 <!--#include virtual="footer.txt"-->
 

doc/html/resource_limits.shtml

@@ -11,6 +11,10 @@ New features are under active development.
 Familiarity with SLURM's <a href="accounting">Accounting</a> web page
 is strongly recommended before use of this document.</p>
 
+<p>Note for users of Maui or Moab schedulers: <br>
+Maui and Moab are not integrated with SLURM's resource limits,
+but should use their own resource limits mechanisms.</p>
+
 <h2>Configuration</h2>
 
 <p>Scheduling policy information must be stored in a database