3 files changed, 34 insertions, 9 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2452119110b..f2f67a36a0f 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-28  Glenn Morris  <rgm@gnu.org>
+
+        * macos.texi (Mac / GNUstep Customization): Mention some new features.
+
 2014-05-27  Glenn Morris  <rgm@gnu.org>
 
         * abbrevs.texi (Expanding Abbrevs): Update re abbrev-expand-function.
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index eb2d96e9af7..97afa5b1beb 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -116,6 +116,15 @@ close the altered one.
 Useful in this context is the listing of all faces obtained by
 @kbd{M-x list-faces-display}.
 
+@cindex Core Text, on Mac OS X
+In Mac OS X 10.5 and later, Emacs uses a Core Text based font backend
+by default.  If you prefer the older font style, enter the following
+at the command-line before starting Emacs:
+
+@example
+% defaults write org.gnu.Emacs FontBackend ns
+@end example
+
 @subsection Customization options specific to Mac OS / GNUstep
 
 The following customization options are specific to the Nextstep port.
@@ -125,6 +134,16 @@ The following customization options are specific to the Nextstep port.
 Non-nil means the menu-bar is hidden by default, but appears if you
 move the mouse pointer over it.  (Requires Mac OS X 10.6 or later.)
 
+@item ns-use-native-fullscreen
+This only affects Mac OS X 10.7 or later, where it is non-@code{nil} by default,
+which means to use native fullscreen support.  Set it to @code{nil}
+to use the older style of fullscreen, which may work better with
+multiple monitors, but lacks the tool bar.
+
+@c FIXME what does this actually _do_?
+@item ns-use-srgb-colorspace
+This only affects Mac OS X 10.7 or later, where it is non-@code{nil} by default.
+Note that it does not apply to images, only to Emacs colors.
 @end table
 
 
diff --git a/etc/NEWS b/etc/NEWS
index c272660af1b..84e5ff5160a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1599,19 +1599,21 @@ edited in another Emacs session or by another user.  See the node
 "Interlocking" in the Emacs User Manual for the details.  To disable
 file locking, customize `create-lockfiles' to nil.
 
++++
 ** New Core Text based font backend for Mac OS X 10.5 and newer.
+To use the old font backend, use the following on the command line:
+  % defaults write org.gnu.Emacs FontBackend ns
 GNUstep and Mac OS X 10.4 use the old font backend.
-To use the old backend by default, do on the command line:
-% defaults write org.gnu.Emacs FontBackend ns
 
-** Improved fullscreen support on Mac OS X.
-Emacs supports both native (Mac OS X 10.7 and newer) and "old style" fullscreen.
-Customize `ns-use-native-fullscreen' to change the style.
-For Mac OS X 10.7 and newer, native is the default.
++++
+** Improved fullscreen support on Mac OS X 10.7 and newer, where the
+default fullscreen method is now "native" fullscreen.  To use the
+old style fullscreen, customize `ns-use-native-fullscreen' to nil.
 
-** On Mac OS X 10.7 and newer, Emacs uses sRGB colorspace by default.
-Customize `ns-use-srgb-colorspace' to disable this.  Note that this
-does not apply to images.
++++
+** On Mac OS X 10.7 and newer, Emacs can use sRGB colorspace, and does so
+by default.  Customize `ns-use-srgb-colorspace' to go back to the old method.
+Note that this does not apply to images.
 
 
 * Installation Changes in Emacs 24.3