From 2531ced6c27a8df40108efcc669863c363511cd9 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 20 Mar 2015 11:32:10 -0700
Subject: [PATCH] Update for SLUG15 CFP

---
 doc/html/meetings.shtml     |  6 +++---
 doc/html/slurm_ug_cfp.shtml | 29 +++++++++++++++--------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/doc/html/meetings.shtml b/doc/html/meetings.shtml
index 72b112c5030..b316be0f5d2 100644
--- a/doc/html/meetings.shtml
+++ b/doc/html/meetings.shtml
@@ -6,8 +6,8 @@
 15-16 September 2015<br>
 Washington DC, USA<br>
 Host: <a href="http://www.gwu.edu/">The George Washington University</a></p>
-<p>More information to come soon.</p>
-<!--<a href="slurm_ug_cfp.html">Call for Abstracts: Due 6 June 2014</a><br>-->
+<!-- <p>More information to come soon.</p>-->
+<a href="slurm_ug_cfp.html">Call for Abstracts: Due 1 June 2015</a><br>
 <!-- <a href="slurm_ug_agenda.html#agenda">Meeting agenda</a><br> -->
 <!-- <a href="slurm_ug_agenda.html#registration">Meeting registration</a><br> -->
 <!-- <a href="slurm_ug_agenda.html#hotels">Meeting hotels</a><br> -->
@@ -40,6 +40,6 @@ Host: Bull</p>
 Paris, France<br>
 Host: CEA</p>
 
-<p style="text-align:center;">Last modified 2 March 2015</p>
+<p style="text-align:center;">Last modified 20 March 2015</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/html/slurm_ug_cfp.shtml b/doc/html/slurm_ug_cfp.shtml
index d2826211a2f..80af201d1eb 100644
--- a/doc/html/slurm_ug_cfp.shtml
+++ b/doc/html/slurm_ug_cfp.shtml
@@ -1,15 +1,16 @@
 <!--#include virtual="header.txt"-->
 
 <h1>CALL  FOR  ABSTRACTS</h1>
-<p>Slurm User Group Meeting 2014<br>
-23-24 September 2014<br>
-Lugano, Switzerland</p>
+<p>Slurm User Group Meeting 2015<br>
+15-16 September 2015<br>
+Washington DC, USA</p>
 
 <p>You are invited to submit an abstract of a tutorial, technical presentation
-or site report to be given at the Slurm User Group Meeting 2014. This event is
+or site report to be given at the Slurm User Group Meeting 2015. This event is
 sponsored and organized by
-The <a href="http://cscs.ch/">Swiss National Supercomputing Centre</a> and
-will be held in Lugano, Switzerland on 23-24 September 2014.</p>
+<a href="http://www.gwu.edu/">The George Washington University</a> and
+<a href="http://www.schedmd.com/">SchedMD</a>.
+It will be held in Washington DC, USA on 15-16 September 2015.</p>
 
 <p>This international event is opened to everyone who wants to:
 <ul>
@@ -22,26 +23,26 @@ Slurm</a>, a highly scalable Resource Manager and Job Scheduler</li>
 
 <p>Everyone who wants to present their own usage, developments, site report,
 or tutorial about Slurm is invited to send an abstract to
-<a href="mailto:sugc@schedmd.com">sugc@schedmd.com</a>.</p>
+<a href="mailto:slugc@schedmd.com">slugc@schedmd.com</a>.</p>
 
 <p><b>Important Dates:</b><br>
-16 June 2014: Abstracts due<br>
-27 June 2014: Notification of acceptance<br>
-23-24 September 2014: Slurm User Group Meeting 2014<br>
+1 June 2015: Abstracts due<br>
+15 June 2015: Notification of acceptance<br>
+15-16 September 2015: Slurm User Group Meeting 2015<br>
 </p>
 
 <p><b>Program Committee:</b><br>
 Yiannis Georgiou (Bull)<br>
+Brian Gilmer (Cray)<br>
 Matthieu Hautreux (CEA)<br>
 Morris Jette (SchedMD)<br>
-Donald Lipari (LLNL, Lawrence Livermore National Laboratory)<br>
-Colin McMurtrie (CSCS, Swiss National Supercomputing Centre)<br>
-Stephen Trofinoff (CSCS, Swiss National Supercomputing Centre)</p>
+Bruce Pfaff (NASA Goddard Space Flight Center)<br>
+Tim Wickberg (The George Washington University)</p>
 
 <!--
 <p><a href="slurm_ug_registration.html">Registration information</a></p>
 -->
 
-<p style="text-align:center;">Last modified 5 June 2014</p>
+<p style="text-align:center;">Last modified 20 March 2015</p>
 
 <!--#include virtual="footer.txt"-->
-- 
GitLab