diff --git a/doc/bare_core.php b/doc/bare_core.php
index 8182dfdbcf..aca1cf0255 100644
--- a/doc/bare_core.php
+++ b/doc/bare_core.php
@@ -75,7 +75,10 @@ If you wish to run the embedded core client without launching the Manager, a typ
/Applications/BOINCManager.app/Contents/resources/boinc -redirectio -dir /Library/Application\\ Support/BOINC\\ Data/
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.
+before launching the BOINC Manager, then it will continue to run even after the user quits the Manager.
+
+On Mac OS X, the BOINC screen saver will also launch the Manager's embedded core client, and will kill it when the screen saver is dismissed,
+but only if the core client was not already running.
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:
diff --git a/doc/mac_advanced.php b/doc/mac_advanced.php
index 06553337a0..2d3adb571c 100644
--- a/doc/mac_advanced.php
+++ b/doc/mac_advanced.php
@@ -9,12 +9,12 @@ expand the zip archive by double-clicking on it in the Finder.
- Close the installer when it is finished. This will automatically launch the BOINC Manager.
- The installer does the following:
- - places BOINCManager.app in your /Applications folder, with the BOINC client embedded inside the BOINCManager application's bundle.
-
- puts BOINCSaver.saver in your /Library/Screen Savers folder.
-
- 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).
-
- 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.
-
- puts BOINC's localization files in the \"BOINC Data/locale\" folder. These files allow BOINC to support over two dozen languages.
+
- places BOINCManager.app in your /Applications folder, with the BOINC client embedded inside the BOINCManager application's bundle.
+
- puts BOINCSaver.saver in your /Library/Screen Savers folder.
+
- sets BOINCManager as one of the items to automatically start whenever the user is logged in. You can add or remove Login Items by using the Accounts pane in the System Preferences (accessible from the Apple menu).
+
- 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.
+
- puts BOINC's localization files in the /Library/Applications Support/BOINC Data/locale folder. These files allow BOINC to support over two dozen languages.
";
diff --git a/doc/screensaver.php b/doc/screensaver.php
index 659056570b..d09a286dd3 100644
--- a/doc/screensaver.php
+++ b/doc/screensaver.php
@@ -8,13 +8,13 @@ which you can select as your screensaver.
On Windows:
- Right-click on the desktop.
-
- Click Properties, select Screen Saver, select BOINC.
+
- Click Properties, select Screen Saver, select BOINC.
On Mac OS X:
- - Under the Apple menu, select \"System Preferences\".
-
- Click on \"Desktop & Screen Saver\".
-
- Select BOINCSaver from the list of Screen Savers.
+
- Under the Apple menu, select System Preferences.
+
- Click on Desktop & Screen Saver.
+
- Select BOINCSaver from the list of Screen Savers.
NOTE: BOINC runs even if you don't use the screensaver.