--- a/NEWS	Fri Jan 30 17:50:03 2015 -0500
+++ b/NEWS	Fri Jan 30 11:51:45 2015 -0500
@@ -1,4 +1,4 @@
-Summary of important user-visible changes for version 4.2:
+Summary of important user-visible changes for version 4.0:
 ---------------------------------------------------------
 
  ** A new syntax for object oriented programming termed classdef has been
@@ -19,7 +19,7 @@
       audioinfo     audiorecorder
       audioplayer   audiowrite
 
- ** Other new classes in Octave 4.2:
+ ** Other new classes in Octave 4.0:
 
       audioplayer    inputParser
       audiorecorder
@@ -37,6 +37,30 @@
     All three optimizations are disabled if Octave is started with the
     --braindead command line option.
 
+ ** For compatibility with Matlab, the "backtrace" warning option is now
+    enabled by default.
+
+ ** The preference
+
+      do_braindead_shortcircuit_evaluation
+
+    is now enabled by default.
+
+ ** The preference
+
+      allow_noninteger_range_as_index
+
+    is now enabled by default and the warning ID
+
+      Octave:noninteger-range-as-index
+
+    is now set to "on" by default instead of "error" by default and "on"
+    for --traditional.
+
+ ** polyeig now returns a row vector of eigenvalues rather than a matrix
+    with the eigenvalues on the diagonal.  This change was made for Matlab
+    compatibility.
+
  ** Interpolation function changes for Matlab compatibility
 
     The interpolation method 'cubic' is now equivalent to 'pchip'
@@ -122,7 +146,7 @@
     previous separate warning IDs "Octave:fopen-file-in-path",
     "Octave:load-file-in-path", and "Octave:md5sum-file-in-path".
 
- ** Other new functions added in 4.2:
+ ** Other new functions added in 4.0:
 
       bandwidth
       cubehelix
@@ -146,6 +170,7 @@
       rotate
       sylvester
       unsetenv
+      validateattributes
       zoom
 
  ** inline() scheduled for eventual deprecation by Matlab
@@ -157,9 +182,9 @@
 
  ** Deprecated functions.
 
-    The following functions have been deprecated in Octave 4.2 and will
-    be removed from Octave 4.6 (or whatever version is the second major
-    release after 4.2):
+    The following functions have been deprecated in Octave 4.0 and will
+    be removed from Octave 4.4 (or whatever version is the second major
+    release after 4.0):
 
       Function             | Replacement
       ---------------------|------------------
@@ -176,8 +201,12 @@
       syl                  | sylvester
       usage                | print_usage
 
-    The following functions were deprecated in Octave 3.8 and have been
-    removed from Octave 4.2.
+      allow_noninteger_range_as_index
+      do_braindead_shortcircuit_evaluation
+
+ ** The following functions were deprecated in Octave 3.8 and will be
+    removed from Octave 4.2 (or whatever version is the second major
+    release after 3.8):
 
       default_save_options    java_new
       gen_doc_cache           java_unsigned_conversion
@@ -187,19 +216,33 @@
       java_debug              read_readline_init_file
       java_invoke             saving_history
 
-    The following keywords were deprecated in Octave 3.8 and have been
-    removed from Octave 4.2
+ ** The following functions were deprecated in Octave 3.6 and have been
+    removed from Octave 4.0.
+
+      cut                polyderiv
+      cor                shell_cmd
+      corrcoef           studentize
+      __error_text__     sylvester_matrix
+      error_text
+
+ ** The following keywords were deprecated in Octave 3.8 and have been
+    removed from Octave 4.0
 
       static
 
-    The following configuration variables were deprecated in Octave 3.8
-    and have been removed from Octave 4.2
+ ** The following configuration variables were deprecated in Octave 3.8
+    and have been removed from Octave 4.0
 
       CC_VERSION  (now GCC_VERSION)
       CXX_VERSION (now GXX_VERSION)
 
-    The internal class <Octave_map> was deprecated in Octave 3.8 and has
-    been removed from Octave 4.2.  Replacement classes are
+ ** The internal function atan2 of the sparse matrix class has been deprecated
+    in Octave 4.0 and will be removed from Octave 4.4 (or whatever version is
+    the second major release after 4.0).  Use the Fatan2 function with sparse
+    inputs as a replacement.
+
+ ** The internal class <Octave_map> was deprecated in Octave 3.8 and has
+    been removed from Octave 4.0.  Replacement classes are
     <octave_map> (struct array) or <octave_scalar_map> for a single structure.
 
  ** The warning ID Octave:singular-matrix-div has been replaced by
@@ -212,60 +255,6 @@
     and DEFINE_OCTAVE_ALLOCATOR2) are now unconditionally defined to be
     empty.
 
-Summary of important user-visible changes for version 4.0:
----------------------------------------------------------
-
- ** For compatibility with Matlab, the "backtrace" warning option is now
-    enabled by default.
-
- ** The preference
-
-      do_braindead_shortcircuit_evaluation
-
-    is now enabled by default.
-
- ** The preference
-
-      allow_noninteger_range_as_index
-
-    is now enabled by default and the warning ID
-
-      Octave:noninteger-range-as-index
-
-    is now set to "on" by default instead of "error" by default and "on"
-    for --traditional.
-
- ** polyeig now returns a row vector of eigenvalues rather than a matrix
-    with the eigenvalues on the diagonal.  This change was made for Matlab
-    compatibility.
-
- ** Other new functions added in 4.0.0:
-
-      validateattributes
-
- ** Deprecated functions.
-
-    The following functions were deprecated in Octave 3.6 and have been
-    removed from Octave 4.0.
-
-      cut                polyderiv
-      cor                shell_cmd
-      corrcoef           studentize
-      __error_text__     sylvester_matrix
-      error_text
-
-    The following functions have been deprecated in Octave 4.0 and will
-    be removed from Octave 4.4 (or whatever version is the second major
-    release after 4.0):
-
-      allow_noninteger_range_as_index
-      do_braindead_shortcircuit_evaluation
-
-    The internal function atan2 of the sparse matrix class has been deprecated
-    in Octave 4.0 and will be removed from Octave 4.4 (or whatever version is
-    the second major release after 4.0).  Use the Fatan2 function with sparse
-    inputs as a replacement.
-
 ---------------------------------------------------------
 
 See NEWS.3 for old news.