diff --git a/checkin_notes b/checkin_notes
index f9879df136..878da2ce22 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9546,3 +9546,9 @@ Charlie 26 Nov 2009
MacAccessibility.cpp
mac_installer/
PostInstall.cpp
+
+David 27 Nov 2009
+ - client: use [wfd] consistently
+
+ client/
+ cs_scheduler.cpp
diff --git a/checkin_notes_2002 b/checkin_notes_2002
index 3a5778ffe7..f932229b6f 100644
--- a/checkin_notes_2002
+++ b/checkin_notes_2002
@@ -1,5 +1,3 @@
-;; -*- mode: text; tab-width: 4; indent-tabs-mode: nil; -*-
-
David A. April 10 2002
Initial checkin of all files.
The system is fairly feature-complete and
diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
index f367d7f79e..9cb18677b1 100644
--- a/client/cs_scheduler.cpp
+++ b/client/cs_scheduler.cpp
@@ -1162,7 +1162,7 @@ PROJECT* CLIENT_STATE::find_project_with_overdue_results() {
//
void CLIENT_STATE::request_work_fetch(const char* where) {
if (log_flags.work_fetch_debug) {
- msg_printf(0, MSG_INFO, "[work_fetch_debug] Request work fetch: %s", where);
+ msg_printf(0, MSG_INFO, "[wfd] Request work fetch: %s", where);
}
must_check_work_fetch = true;
}
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index b79d9ea6a6..b474a44446 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -747,8 +747,9 @@ void WORK_FETCH::compute_shares() {
bool RSC_PROJECT_WORK_FETCH::debt_eligible(PROJECT* p, RSC_WORK_FETCH& rwf) {
if (p->non_cpu_intensive) return false;
if (p->suspended_via_gui) return false;
- if (p->dont_request_more_work) return false;
if (has_runnable_jobs) return true;
+ // must precede the done_request_more_work check
+ if (p->dont_request_more_work) return false;
if (backoff_time > gstate.now) return false;
if (prefs_prevent_fetch(p, rwf.rsc_type)) return false;
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index a9f05d06db..64f91ffa52 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,10 @@
$project_news = array(
+array("November 27, 2009",
+ "An article on
+ volunteer computing appeared today in the Argentine newspaper La Nacion."
+),
array("October 30, 2009",
"The Fifth BOINC Workshop was held Oct. 22-23 in Barcelona.
There were 35 attendees and 21 excellent talks;
diff --git a/version.h b/version.h
index c5e062edda..4cecba564f 100644
--- a/version.h
+++ b/version.h
@@ -23,7 +23,7 @@
#define PACKAGE "boinc"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "boinc_dev@ssl.berkeley.edu"
+#define PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */
#define PACKAGE_NAME "BOINC"