From dd142548c3c82b6d5bb76b57db9ca13ba276f81b Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 10 Jan 2013 13:23:19 -0800
Subject: [PATCH] Add AlpsEngine cray.conf parameter information to Cray way
 page

---
 doc/html/cray.shtml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/html/cray.shtml b/doc/html/cray.shtml
index 28d4ba854d4..cc0e0bdf7dc 100644
--- a/doc/html/cray.shtml
+++ b/doc/html/cray.shtml
@@ -568,6 +568,15 @@ located in the same directory as the <i>slurm.conf</i> file. Configuration
 parameters supported by <i>cray.conf</i> are listed below.</p>
 
 <p><dl>
+<dt><b>AlpsEngine</b></dt>
+<dd>Communication protocol version number to be used between Slurm and
+ALPS/BASIL. The default value is BASIL's response to the ENGINE query.
+Use with caution: Changes in ALPS communications which are not recognized
+by Slurm could result in loss of jobs.
+Currently supported values include
+1.1, 1.2.0, 1.3.0, 3.1.0, 4.0, 4.1.0, 5.0.0, 5.0.1, 5.1.0 or "latest".
+A value of "latest" will use the most current version of Slurm's logic and
+can be useful for validation with new versions of ALPS.</dd>
 <dt><b>apbasil</b></dt>
 <dd>Fully qualified pathname to the apbasil command.
 The default value is <i>/usr/bin/apbasil</i>.</dd>
@@ -657,6 +666,6 @@ login: # /etc/init.d/slurm start
 
 <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 17 December 2012</p>
+<p style="text-align:center;">Last modified 10 January 2013</p>
 
 <!--#include virtual="footer.txt"-->
-- 
GitLab