diff --git a/doc/html/meetings.shtml b/doc/html/meetings.shtml index 7f8c46e2b260897002a1b0b8a33d1d988aba9de6..579e8f794eaf3b02f1fc7727c7d9b8b6b1af82d3 100644 --- a/doc/html/meetings.shtml +++ b/doc/html/meetings.shtml @@ -2,18 +2,23 @@ <h1>Meetings</h1> -<p><b>Slurm User Group Meeting 2014</b><br> -23-24 September 2014<br> -Lugano, Switzerland<br> -Host: <a href="http://cscs.ch/">Swiss National Supercomputing Centre</a></p> +<p><b>Slurm User Group Meeting 2015</b><br> +15-16 September 2015<br> +Washington DC, USA<br> +Host: <a href="http://www.gwu.edu/">The George Washington University</a></p> <!--<a href="slurm_ug_cfp.html">Call for Abstracts: Due 6 June 2014</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> +<!-- <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> --> <br> <h2>Previous Meetings</h2> +<p><b>Slurm User Group Meeting 2014</b><br> +23-24 September 2014<br> +Lugano, Switzerland<br> +Host: Swiss National Supercomputing Centre</p> + <p><b>Slurm User Group Meeting 2013</b><br> 18-19 September 2013<br> Oakland, California, USA<br> @@ -34,6 +39,6 @@ Host: Bull</p> Paris, France<br> Host: CEA</p> -<p style="text-align:center;">Last modified 3 July 2014</p> +<p style="text-align:center;">Last modified 2 March 2015</p> <!--#include virtual="footer.txt"-->