Updating the README text to the fifth milestone: 2.4.x.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5173 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index db92e077f87b047111736c1dc58773daab3d9bab..ce73318f16ff249c16139901e775f54083db061a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-04-03  Benno Schulenberg  <bensberg@justemail.net>
+       * README: Update text to the fifth milestone: 2.4.x, plus tweaks.
+
 2015-03-28  Benno Schulenberg  <bensberg@justemail.net>
        * src/search.c (search_init_globals, search_replace_abort),
        src/winio.c (edit_redraw), src/proto.h, src/global.c: When finding
@@ -22,7 +25,7 @@
        * src/search.c (do_replace_loop): Place a call to edit_refresh better,
        and remove two unneeded ones.  This greatly speeds up nano when doing
        a Replace All with *lots* of occurrences.
-       * src/{color,global,nano,text,utils}.c:  Normalize some whitespace.
+       * src/{color,global,nano,text,utils}.c: Normalize some whitespace.
        * src/global.c (strtosc): The linter is only available when colour is.
        * src/global.c, src/text.c: Treat the formatter like a speller, to fix
        compilation with --disable-speller.  Fixes Savannah bug #44607.
@@ -51,7 +54,7 @@
 
 2015-03-22  Chris Allegretta <chrisa@asty.org>
        * src/text.c (do_alt_speller): timestamp can just be a time_t.
-       Fixes compilation on win32.
+       Fixes compilation on win32 and macOS.
 
 GNU nano 2.4.0  - 2015.03.22
 2015-03-22  Benno Schulenberg  <bensberg@justemail.net>
@@ -164,7 +167,7 @@ GNU nano 2.3.99pre2 - 2015.02.06
 2015-01-13  Chris Allegretta <chrisa@asty.org>
        * src/files.c (open_buffer): Check here for locking and properly
        handle choosing to not open a file when locked instead of in
-       open_file().  Fixes Savannah bug 42373 reported by Benno Schulenberg.
+       open_file().  Fixes Savannah bug #42373 reported by Benno Schulenberg.
 
 GNU nano 2.3.99pre1 - 2015.01.06
 2015-01-03  Chris Allegretta <chrisa@asty.org>

diff --git a/README b/README
index da8078796c53dad99597095b4b20649c00693cf6..c0e7da6e44c9105f40521f1e3ecfa921001ad833 100644 (file)
--- a/README
+++ b/README
@@ -6,20 +6,19 @@ Overview
      The nano project was started because of a few "problems" with the
      wonderfully easy-to-use and friendly Pico text editor.
 
-     First and foremost is its license: the Pine suite does not use the
-     GPL or a GPL-friendly license, and has unclear restrictions on
+     First and foremost was its license: the Pine suite does not use
+     the GPL or a GPL-friendly license, and has unclear restrictions on
      redistribution.  Because of this, Pine and Pico are not included
-     with many GNU/Linux distributions.  Also, other features (like go
-     to line number or search and replace) were unavailable until
-     recently or require a command line flag.  Yuck.
+     with many GNU/Linux distributions.  Also, other features (like
+     go-to-line-number or search-and-replace) were unavailable until
+     recently or require a command-line flag.  Yuck.
 
      nano aims to solve these problems by emulating the functionality of
      Pico as closely as possible while addressing the problems above and
-     perhaps providing other extra functionality.
+     providing other extra functionality.
 
-     The nano editor is now an official GNU package.  For more
-     information on GNU and the Free Software Foundation, please see
-     http://www.gnu.org/.
+     The nano editor is an official GNU package.  For more information on
+     GNU and the Free Software Foundation, please see http://www.gnu.org/.
 
 How to compile and install nano
 
@@ -65,6 +64,6 @@ Mailing Lists and Bug Reports
 
 Current Status
 
-       GNU nano has reached its fourth stable milestone, 2.2.x.
-       Development of new features continues in the 2.3.x branch, while
-       2.2.x versions are dedicated to bug-fixing and polishing.
+       GNU nano has reached its fifth stable milestone, 2.4.x.
+       Development of new features will continue in the 2.5.x branch,
+       while 2.4.x versions are dedicated to bug-fixing and polishing.