Merge from trunk.

2 files changed, 6 insertions, 1 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6e69a96a2a8..8853eb099d6 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-09  Glenn Morris  <rgm@gnu.org>
+
+        * custom.texi (Specifying File Variables):
+        Recommend explicit arguments for minor modes.
+
 2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Document wide integers better.
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index a0dce5b3216..434c574ac42 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1215,7 +1215,7 @@ other context has no special meaning.
 well as the major modes; in fact, you can use it more than once, first
 to set the major mode and then to enable minor modes which are
 specific to particular buffers.  Using @code{mode} for minor modes
-is deprecated, though---instead, use @code{eval: (minor-mode)}. 
+is deprecated, though---instead, use @code{eval: (minor-mode 1)}. 
 
   Often, however, it is a mistake to enable minor modes in file local
 variables.  Most minor modes, like Auto Fill mode, represent individual user