Merge branch 'gawk-4.1-stable'

5 files changed, 11 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index b1c7803c..0b4a89fe 100644
--- a/NEWS
+++ b/NEWS
@@ -61,8 +61,7 @@ Changes from 4.1.1 to 4.1.2
 
 4. A number of bugs have been fixed in the MPFR code.
 
-5. Indirect function calls now work for both built-in and
-   extension functions.
+5. Indirect function calls now work for both built-in and extension functions.
 
 6. Built-in functions are now included in FUNCTAB.
 
@@ -86,7 +85,11 @@ Changes from 4.1.1 to 4.1.2
 10. Infrastructure upgrades: Automake 1.15, Gettext 0.19.4, Libtool 2.4.5,
     Bison 3.0.4.
 
-11. POSIX requires that the names of function parameters not be the
+11. If a user-defined function has a parameter with the same name as another
+    user-defined function, it is no longer possible to call the second
+    function from inside the first.
+
+12. POSIX requires that the names of function parameters not be the
     same as any of the special built-in variables and also not conflict
     with the names of any functions. Gawk has checked for the former
     since 3.1.7. With --posix, it now also checks for the latter.
diff --git a/awk.h b/awk.h
index 7817d60f..799295b5 100644
--- a/awk.h
+++ b/awk.h
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/gawkapi.c b/gawkapi.c
index fc6e159a..3b495452 100644
--- a/gawkapi.c
+++ b/gawkapi.c
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 2012-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 2012-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
diff --git a/main.c b/main.c
index f2bea917..833aa162 100644
--- a/main.c
+++ b/main.c
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.
@@ -24,7 +24,7 @@
  */
 
 /* FIX THIS BEFORE EVERY RELEASE: */
-#define UPDATE_YEAR	2014
+#define UPDATE_YEAR	2015
 
 #include "awk.h"
 #include "getopt.h"
diff --git a/symbol.c b/symbol.c
index cbfb1edf..d698299b 100644
--- a/symbol.c
+++ b/symbol.c
@@ -3,7 +3,7 @@
  */
 
 /* 
- * Copyright (C) 1986, 1988, 1989, 1991-2013 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
  * 
  * This file is part of GAWK, the GNU implementation of the
  * AWK Programming Language.