diff --git a/doc/html/slurm_ug_2010/agenda.htm b/doc/html/slurm_ug_2010/agenda.htm
index 87c9049a313007ecdd7d909c094a62155c26d161..bcf45092c69f1398834a39e3a9167902db343f87 100644
--- a/doc/html/slurm_ug_2010/agenda.htm
+++ b/doc/html/slurm_ug_2010/agenda.htm
@@ -61,13 +61,13 @@
 	
 	<tr>
 	  <td width="20%">&nbsp;Keynotes</td>
-	  <td width="30%">&nbsp;M.Jette (LLNL)<br>&nbsp;D.Auble (LLNL)</td>
+	  <td width="30%">&nbsp;Morris Jette (LLNL)<br>&nbsp;Danny Auble (LLNL)</td>
 	  <td width="40%">&nbsp;SLURM: Resource Management from the Simple to Sophisticated</td>
 	</tr>
 
 	<tr>
 	  <td width="20%">&nbsp;Session #1</td>
-	  <td width="30%">&nbsp;M. Hautreux (CEA)</td>
+	  <td width="30%">&nbsp;Matthieu Hautreux (CEA)</td>
 	  <td width="40%">&nbsp;SLURM at CEA</td>
 	</tr>
 	
@@ -79,17 +79,17 @@
 	<tr>
 	  <td width="10%" rowspan="3">11:00 - 12:30</td>
 	  <td width="20%">&nbsp;Session #2</td>
-	  <td width="30%">&nbsp;J. Smith (Sandia)</td>
-	  <td width="40%">&nbsp;From Torque to SLURM</td>
+	  <td width="30%">&nbsp;Martin Perry (Bull)</td>
+	  <td width="40%">&nbsp;Linux cgroup support for SLURM</td>
 	</tr>
 	<tr>
 	  <td width="20%">&nbsp;Session #3</td>
-	  <td width="30%">&nbsp;C. Fenoy (BSC)</td>
+	  <td width="30%">&nbsp;Carles Fenoy (BSC)</td>
 	  <td width="40%">&nbsp;SLURM at BSC</td>
 	</tr>
 	<tr>
 	  <td width="20%">&nbsp;Session #4</td>
-	  <td width="30%">&nbsp;G. Renker (CSCS)</td>
+	  <td width="30%">&nbsp;Neil String (CSCS)</td>
 	  <td width="40%">&nbsp;Porting SLURM to Cray XT and XE</td>
 	</tr>
 
@@ -101,13 +101,13 @@
 	<tr>
 	  <td width="10%" rowspan="2">14:00 - 15:30</td>
 	  <td width="20%">&nbsp;Session #5</td>
-	  <td width="30%">&nbsp;Y. Georgiou (BULL)</td>
+	  <td width="30%">&nbsp;Yiannis Georgiou (Bull)</td>
 	  <td width="40%">&nbsp;TBD</td>
 	</tr>
 
 	<tr>
 	  <td width="20%">&nbsp;Session #6<br>(60 minutes)</td>
-	  <td width="30%">&nbsp;M.Jette (LLNL)<br>&nbsp;D.Auble (LLNL)</td>
+	  <td width="30%">&nbsp;Morris Jette (LLNL)<br>&nbsp;Danny Auble (LLNL) (LLNL)</td>
 	  <td width="40%">&nbsp;SLURM Version 2.2: Features and release plans</td>
 	</tr>
 	<tr>
@@ -126,7 +126,7 @@
 
     <div id="footer">
       <div id="left">&nbsp;&nbsp;<span class="ucrlnum">LLNL-WEB-438012 |</span> <a href="https://www.llnl.gov/disclaimer.html" target="_blank" class="privacy">Privacy &amp; Legal Notice</a></div>
-      <div id="right"><span class="ucrlnum">20 July 2010&nbsp;&nbsp;</span></div>
+      <div id="right"><span class="ucrlnum">13 September 2010&nbsp;&nbsp;</span></div>
     </div>
     <div id="footer2">
       <div id="left2"><img src="https://computing.llnl.gov/linux/slurm/sponsors.gif" width="129" height="30" border="0" usemap="#Map2"></div>