Do not mention individual ns options in the manual

* doc/emacs/macos.texi (Mac / GNUstep Customization): Mention ns custom group.
(Customization options specific to Mac OS / GNUstep): Remove section.

* etc/NEWS: Related markup.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f2f67a36a0fb4d7446f41cecb6b1691d9252e8b8..efb70f3b09b41e0713d414fed9408087f4c8c240 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-29  Glenn Morris  <rgm@gnu.org>
+
+       * macos.texi (Mac / GNUstep Customization): Mention ns custom group.
+       (Customization options specific to Mac OS / GNUstep): Remove section.
+
 2014-05-28  Glenn Morris  <rgm@gnu.org>
 
        * macos.texi (Mac / GNUstep Customization): Mention some new features.

diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 97afa5b1beba8ccc16b2259766d035b548b4f8cb..2177ad4e21046c5132d5d886a04892f7a1da5b90 100644 (file)
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -90,9 +90,10 @@ of setting PATH is recommended on Mac OS X 10.5 and later, using the
 @node Mac / GNUstep Customization
 @section Mac / GNUstep Customization
 
-Emacs can be customized in several ways in addition to the standard
-customization buffers and the Options menu.
-
+There are a few customization options that are specific to the
+Nextstep port.  For example, they affect things such as the modifier
+keys and the fullscreen behavior.  To see all such options, use
+@kbd{M-x customize-group @key{RET} ns @key{RET}}.
 
 @subsection Font and Color Panels
 
@@ -125,27 +126,6 @@ at the command-line before starting Emacs:
 % 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.
-
-@table @code
-@item ns-auto-hide-menu-bar
-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
-
 
 @node Mac / GNUstep Events
 @section Windowing System Events under Mac OS / GNUstep

diff --git a/etc/NEWS b/etc/NEWS
index 84e5ff5160aaa97457e5b8e94a8c1cdec9cbdce3..a353fdd9d8bfeece480b1dc9c9bacbefe52e108f 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1605,12 +1605,12 @@ 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.
 
-+++
+---
 ** 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 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.