From 50b0ca1eb7afb557f644c70bad194cdff4ecd2d8 Mon Sep 17 00:00:00 2001 From: Morris Jette <jette@schedmd.com> Date: Fri, 26 Oct 2012 13:47:17 -0700 Subject: [PATCH] Minor web page updates --- doc/html/meetings.shtml | 34 ++++++++++++++++++++-------------- doc/html/team.shtml | 16 ++++++++-------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/doc/html/meetings.shtml b/doc/html/meetings.shtml index 6d08002efd2..1d3cb8e4338 100644 --- a/doc/html/meetings.shtml +++ b/doc/html/meetings.shtml @@ -3,26 +3,32 @@ <h1>Meetings</h1> <p><b>SLURM BoF at SC12</b><br> -15 November 2012 12:15<br> +15 November 2012, 12:15<br> Salt Lake City, UT</p> +<p><b>SLURM User Group Meeting 2013</b><br> +Summer 2013<br> +San Fransisco, California, USA<br> +Host: SchedMD</p> + +<br> +<h2>Past User Group Meetings</h2> + <p><b>SLURM User Group Meeting 2012</b><br> 9-10 October 2012<br> -Barcelona, Spain</p> - -<p><a href="http://www.bsc.es/SlurmUserMeeting2012">Call for submissions</a><br> -<a href="http://www.bsc.es/SlurmUserMeeting2012">Registration</a><br> -<a href="http://www.bsc.es/SlurmUserMeeting2012">Agenda</a><br> -</p> +Barcelona, Spain<br> +Host: Barcelona Supercomputing Center</p> -<!--<p><b>SLURM User Group Meeting 2011</b><br> -September 22-23, 2011<br> -Phoenix, Arizona, USA</p>--> +<p><b>SLURM User Group Meeting 2011</b><br> +22-23 September 2011<br> +Phoenix, Arizona, USA<br> +Host: Bull</p> -<!--<p><b>SLURM User Group Meeting 2010</b><br> -October 5, 2010<br> -Paris, France</p>--> +<p><b>SLURM User Group Meeting 2010</b><br> +5 October 2010<br> +Paris, France<br> +Host: CEA</p> -<p style="text-align:center;">Last modified 11 September 2012</p> +<p style="text-align:center;">Last modified 26 October 2012</p> <!--#include virtual="footer.txt"--> diff --git a/doc/html/team.shtml b/doc/html/team.shtml index 1d98b93469d..0b743604c38 100644 --- a/doc/html/team.shtml +++ b/doc/html/team.shtml @@ -11,7 +11,7 @@ organizations. Lead SLURM developers are: <p>SLURM contributors include:</p> <ul> <!-- FUNDING ORGANIZATIONS, PLEASE KEEP IN ALPHABETICAL ORDER --> -<li><a href="http://www.bsc.es">Barcelona Supercomputer Center</a></li> +<li><a href="http://www.bsc.es">Barcelona Supercomputing Center</a></li> <li><a href="http://www.bull.com">Bull</a></li> <li><a href="http://www.cea.fr">CEA</a></li> <li><a href="http://www.fhcrc.org">Fred Hutchinson Cancer Research Center</a></li> @@ -27,7 +27,7 @@ organizations. Lead SLURM developers are: <li>Amjad Majid Ali (Colorado State University)</li> <li>Pär Andersson (National Supercomputer Centre, Sweden)</li> <li>Don Albert (Bull)</li> -<li>Ernest Artiaga (Barcelona Supercomputer Center, Spain)</li> +<li>Ernest Artiaga (Barcelona Supercomputing Center, Spain)</li> <li>Susanne Balle (HP)</li> <li>Ralph Bean (Rochester Institute of Technology)</li> <li>Alexander Bersenev (Institute of Mathematics and Mechanics, Russia)</li> @@ -37,7 +37,7 @@ organizations. Lead SLURM developers are: <li>David Bremer (Lawrence Livermore National Laboratory)</li> <li>Jon Bringhurst (Los Alamos National Laboratory)</li> <li>Bill Brophy (Bull)</li> -<li>Hongjia Cao (National University of Defense Techonogy, China)</li> +<li>Hongjia Cao (National University of Defense Technology, China)</li> <li>Daniel Christians (HP)</li> <li>Gilles Civario (Bull)</li> <li>Chuck Clouston (Bull)</li> @@ -49,7 +49,7 @@ organizations. Lead SLURM developers are: <li>Joey Ekstrom (Lawrence Livermore National Laboratory/Bringham Young University)</li> <li>Josh England (TGS Management Corporation)</li> <li>Kent Engström (National Supercomputer Centre, Sweden)</li> -<li>Carles Fenoy (Barcelona Supercomputer Center, Spain)</li> +<li>Carles Fenoy (Barcelona Supercomputing Center, Spain)</li> <li>Damien François (Université catholique de Louvain, Belgium)</li> <li>Jim Garlick (Lawrence Livermore National Laboratory)</li> <li>Didier Gazen (Laboratoire d'Aerologie, France)</li> @@ -83,13 +83,13 @@ organizations. Lead SLURM developers are: <li>Donna Mecozzi (Lawrence Livermore National Laboratory)</li> <li>Bjørn-Helge Mevik (University of Oslo, Norway)</li> <li>Chris Morrone (Lawrence Livermore National Laboratory)</li> -<li>Pere Munt (Barcelona Supercomputer Center, Spain)</li> +<li>Pere Munt (Barcelona Supercomputing Center, Spain)</li> <li>Mark Nelson (IBM)</li> <li>Michal Novotny (Masaryk University, Czech Republic)</li> <li>Bryan O'Sullivan (Pathscale)</li> <li>Gennaro Oliva (Institute of High Performance Computing and Networking, Italy)</li> <li>Rémi Palancher</li> -<li>Alejandro Lucero Palau (Barcelona Supercomputer Center, Spain)</li> +<li>Alejandro Lucero Palau (Barcelona Supercomputing Center, Spain)</li> <li>Daniel Palermo (HP)</li> <li>Dan Phung (Lawrence Livermore National Laboratory/Columbia University)</li> <li>Ashley Pittman (Quadrics, UK)</li> @@ -98,9 +98,9 @@ organizations. Lead SLURM developers are: <li>Petter Reinholdtsen (University of Oslo, Norway)</li> <li>Gerrit Renker (Swiss National Supercomputing Centre)</li> <li>Andy Riebs (HP)</li> -<li>Asier Roa (Barcelona Supercomputer Center, Spain)</li> +<li>Asier Roa (Barcelona Supercomputing Center, Spain)</li> <li>Andy Roosen (University of Deleware)</li> -<li>Miguel Ros (Barcelona Supercomputer Center, Spain)</li> +<li>Miguel Ros (Barcelona Supercomputing Center, Spain)</li> <li>Beat Rubischon (DALCO AG, Switzerland)</li> <li>Simon Ruderich</li> <li>Dan Rusak (Bull)</li> -- GitLab