# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1435171222 14400
# Node ID 5db7eea18d76efcf9c6ae2ccb529664a5c0dca09
# Parent  3a745710eaca80151ac79c5a31708ce73871509e# Parent  077e73619ba8ab2189450402ac5d7616b0f3c4f1
maint: Periodic merge of stable to default.

diff -r 3a745710eaca -r 5db7eea18d76 NEWS
--- a/NEWS	Wed Jun 24 12:53:18 2015 -0400
+++ b/NEWS	Wed Jun 24 14:40:22 2015 -0400
@@ -338,12 +338,12 @@
     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
+ ** 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.
+    octave_map (struct array) or octave_scalar_map for a single structure.
 
  ** The configure option --enable-octave-allocator has been removed.
-    The internal class <octave_allocator> declared in oct-alloc.h has
+    The internal class octave_allocator declared in oct-alloc.h has
     been removed.  The header remains, but is deprecated.  The macros to
     access the class (DECLARE_OCTAVE_ALLOCATOR, DEFINE_OCTAVE_ALLOCATOR,
     and DEFINE_OCTAVE_ALLOCATOR2) are now unconditionally defined to be