diff --git a/checkin_notes b/checkin_notes
index dd12adba67..8981f6b1d8 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -13762,3 +13762,11 @@ Charlie 18 Nov 2005
     
     client/
         acct_setup.C
+
+Charlie 19 Nov 2005
+    Updated information for Mac clients on web site.
+
+    doc/
+        bare_core.php
+        mac_advanced.php
+        screensaver.php
diff --git a/doc/bare_core.php b/doc/bare_core.php
index 112de5138b..8182dfdbcf 100644
--- a/doc/bare_core.php
+++ b/doc/bare_core.php
@@ -17,6 +17,7 @@ if your browser has not done it for you.
     <pre>
     boinc_client -attach_project http://setiathome.berkeley.edu df0d93e384a2700f70e0bc45a1b2c96c
     </pre>
+<li> (substitute the actual name of the core client for <b>boinc_client</b> in the above example.)
 </ul>
 <p>
 Instructions on running the core client (command-line options, etc.) are
@@ -25,20 +26,6 @@ Instructions on running the core client (command-line options, etc.) are
 You'll probably want to arrange
 to run the executable each time your machine boots or you log on.
 Some examples follow.
-
-<h2> Automatic startup on Mac OS X</h2>
-<p>
-<ul>
-<li>
-Instructions from Paul Buck's
-<a href=http://boinc-doc.net/site-boinc/oman-app/inst-mac.php>BOINC Owner's Manual</a>.
-<li>
-<a href=mac_yenigun.php>Instructions from Berki Yenigun</a>,
-deadsmile at minitel.net
-<li>
-<a href=http://stegic.net/archives/2005/05/boinc_as_a_syst.html>Running
-BOINC as a system service on Mac OS X</a> by Ivan Stegic.
-</ul>
 <h2> Automatic startup on Unix</h2>
 <p>
 Users have contributed scripts for automatic
@@ -59,6 +46,48 @@ startup of BOINC on various versions of Unix:
 <li> <a href=http://rigo.altervista.org/tools/>An init script for running BOINC under SuSE Linux (9.2 and 9.3)</a>
 </ul>
 
+<h2> Automatic startup on Mac OS X</h2>
+<p>
+<ul>
+<li>
+Instructions from Paul Buck's
+<a href=http://boinc-doc.net/site-boinc/oman-app/inst-mac.php>BOINC Owner's Manual</a>.
+<li>
+<a href=mac_yenigun.php>Instructions from Berki Yenigun</a>,
+deadsmile at minitel.net
+<li>
+<a href=http://stegic.net/archives/2005/05/boinc_as_a_syst.html>Running
+BOINC as a system service on Mac OS X</a> by Ivan Stegic.
+</ul>
+
+<h2> Special cautions for Mac OS X</h2>
+<p>
+Normally, you should not install the separate command client if you are running the BOINC Manager.  
+The BOINCManager.app bundle contains an embedded copy of the core client.  The installer adds the 
+BOINC Manager to the installing user's list of <b>Login Items</b>  so it launches automatically whenever that user logs in.    
+To have BOINC Manager run automatically when other users log in, you can manually add the BOINC Manager to each user's <b>Login Items</b>.  
+For details, see <a href=mac_advanced.php>here</a>.
+<p>
+On Mac OS X, the core client executable is named <b>boinc</b>.
+<p>
+If you wish to run the embedded core client without launching the Manager, a typical command is:
+    <pre>
+    /Applications/BOINCManager.app/Contents/resources/boinc -redirectio -dir /Library/Application\\ Support/BOINC\\ Data/
+    </pre>
+Normally, quitting the BOINC Manager also quits the embedded core client.  But if you launch the core client (as in the above example) 
+before launching the BOINC Manager, then it will continue to run even after the user quits the Manager.
+<p>
+If you must mix the stand-alone core client and the BOINC Manager on the same Mac OS X system, be careful of the following:
+<ul>
+<li>The BOINC Manager installer sets the set_user_id permission bit (S_ISUID) for the BOINC Manager and its embedded core client executable files.  
+This causes BOINC to always run with the effective user ID set to the installing user.  This may cause permission problems if the 
+stand-alone core client tries to access the same data as a different user.
+<li>By default, the stand-alone core client expects the data to be in the same directory containing the executable.  But the BOINC Manager 
+sets the current directory to \"/Library/Application Support/BOINC Data/\" before launching the embedded core client.
+</ul>
+If you want BOINC to operate on a separate set of data for each user on a Mac OS X system, then the stand-alone core client may be appropriate.  
+But to avoid permission problems, make sure that users who have their own core client don't run the BOINC Manager.
+
 ";
 page_tail();
 ?>
