diff --git a/doc/html/api.html b/doc/html/api.shtml
similarity index 74%
rename from doc/html/api.html
rename to doc/html/api.shtml
index 9c92f25fe52fc56512452d997577f0023360c57d..3742713a0dc56c73d6af3cebf1dba9350c75ef78 100644
--- a/doc/html/api.html
+++ b/doc/html/api.shtml
@@ -1,58 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616"
-<meta name="LLNLRandRdate" content="28 October 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management: Application Programming Interface (API)</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Switch Plugin API</a></h2>
+<!--#include virtual="header.txt"-->
+
+<h2><a name="top">SLURM Switch Plugin API</a></h2>
 
 <h3>Overview</h3>
 <p>All of the SLURM commands utilize a collection of Application Progamming 
@@ -376,24 +324,8 @@ name.</li>
 allocated by <i>slurm_hostlist_create</i>.
 
 </ul>
-<p class="footer"><a href="#top">top</a></p></td>
-
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 25 October 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 25 October 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/authplugins.html b/doc/html/authplugins.shtml
similarity index 79%
rename from doc/html/authplugins.html
rename to doc/html/authplugins.shtml
index e143181f8886cbcf26068ab6b87a801f6b4e2eb0..eae51e1fb7339e13128cbfddaf96aea483f6b480 100644
--- a/doc/html/authplugins.html
+++ b/doc/html/authplugins.shtml
@@ -1,59 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
+<h1><a name="top">SLURM Authentication Plugin API</a></h1>
 
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="8 June 2004">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Authentication Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Authentication Plugin API</a></h2>
-<h3> Overview</h3>
+<h2> Overview</h2>
 <p> This document describes SLURM authentication plugins and the API that defines 
 them. It is intended as a resource to programmers wishing to write their own SLURM 
 authentication plugins. This is version 0 of the API.</p>
@@ -77,7 +26,7 @@ Note carefully, however, the versioning discussion below.</p>
 <p>The programmer is urged to study <span class="commandline">src/plugins/auth/auth_none.c</span> 
 for an example implementation of a SLURM authentication plugin.</p>
 <p class="footer"><a href="#top">top</a></p>
-<h3>Data Objects</h3>
+<h2>Data Objects</h2>
 <p> The implementation must support an opaque class, which it defines, to be used 
 as an authentication &quot;credential.&quot; This class must encapsulate all user-specific 
 information necessary for the operation of the API specification below. The credential 
@@ -113,7 +62,8 @@ do not conflict with the values assigned above. This is done programmatically
 by assigning plugin-specific errno values which are arithmetically greater than 
 or equal to the symbol SLURM_AUTH_FIRST_LOCAL_ERROR.</p>
 <p class="footer"><a href="#top">top</a></p>
-<h3>API Functions</h3>
+
+<h2>API Functions</h2>
 <p>The following functions must appear. Functions which are not implemented should 
 be stubbed.</p>
 <p class="commandline">void *slurm_auth_alloc (void);</p>
@@ -238,29 +188,16 @@ by the API.</p>
 <p style="margin-left:.2in"><b>Returns</b>: A pointer to a static error message. 
 This function must always return a pointer to a string, even if the string is 
 empty or ambiguous such as &quot;unknown error.&quot;</p>
-<h3>Versioning</h3>
+
+<h2>Versioning</h2>
 <p> This document describes version 0 of the SLURM Authentication API. Future 
 releases of SLURM may revise this API. An authentication plugin conveys its ability 
 to implement a particular API version using the mechanism outlined for SLURM plugins. 
 In addition, the credential is transmitted along with the version number of the 
 plugin that transmitted it. It is at the discretion of the plugin author whether 
 to maintain data format compatibility across different versions of the plugin.</p>
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 8 June 2004</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 8 June 2004</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/bluegene.html b/doc/html/bluegene.shtml
similarity index 88%
rename from doc/html/bluegene.html
rename to doc/html/bluegene.shtml
index 4a4a449278dcfdf228a241a52f5528480121488e..ab47f818373257ce1ecb0f4bbc54c58fb78bca2b 100644
--- a/doc/html/bluegene.html
+++ b/doc/html/bluegene.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="15 October 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Blue Gene User and Administrator Guide</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Blue Gene User and Administrator Guide</h2>
-
-<h3>Overview</h3>
+<!--#include virtual="header.txt"-->
+
+<h1>Blue Gene User and Administrator Guide</h1>
+
+<h2>Overview</h2>
 
 <p>This document describes the unique features of SLURM on the
 <a href="http://www.research.ibm.com/bluegene">IBM Blue Gene</a> systems. 
@@ -75,7 +23,7 @@ Thus the <i>slurmd</i> daemon executes on one of the Blue Gene <i>Front End Node
 This single <i>slurmd</i> daemon provides (almost) all of the normal SLURM services 
 for every <i>base partition</i> on the system. </p>
 
-<h3>User Tools</h3>
+<h2>User Tools</h2>
 
 <p>The normal set of SLURM user tools: srun, scancel, sinfo, squeue and scontrol 
 provide all of the expected services except support for job steps. 
@@ -203,7 +151,7 @@ keys scroll the window containing the text information.</p>
  
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>System Administration</h3>
+<h2>System Administration</h2>
 
 <p>As of IBM's REV 2 driver SLURM must be built in 64bit mod.  
 This can be done by specifying <b>CFLAGS=-m64 CXX="g++ -m64"</b>.  
@@ -535,23 +483,8 @@ daemon serving as a front-end to those nodes is not responding (on
 non-Blue Gene systems, the slurmd actually does run on the compute 
 nodes, so the message is more meaningful there). </p>
 
-<p class="footer"><a href="#top">top</a></p></td>
-
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 14 October 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 14 October 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/checkpoint_plugins.html b/doc/html/checkpoint_plugins.shtml
similarity index 70%
rename from doc/html/checkpoint_plugins.html
rename to doc/html/checkpoint_plugins.shtml
index 3f062367c0b4fd583fe01e75891bcb855d6fd8d3..1313e86f07b11c392ce878672cb5ff7d015f8a92 100644
--- a/doc/html/checkpoint_plugins.html
+++ b/doc/html/checkpoint_plugins.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616"
-<meta name="LLNLRandRdate" content="10 July 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Job Checkpoint Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Job Checkpoint Plugin API</a></h2>
-
-<h3> Overview</h3>
+<!--#include virtual="header.txt"-->
+
+<h1><a name="top">SLURM Job Checkpoint Plugin API</a></h1>
+
+<h2> Overview</h2>
 <p> This document describes SLURM job checkpoint plugins and the API that defines 
 them. It is intended as a resource to programmers wishing to write their own SLURM 
 job checkpoint plugins. This is version 0 of the API.</p>
@@ -82,7 +30,7 @@ Note carefully, however, the versioning discussion below.</p>
 for a sample implementation of a SLURM job checkpoint plugin.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Data Objects</h3>
+<h2>Data Objects</h2>
 <p>The implementation must maintain (though not necessarily directly export) an 
 enumerated <span class="commandline">errno</span> to allow SLURM to discover 
 as practically as possible the reason for any failed API call. Plugin-specific enumerated 
@@ -100,7 +48,7 @@ SLURM_SUCCESS. </p>
 with each job step.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>API Functions</h3>
+<h2>API Functions</h2>
 <p>The following functions must appear. Functions which are not implemented should 
 be stubbed.</p>
 
@@ -192,27 +140,12 @@ the plugin should return SLURM_ERROR and set the error_code and error_msg to an
 appropriate value to indicate the reason for failure.</p>
                                                                                                                        
 
-<h3>Versioning</h3>
+<h2>Versioning</h2>
 <p> This document describes version 0 of the SLURM checkpoint API. Future 
 releases of SLURM may revise this API. A scheduler plugin conveys its ability 
 to implement a particular API version using the mechanism outlined for SLURM plugins.</p>
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 10 July 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 10 July 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/cons_res.html b/doc/html/cons_res.shtml
similarity index 72%
rename from doc/html/cons_res.html
rename to doc/html/cons_res.shtml
index 7c3e4e6cd305c059d98ec4e4ea56b85c3c203621..2dc4e3437b8e0e603d468056e94dfb4c42ae4439 100644
--- a/doc/html/cons_res.html
+++ b/doc/html/cons_res.shtml
@@ -1,58 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="13 May 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Consumable Resources</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">Consumable Resources in SLURM</a></h2>
+<!--#include virtual="header.txt"-->
+
+<h1><a name="top">Consumable Resources in SLURM</a></h1>
 
 <p>SLURM, using the default node allocation plug-in, allocates nodes to jobs in
 exclusive mode which means that even when all the resources within a node are
@@ -67,7 +15,7 @@ SLURM 0.5.0 and newer version of SLURM. Information on how to use
 this plug-in is described below.
 </p>
 
-<h3>Using CPU Consumable Resource Node Allocation Plugin</h3>
+<h2>Using CPU Consumable Resource Node Allocation Plugin</h2>
 
 <ol start=1 type=1>
  <li>This plug-in is available in SLURM 0.5.0 and newer version of SLURM</li>
@@ -94,7 +42,7 @@ this plug-in is described below.
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Example of Node Allocations Using Consumable Resource Plugin</h3>
+<h2>Example of Node Allocations Using Consumable Resource Plugin</h2>
 
 <p>The following example illustrates the different ways four jobs
 are allocated across a cluster using (1) SLURM's default allocation
@@ -137,7 +85,7 @@ there are processors to minimize interference by the kernel and daemons.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Using SLURM's Default Node Allocation (Non-shared Mode)</h3>
+<h2>Using SLURM's Default Node Allocation (Non-shared Mode)</h2>
 
 <p>The four jobs have been launched and 3 of the jobs are now
 pending, waiting to get resources allocated to them. Only Job 2 is running
@@ -178,7 +126,7 @@ cannot be shared with other jobs.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Using a Processor Consumable Resource Approach</h3>
+<h2>Using a Processor Consumable Resource Approach</h2>
 
 <p>The output of squeue shows that we
 have 3 out of the 4 jobs allocated and running. This is a 2 running job
@@ -259,23 +207,8 @@ The reason for that is if users have mpi//threaded/openMP
 programs that will take advantage of all the cpus within a node but only need
 one mpi process per node.</p>
 
