From db57060a2036371f2bac5cdc9ead346781937c0e Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 30 Dec 2003 23:14:34 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=2839
---
 checkin_notes         |  6 ++++++
 client/client_types.C |  3 +++
 client/client_types.h | 15 +++++++++++++++
 doc/client.php        |  5 +++--
 doc/startup.php       |  2 +-
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 4e5e273b56..cd94013e5f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8799,3 +8799,9 @@ David  30 Dec 2003
 
     sched/
         start
+
+David  30 Dec 2003
+    - added <app_version> element to <stderr_out> in RPC request message
+        
+    client/
+        client_types.C,h
diff --git a/client/client_types.C b/client/client_types.C
index c2350fec12..492223182e 100644
--- a/client/client_types.C
+++ b/client/client_types.C
@@ -938,6 +938,9 @@ int RESULT::write(FILE* out, bool to_server) {
     n = stderr_out.length();
     if (n) {
         fprintf(out, "<stderr_out>\n");
+        if (to_server) {
+            fprintf(out, "<app_version>%d</app_version>\n", wup->version_num);
+        }
 		fprintf(out, stderr_out.c_str());
         if (stderr_out[n-1] != '\n') fprintf(out, "\n");
         fprintf(out, "</stderr_out>\n");
diff --git a/client/client_types.h b/client/client_types.h
index 118b79e5c1..494eebb36f 100644
--- a/client/client_types.h
+++ b/client/client_types.h
@@ -248,6 +248,21 @@ struct RESULT {
                 // defined only if active_task_state is PROCESS_SIGNALED
     int active_task_state; // the state of the active task corresponding to this result
     string stderr_out;
+        // the concatenation of:
+        //
+        // - if report_result_error() is called for this result:
+        //   <message>x</message>
+        //   <active_task_state>x</active_task_state>
+        //   <exit_status>x</exit_status>
+        //   <signal>x</signal>
+        //   - if called in FILES_DOWNLOADED state:
+        //     <couldnt_start>x</couldnt_start>
+        //   - if called in NEW state:
+        //     <download_error>x</download_error> for each failed download
+        //   - if called in COMPUTE_DONE state:
+        //     <upload_error>x</upload_error> for each failed upload
+        //
+        // - <stderr_txt>X</stderr_txt>, where X is the app's stderr output
 
     APP* app;
     WORKUNIT* wup;
diff --git a/doc/client.php b/doc/client.php
index f2b019ec51..c9cd432878 100644
--- a/doc/client.php
+++ b/doc/client.php
@@ -60,10 +60,10 @@ The work manager window has several tabs:
     <li>Downloading: input files are being downloaded.
     <li>Ready to run:
         An estimate of the total CPU time is shown.
-    <li>In progress: currently running.
+    <li>Running: currently running.
         Elapsed CPU time and estimated percent done is shown.
     <li>Uploading: output files are being uploaded.
-    <li>Done: waiting to notify the scheduling server.
+    <li>Ready to report: waiting to notify the scheduling server.
     </ul>
     Right-click on a work unit to:
     <ul>
@@ -108,6 +108,7 @@ The work manager's menu items are as follows:
         use this dialog to enter its address and port.
     </ul>
 <li> <b>Help</b>
+    <ul>
     <li> <b>About</b>: show work manage version number.
     </ul>
 </ul>
diff --git a/doc/startup.php b/doc/startup.php
index 927e93db51..45166c0871 100644
--- a/doc/startup.php
+++ b/doc/startup.php
@@ -10,7 +10,7 @@ You can join a second and subsequent projects as follows.
 Note: if you wish, you can use different email and name
 than those of your first account.
 <li> Receive an email containing an account key (a long random string).
-<li> Run the BOINC client, and select the <b>Add Project</b> command.
+<li> Run the BOINC client, and select the <b>Attach to Project</b> command.
 Enter the project's URL and your account key.
 
 </ol>