diff --git a/doc/html/platforms.shtml b/doc/html/platforms.shtml
index 55a888e04ac9b1bee32c239c9e5e2bf94d5499ae..fa446fb7db255c685f2d65452004ccba6dd1c31a 100644
--- a/doc/html/platforms.shtml
+++ b/doc/html/platforms.shtml
@@ -3,10 +3,17 @@
 <h1>Platforms</h1>
 <h2>Operating Systems</h2>
 <ul>
-<li><b>AIX</b>&#151;SLURM support for AIX has been thoroughly tested.</li>
+<li><b>AIX</b>&#151;SLURM support for AIX has been thoroughly tested, but we
+know of no AIX installations using SLURM after 2008. IBM's Parallel Environment
+(PE) and Parallel Operating Environment (POE) are not currently supported, but
+are expected to be supported with Linux late in 2012. See
+<a href="ibm.html">IBM AIX User and Administrator Guide</a> for more information.</li>
 <li><b>Linux</b>&#151;SLURM has been thoroughly tested on most popular Linux
 distributions using i386, ia64, and x86_64 architectures.</li>
-<li><b>OS X</b>&#151;SLURM support for OS X is available.</li>
+<li><b>OS X</b>&#151;SLURM has run OS X in the past, but the current OS X linker
+does not support SLURM plugins. (OS X dynamically linked objects can be called by
+the main program. They may not call functions in the main program or other
+dynamically linked objects, which are features required by SLURM.)</li>
 <li><b>Solaris</b>&#151;SLURM support for Solaris (OpenSolaris build 119) was
 added in version 2.1.</li>
 <li><b>Other</b>&#151;SLURM ports to other systems will be gratefully accepted.</li>
@@ -14,9 +21,13 @@ added in version 2.1.</li>
 <h2>Interconnects</h2>
 <ul>
 <li><b>BlueGene</b>&#151;SLURM support for IBM's BlueGene/L, BlueGene/P and
-BlueGene/Q systems has been thoroughly tested.</li>
+BlueGene/Q systems has been thoroughly tested. See
+<a href="bluegene.html">Blue Gene User and Administrator Guide</a>
+for more information.</li>
 <li><b>Cray XT and XE</b>&#151;Operates as a scheduler on top of Cray's
-ALPS/BASIL software. Supported added in SLURM version 2.3.</li>
+ALPS/BASIL software. Supported added in SLURM version 2.3. Note that Cray's
+ALPS/BASIL software necessitates some changes in SLURM behavior. See
+<a href="cray.html">Cray User and Administrator Guide</a> for more information.</li>
 <li><b>Ethernet</b>&#151;Ethernet requires no special support from SLURM and has
 been thoroughly tested.</li>
 <li><b>IBM Federation</b>&#151;SLURM support for IBM's Federation Switch
@@ -30,6 +41,6 @@ for the three-dimensional torus interconnect.</li>
 <li><b>Other</b>&#151;SLURM ports to other systems will be gratefully accepted.</li>
 </ul>
 
-<p style="text-align:center;">Last modified 8 April 2011</p>
+<p style="text-align:center;">Last modified 9 April 2012</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/html/publications.shtml b/doc/html/publications.shtml
index 3c98bc545bebe37ac49cafa61ae59469270a520f..d90e269adbb6823f5a3bb7bbdb743305be197238 100644
--- a/doc/html/publications.shtml
+++ b/doc/html/publications.shtml
@@ -7,6 +7,10 @@
 <h2>Presentations</h2>
 <ul>
 
+<li><a href="pdfs/LCS_cgroups_BULL.pdf">Resource Management with Linux Control Groups in HPC Clusters</a>
+Yiannis Georgiou, Bull
+(6th Linux Collaboration Summit, April 2012)</li>
+
 <li><b>Presentations from SLURM Birds Of a Feather,
 SuperComputing 2011, November 2011</b></li>
 <ul>
@@ -226,6 +230,6 @@ Danny Auble of LLNL about SLURM.</p>
 Learning Chef: Compute Cluter with SLURM</a>
 A SLURM Cookbook by Adam DeConinck</p>
 
-<p style="text-align:center;">Last modified 6 March 2012</p>
+<p style="text-align:center;">Last modified 11 April 2012</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 51318973111e3589749a343723c27dc36d8b5792..cdcac1335d344eed54a8326a5c04c01b973862fa 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -2,14 +2,13 @@
 
 <h1>SLURM Team</h1>
 <p>SLURM development has been a joint effort of many companies and
-organizations. The primary SLURM development staff currently includes: </p>
+organizations. Lead SLURM developers are:
 <ul>
-<li>Danny Auble (SchedMD, previously Lawrence Livermore National Laboratory)</li>
-<li>Hongjia Cao (National University of Defense Techonogy, China)</li>
-<li>Morris Jette (SchedMD, previously Lawrence Livermore National Laboratory)</li>
+<li>Danny Auble (SchedMD, formerly with Lawrence Livermore National Laboratory)</li>
+<li>Morris Jette (SchedMD, formerly with Lawrence Livermore National Laboratory)</li>
 </ul>
 
-<p> SLURM contributors include: </p>
+<p>SLURM contributors include:</p>
 <ul>
 <li>Ramiro Alba (Centre Tecnol&ograve;gic de Tranfer&egrave;ncia de Calor, Spain)</li>
 <li>Amjad Majid Ali (Colorado State University)</li>
@@ -25,6 +24,7 @@ organizations. The primary SLURM development staff currently includes: </p>
 <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>Daniel Christians (HP)</li>
 <li>Gilles Civario (Bull)</li>
 <li>Chuck Clouston (Bull)</li>
@@ -40,8 +40,8 @@ organizations. The primary SLURM development staff currently includes: </p>
 <li>Didier Gazen (Laboratoire d'Aerologie, France)</li>
 <li>Raphael Geissert (Debian)</li>
 <li>Yiannis Georgiou (Bull)</li>
-<li>Andriy Grytsenko (Massive Solutions Limited, Ukraine)</li>
 <li>Mark Grondona (Lawrence Livermore National Laboratory)</li>
+<li>Andriy Grytsenko (Massive Solutions Limited, Ukraine)</li>
 <li>Takao Hatazaki (HP)</li>
 <li>Matthieu Hautreux (CEA, France)</li>
 <li>Chris Holmes (HP)</li>