diff --git a/checkin_notes b/checkin_notes
index fa2b87a666..8b68e63c19 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10202,3 +10202,9 @@ David  12 Sept 2006
 	lib/
 		parse.C,h
 
+David  12 Sept 2006
+    - user web: $n -> ITEMS_PER_PAGE
+
+    html/user
+        top_teams.php
+        top_users.php
diff --git a/doc/boinc_news.inc b/doc/boinc_news.inc
index ee32ab4473..121cf4f466 100644
--- a/doc/boinc_news.inc
+++ b/doc/boinc_news.inc
@@ -4,7 +4,7 @@ $project_news = array(
 array("September 11, 2006",
     "<a href=chart_list.php>UW-Madison CAE</a>,
     the first BOINC user to top the 1 TERAFLOPS barrier,
-    has surpassed 2 TERAFLOPS.  Congratulations!"
+    now has surpassed 2 TERAFLOPS.  Congratulations!"
 ),
 array("September 2, 2006",
     "The <a href=http://spin.fh-bielefeld.de/>Spinhenge</a> project
diff --git a/doc/build.php b/doc/build.php
index d372b63e5b..a6b0766011 100644
--- a/doc/build.php
+++ b/doc/build.php
@@ -4,17 +4,17 @@ require_once("docutil.php");
 page_head("Software prerequisites");
 
 echo "
-You need certain software packages to compile and/or run BOINC.
+You need certain software packages to build BOINC.
 The list depends on the system you're on,
-and the parts of BOINC that you need to use.
+and the parts of BOINC that you need.
+<b>If you're creating a BOINC project,
+you don't need to build the Core client or BOINC Manager.</b>
 
 <h2>Unix</h2>
-Solaris 2.6-2.9, Red Hat 8 and Enterprise Edition,
-Mac OS X, and Debian Linux (stable and unstable)
-should work out of the box.
-Other Unix-like systems should work without too much effort.
 <p>
-You'll need to install the following software before building BOINC:
+The various parts of BOINC have dependencies on other software;
+most or all of these may already be present on your system.
+You'll need to download and install the ones you don't have.
 
 <table border=1 cellpadding=8>
 <tr>
diff --git a/doc/contact.php b/doc/contact.php
index c2c573025c..e6af0a5dc8 100644
--- a/doc/contact.php
+++ b/doc/contact.php
@@ -127,6 +127,7 @@ show_name("Carl Christensen");
 show_name("Markku Degerholm");
 show_name("Glenn Dill");
 show_name("James Drews");
+show_name("Urs Echternacht");
 show_name("Charlie Fenton");
 show_name("Mike Fleetwood");
 show_name("John Flynn III");
diff --git a/doc/index.php b/doc/index.php
index a8ccd48382..c3830480f4 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -125,6 +125,8 @@ function show_other() {
             <li> BOINC <a href=dev/>message boards</a>
             <li> <a href=papers.php>Papers related to BOINC</a>
             <li> <a href=logo.php>Logos and graphics</a>
+            <li> The <a href=workshop_06.php>2nd Pan-Galactic BOINC Workshop</a>
+    will be held 20-21 September at the University of Geneva, Switzerland.
             </ul>
             <br>
         </td></tr>
diff --git a/doc/project_cookbook.php b/doc/project_cookbook.php
index 317e50b1d8..1f81e389b8 100644
--- a/doc/project_cookbook.php
+++ b/doc/project_cookbook.php
@@ -7,6 +7,7 @@ echo "
 <li> Install and configure all <a href=build.php>prerequisite software</a>
 (follow the directions carefully).
 Make sure MySQL is configured and running.
+<li> Get the BOINC
 <li> Compile the BOINC software, say into HOME/boinc.
 <li> Run HOME/boinc/tools/<a href=make_project.php>make_project</a>
 <li> Append the contents of projects/PROJECT/PROJECT.httpd.conf
diff --git a/html/user/top_teams.php b/html/user/top_teams.php
index a93a91236d..5d4c5a169c 100644
--- a/html/user/top_teams.php
+++ b/html/user/top_teams.php
@@ -51,7 +51,7 @@ if ($type) {
 
 $offset = get_int("offset", true);
 if (!$offset) $offset=0;
-if ($offset % $n) $offset = 0;
+if ($offset % ITEMS_PER_PAGE) $offset = 0;
 
 if ($offset < ITEM_LIMIT) {
     $cache_args = "sort_by=$sort_by&offset=$offset&type=$type";
diff --git a/html/user/top_users.php b/html/user/top_users.php
index 54e3e0321b..9e40469b1b 100644
--- a/html/user/top_users.php
+++ b/html/user/top_users.php
@@ -37,7 +37,7 @@ if (isset($_GET["sort_by"])) {
 
 $offset = get_int("offset", true);
 if (!$offset) $offset=0;
-if ($offset % $n) $offset = 0;
+if ($offset % ITEMS_PER_PAGE) $offset = 0;
 
 if ($offset < ITEM_LIMIT) {
     $cache_args = "sort_by=$sort_by&offset=$offset";