From da3bffef601fd7052b75e6771fe6086da0a79313 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 25 Nov 2004 07:47:52 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=4653
---
 doc/software.php   |  4 ++--
 doc/tools_work.php | 12 ++++++----
 doc/work.php       | 57 +++++++++++++++++++++++++++-------------------
 3 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/doc/software.php b/doc/software.php
index b6f76e5102..360ca56d0f 100644
--- a/doc/software.php
+++ b/doc/software.php
@@ -55,8 +55,8 @@ Set your PATH variable to include MySQL programs
 <p>
 Required on other server(s):
 <ul>
-  <li><b>Apache</b> or other webserver (package <code>apache2</code> or <code>apache</code>)
-  <li><b>PHP</b> 4.0 (package <code>php4</code>)
+  <li><b>Apache</b> or other webserver, with mod_ssl and PHP (package <code>apache2</code>, <code>apache</code> or <code>apache-ssl</code>)
+  <li><b>PHP</b> 4.0, configured for MySQL (packages <code>php4, php4-mysql</code>)
   <li><b>MySQL client</b> (package <code>mysql-client</code>)
   <li><b>Python</b> 2.2+ (package <code>python2.3</code> or <code>python2.2</code>)
   <li><a href=http://sourceforge.net/projects/mysql-python><b>Python module MySQLdb</b></a>
diff --git a/doc/tools_work.php b/doc/tools_work.php
index 9eb4fd6289..83a6599016 100644
--- a/doc/tools_work.php
+++ b/doc/tools_work.php
@@ -102,6 +102,10 @@ create_work
                                         // relative to project root
     -result_template filename           // result template filename
                                         // relative to project root
+    [ -config_dir path ]                // where 'config.xml' is;
+                                        // default = '.'
+    [ -batch n ]
+    [ -priority n ]
 
     // The following are normally supplied in the WU template:
     [ -rsc_fpops_est x ]
@@ -118,12 +122,13 @@ create_work
     infile_1 ... infile_m           // input files
 </pre>
 The workunit parameters are documented <a href=work.php>here</a>.
-The program must be run in the project root directory;
+If the -config_dir option is not used,
+the program must be run in the project root directory;
 it looks for <b>config.xml</b> there, and uses its contents.
 
 <h3>C++ function interface</h3>
 <p>
-The C++ library (backend_lib.C,h) provides the functions:
+The C++ library (crypt.C, backend_lib.C,h) provides the functions:
 <pre>
 int read_key_file(char* path, R_RSA_PRIVATE_KEY& key);
 
@@ -137,8 +142,7 @@ int create_work(
     const char** infiles,                     // array of input file names
     int ninfiles
     R_RSA_PRIVATE_KEY& key,             // upload authentication key
-    const char* upload_url,
-    const char* download_url
+    SCHED_CONFIG&
 );
 </pre>
 <p>
diff --git a/doc/work.php b/doc/work.php
index dfade65e57..7e037cb95a 100644
--- a/doc/work.php
+++ b/doc/work.php
@@ -24,33 +24,12 @@ list_item(
 );
 list_item(
     "input files",
-    "A list of its input files: their names,
+    "A list of the input files: their names,
     and the names by which the application refers to them."
 );
 list_item(
-    "error mask",
-    "A bit mask of various error conditions:
-    <ul>
-    <li> <b>WU_ERROR_COULDNT_SEND_RESULT</b>:
-        The BOINC scheduler was unable to send the workunit
-        to a large number (~100) of hosts,
-        probably because its resource requirements (disk, memory, CPU)
-        were too large for the hosts,
-        or because no application version was available
-        for the hosts' platforms.
-    <li> <b>WU_ERROR_TOO_MANY_ERROR_RESULTS</b>:
-        Too many results with error conditions
-        (upload/download problem, client crashes)
-        have been returned for this work unit.
-    <li> <b>WU_ERROR_TOO_MANY_SUCCESS_RESULTS</b>:
-        Too many successful results have been returned
-        without consensus.
-        This indicates that the application may
-        be nondeterministic.
-    <li> <b>WU_ERROR_TOO_MANY_TOTAL_RESULTS</b>:
-        Too many total results have been sent for this workunit.
-    </ul>
-    "
+    "priority",
+    "Higher-priority work is dispatched first"
 );
 list_end();
 
@@ -151,6 +130,36 @@ list_item(
 );
 list_end();
 
+echo "
+A workunit that is in the system has the following attribute:
+";
+list_start();
+list_item(
+    "error mask",
+    "A bit mask of various error conditions:
+    <ul>
+    <li> <b>WU_ERROR_COULDNT_SEND_RESULT</b>:
+        The BOINC scheduler was unable to send the workunit
+        to a large number (~100) of hosts,
+        probably because its resource requirements (disk, memory, CPU)
+        were too large for the hosts,
+        or because no application version was available
+        for the hosts' platforms.
+    <li> <b>WU_ERROR_TOO_MANY_ERROR_RESULTS</b>:
+        Too many results with error conditions
+        (upload/download problem, client crashes)
+        have been returned for this work unit.
+    <li> <b>WU_ERROR_TOO_MANY_SUCCESS_RESULTS</b>:
+        Too many successful results have been returned
+        without consensus.
+        This indicates that the application may
+        be nondeterministic.
+    <li> <b>WU_ERROR_TOO_MANY_TOTAL_RESULTS</b>:
+        Too many total results have been sent for this workunit.
+    </ul>
+    "
+);
+list_end();
 echo "
 <p>
 BOINC provides a <a href=tools_work.php>utility program and C function</a>