diff --git a/doc/html/configurator.html.in b/doc/html/configurator.html.in
index 790c949b15e30a0e45a6ebf35e5c587d25dbcb79..2988d9c4b6d106ce31c4586e91fd91892288239c 100644
--- a/doc/html/configurator.html.in
+++ b/doc/html/configurator.html.in
@@ -1,6 +1,6 @@
 <!--
 Copyright (C) 2005-2007 The Regents of the University of California.
-Copyright (C) 2008 Lawrence Livermore National Security.
+Copyright (C) 2008-2009 Lawrence Livermore National Security.
 Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
 Written by Morris Jette <jette1@llnl.gov> and Danny Auble <da@llnl.gov>
 
@@ -169,6 +169,7 @@ function displayfile()
    "#PropagateResourceLimits= <br>" +
    "#PropagateResourceLimitsExcept= <br>" +
    "ReturnToService=" + get_radio_value(document.config.return_to_service) + "<br>" +
+   "#SallocDefaultCommand= <br>" +
    "SlurmctldPidFile=" + document.config.slurmctld_pid_file.value + "<br>" +
    "SlurmctldPort=" + document.config.slurmctld_port.value + "<br>" +
    "SlurmdPidFile=" + document.config.slurmd_pid_file.value + "<br>" +
@@ -203,6 +204,7 @@ function displayfile()
    "#MessageTimeout=10 <br>" +
    "#ResvOverRun=0 <br>" +
    "MinJobAge=" + document.config.min_job_age.value + "<br>" +
+   "#OverTimeLimit=0 <br>" +
    "SlurmctldTimeout=" + document.config.slurmctld_timeout.value + "<br>" +
    "SlurmdTimeout=" + document.config.slurmd_timeout.value + "<br>" +
    "#UnkillableStepProgram= <br>" +
@@ -222,6 +224,18 @@ function displayfile()
    get_select_type_params() + "<br>" +
    "# <br>" +
    "# <br>" +
+   "# JOB PRIORITY <br>" +
+   "#PriorityType=priority/basic <br>" +
+   "#PriorityDecayHalfLife= <br>" +
+   "#PriorityFavorSmall= <br>" +
+   "#PriorityMaxAge= <br>" +
+   "#PriorityWeightAge= <br>" +
+   "#PriorityWeightFairshare= <br>" +
+   "#PriorityWeightJobSize= <br>" +
+   "#PriorityWeightPartition= <br>" +
+   "#PriorityWeightQOS= <br>" +
+   "# <br>" +
+   "# <br>" +
    "# LOGGING AND ACCOUNTING <br>" +
    "#AccountingStorageEnforce=0 <br>" +
    get_field("AccountingStorageHost",document.config.accounting_storage_host) + "<br>" +
@@ -459,8 +473,8 @@ Select one value for <B>CryptoType</B>:<BR>
 <A href="http://www.openssl.org/">OpenSSL</A> 
 <P>
 Define the location of public and private keys used by SLURM's 
-cryptographic signature generation plugin (CryptoType).
-These values are only used if CryptoType=OpenSSL.
+cryptographic signature generation plugin (CryptoType).<br>
+<b>These values are only used if CryptoType=OpenSSL.</b><br>
 These files need to be generated by the SLURM administrator.
 Specify fully qualified pathnames.
 <P>
diff --git a/doc/html/overview.shtml b/doc/html/overview.shtml
index 4fc48e23d0995d2c1563f694de1c8a5333281c69..6f97a7f1ffb00a9614fb8a3797ed442b34b5ae7f 100644
--- a/doc/html/overview.shtml
+++ b/doc/html/overview.shtml
@@ -26,7 +26,7 @@ algorithms.
 <a href="https://www.llnl.gov/">Lawrence Livermore National Laboratory (LLNL)</a>,
 <a href="http://www.hp.com/">Hewlett-Packard</a>, 
 <a href="http://www.bull.com/">Bull</a>,
-<a href="http://www.lnxi.com/">Linux NetworX</a> and many other contributors.</p>
+Linux NetworX and many other contributors.</p>
 
 <h2>Architecture</h2>
 <p>SLURM has a centralized manager, <b>slurmctld</b>, to monitor resources and 
diff --git a/doc/html/quickstart_admin.shtml b/doc/html/quickstart_admin.shtml
index ce363f11ce197c35d0215a3e728cf499c947bc10..eea4f9bbc66e2d0538cb814abc79d229960a6165 100644
--- a/doc/html/quickstart_admin.shtml
+++ b/doc/html/quickstart_admin.shtml
@@ -227,8 +227,9 @@ manage the configuration (much of which requires a database).
 The first configuration parameter of interest is <b>PriorityType</b>
 with two options available: <i>basic</i> (first-in-first-out) and
 <i>multifactor</i>. 
-The <i>multifactor</i> plugin is very configurable and its details
-are beyond the scope of this document.
+The <i>multifactor</i> plugin will assign a priority to jobs based upon
+a multitude of configuration parameters (age, size, fair-share allocation, 
+etc.) and its details are beyond the scope of this document.
 See the <a href="job_priority.html">Multi-factor Job Priority Plugin</a>
 document for details.</p>
 
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 94eae3fcaa91ab9b56d94a6c012cea1693cfdb59..caaafed13da3360139616899c3d48eee9ea0293e 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -5,14 +5,14 @@
 <a href="https://www.llnl.gov/">Lawrence Livermore National Laboratory</a> (LLNL),
 <a href="http://www.hp.com/">HP</a>,
 <a href="http://www.bull.com/">Bull</a>,
-<a href="http://www.lnxi.com/">Linux NetworX</a>,
-and a host of others.
+Linux NetworX and many other contributorss.
 
 <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>David Bremer (LLNL)</li>
 <li>Chris Holmes (HP)</li>
 </ul>