diff --git a/doc/create_project.html b/doc/create_project.html
index ebad1fd3b0..e11c438f90 100644
--- a/doc/create_project.html
+++ b/doc/create_project.html
@@ -84,6 +84,6 @@ Monitoring the performance of a BOINC project
 Tools for monitoring the system as a whole.
 </font>
 <ul>
-<li> <a href=stripchart.txt>Stripcharts: a tool for viewing time-varying data </a>
+<li> <a href=stripchart.html>Stripcharts: a tool for viewing time-varying data </a>
 <li> <a href=stripchart_data.html>Recording data for Stripcharts</a>
 </ul>
diff --git a/doc/files.html b/doc/files.html
index 61cf7957c4..8263339889 100644
--- a/doc/files.html
+++ b/doc/files.html
@@ -5,7 +5,7 @@
 <p>
 The BOINC storage model is based on <b>files</b>.
 The inputs and outputs of applications,
-and the applications executables, are files.
+and the application executables, are files.
 <p>
 The BOINC core client transfers files to and from <b>data servers</b>
 operated by the project, using HTTP.
diff --git a/doc/work.html b/doc/work.html
index 19af2c64df..4776a48295 100644
--- a/doc/work.html
+++ b/doc/work.html
@@ -14,33 +14,32 @@ The attributes of a workunit include:
 <li> The estimated resource requirements of the work unit
 (computation, memory, disk space).
 <li> A <b>delay bound</b>: upper bound on how long
-an instance of this work unit should take to complete.
-This limits what hosts the workunit is sent to,
+a result associated with this work unit should take to complete.
+This determines which hosts the workunit can be sent to,
 and it's used to assign result deadlines and
 times for retrying results.
 </ul>
 <p>
 The inputs to a workunit are described by an XML document of the form
 <pre>
-[ &lt;file_info&gt;...&lt;/file_info&gt; ]
+[ &lt;file_info>...&lt;/file_info> ]
 [ ... ]
-&lt;workunit&gt;
-    &lt;app_name&gt;blah&lt;/app_name&gt;
-    [ &lt;command_line&gt;-flags xyz&lt;/command_line&gt; ]
-    [ &lt;env_vars&gt;name=val&amp;name=val&lt;/env_vars&gt; ]
-    [ &lt;file_ref&gt;...&lt;/file_ref&gt; ]
+&lt;workunit>
+    [ &lt;command_line>-flags xyz&lt;/command_line> ]
+    [ &lt;env_vars>name=val&amp;name=val&lt;/env_vars> ]
+    [ &lt;file_ref>...&lt;/file_ref> ]
     [ ... ]
-&lt;workunit&gt;
+&lt;/workunit>
 </pre>
 The components are: 
 <ul>
-<li> The <b>&lt;command_line&gt;</b> element, if present, is the
+<li> The <b>&lt;command_line></b> element, if present, is the
 command-line arguments to be passed to the main program.
-<li> The <b>&lt;env_vars&gt;</b> element, if present, is a list of
+<li> The <b>&lt;env_vars></b> element, if present, is a list of
 environment variables to be passed to the main program.
-<li> Each <b>&lt;file_ref&gt;</b> element describes a <a
+<li> Each <b>&lt;file_ref></b> element describes a <a
 href="files.html">reference</a> to an input file, each of which is
-described by a <b>&lt;file_info&gt;</b> element.
+described by a <b>&lt;file_info></b> element.
 </ul>
 <p>
 A workunit is associated with an application, not with a particular
diff --git a/todo b/todo
index 358a98290c..a5c0cccc32 100755
--- a/todo
+++ b/todo
@@ -1,8 +1,14 @@
+<<<<<<< todo
+user PHP session mechanism
+
+protection mechanism for project admin web
+=======
 use PHP session mechanism instead of our own cookies
 
 use https for login (don't sent account key or password in clear)
 
 protect project admin web pages (htaccess)
+>>>>>>> 1.6
 
 Deadline mechanism for results
     - use in result dispatching