diff --git a/doc/html/meetings.shtml b/doc/html/meetings.shtml index 654162b43d8dc4c169fc2960a545872c8240c260..a6df044e8f97d1328fe1eab18e53324a54749f86 100644 --- a/doc/html/meetings.shtml +++ b/doc/html/meetings.shtml @@ -1,17 +1,22 @@ <!--#include virtual="header.txt"--> <h1>Meetings</h1> -<p><b>Slurm User Group Meeting 2017</b><br> -24-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><a href="slurm_ug_cfp.html">Call for Abstracts: Due 30 June 2017</a></p> -<p><a href="slurm_ug_agenda.html">Meeting agenda, registration information, etc.</a></p> +<p><b>Slurm User Group Meeting 2018</b><br> +25-26 September 2018<br> +Madrid, Spain<br> +Host: <a href="http://www.ciemat.es">CIEMAT</a></p> +<!-- <p><a href="slurm_ug_cfp.html">Call for Abstracts: Due 30 June 2017</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> --> <br> <h2>Previous Meetings</h2> +<p><b>Slurm User Group Meeting 2017</b><br> +24-26 September 2017<br> +Berkeley, California, USA<br> +Host: National Energy Research Scientific Computing Center (NERSC)</p> + <p><b>Slurm User Group Meeting 2016</b><br> 26-27 September 2016<br> Athens, Greece<br>