Documentation updates.

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

diff --git a/ChangeLog b/ChangeLog
index 8657a369e8b63b031ec0a58ace3c4f4873dc03c6..ce88a319ed76f1f9e371a48c59cd2d63e314aefe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@ CVS code -
 - configure.ac:
        - Enable autodetection of broken regexec(). (DLR) Re-added 
          regex.h check to ensure compile under Debian w/autoconf 1.6.
+- README:
+       - Update obsolete 1.1.x information.
 - TODO:
        - Fix typo. (David Benbennick)
 - faq.html:

diff --git a/README b/README
index d41009197885f9b3726fbef0902ae174064c63bf..2ec662d887c1a1194f5fc6c1e9ca5508d487fc6d 100644 (file)
--- a/README
+++ b/README
@@ -56,32 +56,9 @@ Mailing List and Bug Reports
 
 Current Status
 
-       This is the 1.1 or unstable branch of nano.  New features
-       will be added and things will be changed around and basically
-       stability is not guaranteed.  If this is not what you're
-       interested in, please use the latest 1.0.x release of nano.
-
-       New features in this branch include:
-       + .nanorc file support (--enable-nanorc configure option, 
-         see sample.nanorc file)
-       + Negative -r value for "#cols from right", allows dynamic adjustment
-         of wrap margin based on window size.
-       + Write marked text to separate file (^O after selecting with ^^).
-       + Append to file (Meta-A at write file menu).
-       + Multiple file buffers! (--enable-multibuffer configure option,
-         --multibuffer, -F cmdline flag, Meta-F toggle, then ^R to load).
-       + Better compatibility with Pico.  Mouse mode now supports clicking
-         shortcuts and files in browser, search toggles that are Pico 
-         extensions moved to Meta keys so as to not interfere with Pico
-         control sequences.
-       + Smooth scrolling through files, instead of the jerky half-page
-         down, half-page up method.  This is available by using the 
-         -S or --smooth switch, or the Meta-S toggle.
-       + Better non-*nix file support.  GNU nano now automatically
-         converts files from DOS format or Mac format to standard file
-         format.  It can also write files in either format by using the
-         appropriate command line (-D, --dos or -M, --mac) or toggle
-         (Meta-D, Meta-O).
+       GNU nano has reaching its second major milestone, 1.2.x. Development
+       of new features will continue in the 1.3.x branch, while 1.2.x
+       versions will be dedicated to bugfixing and polishing.
 
    Chris Allegretta (chrisa@asty.org)
 

diff --git a/UPGRADE b/UPGRADE
index e65f825296fb5bc68554c059fd28a677b18e9b7f..e859c12772b410ceb4d9b56f6fe68052f3c64ad2 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -6,7 +6,7 @@ Visible changes since 1.0
 * Editor Features
   - Complete Pico compatibility (--pico has been removed, and -p means
     something else, see below).
-  - nanorc support.
+  - nanorc support (see sample.nanorc included in sources).
   - Smooth scrolling (-S).
   - Searching of matching brace/bracket/etc.
   - Help for all editor features.