Mercurial > octave

changeset 31712:ed8b218b7c1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 06 Jan 2023 16:30:59 -0500
parents fa24de314774 (current diff) bc24b226891a (diff)
children 5fb22859dbac
files etc/NEWS.8.md
diffstat 4 files changed, 13 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/etc/HACKING.md	Fri Jan 06 16:30:45 2023 -0500
+++ b/etc/HACKING.md	Fri Jan 06 16:30:59 2023 -0500
@@ -312,16 +312,16 @@
 Since version 5, Octave uses the following rules for release numbering:
 
     Version Dev. Phase      When
-  
-    5.0.0   (experimental)  active development of Octave 5 on default branch  
-    5.0.1   (pre-release)   stabilization period of Octave 5 on stable branch  
-    5.0.90  (pre-release)   first release candidate for 5.1.0  
-    5.0.91  (pre-release)   continued stabilization of Octave 5 on stable branch  
-    6.0.0   (experimental)  active development of Octave 6 on default branch  
-    5.1.0   (release)       first release of Octave 5 from stable branch  
-    5.1.1   (pre-release)   bug fixing on stable branch after 5.1.0 release  
-    5.2.0   (release)       second release of Octave 5 from stable branch  
-    5.2.1   (pre-release)   bug fixing on stable branch after 5.2.0 release  
+
+    5.0.0   (experimental)  active development of Octave 5 on default branch
+    5.0.1   (pre-release)   stabilization period of Octave 5 on stable branch
+    5.0.90  (pre-release)   first release candidate for 5.1.0
+    5.0.91  (pre-release)   continued stabilization of Octave 5 on stable branch
+    6.0.0   (experimental)  active development of Octave 6 on default branch
+    5.1.0   (release)       first release of Octave 5 from stable branch
+    5.1.1   (pre-release)   bug fixing on stable branch after 5.1.0 release
+    5.2.0   (release)       second release of Octave 5 from stable branch
+    5.2.1   (pre-release)   bug fixing on stable branch after 5.2.0 release
     ...     ...             ...
 
 To summarize, the first release of Octave 5 will be Octave 5.1.0 while
--- a/etc/NEWS.6.md	Fri Jan 06 16:30:45 2023 -0500
+++ b/etc/NEWS.6.md	Fri Jan 06 16:30:59 2023 -0500
@@ -285,7 +285,7 @@
   range operator.  Each has a new warning ID so that it can be disabled
   if desired.
 
-  >  `Octave:colon-complex-argument`   : when any arg is complex  
+  >  `Octave:colon-complex-argument`   : when any arg is complex
   >  `Octave:colon-nonscalar-argument` : when any arg is non-scalar
 
 - The `regexp` and related functions now correctly handle and *require*
--- a/etc/NEWS.8.md	Fri Jan 06 16:30:45 2023 -0500
+++ b/etc/NEWS.8.md	Fri Jan 06 16:30:59 2023 -0500
@@ -113,7 +113,6 @@
   `OutputFcn`, and `Refine`, along with corrected orientation of struct
   outputs.
 
-
 - *Early notice of future breaking changes*:  Due to many user requests that
   Octave should have a Matlab-compatible string class, there is work under way
   to implement a string class that will differ from a vector of characters.  In
@@ -142,8 +141,7 @@
   (e.g., replace "foo" with 'foo'). Single-quoted strings are expected to
   retain current behavior.  Further, if your code relies on backslash escape
   sequence interpretation in double-quoted strings (except for special cases
-  like the `printf` family), that code may need to change as well.  
-
+  like the `printf` family), that code may need to change as well.
 
 ### Alphabetical list of new functions added in Octave 8
 
--- a/etc/RELEASE_CHECKLIST.md	Fri Jan 06 16:30:45 2023 -0500
+++ b/etc/RELEASE_CHECKLIST.md	Fri Jan 06 16:30:59 2023 -0500
@@ -19,7 +19,7 @@
 Completion Date:
 
 * Merge default onto stable to become the current stable release (see
-  instructions in `etc/HACKING.md`). 
+  instructions in `etc/HACKING.md`).
 * Bump version numbers in `configure.ac` on stable branch (see
   `etc/HACKING.md`).
 * Bump version numbers in `configure.ac` on default branch (see