diff --git a/checkin_notes b/checkin_notes
index a614d10ad6..39ef524e92 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -21611,6 +21611,12 @@ David  18 Dec 2004
 
 David  19 Dec 2004
 	- fix compile of old Win GUI
+    - update BOINC manager messages a little
 
 	client/win/
 		wingui_mainwindow.cpp
+    clientgui/
+        ViewMessages.cpp
+        ViewProjects.cpp
+        ViewResources.cpp
+        ViewTransfers.cpp
diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index 046808458e..77a366dea6 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -59,19 +59,19 @@
 
 
 const wxString LINKDESC_DEFAULT         = 
-     _("Please click a message to see additional options.");
+     _("Click a message to see additional options.");
 
 const wxString LINK_TASKCOPYALL         = wxT(SECTION_TASK "copyall");
 const wxString LINKDESC_TASKCOPYALL     = 
      _("<b>Copy all</b><br>"
-       "Copy all the messages to the system clipboard.");
+       "Copy all the messages to the clipboard.");
 
 const wxString LINK_TASKCOPYMESSAGE     = wxT(SECTION_TASK "copymessage");
 const wxString LINKDESC_TASKCOPYMESSAGE = 
-     _("<b>Copy selection</b><br>"
-       "Copy the selected message(s) to the system clipboard.  "
-       "You can select multiple items by holding down the shift key "
-       " or control key while clicking on the next desired message.");
+     _("<b>Copy selected messages</b><br>"
+       "Copy the selected messages to the clipboard.  "
+       "You can select multiple messages by holding down the shift "
+       " or control key while clicking on messages.");
 
 
 WX_DEFINE_OBJARRAY( CMessageCache );
@@ -176,7 +176,7 @@ CViewMessages::CViewMessages(wxNotebook* pNotebook) :
     m_pTaskPane->AddVirtualFile(BITMAP_MESSAGE, bmpMessage, wxBITMAP_TYPE_XPM);
 
     m_pTaskPane->CreateTaskHeader(BITMAP_TASKHEADER, bmpTask, _("Tasks"));
-    m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips"));
+    m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Tips"));
 
     m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 115);
     m_pListPane->InsertColumn(COLUMN_TIME, _("Time"), wxLIST_FORMAT_LEFT, 145);
@@ -501,8 +501,8 @@ void CViewMessages::UpdateTaskPane()
     m_pTaskPane->BeginTaskSection( SECTION_TASK, BITMAP_TASKHEADER, m_bTaskHeaderHidden );
     if (!m_bTaskHeaderHidden)
     {
-        m_pTaskPane->CreateTask( LINK_TASKCOPYALL, BITMAP_MESSAGE, _("Copy all"), m_bTaskCopyAllHidden );
-        m_pTaskPane->CreateTask( LINK_TASKCOPYMESSAGE, BITMAP_MESSAGE, _("Copy selection"), m_bTaskCopyMessageHidden );
+        m_pTaskPane->CreateTask( LINK_TASKCOPYALL, BITMAP_MESSAGE, _("Copy all messages"), m_bTaskCopyAllHidden );
+        m_pTaskPane->CreateTask( LINK_TASKCOPYMESSAGE, BITMAP_MESSAGE, _("Copy selected messages"), m_bTaskCopyMessageHidden );
     }
     m_pTaskPane->EndTaskSection( m_bTaskHeaderHidden );
 
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index 8fd70942d2..a7aac60a5c 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -66,7 +66,7 @@
 
 
 const wxString LINKDESC_DEFAULT         = 
-     _("Please click a project to see additional options.");
+     _("Click a project to see additional options.");
 
 const wxString LINK_TASKATTACH      = wxT(SECTION_TASK "attach");
 const wxString LINKDESC_TASKATTACH  = 
@@ -79,14 +79,16 @@ const wxString LINK_TASKDETACH      = wxT(SECTION_TASK "detach");
 const wxString LINKDESC_TASKDETACH  = 
      _("<b>Detach from project</b><br>"
        "Detach this computer from this project.  "
-       "You may wish to update the project first to report "
+       "Work in progress will be lost. "
+       "You can update the project first to report "
        "any completed work.");
 
 const wxString LINK_TASKRESET       = wxT(SECTION_TASK "reset");
 const wxString LINKDESC_TASKRESET   = 
      _("<b>Reset project</b><br>"
-       "Remove all workunits and applications from this project.  "
-       "You may wish to update the project "
+       "Delete all files and work associated with this project, "
+       "and get new work.  "
+       "You can update the project "
        "first to report any completed work.");
 
 const wxString LINK_TASKSUSPEND     = wxT(SECTION_TASK "suspend");
@@ -275,14 +277,14 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
 
     m_pTaskPane->CreateTaskHeader(BITMAP_TASKHEADER, bmpTask, _("Tasks"));
     m_pTaskPane->CreateTaskHeader(BITMAP_WEBHEADER, bmpWeb, _("Web sites"));