-<p class="footer"><a href="#top">top</a></p></td>
-
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 13 May 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 13 May 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/documentation.html b/doc/html/documentation.html
deleted file mode 100644
index 577e4fbb61fe8a94880416554c1b675fdca2e5e1..0000000000000000000000000000000000000000
--- a/doc/html/documentation.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="2 November 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Documentation</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2> Documentation</h2>
-<h3>SLURM Users</h3>
-<ul>
-<li><a href="quickstart.html">Quick Start User Guide</a></li>
-<li><a href="http://www.llnl.gov/LCdocs/slurm">SLURM Reference Manual</a></li>
-<li><a href="bluegene.html">Blue Gene User and Administrator Guide</a></li>
-<li><a href="ibm.html">IBM AIX User and Administrator Guide</a></li>
-</ul>
-<h3>SLURM Administrators</h3>
-<ul>
-<li><a href="quickstart_admin.html">Quick Start Administrator Guide</a></li>
-<li><a href="cons_res.html">Consumable Resources Guide</a></li>
-<li><a href="bluegene.html">Blue Gene User and Administrator Guide</a></li>
-<li><a href="ibm.html">IBM AIX User and Administrator Guide</a></li>
-<li><a href="configurator.html">Configuration Tool</a></li>
-</ul>
-<h3>SLURM Developers</h3>
-<ul>
-<li><a href="programmer_guide.html">Programmer Guide</a></li>
-<li><a href="api.html">Application Programmer Interface (API) Guide</a></li>
-<li><a href="plugins.html">Plugin Programmer Guide</a></li>
-<li><a href="authplugins.html">Authentication Plugin Programmer Guide</a></li>
-<li><a href="checkpoint_plugins.html">Job Checkpoint Plugin Programmer Guild</a></li>
-<li><a href="jobcompplugins.html">Job Completion Logging Plugin Programmer Guide</a></li>
-<li><a href="selectplugins.html">Node Selection Plugin Programmer Guide</a></li>
-<li><a href="schedplugins.html">Scheduler Plugin Programmer Guide</a></li>
-<li><a href="switchplugins.html">Switch (Interconnect) Plugin Programmer Guide</a></li>
-<li><a href="maui.html">Maui Scheduler Integration Guide</a></li>
-<li><a href="mpiplugins.html">MPI Plugin Programmer Guide</a></li>
-</ul></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 2 November 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/documentation.shtml b/doc/html/documentation.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..43c04f466db7f62778f55f232d5397a686c151f9
--- /dev/null
+++ b/doc/html/documentation.shtml
@@ -0,0 +1,39 @@
+<!--#include virtual="header.txt"-->
+
+<h1> Documentation</h1>
+
+<h2>SLURM Users</h2>
+<ul>
+<li><a href="quickstart.shtml">Quick Start User Guide</a></li>
+<li><a href="http://www.llnl.gov/LCdocs/slurm">SLURM Reference Manual</a></li>
+<li><a href="bluegene.shtml">Blue Gene User and Administrator Guide</a></li>
+<li><a href="ibm.shtml">IBM AIX User and Administrator Guide</a></li>
+</ul>
+
+<h2>SLURM Administrators</h2>
+<ul>
+<li><a href="quickstart_admin.shtml">Quick Start Administrator Guide</a></li>
+<li><a href="cons_res.shtml">Consumable Resources Guide</a></li>
+<li><a href="bluegene.shtml">Blue Gene User and Administrator Guide</a></li>
+<li><a href="ibm.shtml">IBM AIX User and Administrator Guide</a></li>
+<li><a href="configurator.html">Configuration Tool</a></li>
+</ul>
+
+<h2>SLURM Developers</h2>
+<ul>
+<li><a href="programmer_guide.shtml">Programmer Guide</a></li>
+<li><a href="api.shtml">Application Programmer Interface (API) Guide</a></li>
+<li><a href="plugins.shtml">Plugin Programmer Guide</a></li>
+<li><a href="authplugins.shtml">Authentication Plugin Programmer Guide</a></li>
+<li><a href="checkpoint_plugins.shtml">Job Checkpoint Plugin Programmer Guild</a></li>
+<li><a href="jobcompplugins.shtml">Job Completion Logging Plugin Programmer Guide</a></li>
+<li><a href="selectplugins.shtml">Node Selection Plugin Programmer Guide</a></li>
+<li><a href="schedplugins.shtml">Scheduler Plugin Programmer Guide</a></li>
+<li><a href="switchplugins.shtml">Switch (Interconnect) Plugin Programmer Guide</a></li>
+<li><a href="maui.shtml">Maui Scheduler Integration Guide</a></li>
+<li><a href="mpiplugins.shtml">MPI Plugin Programmer Guide</a></li>
+</ul>
+
+<p style="text-align:center;">Last modified 2 November 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/download.html b/doc/html/download.html
deleted file mode 100644
index 574b2a14bf579b16bc7e8e4468e27c98173d55f2..0000000000000000000000000000000000000000
--- a/doc/html/download.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="20 November 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Download</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Download</h2>
-<p>
-SLURM source can be downloaded from <br>
-<a href="ftp://ftp.llnl.gov/pub/linux/slurm/">
-ftp://ftp.llnl.gov:/pub/linux/slurm</a><br>
-The latest stable release is version 0.6.</p>
-
-<p><b>NOTE:</b> This server will only download files to computers 
-on which it can perform a reverse DNS lookup for the IP address 
-issuing the request. 
-This is a LLNL site-wide policy for security purposes that we have 
-no control over. 
-Some firewalls prevent reverse DNS lookup, so you may need to download 
-the files to some computer outside of your firewall.</p>
-
-<p> Other software available for download includes
-<ul>
-<li><b>Test Suite (slurm-qa)</b><br>
-Includes a collection of about 150 functionality and stress tests for SLURM.
-NOTE: These tests are now within the main SLURM distribution in the 
-directory <i>testsuite/expect</i>.  
-For older versions of SLURM, the test suite may be downloaded from 
-<a href="ftp://ftp.llnl.gov/pub/linux/slurm-qa/">ftp://ftp.llnl.gov:/pub/linux/slurm-qa</a>
-</li>
-<li><b>PAM Modules (pam_slurm)</b><br>
-Pluggable Authentication Module (PAM) for restricting access to compute nodes 
-where SLURM performs resource management. Access to the node is restricted to 
-user root and users who have been allocated resources on that node. <br>
-pam_slurm is available for download from 
-<a href="ftp://ftp.llnl.gov/pub/linux/pam_slurm/">ftp://ftp.llnl.gov:/pub/linux/pam_slurm</a>
-</ul>
-<h2>Related Software</h2>
-<ul>
-<li>Authentication plugins</li>
-<ul>
-<li><b>Munge</b><br>
-In order to compile the "auth/munge" authentication plugin for SLURM, you will need
-to build and install Munge, available from 
-<a href="ftp://ftp.llnl.gov/pub/linux/munge/">ftp://ftp.llnl.gov:/pub/linux/munge</a>.
-</li> </ul>
-<li>Interconnect plugins</li>
-<ul>
-<li><b>QsNet</b><br>
-In order to build the "switch/elan" plugin for SLURM, you will need
-the <b>qsnetlibs</b> development libraries from 
-<a href="http://www.quadrics.com">Quadrics</a>. The Elan
-plugin also requires the <b>libelanhosts</b> library and
-a corresponding /etc/elanhosts configuration file, used to map
-hostnames to Elan IDs. The libelanhosts source is available from
-<a href="ftp://ftp.llnl.gov/pub/linux/libelanhosts/">ftp://ftp.llnl.gov:/pub/linux/libelanhosts</a>.
-</ul>
-<li>MPI versions supported</li>
-<ul>
-<li><a href="http://www.mpi-softtech.com/">ChaMPIon, MPI Software Technology</a></li>
-<li><a href="http://www.hp.com/go/mpi">HP-MPI</a></li>
-<li><a href="http://www.lam-mpi.org/">LAM/MPI</a></li>
-<li><a href="http://www-unix.mcs.anl.gov/mpi/mpich2/">MPICH2</a></li>
-<li><a href="http://www.myri.com/scs/">MPICH-GM</a></li>
-<li><a href="http://www.open-mpi.org">Open MPI</a></li>
-<li><a href="http://www.quadrics.com/">Quadrics MPI</a></li>
-</ul>
-<li>Schedulers</li>
-<ul>
-<li><a href="http://www.llnl.gov/LCdocs/dpcs/">Livermore Computing Resource Manager (LCRM/DPCS)</a></li>
-<li><a href="http://www.platform.com/">Load Sharing Facility (LSF)</a></li>
-<li><a href="http://www.supercluster.org/maui/">Maui Scheduler</a></li>
-<li><a href="http://www.clusterresources.com/pages/products/moab-cluster-suite.php">
-Moab Cluster Suite</a></li>
-</ul>
-</ul>
-</td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 20 November 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/download.shtml b/doc/html/download.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..089a0ce30a653509bec90e0eba7bd56109c07d15
--- /dev/null
+++ b/doc/html/download.shtml
@@ -0,0 +1,76 @@
+<!--#include virtual="header.txt"-->
+
+<h1>Download</h1>
+<p>
+SLURM source can be downloaded from <br>
+<a href="ftp://ftp.llnl.gov/pub/linux/slurm/">
+ftp://ftp.llnl.gov:/pub/linux/slurm</a><br>
+The latest stable release is version 0.6.</p>
+
+<p><b>NOTE:</b> This server will only download files to computers 
+on which it can perform a reverse DNS lookup for the IP address 
+issuing the request. 
+This is a LLNL site-wide policy for security purposes that we have 
+no control over. 
+Some firewalls prevent reverse DNS lookup, so you may need to download 
+the files to some computer outside of your firewall.</p>
+
+<p> Other software available for download includes
+<ul>
+<li><b>Test Suite (slurm-qa)</b><br>
+Includes a collection of about 150 functionality and stress tests for SLURM.
+NOTE: These tests are now within the main SLURM distribution in the 
+directory <i>testsuite/expect</i>.  
+For older versions of SLURM, the test suite may be downloaded from 
+<a href="ftp://ftp.llnl.gov/pub/linux/slurm-qa/">ftp://ftp.llnl.gov:/pub/linux/slurm-qa</a>
+</li>
+<li><b>PAM Modules (pam_slurm)</b><br>
+Pluggable Authentication Module (PAM) for restricting access to compute nodes 
+where SLURM performs resource management. Access to the node is restricted to 
+user root and users who have been allocated resources on that node. <br>
+pam_slurm is available for download from 
+<a href="ftp://ftp.llnl.gov/pub/linux/pam_slurm/">ftp://ftp.llnl.gov:/pub/linux/pam_slurm</a>
+</ul>
+<h1>Related Software</h1>
+<ul>
+<li>Authentication plugins</li>
+<ul>
+<li><b>Munge</b><br>
+In order to compile the "auth/munge" authentication plugin for SLURM, you will need
+to build and install Munge, available from 
+<a href="ftp://ftp.llnl.gov/pub/linux/munge/">ftp://ftp.llnl.gov:/pub/linux/munge</a>.
+</li> </ul>
+<li>Interconnect plugins</li>
+<ul>
+<li><b>QsNet</b><br>
+In order to build the "switch/elan" plugin for SLURM, you will need
+the <b>qsnetlibs</b> development libraries from 
+<a href="http://www.quadrics.com">Quadrics</a>. The Elan
+plugin also requires the <b>libelanhosts</b> library and
+a corresponding /etc/elanhosts configuration file, used to map
+hostnames to Elan IDs. The libelanhosts source is available from
+<a href="ftp://ftp.llnl.gov/pub/linux/libelanhosts/">ftp://ftp.llnl.gov:/pub/linux/libelanhosts</a>.
+</ul>
+<li>MPI versions supported</li>
+<ul>
+<li><a href="http://www.mpi-softtech.com/">ChaMPIon, MPI Software Technology</a></li>
+<li><a href="http://www.hp.com/go/mpi">HP-MPI</a></li>
+<li><a href="http://www.lam-mpi.org/">LAM/MPI</a></li>
+<li><a href="http://www-unix.mcs.anl.gov/mpi/mpich2/">MPICH2</a></li>
+<li><a href="http://www.myri.com/scs/">MPICH-GM</a></li>
+<li><a href="http://www.open-mpi.org">Open MPI</a></li>
+<li><a href="http://www.quadrics.com/">Quadrics MPI</a></li>
+</ul>
+<li>Schedulers</li>
+<ul>
+<li><a href="http://www.llnl.gov/LCdocs/dpcs/">Livermore Computing Resource Manager (LCRM/DPCS)</a></li>
+<li><a href="http://www.platform.com/">Load Sharing Facility (LSF)</a></li>
+<li><a href="http://www.supercluster.org/maui/">Maui Scheduler</a></li>
+<li><a href="http://www.clusterresources.com/pages/products/moab-cluster-suite.php">
+Moab Cluster Suite</a></li>
+</ul>
+</ul>
+
+<p style="text-align:center;">Last modified 20 November 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/faq.html b/doc/html/faq.shtml
similarity index 72%
rename from doc/html/faq.html
rename to doc/html/faq.shtml
index 1369e3f48bccc90c83a660347a9e6791f9910601..f904b202d3a6e4685f5b3ef125324758e01e8676 100644
--- a/doc/html/faq.html
+++ b/doc/html/faq.shtml
@@ -1,58 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="27 April 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:FAQ</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Frequently Asked Questions</h2>
+<h1>Frequently Asked Questions</h1>
 <ol>
 <li><a href="#comp">Why is my job/node in &quot;completing&quot; state?</a></li>
 <li><a href="#rlimit">Why do I see the error &quot;Can't propagate RLIMIT_...&quot;?</a></li>
@@ -198,23 +146,6 @@ satisfy the request, no lower priority job in that partition's queue
 will be considered as a backfill candidate. Any programmer wishing 
 to augment the existing code is welcome to do so. 
 
-<br>
-</td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 27 April 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p style="text-align:center;">Last modified 27 April 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/footer.txt b/doc/html/footer.txt
new file mode 100644
index 0000000000000000000000000000000000000000..37652cbd7c76f4d7e334be954fb4cb12c6dc969b
--- /dev/null
+++ b/doc/html/footer.txt
@@ -0,0 +1,12 @@
+</div>
+
+<div id="footer">
+For information about this page, contact
+<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.
+<br>
+<a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a>
+UCRL-WEB-217616
+</div>
+
+</div></body>
+</html>
diff --git a/doc/html/header.txt b/doc/html/header.txt
new file mode 100644
index 0000000000000000000000000000000000000000..52b0124898e3fce7670a529657bf33f389927a25
--- /dev/null
+++ b/doc/html/header.txt
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Pragma" content="no-cache">
+<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
+Linux clusters, high-performance computing, Livermore Computing">
+<meta name="LLNLRandR" content="UCRL-WEB-217616">
+<meta name="LLNLRandRdate" content="7 December 2005">
+<meta name="distribution" content="global">
+<meta name="description" content="Simple Linux Utility for Resource Management">
+<meta name="copyright"
+content="This document is copyrighted U.S.
+Department of Energy under Contract W-7405-Eng-48">
+<meta name="Author" content="Morris Jette">
+<meta name="email" content="jette1@llnl.gov">
+<meta name="Classification"
+content="DOE:DOE Web sites via organizational
+structure:Laboratories and Other Field Facilities">
+<title>Simple Linux Utility for Resource Management</title>
+<link href="slurmstyles.css" rel="stylesheet" type="text/css">
+</head>
+
+<body><div id="container">
+
+<div id="banner">
+<img src="slurm_banner_left.jpg" width="565" height="145" usemap="#Map_left" border=0
+	alt="Simple Linux Utility for Resource Management">
+<map name="Map_left">
+      <area shape="rect" coords="330,1,468,11"
+	href="http://www.llnl.gov/disclaimer.html">
+      <area shape="rect" coords="11,23,213,115" href="slurm.shtml">
+</map>
+<img src="slurm_banner_right.jpg" id="banner_right_img" width="138" height="100"
+	usemap="#Map_right" border=0>
+<map name="Map_right">
+      <area shape="rect" coords="0,0,138,100" href="../">
+</map>
+</div>
+
+<div id="navigation">
+<h1>Navigation</h1>
+<a href="slurm.shtml" class="nav" align="center">Home</a>
+<h2>About</h2>
+<ul>
+	  <li><a href="overview.shtml" class="nav">Overview</a></li>
+	  <li><a href="news.shtml" class="nav">What's New</a></li>
+	  <li><a href="publications.shtml" class="nav">Publications</a></li>
+	  <li><a href="team.shtml" class="nav">SLURM Team</a></li>
+</ul>
+<h2>Using</h2>
+<ul>
+	  <li><a href="documentation.shtml" class="nav">Documentation</a></li>
+	  <li><a href="faq.shtml" class="nav">FAQ</a></li>
+	  <li><a href="help.shtml" class="nav">Getting Help</a></li>
+	  <li><a href="mail.shtml"  class="nav">Mailing Lists</a></p>
+</ul>
+<h2>Installing</h2>
+<ul>
+	  <li><a href="platforms.shtml" class="nav">Platforms</a></li>
+	  <li><a href="download.shtml" class="nav">Download</a></li>
+	  <li><a href="quickstart_admin.shtml" class="nav">Guide</a></li>
+</ul>
+</div>
+
+<div id="content">
+
diff --git a/doc/html/help.html b/doc/html/help.html
deleted file mode 100644
index d90152dd825b74cd831831e04b6625bb1ba2ac56..0000000000000000000000000000000000000000
--- a/doc/html/help.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="25 April 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Help</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Getting Help</h2>
-<p>Try the following steps if you are having problems with SLURM:</p>
-<ol>
-<li>See if the problem is addressed in the <a href="faq.html">SLURM FAQ</a>.</li>
-<li>For run-time problems, try running the command or daemons in verbose mode 
-(<span class="commandline">-v</span> option), and see if additional information 
-helps you resolve the problem.</li>
-<li>Customers of HP, Linux NetworX, and PathScale should contact their support staff.</li>
-<li>Send a detailed description of the problem and logs to 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</li>
-</ol></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 25 April 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/help.shtml b/doc/html/help.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..0533237e535bb801a45cc46dff7021fba045281c
--- /dev/null
+++ b/doc/html/help.shtml
@@ -0,0 +1,17 @@
+<!--#include virtual="header.txt"-->
+
+<h1>Getting Help</h1>
+<p>Try the following steps if you are having problems with SLURM:</p>
+<ol>
+<li>See if the problem is addressed in the <a href="faq.html">SLURM FAQ</a>.</li>
+<li>For run-time problems, try running the command or daemons in verbose mode 
+(<span class="commandline">-v</span> option), and see if additional information 
+helps you resolve the problem.</li>
+<li>Customers of HP, Linux NetworX, and PathScale should contact their support staff.</li>
+<li>Send a detailed description of the problem and logs to 
+<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</li>
+</ol>
+
+<p style="text-align:center;">Last modified 25 April 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/ibm.html b/doc/html/ibm.shtml
similarity index 51%
rename from doc/html/ibm.html
rename to doc/html/ibm.shtml
index 134e638a5d1bd2665564afa0393f004b55d18218..313d027e224762c5e4c609543e7b576a03e5c9d5 100644
--- a/doc/html/ibm.html
+++ b/doc/html/ibm.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
+<h1>IBM AIX User and Administrator Guide</h1>
 
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="31 August 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:IBM AIX User and Administrator Guide</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>IBM AIX User and Administrator Guide</h2>
-
-<h3>Overview</h3>
+<h2>Overview</h2>
 
 <p>This document describes the unique features of SLURM on the
 IBM AIX computers with a Federation switch.
