From 05f406596019898e8ca3965011d93fe42171d9e9 Mon Sep 17 00:00:00 2001
From: Chris Allegretta <chrisa@asty.org>
Date: Wed, 23 Jan 2002 02:37:36 +0000
Subject: [PATCH] Add the codeset.m4 and iconv.m4 entries to Makefile.am

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1034 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
 ChangeLog   |  2 +-
 Makefile.am |  3 ++-
 NEWS        | 19 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5fbb23c8..8fc6e6ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS code -
+nano-1.1.6 - 01/22/2002
 - General
 	- Add Meta-A as alternate keyystroke for ^^ for people with
 	  non-US keyboards.
diff --git a/Makefile.am b/Makefile.am
index 48e8418e..8822344c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
 M4DIR = $(srcdir)/m4
 ACLOCAL_AMFLAGS = -I $(M4DIR)
 ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 \
-	$(M4DIR)/progtest.m4 $(M4DIR)/lcmessage.m4
+	$(M4DIR)/progtest.m4 $(M4DIR)/lcmessage.m4 $(M4DIR)/iconv.m4 \
+	$(M4DIR)/codeset.m4
 
 bin_PROGRAMS = 	nano
 nano_SOURCES =	color.c \
diff --git a/NEWS b/NEWS
index 8d78344c..595b3711 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,22 @@
+01/22/2002 - GNU nano 1.1.6 is released.  Lots of new features in this
+		release.  New Meta-keys were added as alternates for 
+		control sequences: Meta-A for the marker key (^^), and
+		Meta-G for the 'goto dir' key in the file browser (^_).
+		The color syntax highlighting now supports multiple
+		lines via start="regex" end="regex" syntax, and the
+		.nanorc regex format itself has changed. Also, the
+		gettext code was upgraded to version 0.10.40, and nano
+		will now display a message if only occurrence of a
+		given search exists. 
+			For bugfixes, there are fixes for spelling,
+		stray newlines in the usage() function, suspend issues
+		with tcsh, auto-indent and wrapping clashes, ugly code 
+		in rcfile.c, global variable compatibility with AIX.
+		There are also oodles of translation updates.
+		Have fun with it.
+
 01/05/2002 - GNU nano 1.1.5 is out.  The main new feature in this 
-		release if the changed behavior of the keypad.  Nano now 
+		release is the changed behavior of the keypad.  Nano now 
 		does the Right Thing and used keypad() by default.  If
 		you wish to use the keypad arrow keys in certain 
 		terminals, you may use the -K or --keypad flag to