diff --git a/checkin_notes b/checkin_notes
index befb92ea0c..087693f2de 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10012,3 +10012,6 @@ David  Feb 9 2004
 		app.C,h
 		client_state.C
 		cs_scheduler.C
+
+David  Feb 11 2004
+    - updated docs
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index a2ca5db6a3..d4f79a3286 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -520,8 +520,7 @@ int CLIENT_STATE::handle_scheduler_reply(
     }
 
     if (sr.request_delay) {
-		int t = time(0) + sr.request_delay;
-        project->min_rpc_time = max(t, project->min_rpc_time);
+        project->min_rpc_time = time(0) + sr.request_delay;
     }
 
     project->host_total_credit = sr.host_total_credit;
diff --git a/doc/assimilate.php b/doc/assimilate.php
index dce8528f72..2e5075ae27 100644
--- a/doc/assimilate.php
+++ b/doc/assimilate.php
@@ -7,9 +7,9 @@ This is best done by linking the program <b>sched/assimilate.C</b>
 with an application-specific function of the form
 <pre>
 int assimilate_handler(
-    WORKUNIT& wu, vector<RESULT>& results, RESULT& canononical_result
+    WORKUNIT& wu, vector&lt;RESULT>& results, RESULT& canononical_result
 );
-<pre>
+</pre>
 ";
 page_tail();
 ?>
