Merge from mainline.

1 files changed, 17 insertions, 15 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 96cc97ac795..cfb788940d0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -330,7 +330,7 @@ prompts for a number to count from and for a format string.
 ** The Landmark game is now invoked with `landmark', not `lm'.
 
 ** Prolog mode has been completely revamped, with lots of additional
-functionality such as more intelligent indentation, electricty, support for
+functionality such as more intelligent indentation, electricity, support for
 more variants, including Mercury, and a lot more.
 
 ** shell-mode can track your cwd by reading it from your prompt.
@@ -347,6 +347,12 @@ Just set shell-dir-cookie-re to an appropriate regexp.
 ** browse-url has gotten a new variable that is used for mailto: URLs,
    `browse-url-mailto-function', which defaults to `browse-url-mail'.
 
+** Directory local variables can apply to file-less buffers, in certain modes
+(eg dired, vc-dir, log-edit).  For example, adding
+"(diff-mode . ((mode . whitespace)))" to your .dir-locals.el file,
+will turn on `whitespace-mode' for *vc-diff* buffers.  Modes should
+call `hack-dir-local-variables-non-file-buffer' to support this.
+
 ** ERC changes
 
 *** New vars `erc-autojoin-timing' and `erc-autojoin-delay'.
@@ -412,16 +418,12 @@ choose a color via list-colors-display.
 *** dired-jump and dired-jump-other-window called with a prefix argument
 read a file name from the minibuffer instead of using buffer-file-name.
 
-** Directory local variables can apply to file-less buffers.
-For example, adding "(diff-mode . ((mode . whitespace)))" to your
-.dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers.
++++
+*** The `dired local variables' feature provided by Dired-x is obsolete.
+The standard directory local variables feature replaces it.
 
 ** SQL Mode enhancements.
 
-*** Several variables have been marked as safe local variables.  The
-variables `sql-product', `sql-user', `sql-server', `sql-database' and
-`sql-port' can now be safely used as local variables.
-
 *** `sql-dialect' is a synonym for `sql-product'.
 
 *** Added ability to login with a port on MySQL and Postgres.
@@ -530,7 +532,7 @@ objects shown and the details available are product specific.
 **** List all objects.
 Using `M-x sql-list-all', `C-c C-l a' or selecting "SQL->List all
 objects" will list all the objects in the database.  At a minimum it
-lists the tables and views in the database.  Preceeding the command by
+lists the tables and views in the database.  Preceding the command by
 universal argument may provide additional details or extend the
 listing to include other schemas objects.  The list will appear in a
 separate window in view-mode.
@@ -538,7 +540,7 @@ separate window in view-mode.
 **** List Table details.
 Using `M-x sql-list-table', `C-c C-l t' or selecting "SQL->List Table
 details" will ask for the name of a database table or view and display
-the list of columns in the relation.  Preceeding the comand with the
+the list of columns in the relation.  Preceding the command with the
 universal argument may provide additional details about each column.
 The list will appear in a separate window in view-mode.
 
@@ -553,7 +555,7 @@ In general, the SQL*Plus option SCAN should always be set OFF under
 SQL interactive mode and this option used in its place.
 
 *** SQL interactive mode will replace tabs with spaces.
-This prevents the comand interpretter for MySQL and Postgres from
+This prevents the command interpreter for MySQL and Postgres from
 listing object name completions when being sent text via
 `sql-send-*' functions.
 
@@ -562,7 +564,7 @@ listing object name completions when being sent text via
 ** sregex.el is now obsolete, since rx.el is a strict superset.
 
 ** s-region.el and pc-select are now declared obsolete,
-superceded by shift-select-mode enabled by default in 23.1.
+superseded by shift-select-mode enabled by default in 23.1.
 ** pc-mode.el is also declared obsolete.
 ** gdb-mi
 
@@ -710,6 +712,7 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 
 * Lisp changes in Emacs 24.1
 
+** byte-compile-disable-print-circle is obsolete.
 ** Removed the stack-trace-on-error variable.
 Also the debugger can now "continue" from an error, which means it will jump
 to the error handler as if the debugger had not been invoked instead of
@@ -800,10 +803,9 @@ displayed with a "spinning bar".
 runtime checks.
 
 ** New configure.bat option --distfiles to specify files to be
-   included in binary distribution
+included in binary distribution
 
-** New make target `dist' to create binary disttribution for Windows
-   platform
+** New make target `dist' to create binary distribution for MS Windows
 
 
 ----------------------------------------------------------------------