merge trunk

2 files changed, 32 insertions, 2 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4f83227c8dc..10199922b34 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * NEWS: Add sections for Emacs-23.3.
+
 2010-05-08  Chong Yidong  <cyd@stupidchicken.com>
 
         * PROBLEMS: Document gcc-4.5 bug (Bug#6031).
@@ -43,8 +47,7 @@
 
 2010-03-24  Francesc Rocher  <rocher@member.fsf.org>
 
-        * MORE.STUFF: Remove CEDET entry, now distributed as part of
-        Emacs.
+        * MORE.STUFF: Remove CEDET entry, now distributed as part of Emacs.
 
 2010-03-22  Teodor Zlatanov  <tzz@lifelogs.com>
 
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index b52b1f79f41..9124fe1c069 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -15,6 +15,33 @@ You can narrow news to a specific version by calling `view-emacs-news'
 with a prefix argument or by typing C-u C-h C-n.
 
 
+* Installation Changes in Emacs 23.3
+
+* Startup Changes in Emacs 23.3
+
+* Changes in Emacs 23.3
+
+
+* Editing Changes in Emacs 23.3
+
+
+* Changes in Specialized Modes and Packages in Emacs 23.3
+
+
+* New Modes and Packages in Emacs 23.3
+
+
+* Incompatible Lisp Changes in Emacs 23.3
+
+
+* Lisp changes in Emacs 23.3
+
+** New function byte-to-string, like char-to-string but for bytes.
+
+
+* Changes in Emacs 23.3 on non-free operating systems
+
+
 * Installation Changes in Emacs 23.2
 
 ** New configure options for Emacs developers.