@@ -62,7 +10,7 @@ You should be familiar with the SLURM's mode of operation on Linux clusters
 before studying the relatively few differences in IBM system operation 
 described in this document.</p>
 
-<h3>User Tools</h3>
+<h2>User Tools</h2>
 
 <p>The normal set of SLURM user tools: srun, scancel, sinfo, smap, squeue and scontrol 
 provide all of the expected services except support for job steps. 
@@ -89,7 +37,7 @@ The format of SLURM_NETWORK is "network.[protocol],[type],[usage],[mode]".
 For example "network.mpi,en0,shared,ip". 
 See LoadLeveler documentation for more details.</p>
 
-<h3>Checkpoint</h3>
+<h2>Checkpoint</h2>
 
 <p>SLURM supports checkpoint via poe. 
 In order to enable checkpoint, the shell executing the poe command must 
@@ -108,7 +56,7 @@ To initiate a checkpoint in which the job step will terminate afterwards,
 use the command: <br>
 <b>scontrol check vacate <i>job_id.step_id</i></b></p>
 
-<h3>System Administration</h3>
+<h2>System Administration</h2>
 
 <p>Three unique components are required to use SLURM on an IBM system.
 <ol>
@@ -135,23 +83,8 @@ Until this last issue is resolved, use of SLURM on an IBM AIX system
 should not be viewed as a supported configuration (at least outside 
 of LLNL, which established a contract with IBM for this purpose).</p>
 
-<p class="footer"><a href="#top">top</a></p></td>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 31 August 2005</p></td>
 
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 31 August 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/jobacctplugins.html b/doc/html/jobacctplugins.shtml
similarity index 77%
rename from doc/html/jobacctplugins.html
rename to doc/html/jobacctplugins.shtml
index 294c894404c8e9ae9a901cc1f8c1a9df08348a4e..f8a96ed6da296df063503f2b1802e5ed2da81798 100644
--- a/doc/html/jobacctplugins.html
+++ b/doc/html/jobacctplugins.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616"
-<meta name="LLNLRandRdate" content="23 July 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="Author" content="Andy Riebs">
-<meta name="email" content="andy.riebs@hp.com">
-<meta name="copyright"
-content="Job accounting description
-Copyright (C) 2005 Hewlett-Packard Development Company L.P.">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management: Job Accounting Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt="">
-<p><a href="slurm.html" class="nav" align="center">Home</a>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Job Accounting Plugin API</a></h2>
-
-<h3> Overview</h3>
+<!--#include virtual="header.txt"-->
+
+<h1><a name="top">SLURM Job Accounting Plugin API</a></h1>
+
+<h2> Overview</h2>
 <p> This document describes SLURM job accounting plugins and the API that
 defines them. It is intended as a resource to programmers wishing to write
 their own SLURM job accounting plugins. This is version 0 of the API.
@@ -87,7 +35,7 @@ for a sample implementation of a SLURM job accounting plugin.
 <p class="footer"><a href="#top">top</a>
 
 
-<h3>API Functions</h3>
+<h2>API Functions</h2>
 
 The job accounting API uses hooks in four distinct processes:
 <p>
@@ -299,7 +247,7 @@ should return
 <p class="footer"><a href="#top">top</a>
 
 
-<h3>Job Accounting Messages</h3>
+<h2>Job Accounting Messages</h2>
 <p>If messages are passed between components of a job accounting plugin,
 the <span class="commandline">slurm_send_recv</span> calls must be
 used.
@@ -313,7 +261,7 @@ invokes <span class="commandline">slurm_jobacct_process_message()</span>.
 <p class="footer"><a href="#top">top</a>
 
 
-<h3>Parameters</h3>
+<h2>Parameters</h2>
 <p>Rather than proliferate slurm.conf parameters for new or evolved
 plugins, the job accounting API counts on three parameters:
 <dl>
@@ -331,28 +279,13 @@ should be specified in a comma-separated list.
 <p class="footer"><a href="#top">top</a>
 
 
-<h3>Versioning</h3>
+<h2>Versioning</h2>
 <p> This document describes version 0 of the SLURM Job Accounting API. Future 
 releases of SLURM may revise this API. A job accounting plugin conveys its
 ability to implement a particular API version using the mechanism outlined
 for SLURM plugins.
-<p class="footer"><a href="#top">top</a></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 23 June 2005</td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a>
+
+<p style="text-align:center;">Last modified 23 June 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/jobcompplugins.html b/doc/html/jobcompplugins.shtml
similarity index 61%
rename from doc/html/jobcompplugins.html
rename to doc/html/jobcompplugins.shtml
index 20f184fcf5948b6e6e330ac8cf717c3fb5434c69..93f21b5bc070e429d4f43c35431cc23f64301048 100644
--- a/doc/html/jobcompplugins.html
+++ b/doc/html/jobcompplugins.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
+<h1><a name="top">SLURM Job Completion Logging Plugin API</a></h1>
 
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616"
-<meta name="LLNLRandRdate" content="11 July 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Job Completion Logging Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Job Completion Logging Plugin API</a></h2>
-
-<h3> Overview</h3>
+<h2> Overview</h2>
 <p> This document describes SLURM job completion logging plugins and the API that defines 
 them. It is intended as a resource to programmers wishing to write their own SLURM 
 job completion logging plugins. This is version 0 of the API.</p>
@@ -81,7 +29,7 @@ Note carefully, however, the versioning discussion below.</p>
 for sample implementations of a SLURM job completion logging plugin.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Data Objects</h3>
+<h2>Data Objects</h2>
 <p>The implementation must maintain (though not necessarily directly export) an 
 enumerated <span class="commandline">errno</span>  to allow SLURM to discover 
 as practically as possible the reason for any failed API call. Plugin-specific enumerated 
@@ -103,7 +51,7 @@ the initial value of any errno, prior to any error condition arising, should be
 SLURM_SUCCESS. </p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>API Functions</h3>
+<h2>API Functions</h2>
 <p>The following functions must appear. Functions which are not implemented should 
 be stubbed.</p>
 
@@ -144,27 +92,12 @@ specific error code.</p>
 or NULL if no description found in this plugin.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Versioning</h3>
