summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS.227
-rw-r--r--etc/images/mail/README2
2 files changed, 8 insertions, 1 deletions
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 049c565ff6f..3bf60b4359d 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -112,6 +112,13 @@ This can be used to add menu entries for backend specific functions.
*** VC has some support for Git.
+* Incompatible Lisp Changes in Emacs 22.2
+
+** shell.el no longer defines the aliases `dirtrack-toggle' and
+`dirtrack-mode' for `shell-dirtrack-mode'. These names were removed
+because they clash with commands provided by dirtrack.el. Use
+`shell-dirtrack-mode' instead.
+
* Lisp Changes in Emacs 22.2.
** Frame-local variables are deprecated and are slated for removal.
diff --git a/etc/images/mail/README b/etc/images/mail/README
index 83183343fc1..962206e6ae8 100644
--- a/etc/images/mail/README
+++ b/etc/images/mail/README
@@ -1,7 +1,7 @@
COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
The following icons are from GNOME 2.x. They are not part of Emacs,
-but distributed and used by Emacs. They are licensed under the
+but are distributed and used by Emacs. They are licensed under the
GNU General Public License version 2 or later. See the source of the
gnome-icons-theme package for more information.