diff --git a/doc/configuration.php b/doc/configuration.php
index 520b6a13a3..a07436d599 100644
--- a/doc/configuration.php
+++ b/doc/configuration.php
@@ -25,14 +25,14 @@ htmlspecialchars("
   <daemons>
     <daemon>
       [ <host>foobar</host> ]
-      [ <disabled>1</disabled> ]
+      [ <disabled/> ]
       <cmd>feeder -d 3</cmd>
     </daemon>
   </daemons>
   <tasks>
     <task>
       [ <host>foobar</host> ]
-      [ <disabled>1</disabled> ]
+      [ <disabled/> ]
       <cmd>get_load</cmd>
       <output>get_load.out</output>
       <period>5 min</period>
@@ -47,19 +47,19 @@ htmlspecialchars("
 "),
 "</pre>
 <b>Tasks</b> are periodic, short-running jobs.
-CMD and PERIOD are required.
+&lt;cmd> and &lt;period> are required.
 OUTPUT specifies the file to output and by default is COMMAND_BASE_NAME.out.
-Commands are run in the <bin_dir> directory
-which is a path relative to <project_dir> and output to <log_dir>.
+Commands are run in the &lt;bin_dir> directory
+which is a path relative to &lt;project_dir> and output to &lt;log_dir>.
 
 <p>
 <b>Daemons</b> are continuously-running programs.
-The process ID is recorded in the <pid_dir> directory
+The process ID is recorded in the &lt;pid_dir> directory
 and the process is sent a SIGHUP in a DISABLE operation.
 <p>
 Both tasks and daemons can run on a different host (specified by &lt;host>).
 The default is the project's main host, which is specified in config.host
-A daemon or task can be turned off by adding the <disabled/> element.
+A daemon or task can be turned off by adding the &lt;disabled/> element.
 ";
 page_tail();
 ?>
diff --git a/doc/docutil.php b/doc/docutil.php
index 1972a068e5..b3dbc8c0cc 100644
--- a/doc/docutil.php
+++ b/doc/docutil.php
@@ -42,11 +42,11 @@ function list_start() {
 function list_heading($x, $y, $z=null) {
     echo "
         <tr>
-            <th valign=top><b>$x</b></td>
-            <th valign=top>$y</td>
+            <th valign=top><b>$x</b></th>
+            <th valign=top>$y</th>
 ";
     if ($z) {
-        echo "       <th valign=top>$z</a>\n";
+        echo "       <th valign=top>$z</th>\n";
     }
 echo " </tr>\n";
 }
diff --git a/doc/platform.php b/doc/platform.php
index 58b3d123df..96397c80f3 100644
--- a/doc/platform.php
+++ b/doc/platform.php
@@ -107,8 +107,10 @@ to the core client, which records it in the
 <b>architecture_xml</b> field of the <b>result</b> database record.
 For example, the application might pass a description like
 <pre>
-&lt;has_3dnow_instructions/>
-&lt;graphics_board>ATI Rage 64MB</graphics_board>
+", htmlspecialchars("
+<has_3dnow_instructions/>
+<graphics_board>ATI Rage 64MB</graphics_board>
+"), "
 </pre>
 This makes it possible, for example, to report average or total
 performance statistics for 3DNow hosts contrasted
diff --git a/doc/tool_add.php b/doc/tool_add.php
index fd960eec94..b45e1cd8c4 100644
--- a/doc/tool_add.php
+++ b/doc/tool_add.php
@@ -1,22 +1,24 @@
-<? // -*- html -*-
-   // $Id$
+<?
    require_once("docutil.php");
-   page_head("<code>add</code> Tool");
-   ?>
+   page_head("add - tool for adding database items");
 
-`<code>add</code>' adds objects to the BOINC database through the command-line.
+echo "
+<b>add</b> is a command-line tool for adding entries to the BOINC database.
 
+<p>
+<b>add is deprecated - we recommend using <a href=tool_xadd.php>xadd</a> instead.</b>
+<p>
 
 Usages:
 <pre>
 
-add project      --name=yah --long_name="YETI @ home"
+add project      --name=sah --long_name=\"SETI@home\"
 
-add platform     --name=c64 [ --user_friendly_name="Commodore 64" ]
+add platform     --name=windows [ --user_friendly_name=\"Windows (95, NT, XP)\" ]
 
 add core_version --platform=c64 --version_num=717
                     --exec_file=/path/to/boinc_7.17_c64
-                    [--message="Message"] [--message_priority="Priority"]
+                    [--message=\"Message\"] [--message_priority=\"Priority\"]
 
 add app          --name=YetiApp [--min_version=716]
 
@@ -26,8 +28,8 @@ add app_version  --app=YetiApp --platform=c64 --version_num=717
                     [--exec_file=/path/to/more_bins
                       [--signature_file=/tmp/sig_file2]] ...
 
-add user         --name="Carl Sagan" --email_addr="carl.sagan@example.com"
-                    --authenticator="deadbeef"
+add user         --name=\"Carl Sagan\" --email_addr=\"carl.sagan@example.com\"
+                    --authenticator=\"deadbeef\"
                     [--country=Estonia --postal_code=94703
                      --global_prefs_file=/path/to/prefs.xml]
 
@@ -43,8 +45,7 @@ A project is created with <a href=make_project.php>make_project</a>.
 Core_version and app_version are automatically added by the
 <a href=tool_update_versions.php>update_versions</a> tool.
 Users are usually created through the Web interface.
-
-<?
+";
    page_tail();
 ?>
 
diff --git a/doc/tool_upgrade.php b/doc/tool_upgrade.php
new file mode 100644
index 0000000000..d783afe933
--- /dev/null
+++ b/doc/tool_upgrade.php
@@ -0,0 +1,28 @@
+<?php
+   require_once("docutil.php");
+   page_head("Upgrading project software");
+
+echo "
+    The script <b>bin/upgrade</b> copies files from
+    the BOINC source tree to a project tree.
+    This is typically done after updating the source tree
+    and recompiling the software.
+    <p>
+    <b>upgrade</b> does the following:
+    <ul>
+    It copies files from the source/html/* directories
+    to the corresponding project directories.
+    <li>
+    It copies source/sched/cgi and source/sched/file_upload_handler
+    to projects/cgi-bin.
+    <li>
+    It copies other programs in source/sched
+    to project/bin.
+    <li>
+    It copies programs in source/tools to project/bin.
+    </ul>
+
+";
+   page_tail();
+?>
+
diff --git a/doc/tool_xadd.php b/doc/tool_xadd.php
index bd53725aca..c8f5aa66ab 100644
--- a/doc/tool_xadd.php
+++ b/doc/tool_xadd.php
@@ -29,11 +29,8 @@ Notes:
   <li>Object arguments have the same format as for the `add' tool
     command-line arguments.  See also the <a href=tool_add.php>documentation
     for `add'</a>.
-  <li>This tool (currently) only adds new items; thus:
-    <ul>
-      <li>Entries that conflict with existing database entries are ignored;
-        this includes entries that have changed.
-    </ul>
+  <li>This tool (currently) only adds new items;
+      Entries that conflict with existing database entries are ignored.
 </ul>
 ";
    page_tail();
diff --git a/sched/start b/sched/start
index 57a5f946d1..10c090d707 100755
--- a/sched/start
+++ b/sched/start
@@ -23,14 +23,14 @@ A config.xml file looks like this:
   <daemons>
     <daemon>
       [ <host>foobar</host> ]
-      [ <disabled>1</disabled> ]
+      [ <disabled/> ]
       <cmd>feeder -d 3</cmd>
     </daemon>
   </daemons>
   <tasks>
     <task>
       [ <host>foobar</host> ]
-      [ <disabled>1</disabled> ]
+      [ <disabled/> ]
       <cmd>get_load</cmd>
       <output>get_load.out</output>
       <period>5 min</period>