+<h2>Versioning</h2>
 <p> This document describes version 0 of the SLURM job completion API. Future 
 releases of SLURM may revise this API. A job completion plugin conveys its ability 
 to implement a particular API version using the mechanism outlined for SLURM plugins.</p>
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 10 July 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 10 July 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/mail.html b/doc/html/mail.html
deleted file mode 100644
index 8dbcbf45c14637071aa34e297de6bcfb58d6f2d2..0000000000000000000000000000000000000000
--- a/doc/html/mail.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="13 May 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Mailing Lists</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Mailing Lists</h2>
-<p>We maintain two SLURM mailing lists: 
-<ul>
-<li><b>slurm-announce</b> is designated for communications about SLURM releases.</li>
-<li><b>slurm-dev</b> is designated for communications to SLURM developers.</li>
-</ul>
-To subscribe to either list, send a message to 
-<a href="mailto:majordomo@lists.llnl.gov">majordomo@lists.llnl.gov</a> with the body of the 
-message containing the word "subscribe" followed by the list name and your e-mail address 
-(if not the sender). For example: <br>
-<i>subscribe slurm-announce bob@yahoo.com</i></p>
-</td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 13 May 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/mail.shtml b/doc/html/mail.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..b22a511cd037bf2cbe15176bd0a0a5cf672ff715
--- /dev/null
+++ b/doc/html/mail.shtml
@@ -0,0 +1,17 @@
+<!--#include virtual="header.txt"-->
+
+<h1>Mailing Lists</h1>
+<p>We maintain two SLURM mailing lists: 
+<ul>
+<li><b>slurm-announce</b> is designated for communications about SLURM releases.</li>
+<li><b>slurm-dev</b> is designated for communications to SLURM developers.</li>
+</ul>
+To subscribe to either list, send a message to 
+<a href="mailto:majordomo@lists.llnl.gov">majordomo@lists.llnl.gov</a> with the body of the 
+message containing the word "subscribe" followed by the list name and your e-mail address 
+(if not the sender). For example: <br>
+<i>subscribe slurm-announce bob@yahoo.com</i></p>
+
+<p style="text-align:center;">Last modified 13 May 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/maui.html b/doc/html/maui.shtml
similarity index 50%
rename from doc/html/maui.html
rename to doc/html/maui.shtml
index 9760f07f8ec503f8cd3d81f938c2e6b668a3875f..c152a3ac94d022c34cdbd23f91bf0afc2b8fb01e 100644
--- a/doc/html/maui.html
+++ b/doc/html/maui.shtml
@@ -1,59 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="24 January 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Maui Scheduler Integration Guide</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Maui Scheduler Integration Guide</h2>
-<h3>Overview</h3>
+<h1>Maui Scheduler Integration Guide</h1>
+<h2>Overview</h2>
 <p>Maui configuration is quite complicated and is really beyond the scope
 of any documents we could supply with SLURM.  We don't intend SLURM to
 be a "wrapper" for Maui, or to subordinate Maui.  The best (and
@@ -62,7 +10,7 @@ documents at the site of Maui's developers:
 <a href="http://www.clusterresources.com/products/maui/docs/mauiadmin.shtml">
 http://www.clusterresources.com/products/maui/docs/mauiadmin.shtml</a>.
 
-<h3>Configuration</h3>
+<h2>Configuration</h2>
 <p>First, download the Maui scheduler kit from their web site
 <a href="http://www.clusterresources.com/products/maui">
 http://www.clusterresources.com/products/maui</a>. 
@@ -138,22 +86,8 @@ set path=(/root/MAUI/maui-3.2.6p9/bin $path)
 setenv MAUIHOMEDIR /root/MAUI/maui-3.2.6p9
 </pre>
 
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 24 January 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 24 January 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/mpiplugins.html b/doc/html/mpiplugins.shtml
similarity index 58%
rename from doc/html/mpiplugins.html
rename to doc/html/mpiplugins.shtml
index 63a1c8abbe529165c4c7cff33d14bd2014fad541..38c73df9f45ab1b4b87641ee67952f67483030f3 100644
--- a/doc/html/mpiplugins.html
+++ b/doc/html/mpiplugins.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616"
-<meta name="LLNLRandRdate" content="6 December 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:MPI Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM MPI Plugin API</a></h2>
-
-<h3> Overview</h3>
+<!--#include virtual="header.txt"-->
+
+<h1><a name="top">SLURM MPI Plugin API</a></h1>
+
+<h2> Overview</h2>
 <p> This document describes SLURM MPI selection plugins and the API that defines 
 them. It is intended as a resource to programmers wishing to write their own SLURM 
 node selection plugins. This is version 0 of the API.</p>
@@ -96,7 +44,7 @@ which will set configure the slurmd to use the correct mpi as well to interact w
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Data Objects</h3>
+<h2>Data Objects</h2>
 <p> These functions are expected to read and/or modify data structures directly in 
 the slurmd daemon's and srun memory. Slurmd is a multi-threaded program with independent 
 read and write locks on each data structure type. Thererfore the type of operations 
@@ -104,7 +52,7 @@ permitted on various data structures is identified for each function.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>API Functions</h3>
+<h2>API Functions</h2>
 <p>The following functions must appear. Functions which are not implemented should 
 be stubbed.</p>
 
@@ -145,7 +93,7 @@ the plugin should return SLURM_ERROR, causing slurmctld to exit.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Versioning</h3>
+<h2>Versioning</h2>
 <p> This document describes version 0 of the SLURM node selection API. Future 
 releases of SLURM may revise this API. A node selection plugin conveys its ability 
 to implement a particular API version using the mechanism outlined for SLURM plugins. 
@@ -153,23 +101,8 @@ In addition, the credential is transmitted along with the version number of the
 plugin that transmitted it. It is at the discretion of the plugin author whether 
 to maintain data format compatibility across different versions of the plugin.</p>
 
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 6 December 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 6 December 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/news.html b/doc/html/news.html
deleted file mode 100644
index a724207cd12c4219e8a33c87389881289c3f18ec..0000000000000000000000000000000000000000
--- a/doc/html/news.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="6 December 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:What's New</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>What's New</h2>
-
-<h3>Index</h3>
-<ul>
-<li><a href="#04">SLURM Version 0.4, January 2005</a></li>
-<li><a href="#05">SLURM Version 0.5, July 2005</a></li>
-<li><a href="#06">SLURM Version 0.6, September 2005</a></li>
-<li><a href="#10">SLURM Version 1.0, January 2006</a></li>
-<li><a href="#11">SLURM Version 1.1, May 2006</a></li>
-<li><a href="#12">SLURM Version 1.2 and beyond</a></li>
-</ul>
-
-<h3><a name="04">Major Updates in SLURM Version 0.4</a></h3>
-<p>SLURM Version 0.4 became available in January 2005. 
-Major enhancements included: 
-<ul>
-<li>Support for <a href="http://www.platform.com/">Load Sharing Facility (LSF)</a></li>
-<li>Add support for <a href="http://www.myri.com/scs/">MPICH-GM</a>
-(<a href="http:www.myri.com/">Myricom's</a> version of MPI).</li>
-<li>Support for the IBM AIX operating system.</li>
-<li>Support for the IBM 
-<a href="http://www.research.ibm.com/bluegene/">IBM BlueGene</a> system.</li>
-<li>Support for dependent jobs.</li>
-<li>Support for job account numbers.</li>
-<li>Add "reason"  field to show what pending jobs are waiting for.</li>
-<li>New graphical user interface, smap.</li>
-</ul>
-
-<h3><a name="05">Major Updates in SLURM Version 0.5</a></h3>
-<p>SLURM Version 0.5 became available in July 2005.
-Major enhancements included:
-<ul>
-<li>Moved slurm process tracking options to plugin (ProctrackType).</li>
-<li>Support for the IBM Federation switch.</li>
-<li>Manage consumable resources</li>
-<li>Perform job accounting (record resource utilization).</li>
-<li>Added BlueGene bglblock freeing tool, sfree.</li>
-<li>Added AIX checkpoint plugin (CheckpointType).</li>
-</ul>
-
-<h3><a name="06">Major Updates in SLURM Version 0.6</a></h3>
-<p>SLURM Version 0.6 became available in September 2005.
-Major enhancements include:
-<ul>
-<li>Support for Infiniband</li>
-<li>Support for configurable resource limit propagation.</li>
-<li>MPI support moved into plugin (substantive configuration changes required for MPICH-GM).</li>
-<li>Srun options can be specified in job script (#SLURM ...)</li>
-<li>Names (not just numbers) for job step identification.</li>
-</ul>
-
-<h3><a name="10">Major Updates in SLURM Version 1.0</a></h3>
-<p>We expect to make SLURM Version 1.0 available in January 2006.
-Major enhancements include:
-<ul>
-<li>I/O streams for all tasks on a node are transmitted through one pair of
-sockets instead of distinct sockets for each task. This improves performance
-and scalability.</li>
-<li>Resource management supported to the core level on a node.</li>
-<li>Nodes can be in multiple partitions, providing more flexibility in
-managing the SLURM partitions as queues.</li>
-<li>Support for task communication/synchronization primitives (PMI).</li>
-<li>E-mail notification on job state changes.</li>
-<li>Better control over task distribution.</li>
-<li>User control of job prioritization via <i>nice</i> option.</li>
-<li>Web-based <a href="configurator.html">configuration tool</a>.</li>
-</ul>
-
-<h3><a name="11">Major Updates in SLURM Version 1.1</a></h3>
-<p>We expect to make SLURM Version 1.1 available in May 2006.
-Major enhancements include:
-<ul>
-<li>Communications enhancements, validated up to 16,384 node clusters.</li>
-<li>Preempt/resume jobs per scheduler directives.</li>
-</ul>
-
-<h3><a name="12">Major Updates in SLURM Version 1.2 and beyond</a></h3>
-<p> Detailed plans for release dates and contents of future SLURM releases have 
-not been finalized. Anyone desiring to perform SLURM development should notify
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>
-to coordinate activies. Future development plans includes:
-<ul>
-<li>Permit resource allocations (jobs) to change size.</li>
-<li>Enforce CPU and memory limits by job.</li>
-<li>Convert state save functions to plugins for use of various databases.</li>
-<li>Develop Perl API to SLURM.</li>
-<li>Add Kerberos credential support including credential forwarding and refresh.</li>
-</ul></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 6 December 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/news.shtml b/doc/html/news.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..af7f37e8840afa19588ca1dc809145986c961d5e
--- /dev/null
+++ b/doc/html/news.shtml
@@ -0,0 +1,95 @@
+<!--#include virtual="header.txt"-->
+
+<h1>What's New</h1>
+
+<h2>Index</h2>
+<ul>
+<li><a href="#04">SLURM Version 0.4, January 2005</a></li>
+<li><a href="#05">SLURM Version 0.5, July 2005</a></li>
+<li><a href="#06">SLURM Version 0.6, September 2005</a></li>
+<li><a href="#10">SLURM Version 1.0, January 2006</a></li>
+<li><a href="#11">SLURM Version 1.1, May 2006</a></li>
+<li><a href="#12">SLURM Version 1.2 and beyond</a></li>
+</ul>
+
+<h2><a name="04">Major Updates in SLURM Version 0.4</a></h2>
+<p>SLURM Version 0.4 became available in January 2005. 
+Major enhancements included: 
+<ul>
+<li>Support for <a href="http://www.platform.com/">Load Sharing Facility (LSF)</a></li>
+<li>Add support for <a href="http://www.myri.com/scs/">MPICH-GM</a>
+(<a href="http:www.myri.com/">Myricom's</a> version of MPI).</li>
+<li>Support for the IBM AIX operating system.</li>
+<li>Support for the IBM 
+<a href="http://www.research.ibm.com/bluegene/">IBM BlueGene</a> system.</li>
+<li>Support for dependent jobs.</li>
+<li>Support for job account numbers.</li>
+<li>Add "reason"  field to show what pending jobs are waiting for.</li>
+<li>New graphical user interface, smap.</li>
+</ul>
+
+<h2><a name="05">Major Updates in SLURM Version 0.5</a></h2>
+<p>SLURM Version 0.5 became available in July 2005.
+Major enhancements included:
+<ul>
+<li>Moved slurm process tracking options to plugin (ProctrackType).</li>
+<li>Support for the IBM Federation switch.</li>
+<li>Manage consumable resources</li>
+<li>Perform job accounting (record resource utilization).</li>
+<li>Added BlueGene bglblock freeing tool, sfree.</li>
+<li>Added AIX checkpoint plugin (CheckpointType).</li>
+</ul>
+
+<h2><a name="06">Major Updates in SLURM Version 0.6</a></h2>
+<p>SLURM Version 0.6 became available in September 2005.
+Major enhancements include:
+<ul>
+<li>Support for Infiniband</li>
+<li>Support for configurable resource limit propagation.</li>
+<li>MPI support moved into plugin (substantive configuration changes required for MPICH-GM).</li>
+<li>Srun options can be specified in job script (#SLURM ...)</li>
+<li>Names (not just numbers) for job step identification.</li>
+</ul>
+
+<h2><a name="10">Major Updates in SLURM Version 1.0</a></h2>
+<p>We expect to make SLURM Version 1.0 available in January 2006.
+Major enhancements include:
+<ul>
+<li>I/O streams for all tasks on a node are transmitted through one pair of
+sockets instead of distinct sockets for each task. This improves performance
+and scalability.</li>
+<li>Resource management supported to the core level on a node.</li>
+<li>Nodes can be in multiple partitions, providing more flexibility in
+managing the SLURM partitions as queues.</li>
+<li>Support for task communication/synchronization primitives (PMI).</li>
+<li>E-mail notification on job state changes.</li>
+<li>Better control over task distribution.</li>
+<li>User control of job prioritization via <i>nice</i> option.</li>
+<li>Web-based <a href="configurator.html">configuration tool</a>.</li>
+</ul>
+
+<h2><a name="11">Major Updates in SLURM Version 1.1</a></h2>
+<p>We expect to make SLURM Version 1.1 available in May 2006.
+Major enhancements include:
+<ul>
+<li>Communications enhancements, validated up to 16,384 node clusters.</li>
+<li>Preempt/resume jobs per scheduler directives.</li>
+</ul>
+
+<h2><a name="12">Major Updates in SLURM Version 1.2 and beyond</a></h2>
+<p> Detailed plans for release dates and contents of future SLURM releases have 
+not been finalized. Anyone desiring to perform SLURM development should notify
+<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>
+to coordinate activies. Future development plans includes:
+<ul>
+<li>Permit resource allocations (jobs) to change size.</li>
+<li>Enforce CPU and memory limits by job.</li>
+<li>Convert state save functions to plugins for use of various databases.</li>
+<li>Develop Perl API to SLURM.</li>
+<li>Add Kerberos credential support including credential forwarding and refresh.</li>
+</ul>
+
+
+<p style="text-align:center;">Last modified 6 December 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/overview.html b/doc/html/overview.shtml
similarity index 65%
rename from doc/html/overview.html
rename to doc/html/overview.shtml
index d13ce1f4527eadc7cb74a318806992b126e6a570..6eb69d96957ae25fa27c47d07714579e4cc21a30 100644
--- a/doc/html/overview.html
+++ b/doc/html/overview.shtml
@@ -1,58 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="7 December 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Overview</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">Overview</a></h2>
+<!--#include virtual="header.txt"-->
+
+<h1><a name="top">Overview</a></h1>
 <p>The Simple Linux Utility for Resource Management (SLURM) is an open source,
 fault-tolerant, and highly scalable cluster management and job scheduling system 
 for large and small Linux clusters. SLURM requires no kernel modifications for
@@ -72,7 +20,7 @@ work.</p>
 Linux NetworX distributes SLURM as a component in their ClusterWorX software.
 HP distributes and supports SLURM as a component in their XC System Software.</p>
 
-<h3>Architecture</h3>
+<h2>Architecture</h2>
 <p>SLURM has a centralized manager, <b>slurmctld</b>, to monitor resources and 
 work. There may also be a backup manager to assume those responsibilities in the 
 event of failure. Each compute server (node) has a <b>slurmd</b> daemon, which 
@@ -84,8 +32,11 @@ The <b>smap</b> command graphically reports system and job status including
 network topology. There is also an administrative 
 tool <b>scontrol</b> available to monitor and/or modify configuration and state 
 information. APIs are available for all functions.</p>
-<p><img src="arch.gif" width="600"></p>
-<p><b>Figure 1. SLURM components</b></p>
+
+<div class="figure">
+  <img src="arch.gif" width="600"><br />
+  Figure 1. SLURM components
+</div>
 
 <p>SLURM has a general-purpose plugin mechanism available to easily support various 
 infrastructure. This permits a wide variety of SLURM configurations using a 
@@ -139,12 +90,15 @@ a job is assigned a set of nodes, the user is able to initiate parallel work in
 the form of job steps in any configuration within the allocation. For instance,
 a single job step may be started that utilizes all nodes allocated to the job,
 or several job steps may independently use a portion of the allocation.</p>
-<p><img src="entities.gif" width="291" height="218">
-<p><b>Figure 2. SLURM entities</b></p>
+
+<div class="figure">
+  <img src="entities.gif" width="291" height="218"><br />
+  Figure 2. SLURM entities
+</div>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Configurability</h3>
+<h2>Configurability</h2>
 <p>Node state monitored include: count of processors, size of real memory, size 
 of temporary disk space, and state (UP, DOWN, etc.). Additional node information 
 includes weight (preference in being allocated work) and features (arbitrary information 
@@ -190,22 +144,7 @@ PartitionName=debug Nodes=lx[0003-0030] State=UP    Default=YES
 PartitionName=class Nodes=lx[0031-0040] AllowGroups=students
 PartitionName=batch Nodes=lx[0041-9999] MaxTime=UNLIMITED MaxNodes=4096
 </pre>
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 7 December 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+
+<p style="text-align:center;">Last modified 7 December 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/platforms.html b/doc/html/platforms.html
deleted file mode 100644
index 6a592dd5bca884c65d5825c708c6ab74fd69b540..0000000000000000000000000000000000000000
--- a/doc/html/platforms.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="4 August 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Platforms</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Platforms</h2>
-<h3>Operating Systems</h3>
-<ul>
-<li><b>AIX</b>&#151;SLURM support for AIX is available in version 0.4.</li>
-<li><b>Blue Gene</b>&#151;SLURM support for IBM's Blue Gene system is available 
-in version 0.4.</li>
-<li><b>Linux</b>&#151;SLURM has been thoroughly tested on Red Hat Linux using 
-both IA32 and IA64. We anticipate SLURM functioning properly on other Linux distributions 
-as well.</li>
-<li><b>Other</b>&#151;SLURM ports to other systems will be gratefully accepted.</li>
-</ul>
-<h3>Interconnects</h3>
-<ul>
-<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 is available 
-in version 0.5.</li>
-<li><b>Infiniband</b>&#151;Infiniband support is available in version 0.6.</li>
-<li><b>Myrinet</b>&#151;Myrinet and MPICH-GM are support is available in version
-0.4</li>
-<li><b>Quadrics Elan</b>&#151;SLURM support for Quadrics Elan 3 and Elan 4 switches 
-are available in all versions of SLURM and have been thoroughly tested.</li>
-<li><b>Other</b>&#151;SLURM ports to other systems will be gratefully accepted.</li>
-</ul></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 4 August 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/platforms.shtml b/doc/html/platforms.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..c72ab52da214d7ddd0200278670a69bcff0202e3
--- /dev/null
+++ b/doc/html/platforms.shtml
@@ -0,0 +1,30 @@
+<!--#include virtual="header.txt"-->
+
+<h1>Platforms</h1>
+<h2>Operating Systems</h2>
+<ul>
+<li><b>AIX</b>&#151;SLURM support for AIX is available in version 0.4.</li>
+<li><b>Blue Gene</b>&#151;SLURM support for IBM's Blue Gene system is available 
+in version 0.4.</li>
+<li><b>Linux</b>&#151;SLURM has been thoroughly tested on Red Hat Linux using 
+both IA32 and IA64. We anticipate SLURM functioning properly on other Linux distributions 
+as well.</li>
+<li><b>Other</b>&#151;SLURM ports to other systems will be gratefully accepted.</li>
+</ul>
+<h2>Interconnects</h2>
+<ul>
+<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 is available 
+in version 0.5.</li>
+<li><b>Infiniband</b>&#151;Infiniband support is available in version 0.6.</li>
+<li><b>Myrinet</b>&#151;Myrinet and MPICH-GM are support is available in version
+0.4</li>
+<li><b>Quadrics Elan</b>&#151;SLURM support for Quadrics Elan 3 and Elan 4 switches 
+are available in all versions of SLURM and have been thoroughly tested.</li>
+<li><b>Other</b>&#151;SLURM ports to other systems will be gratefully accepted.</li>
+</ul>
+
+<p style="text-align:center;">Last modified 4 August 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/plugins.html b/doc/html/plugins.shtml
similarity index 65%
rename from doc/html/plugins.html
rename to doc/html/plugins.shtml
index 40a3aee67f09cf463e7e767bf4399be1bf86f4a4..7e0c45c5f3bbcd31851073f44ab3c8de58688d96 100644
--- a/doc/html/plugins.html
+++ b/doc/html/plugins.shtml
@@ -1,64 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="9 July 2004">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Plugin API</a></h2>
-<h3>Overview</h3>
+<h1><a name="top">SLURM Plugin API</a></h1>
+<h2>Overview</h2>
 <p>A SLURM plugin is a dynamically linked code object which is loaded explicitly 
 at run time by the SLURM libraries. A plugin provides a customized implementation 
 of a well-defined API connected to tasks such as authentication, interconnect 
 fabric, and task scheduling.</p>
-<h3>Identification</h3>
+<h2>Identification</h2>
 <p>A SLURM plugin identifies itself by a short character string formatted similarly 
 to a MIME type: <i>&lt;major&gt;/&lt;minor&gt;</i>. The major type identifies 
 which API the plugin implements. The minor type uniquely distinguishes a plugin 
@@ -66,7 +14,7 @@ from other plugins that implement that same API, by such means as the intended
 platform or the internal algorithm. For example, a plugin to interface to the 
 Maui scheduler would give its type as &quot;sched/maui.&quot; It would implement 
 the SLURM Scheduler API.</p>
-<h3>Versioning</h3>
+<h2>Versioning</h2>
 <p>SLURM plugin version numbers comprise a major and minor revision number. As 
 SLURM evolves, changes to the individual plugin APIs may be necessary to implement 
 new features. The major number identifies the version of the applicable API that 
@@ -86,7 +34,7 @@ and denotes revisions or upgrades particular to that implementation. If two or
 more plugins of the same type are provided in an installation, the plugin with 
 the highest minor revision will be selected.</p>
 <p class="footer"><a href="#top">top</a></p>
-<h3>Data Objects</h3>
+<h2>Data Objects</h2>
 <p>A plugin must define and export the following symbols:</p>
 <ul>
 <li><span class="commandline">char plugin_type[]<br>
@@ -114,7 +62,7 @@ rounded to the next lowest 1,000. Only the major version number of this symbol
 is significant.</li>
 </ul>
 <p class="footer"><a href="#top">top</a></p>
-<h3>API Functions</h3>
+<h2>API Functions</h2>
 <p class="commandline">int init (void);</p>
 <p style="margin-left:.2in"><b>Description</b>: If present, this function is called 
 just after the plugin is loaded. This allows the plugin to perform any global 
@@ -137,12 +85,12 @@ before the SLURM <span class="commandline">plugininit()</span>, and the SLURM
 <p>The functions need not appear. The plugin may provide either <span class="commandline">init()</span> 
 or <span class="commandline">fini()</span> or both.</p>
 <p class="footer"><a href="#top">top</a></p>
-<h3>Thread Safety</h3>
+<h2>Thread Safety</h2>
 <p>SLURM is a multithreaded application. The SLURM plugin library may exercise 
 the plugin functions in a re-entrant fashion. It is the responsibility of the 
 plugin author to provide the necessarily mutual exclusion and synchronization 
 in order to avoid the pitfalls of re-entrant code.</p>
-<h3>Run-time Support</h3>
+<h2>Run-time Support</h2>
 <p>The standard system libraries are available to the plugin. The SLURM libraries 
 are also available and plugin authors are encouraged to make use of them rather 
 than develop their own substitutes. Plugins should use the SLURM log to print 
@@ -151,29 +99,15 @@ error messages.</p>
 needed for correct operation. Plugins will not load if their dependent libraries 
 are not available, so it is the installer's job to make sure the specified libraries 
 are available.</p>
-<h3>Performance</h3>
+<h2>Performance</h2>
 <p>All plugin functions are expected to execute very quickly. If any function 
 entails delays (e.g. transations with other systems), it should be written to 
 utilize a thread for that functionality. This thread may be created by the 
 <span class="commandline">init()</span> function and deleted by the 
 <span class="commandline">fini()</span> functions. See <b>plugins/sched/backfill</b>
 for an example of how to do this.</p>
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 9 July 2004</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 9 July 2004</p></td>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/programmer_guide.html b/doc/html/programmer_guide.shtml
similarity index 70%
rename from doc/html/programmer_guide.html
rename to doc/html/programmer_guide.shtml
index e779a8d8df61e3b6b0a1503da3ec7fbf4071004e..a0d4e899491ce897890fbba84c3094248d1cc827 100644
--- a/doc/html/programmer_guide.html
+++ b/doc/html/programmer_guide.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="13 May 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Programmers Guide</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Programmer's Guide</a></h2>
-
-<h3>Overview</h3>
+<!--#include virtual="header.txt"-->
+
+<h1><a name="top">SLURM Programmer's Guide</a></h1>
+
+<h2>Overview</h2>
 
 <p>Simple Linux Utility for Resource Management (SLURM) is an open source, fault-tolerant, 
 and highly scalable cluster management and job scheduling system for large and 
@@ -78,7 +26,7 @@ including Red Hat Linux, IBM's AIX, Sun's Solaris, and Compaq's Tru-64. The only
 module at this time that is operating system dependent is <span class="commandline">src/slurmd/read_proc.c</span>. 
 We will be porting and testing on additional platforms in future releases. 
 
-<h3>Plugins</h3>
+<h2>Plugins</h2>
 
 <p>To make the use of different infrastructures possible, SLURM uses a general 
 purpose plugin mechanism. A SLURM plugin is a dynamically linked code object that 
@@ -95,7 +43,7 @@ types also have their own documenation available, such as
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Directory Structure</h3>
+<h2>Directory Structure</h2>
 
 <p>The contents of the SLURM directory structure will be described below in increasing 
 detail as the structure is descended. The top level directory contains the scripts 
@@ -124,14 +72,14 @@ are here.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Documentation</h3>
+<h2>Documentation</h2>
 <p>All of the documentation is in the subdirectory <b>doc</b>. Man pages for the 
 APIs, configuration file, commands, and daemons are in <b>doc/man</b>. Various 
 documents suitable for public consumption are in <b>doc/html</b>. Overall SLURM 
 design documents including various figures are in <b>doc/pubdesign</b>. Various 
 design documents (many of which are dated) can be found in <b>doc/slides</b> and 
 <b>doc/txt</b>. A survey of available resource managers as of 2001 is in <b>doc/survey</b>. 
-<h3>Source Code</h3>
+<h2>Source Code</h2>
 
 <p>Functions are divided into several categories, each in its own subdirectory. 
 The details of each directory's contents are proved below. The directories are 
@@ -166,7 +114,7 @@ a parallel job step.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Configuration</h3>
+<h2>Configuration</h2>
 <p>Configuration files are included in the <b>etc</b> subdirectory. <b>slurm.conf.example</b> 
 includes a description of all configuration options and default settings. See 
 <b>doc/man/man5/slurm.conf.5</b> for more details.
@@ -175,7 +123,7 @@ is a script that determines which SLURM daemon(s) should execute on any node bas
 upon the configuration file contents. It will also manage these daemons: starting, 
 signalling, restarting, and stopping them.</p> 
 
-<h3>Test Suite</h3>
+<h2>Test Suite</h2>
 <p>The <b>testsuite</b> files use a DejaGnu framework for testing. These tests 
 are very limited in scope. We also have a set of Expect SLURM tests available 
 as a separate distribution. These tests are executed after SLURM has been installed 
@@ -183,12 +131,12 @@ and the daemons initiated. About 110 test scripts exercise all SLURM commands
 and options including stress tests. Get these test from
 <a href="ftp://ftp.llnl.gov/pub/linux/slurm-qa">ftp://ftp.llnl.gov/pub/linux/slurm-qa</a></p>
 
-<h3>Adding Files and Directories</h3>
+<h2>Adding Files and Directories</h2>
 <p>If you are adding files and directories to SLURM, it will be necessary to
 re-build configuration files before executing the <b>configure</b> command.
 You can do this by executing the command <b>autoreconf --force --install</b>.
 
-<h3>Tricks of the Trade</h3>
+<h2>Tricks of the Trade</h2>
 <p>You can make a single node appear to SLURM as a Linux cluster by manually 
 defining <b>HAVE_FRONT_END</b> to have a non-zero value in the file <b>config.h</b>.
 All (fake) nodes should be defined in the <b>slurm.conf</b> file.
@@ -199,23 +147,8 @@ executes.  Initiate one <span class="commandline">slurmd</span> and one
 simultaneous job steps to avoid overloading the 
 <span class="commandline">slurmd</span> daemon executing them all.</p>
 
-<p class="footer"><a href="#top">top</a></p></td>
-
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 13 May 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 13 May 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/publications.html b/doc/html/publications.html
deleted file mode 100644
index 8618eec19a34583536b0ddda30e13abee014b626..0000000000000000000000000000000000000000
--- a/doc/html/publications.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="15 January 2004">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Publications</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Publications</h2>
-<p><a href="slurm_design.pdf">SLURM: Simple Linux Utility for Resource Management</a> 
-[PDF] submitted to the ClusterWorld Conference and Expo held in San Jose, California, 
-June 23-26, 2003 (UCRL-MA-147996, Rev. 3, June 2003).</p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 15 January 2004</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/publications.shtml b/doc/html/publications.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..110e9ddf8c956dced6e3ee0219adca5516dffd2f
--- /dev/null
+++ b/doc/html/publications.shtml
@@ -0,0 +1,10 @@
+<!--#include virtual="header.txt"-->
+
+<h1>Publications</h1>
+<p><a href="slurm_design.pdf">SLURM: Simple Linux Utility for Resource Management</a> 
+[PDF] submitted to the ClusterWorld Conference and Expo held in San Jose, California, 
+June 23-26, 2003 (UCRL-MA-147996, Rev. 3, June 2003).</p>
+
+<p style="text-align:center;">Last modified 15 January 2004</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/quickstart.html b/doc/html/quickstart.shtml
similarity index 73%
rename from doc/html/quickstart.html
rename to doc/html/quickstart.shtml
index 2c79186e47e0c83080edd10aef1ee272a22e9202..75b89f63273b190b298c2d7aabc715ec51bd39ad 100644
--- a/doc/html/quickstart.html
+++ b/doc/html/quickstart.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
+<h1>Quick Start User Guide</h1>
 
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="6 December 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Quick Start User Guide</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Quick Start User Guide</h2>
-
-<h3>Overview</h3>
+<h2>Overview</h2>
 <p>The Simple Linux Utility for Resource Management (SLURM) is an open source, 
 fault-tolerant, and highly scalable cluster management and job scheduling system 
 for large and small Linux clusters. SLURM requires no kernel modifications for 
@@ -66,14 +14,18 @@ monitoring work (normally a parallel job) on the set of allocated nodes. Finally
 it arbitrates conflicting requests for resources by managing a queue of pending 
 work.</p>
 
-<h3>Architecture</h3>
+<h2>Architecture</h2>
 <p>As depicted in Figure 1, SLURM consists of a <b>slurmd</b> daemon running on 
 each compute node, a central <b>slurmctld</b> daemon running on a management node 
 (with optional fail-over twin), and six utility programs: <b>srun</b>, <b>scancel</b>, 
 <b>sinfo</b>, <b>srun</b>, <b>smap</b>, <b>squeue</b>, and <b>scontrol</b>.  
 All of the commands can run anywhere in the cluster.</p>
-<p><img src="arch.gif" width="600"> 
-<p><b>Figure 1. SLURM components</b></p>
+
+<div class="figure">
+  <img src="arch.gif" width="600"><br />
+  Figure 1. SLURM components
+</div>
+
 <p>The entities managed by these SLURM daemons, shown in Figure 2, include <b>nodes</b>, 
 the compute resource in SLURM, <b>partitions</b>, which group nodes into logical 
 sets, <b>jobs</b>, or allocations of resources assigned to a user for 
@@ -87,11 +39,15 @@ a job is assigned a set of nodes, the user is able to initiate parallel work in
 the form of job steps in any configuration within the allocation. For instance, 
 a single job step may be started that utilizes all nodes allocated to the job, 
 or several job steps may independently use a portion of the allocation.</p>
-<p><img src="entities.gif" width="291" height="218"> 
-<p><b>Figure 2. SLURM entities</b></p>
+
+<div class="figure">
+  <img src="entities.gif" width="291" height="218"><br />
+  Figure 2. SLURM entities
+</div>
+
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Commands</h3>
+<h2>Commands</h2>
 <p>Man pages exist for all SLURM daemons, commands, and API functions. The command 
 option <span class="commandline">--help</span> also provides a brief summary of 
 options. Note that the command options are all case insensitive.</p>
@@ -122,7 +78,7 @@ jobs, partitions, and nodes managed by SLURM, but graphically displays the
 information to reflect network topology.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Examples</h3>
+<h2>Examples</h2>
 <p>Execute <span class="commandline">/bin/hostname</span> on four nodes (<span class="commandline">-N4</span>). 
 Include task numbers on the output (<span class="commandline">-l</span>). The 
 default partition will be used. One task per node will be used by default. </p>
@@ -200,7 +156,7 @@ batch          1 DOWN         2      3448       82306 adev8
 </pre>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>MPI</h3>
+<h2>MPI</h2>
 <p>MPI use depends upon the type of MPI being used. 
 Instructions for using several varieties of MPI with SLURM are
 provided below.</p> 
@@ -271,22 +227,6 @@ the base partition count.
 See <a href="bluegene.html">BlueGene User and Administrator Guide</a> 
 for more information.</p>
 
-</td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 6 December 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p style="text-align:center;">Last modified 6 December 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/quickstart_admin.html b/doc/html/quickstart_admin.shtml
similarity index 86%
rename from doc/html/quickstart_admin.html
rename to doc/html/quickstart_admin.shtml
index bccab43a96a99a3e86949b0def6aba22a1fe0368..8c14ae53203ca6d4b82ccdade18ca6fc12fc6a60 100644
--- a/doc/html/quickstart_admin.html
+++ b/doc/html/quickstart_admin.shtml
@@ -1,63 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="7 December 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Susanne Balle">
-<meta name="email" content="susanne.balle@hp.com">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Quick Start Administrator Guide</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>Quick Start Administrator Guide</h2>
-<h3>Overview</h3>
+<!--#include virtual="header.txt"-->
+
+<h1>Quick Start Administrator Guide</h1>
+<h2>Overview</h2>
 Please see the <a href="quickstart.html">Quick Start User Guide</a> for a general 
 overview. 
  
-<h3>Building and Installing</h3>
+<h2>Building and Installing</h2>
 
 <p>Instructions to build and install SLURM manually are shown below. 
 See the README and INSTALL files in the source distribution for more details.
@@ -153,7 +101,7 @@ To build SLURM on our AIX system, the following .rpmmacros file is used:
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Daemons</h3>
+<h2>Daemons</h2>
 <p><b>slurmctld</b> is sometimes called the &quot;controller&quot; daemon. It 
 orchestrates SLURM activities, including queuing of job, monitoring node state, 
 and allocating resources (nodes) to jobs. There is an optional backup controller 
@@ -182,8 +130,8 @@ A file <b>etc/init.d/slurm</b> is provided for this purpose.
 This script accepts commands <b>start</b>, <b>startclean</b> (ignores 
 all saved state), <b>restart</b>, and <b>stop</b>.</p>
 
-<h3>Infrastructure</h3>
-<h4>Authentication of SLURM communications</h4>
+<h2>Infrastructure</h2>
+<h3>Authentication of SLURM communications</h3>
 <p>All communications between SLURM components are authenticated. The 
 authentication infrastructure is provided by a dynamically loaded
 plugin chosen at runtame via the <b>AuthType</b> keyword in the SLURM 
@@ -201,7 +149,7 @@ may have this requirement. For instance, if SLURM is making use of the
 auth/munge plugin for communication, the clocks on all nodes will need to 
 be synchronized. </p>
 
-<h4>MPI support</h4>
+<h3>MPI support</h3>
 <p>Quadrics MPI works directly with SLURM on systems having Quadrics 
 interconnects and is the preferred version of MPI for those systems.
 Set the <b>MpiDefault=none</b> configuration parameter in slurm.conf.</p>
@@ -232,7 +180,7 @@ for use of Open MPI.</p>
 nodes in the slurm.conf configuration file. SLURM presently lacks the ability 
 to arbitrarily order tasks across nodes.</p> 
 
-<h4>Scheduler support</h4>
+<h3>Scheduler support</h3>
 <p>The scheduler used by SLURM is controlled by the <b>SchedType</b> configuration 
 parameter. This is meant to control the relative importance of pending jobs.
 SLURM's default scheduler is FIFO (First-In First-Out). A backfill scheduler 
@@ -243,7 +191,7 @@ SLURM also supports a plugin for use of <a href="http://supercluster.org/maui">
 The Maui Scheduler</a>, which offers sophisticated scheduling algorithms. 
 Motivated users can even develop their own scheduler plugin if so desired. </p>
 
-<h4>Node selection</h4>
+<h3>Node selection</h3>
 <p>The node selection mechanism used by SLURM is controlled by the 
 <b>SelectType</b> configuration parameter. 
 If you want to execute multiple jobs per node, but apportion the processors, 
@@ -256,19 +204,19 @@ For more information, please see
 For BlueGene systems, <i>bluegene</i> plugin is required (it is topology 
 aware and interacts with the BlueGene bridge API).</p>
 
-<h4>Logging</h4>
+<h3>Logging</h3>
 <p>SLURM uses the syslog function to record events. It uses a range of importance
 levels for these messages. Be certain that your system's syslog functionality
 is operational. </p>
 
-<h4>Corefile format</h4>
+<h3>Corefile format</h3>
 <p>SLURM is designed to support generating a variety of core file formats for 
 application codes that fail (see the <i>--core</i> option of the <i>srun</i>
 command).  As of now, SLURM only supports a locally developed lightweight
 corefile library which has not yet been released to the public. It is 
 expected that this library will be available in the near future. </p>
 
-<h4>Parallel debugger support</h4>
+<h3>Parallel debugger support</h3>
 <p>SLURM exports information for parallel debuggers using the specification
 detailed  <a href=http://www-unix.mcs.anl.gov/mpi/mpi-debug/mpich-attach.txt>here</a>.
 This is meant to be exploited by any parallel debugger (notably, TotalView),
@@ -287,7 +235,7 @@ because the SLRUM_JOBID environment variable is set in the allocation shell
 environment.
 </p>
 
-<h4>Compute node access</h4>
+<h3>Compute node access</h3>
 <p>SLURM does not by itself limit access to allocated compute nodes, 
 but it does provide mechanisms to accomplish this. 
 There is a Pluggable Authentication Module (PAM) for restricting access 
@@ -303,7 +251,7 @@ even those allocated to other users.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Configuration</h3>
+<h2>Configuration</h2>
 <p>The SLURM configuration file includes a wide variety of parameters. 
 This configuration file must be available on each node of the cluster. A full
 description of the parameters is included in the <i>slurm.conf</i> man page. Rather than 
@@ -373,7 +321,7 @@ PartitionName=DEFAULT State=UP
 PartitionName=pdebug Nodes=mcr[0-191] MaxTime=30 MaxNodes=32 Default=YES
 PartitionName=pbatch Nodes=mcr[192-1151]
 </pre> 
-<h3>Security</h3>
+<h2>Security</h2>
 <p>You will should create unique job credential keys for your site
 using the program <a href="http://www.openssl.org/">openssl</a>. 
 <b>You must use openssl and not ssh-genkey to construct these keys.</b>
@@ -403,7 +351,7 @@ can prevent a user from accessing a node which he has not been allocated, if tha
 mode of operation is desired.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Starting the Daemons</h3>
+<h2>Starting the Daemons</h2>
 <p>For testing purposes you may want to start by just running slurmctld and slurmd 
 on one node. By default, they execute in the background. Use the <span class="commandline">-D</span> 
 option for each daemon to execute them in the foreground and logging will be done 
@@ -432,7 +380,7 @@ In practice, SLURM restarts with preservation consistently.</p>
 available. </p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Administration Examples</h3>
+<h2>Administration Examples</h2>
 <p><span class="commandline">scontrol</span> can be used to print all system information 
 and modify most of it. Only a few examples are shown below. Please see the scontrol 
 man page for full details. The commands and options are all case insensitive.</p>
@@ -546,7 +494,7 @@ Slurmctld(primary/backup) at adevi/adevj are UP/UP
 adev0: scontrol shutdown
 </pre> <p class="footer"><a href="#top">top</a></p>
 
-<h3>Testing</h3>
+<h2>Testing</h2>
 <p>An extensive test suite is available within the SLURM distribution 
 in <i>testsuite/expect</i>. 
 There are about 150 tests which will execute on the order of 1000 jobs 
@@ -563,7 +511,7 @@ or the full test suite may be executed with the single command
 <i>regression</i>.
 See <i>testsuite/expect/README</i> for more information.</p>
 
-<h3>Upgrades</h3>
+<h2>Upgrades</h2>
 <p>When upgrading to a new major or minor release of SLURM (e.g. 0.3.x to 0.4.x) 
 all running and pending jobs will be purged due to changes in state save 
 information. It is possible to develop software to translate state information 
@@ -575,23 +523,8 @@ An exception to this is that jobs may be lost when installing new pre-release
 versions (e.g. 0.4.0-pre1 to 0.4.0-pre2). We'll try to note these cases 
 in the NEWS file.
 
-</pre> <p class="footer"><a href="#top">top</a></p></td>
-
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 7 December 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+</pre> <p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 7 December 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/schedplugins.html b/doc/html/schedplugins.shtml
similarity index 66%
rename from doc/html/schedplugins.html
rename to doc/html/schedplugins.shtml
index 4abbb60e56d5ea2c803659606b1140ee76e074bb..d782cf0332b5cbc3ffdf2ea6cd877bb614cec141 100644
--- a/doc/html/schedplugins.html
+++ b/doc/html/schedplugins.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
+<h1><a name="top">SLURM Scheduler Plugin API</a></h1>
 
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616"
-<meta name="LLNLRandRdate" content="23 July 2004">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Scheduler Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Scheduler Plugin API</a></h2>
-
-<h3> Overview</h3>
+<h2> Overview</h2>
 <p> This document describes SLURM scheduler plugins and the API that defines 
 them. It is intended as a resource to programmers wishing to write their own SLURM 
 scheduler plugins. This is version 0 of the API.</p>
@@ -93,7 +41,7 @@ Note carefully, however, the versioning discussion below.</p>
 for sample implementations of a SLURM scheduler plugin.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Data Objects</h3>
+<h2>Data Objects</h2>
 <p>The implementation must maintain (though not necessarily directly export) an
 enumerated <span class="commandline">errno</span>  to allow SLURM to discover
 as practically as possible the reason for any failed API call. Plugin-specific enumerated
@@ -117,7 +65,7 @@ the initial value of any errno, prior to any error condition arising, should be
 SLURM_SUCCESS. </p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>API Functions</h3>
+<h2>API Functions</h2>
 <p>The following functions must appear. Functions which are not implemented should 
 be stubbed.</p>
 
@@ -161,27 +109,12 @@ specific error code.</p>
 or NULL if no description found in this plugin.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Versioning</h3>
+<h2>Versioning</h2>
 <p> This document describes version 0 of the SLURM Scheduler API. Future 
 releases of SLURM may revise this API. A scheduler plugin conveys its ability 
 to implement a particular API version using the mechanism outlined for SLURM plugins.</p>
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 23 July 2004</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 23 July 2004</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/selectplugins.html b/doc/html/selectplugins.shtml
similarity index 82%
rename from doc/html/selectplugins.html
rename to doc/html/selectplugins.shtml
index c8628fdaf65902837049f789ac64abb42d79c4f9..9e743b5d58fae0a6e490fdff124eb6ad9df0d65e 100644
--- a/doc/html/selectplugins.html
+++ b/doc/html/selectplugins.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<!--#include virtual="header.txt"-->
 
-<html>
+<h1><a name="top">SLURM Node Selection Plugin API</a></h1>
 
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616"
-<meta name="LLNLRandRdate" content="1 October 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Node Selection Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Node Selection Plugin API</a></h2>
-
-<h3> Overview</h3>
+<h2> Overview</h2>
 <p> This document describes SLURM node selection plugins and the API that defines 
 them. It is intended as a resource to programmers wishing to write their own SLURM 
 node selection plugins. This is version 0 of the API.</p>
@@ -129,7 +77,7 @@ to syncronize the plugin's state with that of slurmctld.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Data Objects</h3>
+<h2>Data Objects</h2>
 <p> These functions are expected to read and/or modify data structures directly in 
 the slurmctld daemon's memory. Slurmctld is a multi-threaded program with independent 
 read and write locks on each data structure type. Thererfore the type of operations 
@@ -143,11 +91,11 @@ manipulations (these functions are directly accessible from the plugin).</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>API Functions</h3>
+<h2>API Functions</h2>
 <p>The following functions must appear. Functions which are not implemented should 
 be stubbed.</p>
 
-<h4>Global Node Selection Functions</h4>
+<h3>Global Node Selection Functions</h3>
 <p class="commandline">int select_p_state_save (char *dir_name);</p>
 <p style="margin-left:.2in"><b>Description</b>: Save any global node selection state 
 information to a file within the specified directory. The actual file name used is plugin specific. 
@@ -207,7 +155,7 @@ SLURM_NO_CHANGE_IN_DATA if data has not changed since last packed, otherwise SLU
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h4>Job-Specific Node Selection Functions</h4>
+<h3>Job-Specific Node Selection Functions</h3>
 <p class="commandline">int select_p_job_test (struct job_record *job_ptr,
 bitstr_t *bitmap, int min_nodes, int max_nodes);</p>
 <p style="margin-left:.2in"><b>Description</b>: Given a job's scheduling requirement 
@@ -283,7 +231,7 @@ the plugin should return SLURM_ERROR.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h4>Get/set plugin information</h4>
+<h3>Get/set plugin information</h3>
 <p class="commandline">int select_p_get_extra_jobinfo(struct node_record *node_ptr,
 struct job_record *job_ptr, enum select_data_info info, void *data);</p>
 <p style="margin-left:.2in"><b>Description</b>: Get plugin-specific information 
@@ -343,7 +291,7 @@ list of slurm jobs from slurmctld job records.</p>
 the plugin should return SLURM_ERROR.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Versioning</h3>
+<h2>Versioning</h2>
 <p> This document describes version 0 of the SLURM node selection API. Future 
 releases of SLURM may revise this API. A node selection plugin conveys its ability 
 to implement a particular API version using the mechanism outlined for SLURM plugins. 
@@ -351,23 +299,8 @@ In addition, the credential is transmitted along with the version number of the
 plugin that transmitted it. It is at the discretion of the plugin author whether 
 to maintain data format compatibility across different versions of the plugin.</p>
 
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 1 October 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 1 October 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/shtml2html.py b/doc/html/shtml2html.py
new file mode 100755
index 0000000000000000000000000000000000000000..054af1e0b84a7d0b4af61f6c3607c484f29ac416
--- /dev/null
+++ b/doc/html/shtml2html.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+
+import re
+import sys
+import os
+
+include_pat = r'(<!--\s*#include\s*virtual\s*=\s*"([^"]+)"\s*-->)'
+include_regex = re.compile(include_pat)
+
+url_pat = r'(<\s*a\s*href\s*=\s*")([^"]+)(.*?>)'
+url_regex = re.compile(url_pat)
+
+def include_virtual(matchobj):
+    filename = matchobj.group(2)
+    if os.access(filename, os.F_OK):
+        #print 'Including file', filename
+        lines = file(filename, 'r').read()
+        return lines
+    else:
+        return matchobj.group(0)
+
+def url_rewrite(matchobj):
+    if matchobj.group(2)[-6:] == '.shtml' \
+           and os.access(matchobj.group(2), os.F_OK):
+        location = matchobj.group(2)
+        newname = location[:-6] + '.html'
+        #print 'Rewriting', location, 'to', newname
+        return matchobj.group(1) + newname + matchobj.group(3)
+    else:
+        return matchobj.group(0)
+
+# Make sure all of the files on the command line have the .shtml extension.
+files = []
+for f in sys.argv[1:]:
+    if f[-6:] == '.shtml':
+        files.append(f)
+    else:
+        #print 'Skipping file %s (extension is not .shtml)' % f
+        pass
+
+for filename in files:
+    newfilename = filename[:-6] + '.html'
+    print 'Converting', filename, '->', newfilename
+    shtml = file(filename, 'r')
+    html = file(newfilename, 'w')
+
+    for line in shtml.readlines():
+        line = include_regex.sub(include_virtual, line)
+        line = url_regex.sub(url_rewrite, line)
+        html.write(line)
+
+    html.close()
+    shtml.close()
diff --git a/doc/html/slurm.html b/doc/html/slurm.html
deleted file mode 100644
index 10ad3268d972be354c345b1f592dd8ec95cc824d..0000000000000000000000000000000000000000
--- a/doc/html/slurm.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="7 December 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr> 
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1"></p> 
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a></b><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top">
-<h2><br>
-SLURM: A Highly Scalable Resource Manager</h2>
-<p>SLURM is an open-source resource manager designed for Linux clusters of all 
-sizes. It provides three key functions. First it allocates exclusive and/or non-exclusive 
-access to resources (computer nodes) to users for some duration of time so they 
-can perform work. Second, it provides a framework for starting, executing, and 
-monitoring work (typically a parallel job) on a set of allocated nodes. Finally, 
-it arbitrates conflicting requests for resources by managing a queue of pending 
-work. </p>
-
-<p>SLURM is not a sophisticated batch system, but it does provide an Applications 
-Programming Interface (API) for integration with external schedulers such as 
-<a href="http://supercluster.org/maui">The Maui Scheduler</a>. 
-While other resource managers do exist, SLURM is unique in several respects: 
-<ul>
-<li>Its source code is freely available under the 
-<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.</li>
-<li>It is designed to operate in a heterogeneous cluster with up to 16,384 nodes.</li>
-<li>It is portable; written in C with a GNU autoconf configuration engine. While 
-initially written for Linux, other UNIX-like operating systems should be easy 
-porting targets. A plugin mechanism exists to support various interconnects, authentication 
-mechanisms, schedulers, etc.</li>
-<li>SLURM is highly tolerant of system failures, including failure of the node 
-executing its control functions.</li>
-<li>It is simple enough for the motivated end user to understand its source and 
-add functionality.</li>
-</ul></p>
-
-<p>SLURM provides resource management on about 1000 computers world-wide including 
-many of the most powerful computers in the world including:
-<ul>
-<li><a href="http://www.llnl.gov/asci/platforms/bluegenel/">BlueGene/L</a> with 65,536
-dual-processor compute nodes</li>
-<li><a href="http://www.llnl.gov/linux/thunder/">Thunder</a> a Linux cluster with 1024 nodes 
-each having four Itanium2 processors</li>
-<li><a href="http://www.llnl.gov/asci/platforms/purple/">ASC Purple</a> an IBM SP/AIX cluster 
-with about 1500 nodes each having eight Power5 processors</li>
-</p>
-
-</td>
-</tr>
-<tr> 
-<td colspan="3"><hr>
-<p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 7 December 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
- <area shape="rect" coords="616,4,762,97" href="../">
- <area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/slurm.shtml b/doc/html/slurm.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..5e674ea0de212fd9a4ca66a4c90f6ec8894d07e4
--- /dev/null
+++ b/doc/html/slurm.shtml
@@ -0,0 +1,43 @@
+<!--#include virtual="header.txt"-->
+
+<h1>SLURM: A Highly Scalable Resource Manager</h1>
+<p>SLURM is an open-source resource manager designed for Linux clusters of all 
+sizes. It provides three key functions. First it allocates exclusive and/or non-exclusive 
+access to resources (computer nodes) to users for some duration of time so they 
+can perform work. Second, it provides a framework for starting, executing, and 
+monitoring work (typically a parallel job) on a set of allocated nodes. Finally, 
+it arbitrates conflicting requests for resources by managing a queue of pending 
+work. </p>
+
+<p>SLURM is not a sophisticated batch system, but it does provide an Applications 
+Programming Interface (API) for integration with external schedulers such as 
+<a href="http://supercluster.org/maui">The Maui Scheduler</a>. 
+While other resource managers do exist, SLURM is unique in several respects: 
+<ul>
+<li>Its source code is freely available under the 
+<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.</li>
+<li>It is designed to operate in a heterogeneous cluster with up to 16,384 nodes.</li>
+<li>It is portable; written in C with a GNU autoconf configuration engine. While 
+initially written for Linux, other UNIX-like operating systems should be easy 
+porting targets. A plugin mechanism exists to support various interconnects, authentication 
+mechanisms, schedulers, etc.</li>
+<li>SLURM is highly tolerant of system failures, including failure of the node 
+executing its control functions.</li>
+<li>It is simple enough for the motivated end user to understand its source and 
+add functionality.</li>
+</ul></p>
+
+<p>SLURM provides resource management on about 1000 computers world-wide including 
+many of the most powerful computers in the world including:
+<ul>
+<li><a href="http://www.llnl.gov/asci/platforms/bluegenel/">BlueGene/L</a> with 65,536
+dual-processor compute nodes</li>
+<li><a href="http://www.llnl.gov/linux/thunder/">Thunder</a> a Linux cluster with 1024 nodes 
+each having four Itanium2 processors</li>
+<li><a href="http://www.llnl.gov/asci/platforms/purple/">ASC Purple</a> an IBM SP/AIX cluster 
+with about 1500 nodes each having eight Power5 processors</li>
+</ul>
+
+<p style="text-align:center;">Last modified 7 December 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/slurm_banner.jpg b/doc/html/slurm_banner.jpg
deleted file mode 100644
index a9d459f858c18532966930f2c346e7c46eaed7e9..0000000000000000000000000000000000000000
Binary files a/doc/html/slurm_banner.jpg and /dev/null differ
diff --git a/doc/html/slurm_banner_filler.jpg b/doc/html/slurm_banner_filler.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eeb049c851a37c02e01de2a93abcf86452acfc02
Binary files /dev/null and b/doc/html/slurm_banner_filler.jpg differ
diff --git a/doc/html/slurm_banner_filler.png b/doc/html/slurm_banner_filler.png
new file mode 100644
index 0000000000000000000000000000000000000000..fca0ea1f38a15c9510b4efa71b8ea9341c0b45dd
Binary files /dev/null and b/doc/html/slurm_banner_filler.png differ
diff --git a/doc/html/slurm_banner_left.jpg b/doc/html/slurm_banner_left.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1ac4a81cf4b17ce979dedc32beddc87509f053cb
Binary files /dev/null and b/doc/html/slurm_banner_left.jpg differ
diff --git a/doc/html/slurm_banner_left.png b/doc/html/slurm_banner_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..68bb4220fb1b1fd15401c90e489fa3d8ea9b1f37
Binary files /dev/null and b/doc/html/slurm_banner_left.png differ
diff --git a/doc/html/slurm_banner_right.jpg b/doc/html/slurm_banner_right.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b29fd3856b65c5ac395da612059809430a95cbc8
Binary files /dev/null and b/doc/html/slurm_banner_right.jpg differ
diff --git a/doc/html/slurm_banner_right.png b/doc/html/slurm_banner_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..70ac3d58f86d30695b7f099aacbbde44127ec756
Binary files /dev/null and b/doc/html/slurm_banner_right.png differ
diff --git a/doc/html/slurmstyles.css b/doc/html/slurmstyles.css
index b3663896dddf9004c5c368553caef6306c6a5a27..05b27502078c51edb531ed43e31b5f6afbdccef0 100644
--- a/doc/html/slurmstyles.css
+++ b/doc/html/slurmstyles.css
@@ -1,17 +1,103 @@
-h2 {  font-family: Arial, Verdana, sans-serif; font-size: 16px; font-weight: bold; color: #6699CC;  text-align: center; }
-h3 {  font-family: Arial, Verdana, sans-serif; font-size: 14px; font-weight: bold; color: #6699CC}
-h4 {  font-family: Arial, Verdana, sans-serif; font-size: 12px; font-weight: bold; color: #6699CC}
-p,ol,ul,li,td {  font-family: Arial, Verdana, sans-serif; font-size: 12px; color: #000000}
-pre {  font-family: "Courier New", Courier, mono; font-size: 12px; color: #000000}
-.whitetext {  font-family: Arial, Verdana, sans-serif; font-size: 12px; font-weight: bold; color: #FFFFFF}
-.footer {  font-family: Arial, Verdana, sans-serif; font-size: 10px; color: #000000}
-a:link {  font-family: Arial, Verdana, sans-serif; color: #6699CC; text-decoration: underline}
-a:visited {  font-family: Arial, Verdana, sans-serif; color: #6699CC; text-decoration: underline}
-a:active { font-family: Arial, Helvetica, sans-serif; color: #6699CC; text-decoration: none }
-a:hover {  font-family: Arial, Verdana, sans-serif; color: #6699CC; text-decoration: none}
-a.nav:link {  font-family: Arial, Verdana, sans-serif; color: #6699CC; font-weight: bold; text-decoration: none}
-a.nav:visited {  font-family: Arial, Verdana, sans-serif; color: #6699CC; font-weight: bold; text-decoration: none}
-a.nav:active { font-family: Arial, Helvetica, sans-serif; font-weight: bold; color: #6699CC; text-decoration: none }
-a.nav:hover {  font-family: Arial, Verdana, sans-serif; color: #6699CC; font-weight: bold; text-decoration: underline}.commandline {
-	font-family: "Courier New", Courier, mono;
+body { 
+  background-color: #000000;
+}
+h1 { font-size: 150% }
+h2 { font-size: 130% }
+h3 { font-size: 115% }
+p  { font-size: 100% }
+
+pre {
+  width: 90%;
+  margin: 0 0 15px 20px;
+  padding: 15px;
+  border: 1px solid gray;
+  background-color: #ddd;
+  font-family: monospace;
+  white-space: pre;
+  overflow: auto;
+}
+
+/* "container" wraps the entire web page */
+#container {
+  width: 95%;
+  margin: 10px auto;
+  background-color: #fff;
+  color: #333;
+  border: 0px solid gray;
+  line-height: 130%;
+}
+
+#banner {
+  /*
+   * In IE6, the "banner" div is a little taller than the slurm_banner.jpg
+   * (who knows why...) and if the background-color was #000000, a line of
+   * black would appear under the banner.
+   */
+  background-color: #FFFFFF;
+  /*background-color: #000000;*/
+  background-image: url(slurm_banner_filler.jpg);
+  background-repeat: repeat-x;
+  /*border-bottom: 1px solid gray;*/
+}
+#banner_right_img {
+  position: absolute;
+  right: 5%;
+  z-index: 1;
+}
+
+#navigation {
+  float: left;
+  margin-left: 20px;
+  width: 160px;
+  overflow: auto;
+}
+
+/* The main info of the page is wrapped in a "content" div */
+#content {
+  margin-left: 200px;
+  border-left: 1px solid gray;
+  padding: 1em;
+  /*max-width: 36em;*/
+}
+#content h1 { text-align: center; }
+#content dt { font-weight: bold; } /* normal, bold, 900 */
+
+#footer {
+  clear: both;
+  margin: 0;
+  padding: .5em;
+  color: #333;
+  background-color: #ddd;
+  border-top: 1px solid gray;
+  text-align: center;
+}
+
+div.figure {
+  /*float: right;*/
+  margin: 0 0 15px 20px;
+  padding: 15px;
+  /*border: 1px solid gray;*/
+  text-align: center;
+  font-style: italic;
+  overflow: auto;
+}
+
+div.terminal {
+  width: 90%;
+  margin: 0 0 15px 20px;
+  padding: 15px;
+  border: 1px solid gray;
+  background-color: #ddd;
+  font-family: monospace;
+  white-space: pre;
+  overflow: auto;
+}
+
+/* When printing, eliminate the nagivation column on the left,
+ * and make the content section fill the width of the page.
+ */
+@media print {
+  #navigation { display: none }
+  #content { margin-left: 0px; border-left: 0px solid gray; }
+  }
 }
diff --git a/doc/html/spacer.gif b/doc/html/spacer.gif
deleted file mode 100644
index 35d42e808f0a8017b8d52a06be2f8fec0b466a66..0000000000000000000000000000000000000000
Binary files a/doc/html/spacer.gif and /dev/null differ
diff --git a/doc/html/switchplugins.html b/doc/html/switchplugins.shtml
similarity index 88%
rename from doc/html/switchplugins.html
rename to doc/html/switchplugins.shtml
index 8b5afaf12c0e6c298bb9aa4180e06de3b41000c9..eedf4c676bcd29d39c73916540819619ad4b9329 100644
--- a/doc/html/switchplugins.html
+++ b/doc/html/switchplugins.shtml
@@ -1,60 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616"
-<meta name="LLNLRandRdate" content="1 October 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:Switch Plugins</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2><a name="top">SLURM Switch Plugin API</a></h2>
-
-<h3> Overview</h3>
+<!--#include virtual="header.txt"-->
+
+<h1><a name="top">SLURM Switch Plugin API</a></h1>
+
+<h2> Overview</h2>
 <p> This document describes SLURM switch (interconnect) plugins and the API that defines 
 them. It is intended as a resource to programmers wishing to write their own SLURM 
 switch plugins. This is version 0 of the API.
@@ -88,7 +36,7 @@ Note carefully, however, the versioning discussion below.</p>
 for sample implementations of a SLURM switch plugin.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Data Objects</h3>
+<h2>Data Objects</h2>
 <p> The implementation must support two opaque data classes.
 One is used as an job's switch &quot;credential.&quot; 
 This class must encapsulate all job-specific information necessary 
@@ -120,11 +68,11 @@ the initial value of any errno, prior to any error condition arising, should be
 SLURM_SUCCESS. </p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>API Functions</h3>
+<h2>API Functions</h2>
 <p>The following functions must appear. Functions which are not implemented should 
 be stubbed.</p>
 
-<h4>Global Switch State Functions</h4>
+<h3>Global Switch State Functions</h3>
 <p class="commandline">int switch_p_libstate_save (char *dir_name);</p>
 <p style="margin-left:.2in"><b>Description</b>: Save any global switch state to a file 
 within the specified directory. The actual file name used is plugin specific. It is recommended 
@@ -168,7 +116,7 @@ If so, delay scheduling a new job while another is in the process of terminating
 any other job is in the process of terminating.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h4>Node's Switch State Monitoring Functions</h4>
+<h3>Node's Switch State Monitoring Functions</h3>
 
 <p>Nodes will register with current switch state information when the slurmd daemon 
 is initiated. The slurmctld daemon will also request that slurmd supply current 
@@ -250,7 +198,7 @@ of buf in bytes.<br>
 of buf in bytes.</p>
 <p style="margin-left:.2in"><b>Returns</b>: Location of buffer, same as <i>buf</i>.</p>
 
-<h4>Job's Switch Credential Management Functions</h4>
+<h3>Job's Switch Credential Management Functions</h3>
 <p class="commandline">int switch_p_alloc_jobinfo(switch_jobinfo_t *switch_job);</p>
 <p style="margin-left:.2in"><b>Description</b>: Allocate storage for a job's switch credential.
 It is recommended that the credential contain a magic number for validation purposes.</p>
@@ -388,7 +336,7 @@ to indicate the reason for failure.</p>
 
 <p class="footer"><a href="#top">top</a></p>
 
-<h4>Node Specific Switch Management Functions</h4>
+<h3>Node Specific Switch Management Functions</h3>
 <p class="commandline">int switch_p_node_init (void);</p>
 <p style="margin-left:.2in"><b>Description</b>: This function is run from the top level slurmd 
 only once per slurmd run. It may be used, for instance, to perform some one-time
@@ -407,7 +355,7 @@ the plugin should return SLURM_ERROR and set the errno to an appropriate value
 to indicate the reason for failure.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h4>Job Management Functions</h4>
+<h3>Job Management Functions</h3>
 <blockquote><pre>
 =========================================================================
 Process 1 (root)        Process 2 (root, user)  |  Process 3 (user task) 
@@ -520,7 +468,7 @@ the plugin should return SLURM_ERROR and set the errno to an appropriate value
 to indicate the reason for failure.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h4>Error Handling Functions</h4>
+<h3>Error Handling Functions</h3>
 <a name="get_errno"><p class="commandline">int switch_p_get_errno (void);</p></a>
 <p style="margin-left:.2in"><b>Description</b>: Return the number of a switch
 specific error.</p>
@@ -538,30 +486,15 @@ specific error code.</p>
 or NULL if no description found in this plugin.</p>
 <p class="footer"><a href="#top">top</a></p>
 
-<h3>Versioning</h3>
+<h2>Versioning</h2>
 <p> This document describes version 0 of the SLURM Switch API. Future 
 releases of SLURM may revise this API. A switch plugin conveys its ability 
 to implement a particular API version using the mechanism outlined for SLURM plugins. 
 In addition, the credential is transmitted along with the version number of the 
 plugin that transmitted it. It is at the discretion of the plugin author whether 
 to maintain data format compatibility across different versions of the plugin.</p>
-<p class="footer"><a href="#top">top</a></p></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact 
-<a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 1 October 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
+<p class="footer"><a href="#top">top</a></p>
+
+<p style="text-align:center;">Last modified 1 October 2005</p>
+
+<!--#include virtual="footer.txt"-->
diff --git a/doc/html/team.html b/doc/html/team.html
deleted file mode 100644
index 539ef10c02d91c5b1e116327640ba9dafe4dc26a..0000000000000000000000000000000000000000
--- a/doc/html/team.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
-Linux clusters, high-performance computing, Livermore Computing">
-<meta name="LLNLRandR" content="UCRL-WEB-217616">
-<meta name="LLNLRandRdate" content="18 November 2005">
-<meta name="distribution" content="global">
-<meta name="description" content="Simple Linux Utility for Resource Management">
-<meta name="copyright"
-content="This document is copyrighted U.S.
-Department of Energy under Contract W-7405-Eng-48">
-<meta name="Author" content="Morris Jette">
-<meta name="email" content="jette1@llnl.gov">
-<meta name="Classification"
-content="DOE:DOE Web sites via organizational
-structure:Laboratories and Other Field Facilities">
-<title>Simple Linux Utility for Resource Management:SLURM Team</title>
-<link href="slurmstyles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#000000" text="#000000" leftmargin="0" topmargin="0">
-<table width="770" border="0" cellspacing="0" cellpadding="0">
-<tr> 
-<td><img src="slurm_banner.jpg" width="770" height="145" usemap="#Map" border="0" alt="Simple Linux Utility for Resource Management"></td>
-</tr>
-</table>
-<table width="770" border="0" cellspacing="0" cellpadding="3" bgcolor="#FFFFFF">
-<tr> 
-<td width="100%"> 
-<table width="760" border="0" cellspacing="0" cellpadding="4" align="right">
-<tr>
-<td valign="top" bgcolor="#000000"><p><img src="spacer.gif" width="110" height="1" alt=""></p>
-<p><a href="slurm.html" class="nav" align="center">Home</a></p>
-<p><span class="whitetext">About</span><br>
-<a href="overview.html" class="nav">Overview</a><br>
-<a href="news.html" class="nav">What's New</a><br>
-<a href="publications.html" class="nav">Publications</a><br>
-<a href="team.html" class="nav">SLURM Team</a></p>
-<p><span class="whitetext">Using</span><br>
-<a href="documentation.html" class="nav">Documentation</a><br>
-<a href="faq.html" class="nav">FAQ</a><br>
-<a href="help.html" class="nav">Getting Help</a><br>
-<a href="mail.html"  class="nav">Mailing Lists</a></p>
-<p><span class="whitetext">Installing</span><br>
-<a href="platforms.html" class="nav">Platforms</a><br>
-<a href="download.html" class="nav">Download</a><br>
-<a href="quickstart_admin.html" class="nav">Guide</a></p></td>
-<td><img src="spacer.gif" width="10" height="1" alt=""></td>
-<td valign="top"><h2>SLURM Team</h2>
-<p>SLURM development has been a joint effort of 
-<a href="http://www.llnl.gov/">Lawrence Livermore National Laboratory</a> (LLNL),
-<a href="http://www.hp.com/">HP</a>,
-<a href="http://www.lnxi.com/">Linux NetworX</a>, and
-<a href="http://www.pathscale.com/">PathScale</a>.
-The current SLURM development staff includes: </p>
-<ul>
-<li>Morris Jette (LLNL, Project leader)</li>
-<li>Danny Auble (LLNL)</li>
-<li>Susanne Balle (HP)</li>
-<li>Mark Grondona (LLNL)</li>
-<li>Chris Holmes (HP)</li>
-<li>Chris Morrone (LLNL)</li>
-<li>Andy Riebs (HP)</li>
-<li>Jay Windley (Linux NetworX)</li>
-</ul>
-<p> SLURM alumni and contributers include: 
-<ul>
-<li>Ernest Artiaga (barcelona Supercomputer Center></li>
-<li>Daniel Christians (HP)</li>
-<li>Chris Dunlap (LLNL)</li>
-<li>Joey Ekstrom (LLNL/Bringham Young University)</li>
-<li>Jim Garlick (LLNL)</li>
-<li>Takao Hatazaki (HP)</li>
-<li>Nathan Huff (North Dakota State University)</li>
-<li>David Jackson (Cluster Resources)</li>
-<li>Greg Johnson (LANL) </li>
-<li>Jason King (LLNL)</li>
-<li>Bryan O'Sullivan (Pathscale)</li>
-<li>Daniel Palermo (HP)</li>
-<li>Dan Phung (LLNL/Columbia University)</li>
-<li>Jeff Squyres (LAM MPI)</li>
-<li>Kevin Tew (LLNL/Bringham Young University)</li>
-</ul></td>
-</tr>
-<tr> 
-<td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
-<p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
-<p class="footer">UCRL-WEB-217616<br>
-Last modified 18 November 2005</p></td>
-</tr>
-</table>
-</td>
- </tr>
-</table>
-<map name="Map">
-<area shape="rect" coords="616,4,762,97" href="../">
-<area shape="rect" coords="330,1,468,11" href="http://www.llnl.gov/disclaimer.html">
-<area shape="rect" coords="11,23,213,115" href="slurm.html">
-</map>
-</body>
-</html>
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
new file mode 100644
index 0000000000000000000000000000000000000000..ce6e3ec6bf2e83c6f05af2cd07402df1e373aa6e
--- /dev/null
+++ b/doc/html/team.shtml
@@ -0,0 +1,43 @@
+<!--#include virtual="header.txt"-->
+
+<h1>SLURM Team</h1>
+<p>SLURM development has been a joint effort of 
+<a href="http://www.llnl.gov/">Lawrence Livermore National Laboratory</a> (LLNL),
+<a href="http://www.hp.com/">HP</a>,
+<a href="http://www.lnxi.com/">Linux NetworX</a>, and
+<a href="http://www.pathscale.com/">PathScale</a>.
+
+<p>The current SLURM development staff includes: </p>
+<ul>
+<li>Morris Jette (LLNL, Project leader)</li>
+<li>Danny Auble (LLNL)</li>
+<li>Susanne Balle (HP)</li>
+<li>Mark Grondona (LLNL)</li>
+<li>Chris Holmes (HP)</li>
+<li>Chris Morrone (LLNL)</li>
+<li>Andy Riebs (HP)</li>
+<li>Jay Windley (Linux NetworX)</li>
+</ul>
+
+<p> SLURM alumni and contributers include: </p>
+<ul>
+<li>Ernest Artiaga (barcelona Supercomputer Center></li>
+<li>Daniel Christians (HP)</li>
+<li>Chris Dunlap (LLNL)</li>
+<li>Joey Ekstrom (LLNL/Bringham Young University)</li>
+<li>Jim Garlick (LLNL)</li>
+<li>Takao Hatazaki (HP)</li>
+<li>Nathan Huff (North Dakota State University)</li>
+<li>David Jackson (Cluster Resources)</li>
+<li>Greg Johnson (LANL) </li>
+<li>Jason King (LLNL)</li>
+<li>Bryan O'Sullivan (Pathscale)</li>
+<li>Daniel Palermo (HP)</li>
+<li>Dan Phung (LLNL/Columbia University)</li>
+<li>Jeff Squyres (LAM MPI)</li>
+<li>Kevin Tew (LLNL/Bringham Young University)</li>
+</ul>
+
+<p style="text-align:center;">Last modified 18 November 2005</p>
+
+<!--#include virtual="footer.txt"-->