diff --git a/doc/mac_advanced.php b/doc/mac_advanced.php
index c77444429c..06553337a0 100644
--- a/doc/mac_advanced.php
+++ b/doc/mac_advanced.php
@@ -5,13 +5,17 @@ echo "
 <ul>
 <li> If your browser has not already done so,
 expand the zip archive by double-clicking on it in the Finder.
-<li> Double-click on BOINC.pkg to run the installer.
-<li> The installer places two items onto your hard drive: BOINCManager.app in your /Applications folder and BOINCSaver.saver in your /Library/Screen Savers folder.  
-<li> It also sets BOINCManager as one of the items to automatically start whenever the user is logged in.  You can add or remove Startup Items by using the Accounts Pane in the System Preferences (accessible from the Apple menu).  
-<li> The installer creates a \"BOINC Data\" folder inside your
-\"/Library/Applications Support\" folder if one does not already exist.  If you have previously been running BOINC in a different folder, copy your data into this folder.  
-<li> The BOINC application bundle includes the BOINC client embedded inside it.
+<li> Double-click on BOINC.pkg to run the installer, then follow the prompts.
 <li> Close the installer when it is finished.  This will automatically launch the BOINC Manager.
+<li> The installer does the following:
+    <ul>
+    <li> places BOINCManager.app in your /Applications folder, with the BOINC client embedded inside the BOINCManager application's bundle.
+    <li> puts BOINCSaver.saver in your /Library/Screen Savers folder.  
+    <li> sets BOINCManager as one of the items to automatically start whenever the user is logged in.  You can add or remove Startup Items by using the Accounts Pane in the System Preferences (accessible from the Apple menu).  
+    <li> creates a \"BOINC Data\" folder inside your
+\"/Library/Applications Support\" folder if one does not already exist.  If you have previously been running BOINC in a different folder, copy your data into this folder.  
+    <li> puts BOINC's localization files in the \"BOINC Data/locale\" folder.  These files allow BOINC to support over two dozen languages. 
+    </ul>
 </ul>
 ";
 page_tail();
diff --git a/doc/screensaver.php b/doc/screensaver.php
index 2b6928652a..659056570b 100644
--- a/doc/screensaver.php
+++ b/doc/screensaver.php
@@ -3,9 +3,19 @@ require_once("docutil.php");
 page_head("The BOINC screensaver");
 echo "
 The BOINC client software on Windows and Mac OS X includes a screensaver program,
-which you can select as your screensaver
-(on Windows, right-click on the desktop,
-click Properties, select Screen Saver, select BOINC).
+which you can select as your screensaver.
+<p>
+On Windows:
+    <ul>
+    <li>Right-click on the desktop.
+    <li>Click Properties, select Screen Saver, select BOINC.
+    </ul>
+On Mac OS X:
+    <ul>
+    <li>Under the Apple menu, select \"System Preferences\".
+    <li>Click on \"Desktop & Screen Saver\".
+    <li>Select BOINCSaver from the list of Screen Savers.
+    </ul>
 <p>
 NOTE: BOINC runs even if you don't use the screensaver.
 <p>
@@ -20,7 +30,7 @@ the screensaver cycles between them every few minutes.
 
 <li> If applications are running but non are graphics-capable,
 the screensaver shows the names of the applications
-and their fraction done.
+and their fraction done for the current work unit.
 
 <li> If the core client is running but no applications are running,
 the screensaver shows that.
@@ -29,7 +39,7 @@ the screensaver shows that.
     the screensaver shows that.
 </ul>
 <p>
-Normally, if you press a key or mouse the mouse
+Normally, if you press a key or move the mouse
 while the screensaver is active,
 the screensaver will exit.
 Some BOINC applications handle keyboard/mouse input.