From 46d5fe78e28dc651c20e73f143db9610f957edf8 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 4 Mar 2011 17:52:18 +0000
Subject: [PATCH] Add info about SLURM User Group Meeting

---
 doc/html/Makefile.am    |  2 ++
 doc/html/Makefile.in    |  2 ++
 doc/html/cfp.shtml      | 40 ++++++++++++++++++++++++++++++++++++++++
 doc/html/header.txt     |  1 +
 doc/html/meetings.shtml | 20 ++++++++++++++++++++
 5 files changed, 65 insertions(+)
 create mode 100644 doc/html/cfp.shtml
 create mode 100644 doc/html/meetings.shtml

diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index 8128ed38f38..3b8ef657f89 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -8,6 +8,7 @@ generated_html = \
 	authplugins.html \
 	big_sys.html \
 	bluegene.html \
+	cfp.html \
 	checkpoint_blcr.html \
 	checkpoint_plugins.html \
 	cons_res.html \
@@ -31,6 +32,7 @@ generated_html = \
 	mail.html \
 	maui.html \
 	mc_support.html \
+	meetings.html \
 	moab.html \
 	mpi_guide.html \
 	mpiplugins.html \
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 10b9aba5d81..51ef2f92326 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -307,6 +307,7 @@ generated_html = \
 	authplugins.html \
 	big_sys.html \
 	bluegene.html \
+	cfp.html \
 	checkpoint_blcr.html \
 	checkpoint_plugins.html \
 	cons_res.html \
@@ -330,6 +331,7 @@ generated_html = \
 	mail.html \
 	maui.html \
 	mc_support.html \
+	meetings.html \
 	moab.html \
 	mpi_guide.html \
 	mpiplugins.html \
diff --git a/doc/html/cfp.shtml b/doc/html/cfp.shtml
new file mode 100644
index 00000000000..ccbb0513ce4
--- /dev/null
+++ b/doc/html/cfp.shtml
@@ -0,0 +1,40 @@
+<!--#include virtual="header.txt"-->
+
+<p><b>CALL  FOR  SUBMISSIONS</b><br><br>
+SLURM User Group Meeting 2011<br>
+September 22-23, 2011<br>
+Phoenix, Arizona, USA</p>
+
+<p>You are invited to submit an abstract of a presentation or tutorial
+to be given at the SLURM User Group Meeting 2011. This event will be
+sponsored and organized by <a href="http://www.bull.com">Bull</a> and
+will be held in Phoenix, Arizona, USA on September 22 and 23, 2011.</p>
+
+<p>This international event is opened to everyone who wants to:
+<ul>
+<li>Learn more about <a href="https://computing.llnl.gov/linux/slurm">
+SLURM</a>, a highly scalable Resource Manager and Job Scheduler</li>
+<li>Share their knowledge and experience with other users and administrators</li>
+<li>Get detailed informations about the latest features and developments</li>
+<li>Share requirements and discuss future developments</li>
+</ul></p>
+
+<p>Everyone who wants to present their own usage, developments, site report,
+or tutorial about SLURM is invited to send a short abstract including
+the presentation's expected duration to
+<a href="mailto:slurm_user_group@lists.llnl.gov">slurm_user_group@lists.llnl.gov</a>.</p>
+
+<p>IMPORTANT DATES:<br>
+April 30, 2011:      Submission of abstracts<br>
+May 31, 2011:        Notification of acceptance<br>
+September 22, 2011:  SLURM User Group Meeting 2011 (tutorials)<br>
+September 23, 2011:  SLURM User Group Meeting 2011<br>
+</p>
+
+<p>Program Committee:<br>
+Danny Auble (Lawrence Livermore National Laboratory)<br>
+Matthieu Hautreux (CEA, French Atomic and Alternative Energies Commission)<br>
+Morris Jette (Lawrence Livermore National Laboratory)<br>
+Nancy Kritkausky (Bull)</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/header.txt b/doc/html/header.txt
index 64cd41e80c4..2e1ef22406c 100644
--- a/doc/html/header.txt
+++ b/doc/html/header.txt
@@ -38,6 +38,7 @@ structure:Laboratories and Other Field Facilities">
 <h2>About</h2>
 <ul>
 	  <li><a href="overview.shtml" class="nav">Overview</a></li>
+	  <li><a href="meetings.shtml" class="nav">Meetings</a></li>
 	  <li><a href="news.shtml" class="nav">What's New</a></li>
 	  <li><a href="publications.shtml" class="nav">Publications</a></li>
 	  <li><a href="testimonials.shtml" class="nav">Testimonials</a></li>
diff --git a/doc/html/meetings.shtml b/doc/html/meetings.shtml
new file mode 100644
index 00000000000..1acbb4c2314
--- /dev/null
+++ b/doc/html/meetings.shtml
@@ -0,0 +1,20 @@
+<!--#include virtual="header.txt"-->
+
+<h1>Meetings</h1>
+
+<p><b>SLURM User Group Meeting 2011</b><br>
+September 22-23, 2011<br>
+Phoenix, Arizona, USA</p>
+
+<p><a href="cfp.html">Call for submissions</a><br>
+Registration (not yet available)<br>
+Agenda (not yet available)<br>
+</p>
+
+<!--<p><b>SLURM User Group Meeting 2010</b><br>
+October 5, 2010<br>
+Paris, France</p>-->
+
+<p style="text-align:center;">Last modified 4 March 2011</p>
+
+<!--#include virtual="footer.txt"-->
-- 
GitLab