-    m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips"));
+    m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Tips"));
 
     m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 150);
     m_pListPane->InsertColumn(COLUMN_ACCOUNTNAME, _("Account"), wxLIST_FORMAT_LEFT, 80);
     m_pListPane->InsertColumn(COLUMN_TEAMNAME, _("Team"), wxLIST_FORMAT_LEFT, 80);
-    m_pListPane->InsertColumn(COLUMN_TOTALCREDIT, _("Total Credit"), wxLIST_FORMAT_RIGHT, 80);
-    m_pListPane->InsertColumn(COLUMN_AVGCREDIT, _("Avg. Credit"), wxLIST_FORMAT_RIGHT, 80);
-    m_pListPane->InsertColumn(COLUMN_RESOURCESHARE, _("Resource Share"), wxLIST_FORMAT_CENTRE, 85);
+    m_pListPane->InsertColumn(COLUMN_TOTALCREDIT, _("Total credit"), wxLIST_FORMAT_RIGHT, 80);
+    m_pListPane->InsertColumn(COLUMN_AVGCREDIT, _("Avg. credit"), wxLIST_FORMAT_RIGHT, 80);
+    m_pListPane->InsertColumn(COLUMN_RESOURCESHARE, _("Resource share"), wxLIST_FORMAT_CENTRE, 85);
     m_pListPane->InsertColumn(COLUMN_STATUS, _("Status"), wxLIST_FORMAT_LEFT, 150);
 
     m_bTipsHeaderHidden = false;
diff --git a/clientgui/ViewResources.cpp b/clientgui/ViewResources.cpp
index 791240cfab..794f6db79a 100644
--- a/clientgui/ViewResources.cpp
+++ b/clientgui/ViewResources.cpp
@@ -128,7 +128,7 @@ CViewResources::CViewResources(wxNotebook* pNotebook) :
     m_pTaskPane->AddVirtualFile(wxT(BITMAP_RESOURCES), bmpResources, wxBITMAP_TYPE_XPM);
 
     m_pTaskPane->CreateTaskHeader(BITMAP_TASKHEADER, bmpTask, _("Tasks"));
-    m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips"));
+    m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Tips"));
 
     m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, -1);
     m_pListPane->InsertColumn(COLUMN_DISKSPACE, _("Disk Space"), wxLIST_FORMAT_LEFT, -1);
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index 472687df0c..acef573f4f 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -224,7 +224,7 @@ CViewTransfers::CViewTransfers(wxNotebook* pNotebook) :
     m_pTaskPane->AddVirtualFile(BITMAP_TRANSFER, bmpTransfer, wxBITMAP_TYPE_XPM);
 
     m_pTaskPane->CreateTaskHeader(BITMAP_TASKHEADER, bmpTask, _("Tasks"));
-    m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Quick Tips"));
+    m_pTaskPane->CreateTaskHeader(BITMAP_TIPSHEADER, bmpTips, _("Tips"));
 
     m_pListPane->InsertColumn(COLUMN_PROJECT, _("Project"), wxLIST_FORMAT_LEFT, 125);
     m_pListPane->InsertColumn(COLUMN_FILE, _("File"), wxLIST_FORMAT_LEFT, 205);
diff --git a/doc/boinc_dev.php b/doc/boinc_dev.php
index 9a08fe890e..7a59483245 100644
--- a/doc/boinc_dev.php
+++ b/doc/boinc_dev.php
@@ -49,7 +49,9 @@ before getting into the source code.
 <li> <a href=host_id.php>Host identification</a>
 <li> <a href=client_app.php>Core client/application interaction (basic)</a>
 <li> <a href=client_app_graphic.php>Core client/application interaction (graphics)</a>
+<!--
 <li> <a href=disk_management.php>Disk space management</a>
+-->
 </ul>
 <h2>Server programs</h2>
 <ul>
diff --git a/doc/links.php b/doc/links.php
index 920e1d4f17..d2512ade9a 100644
--- a/doc/links.php
+++ b/doc/links.php
@@ -10,6 +10,7 @@ function language($lang, $sites) {
     foreach ($sites as $s) {
         echo "$s<br>\n";
     }
+    echo "</td></tr>\n";
 }
 
 function site($url, $name) {
@@ -24,11 +25,11 @@ Information for BOINC participants is available in several languages
 
 ";
 
+list_start();
 echo "
 <tr><th>Language</th><th>Site</th></tr>
 ";
 
-list_start();
 language("Chinese", array(
     site("http://www.equn.com/boinchina", "www.equn.com/boinchina")
 ));
diff --git a/doc/server_debug.php b/doc/server_debug.php
index f1a4f84645..1ae0b45db1 100644
--- a/doc/server_debug.php
+++ b/doc/server_debug.php
@@ -46,7 +46,9 @@ Run the scheduler under the debugger, giving it this file as stdin,
                       
 <li>
  You may have to doctor the database as follows:
+ <pre>
    update host set rpc_seqno=0, rpc_time=0 where hostid=N
+ </pre>
    to keep the scheduler from rejecting the request.
 </ul>
 This is useful for figuring out why your project is generating