From 667c5ef4020cdaea5c49177d71f6c4d2d6770fac Mon Sep 17 00:00:00 2001
From: Tim Wickberg <tim@schedmd.com>
Date: Thu, 13 Apr 2017 14:20:04 -0600
Subject: [PATCH] Docs - add initial SLUG17 info to meetings.shtml

---
 doc/html/meetings.shtml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/html/meetings.shtml b/doc/html/meetings.shtml
index 5d22ba12b53..ade9dfcad16 100644
--- a/doc/html/meetings.shtml
+++ b/doc/html/meetings.shtml
@@ -1,12 +1,11 @@
 <!--#include virtual="header.txt"-->
 
 <h1>Meetings</h1>
-<!--
-<p><b>Slurm User Group Meeting 2016</b><br>
-26-27 September 2016<br>
-Athens, Greece<br>
-Host: <a href="http://www.grnet.gr/">Greek Research and Technology Network (GRNET)</a></p> -->
-<!-- <p>More information coming soon.</p> -->
+<p><b>Slurm User Group Meeting 2017</b><br>
+25-26 September 2017<br>
+Berkeley, California, USA<br>
+Host: <a href="http://www.nersc.gov/">National Energy Research Scientific Computing Center (NERSC)</a></p>
+<p>More information coming soon.</p>
 <!-- <p><a href="slurm_ug_cfp.html">Call for Abstracts: Due 30 June 2016</a></p> -->
 <!-- <p><a href="slurm_ug_agenda.html">Meeting agenda, registration information, etc.</a></p> -->
 <!-- <p><a href="slurm_ug_agenda.html#hotels">Meeting hotels</a></p> -->
-- 
GitLab