2 files changed, 10 insertions, 4 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 7e71eca54b9..da9b8c180c4 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -380,12 +380,12 @@
 
 2011-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
 
-        * images/icons/allout-widgets/dark-bg/encrypted-locked.png:
-        * images/icons/allout-widgets/dark-bg/encrypted-locked.xpm:
+        * images/icons/allout-widgets/dark-bg/locked-encrypted.png:
+        * images/icons/allout-widgets/dark-bg/locked-encrypted.xpm:
         * images/icons/allout-widgets/dark-bg/unlocked-encrypted.png:
         * images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm:
-        * images/icons/allout-widgets/light-bg/encrypted-locked.png:
-        * images/icons/allout-widgets/light-bg/encrypted-locked.xpm:
+        * images/icons/allout-widgets/light-bg/locked-encrypted.png:
+        * images/icons/allout-widgets/light-bg/locked-encrypted.xpm:
         * images/icons/allout-widgets/light-bg/unlocked-encrypted.png:
         * images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm:
         Reorganize icon directories and files to reconcile against windows
diff --git a/etc/NEWS b/etc/NEWS
index 583c86b901d..65b6e532fc8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -965,6 +965,12 @@ Its functions and variables have been similarly renamed.
 ** Occur Edit mode applies edits made in *Occur* buffers to the
 original buffers.  It is bound to "e" in Occur mode.
 
+** When `occur' is called with the prefix argument `C-u'
+the matching strings are collected into the `*Occur*' buffer
+without line numbers.  If there are parenthesized subexpressions
+in the specified regexp, `occur' reads replacement text that
+may contain \\& and \\N whose convention follows `replace-match'.
+
 +++
 ** New global minor mode electric-pair-mode.
 When enabled, typing an open parenthesis automatically inserts the