*** empty log message ***

2 files changed, 11 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index ecde349f915..a8092923ea5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3967,6 +3967,12 @@ A file local variables list cannot specify a string with text
 properties--any specified text properties are discarded.
 
 +++
+*** The variable `enable-local-variables' controls how local variable
+lists are handled.  t, the default, specifies the standard querying
+behavior.  :safe means use only safe values, and ignore the rest.
+nil means ignore them all.  Anything else means always query.
+
++++
 *** The variable `safe-local-eval-forms' specifies a list of forms that
 are ok to evaluate when they appear in an `eval' local variables
 specification.  Normally Emacs asks for confirmation before evaluating
@@ -10790,9 +10796,6 @@ SNMPv2 MIBs.  It has entries on `auto-mode-alist'.
 editing SQL files, and M-x sql-interactive-mode for interacting with
 SQL interpreters.  It has an entry on `auto-mode-alist'.
 
-*** M-x highlight-changes-mode provides a minor mode displaying buffer
-changes with a special face.
-
 *** ispell4.el has been deleted.  It got in the way of ispell.el and
 this was hard to fix reliably.  It has long been obsolete -- use
 Ispell 3.1 and ispell.el.
diff --git a/man/ChangeLog b/man/ChangeLog
index 5123c1127ae..e084c379762 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-11  Richard Stallman  <rms@gnu.org>
+
+        * custom.texi (Safe File Variables):
+        Document enable-local-variables = :safe.
+
 2006-04-11  Karl Berry  <karl@gnu.org>
 
         * emacs-xtra.texi, emacs.texi (Dired under VC, VC Dired Commands,