diff --git a/checkin_notes b/checkin_notes
index 7aea5cede5..1d632b9111 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3745,3 +3745,10 @@ Rom    18 Apr 2007
         boinccas.dll (Added)
         boinccas95.dll (Added)
         dbghelp95.dll (Added)
+
+David  18 Apr 2007
+    - bug fixes for sample work generator
+
+    sched/
+        sched_config.C,h
+        sample_work_generator.C
diff --git a/doc/boinc_dev.php b/doc/boinc_dev.php
index 8667c14f52..debd9f4c6d 100644
--- a/doc/boinc_dev.php
+++ b/doc/boinc_dev.php
@@ -1,6 +1,6 @@
 <?php
 require_once("docutil.php");
-page_head("BOINC software development ");
+page_head("BOINC software development [deprecated - Wiki]");
 
 if (!$book) {
     echo "
@@ -33,7 +33,7 @@ echo "
 <li> <a href=test.php>The BOINC testing framework</a>
 </ul>
 <p>
-BOINC is free software, distributed under the Lesser GNU Public License (LGPL).
+BOINC is free software, distributed under the Lesser General Public License (LGPL).
 We need volunteers to help with software testing and development.
 If you have one or more of the relevant technical skills
 (C++ system programming, PHP/MySQL web development,
diff --git a/doc/create_project.php b/doc/create_project.php
index 70f26ba24f..7e4e4e6c2c 100644
--- a/doc/create_project.php
+++ b/doc/create_project.php
@@ -36,7 +36,7 @@ if ($book) {
     copyright();
     echo "</font><br><br>";
 } else {
-    page_head("Creating BOINC projects");
+    page_head("Creating BOINC projects [deprecated - Wiki]");
     echo "
         These pages are also available as
         <a href=create_project.php?book=1>one big HTML file</a>
diff --git a/doc/file_deleter.php b/doc/file_deleter.php
index e3a42e1256..bbe884085d 100644
--- a/doc/file_deleter.php
+++ b/doc/file_deleter.php
@@ -1,6 +1,6 @@
 <?php
 require_once("docutil.php");
-page_head("Server-side file deletion");
+page_head("Server-side file deletion [deprecated - Wiki]");
 echo "
 Files are deleted from the data server's upload and download directories
 by the <b>file_deleter</b> daemon.
diff --git a/doc/index.php b/doc/index.php
index 93bff3f99f..52d53b0d0c 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -85,7 +85,7 @@ function show_create() {
         A BOINC project with a single Linux server
         can provide computing power equivalent
         to a cluster with tens of thousands of CPUs.
-        Learn how to <a href=create_project.php>create
+        Learn how to <a href=trac/wiki/CreateProjectOutline>create
         and operate a BOINC project</a>.
         <ul>
         <li> <b>Scientists</b>: if your group has moderate
@@ -110,7 +110,7 @@ function show_other() {
         <tr><td>
             <ul>
             <li> <a href=intro.php>Overview</a>
-            <li> <a href=boinc_dev.php>Software development</a>
+            <li> <a href=trac/>Software development</a>
             <li> <a href=translation.php>Translation</a> of web and GUI text
             <li> <a href=contact.php>Personnel and contributors</a>
             <li> BOINC <a href=email_lists.php>email lists</a>
diff --git a/doc/tools_work.php b/doc/tools_work.php
index 3f7fbf64b8..923c3d28c1 100644
--- a/doc/tools_work.php
+++ b/doc/tools_work.php
@@ -1,6 +1,6 @@
 <?php
 require_once("docutil.php");
-page_head("Generating work");
+page_head("Generating work [deprecated - Wiki]");
 echo "
 
 As described earlier, a <a href=work.php>workunit</a>
diff --git a/sched/sample_work_generator.C b/sched/sample_work_generator.C
index 7402e5358f..bca5acec20 100644
--- a/sched/sample_work_generator.C
+++ b/sched/sample_work_generator.C
@@ -64,7 +64,7 @@ int make_job() {
     // Create the input file.
     // Put it at the right place in the download dir hierarchy
     //
-    config.upload_path(name, path);
+    config.download_path(name, path);
     FILE* f = fopen(path, "w");
     if (!f) return ERR_FOPEN;
     fprintf(f, "This is the input file for job %s", name);
diff --git a/sched/sched_config.C b/sched/sched_config.C
index 9127e90e51..b8b3491a0e 100644
--- a/sched/sched_config.C
+++ b/sched/sched_config.C
@@ -164,7 +164,11 @@ int SCHED_CONFIG::parse_file(const char* dir) {
 }
 
 void SCHED_CONFIG::upload_path(const char* filename, char* path) {
-    ::dir_hier_path(filename, upload_dir, uldl_dir_fanout, path);
+    ::dir_hier_path(filename, upload_dir, uldl_dir_fanout, path, true);
+}
+
+void SCHED_CONFIG::download_path(const char* filename, char* path) {
+    ::dir_hier_path(filename, download_dir, uldl_dir_fanout, path);
 }
 
 void get_project_dir(char* p, int len) {
diff --git a/sched/sched_config.h b/sched/sched_config.h
index ebf789d8b9..06c2f73a62 100644
--- a/sched/sched_config.h
+++ b/sched/sched_config.h
@@ -89,6 +89,7 @@ public:
     int parse_file(const char* dir=".");
 
     void upload_path(const char*, char*);
+    void download_path(const char*, char*);
 };
 
 // get the project's home directory