Merge from origin/emacs-25

ef33bc7 Spelling and grammar fixes 9c3dbab Fix copyright years by hand 0e96320 Update copyright year to 2016
author: John Wiegley 2016-01-11 22:48:07 -0800
committer: John Wiegley 2016-01-11 22:48:07 -0800
commit: 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch)
tree: fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /etc/srecode
parent: c043d9731b499a241830d705e9055c9e42ccf28c (diff)
parent: ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff)
download: emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz
emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip
16 files changed, 16 insertions, 16 deletions
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index 18dcc91a453..b1aa2e92987 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -1,6 +1,6 @@
 ;;; c.srt --- SRecode templates for c-mode
-;; Copyright (C) 2007-2010, 2012-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2010, 2012-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index e325039d33f..2103c3f223a 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -1,6 +1,6 @@
 ;;; cpp.srt --- SRecode templates for c++-mode
-;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index 4d2128bd16f..22f4fca72b0 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -1,6 +1,6 @@
 ;;; default.srt --- SRecode templates for srecode-template-mode
-;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index 791f0b5df29..c729670d0ef 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -1,6 +1,6 @@
 ;; doc-c.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 646b1416e6d..5612965cb38 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -1,6 +1,6 @@
 ;; doc-default.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index d05f46a324d..b6f27f564e1 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -1,6 +1,6 @@
 ;; doc-java.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
index 82c5a842053..a3dc378d2b7 100644
--- a/etc/srecode/ede-autoconf.srt
+++ b/etc/srecode/ede-autoconf.srt
@@ -1,6 +1,6 @@
 ;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE
-;; Copyright (C) 2010, 2012-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2012-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index 7f7f47a3027..8adc76089d1 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -1,6 +1,6 @@
 ;; ede-make.srt --- SRecode templates for Makefiles used by EDE.
-;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index 14cd738d3ee..a94f7c65288 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -1,6 +1,6 @@
 ;;; el.srt --- SRecode templates for Emacs Lisp mode
-;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
 ;; Author: Eric Ludlam <zappo@gnu.org>
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt
index 4b9d99e124f..7bed0979189 100644
--- a/etc/srecode/getset-cpp.srt
+++ b/etc/srecode/getset-cpp.srt
@@ -1,6 +1,6 @@
 ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.
-;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index be63e6bf702..1f885b2be67 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -1,6 +1,6 @@
 ;; java.srt
-;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt
index 79d9feabfcf..761636eb3ac 100644
--- a/etc/srecode/make.srt
+++ b/etc/srecode/make.srt
@@ -1,6 +1,6 @@
 ;; make.srt
-;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index 430b78a092a..6b5d1c5bf54 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -1,6 +1,6 @@
 ;;; template.srt --- Templates for Semantic Recoders
-;; Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2016 Free Software Foundation, Inc.
 ;; Author: Eric Ludlam <zappo@gnu.org>
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index c76915a7a16..8d39957e84f 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -1,6 +1,6 @@
 ;; test.srt --- SRecode templates for testing
-;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt
index aa6fa086a15..f7b5bdf62d5 100644
--- a/etc/srecode/texi.srt
+++ b/etc/srecode/texi.srt
@@ -1,6 +1,6 @@
 ;; texi.srt --- SRecode templates for Texinfo
-;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index 71fb7594483..69159ab7fc4 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -1,6 +1,6 @@
 ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.
-;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
author	John Wiegley	2016-01-11 22:48:07 -0800
committer	John Wiegley	2016-01-11 22:48:07 -0800
commit	1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch)
tree	fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /etc/srecode
parent	c043d9731b499a241830d705e9055c9e42ccf28c (diff)
parent	ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff)
download	emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip

diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt index 18dcc91a453..b1aa2e92987 100644 --- a/etc/srecode/c.srt +++ b/etc/srecode/c.srt
@@ -1,6 +1,6 @@
1	;;; c.srt --- SRecode templates for c-mode	1	;;; c.srt --- SRecode templates for c-mode
2		2
3	;; Copyright (C) 2007-2010, 2012-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-2010, 2012-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt index e325039d33f..2103c3f223a 100644 --- a/etc/srecode/cpp.srt +++ b/etc/srecode/cpp.srt
@@ -1,6 +1,6 @@
1	;;; cpp.srt --- SRecode templates for c++-mode	1	;;; cpp.srt --- SRecode templates for c++-mode
2		2
3	;; Copyright (C) 2007-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt index 4d2128bd16f..22f4fca72b0 100644 --- a/etc/srecode/default.srt +++ b/etc/srecode/default.srt
@@ -1,6 +1,6 @@
1	;;; default.srt --- SRecode templates for srecode-template-mode	1	;;; default.srt --- SRecode templates for srecode-template-mode
2		2
3	;; Copyright (C) 2007-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index 791f0b5df29..c729670d0ef 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt
@@ -1,6 +1,6 @@
1	;; doc-c.srt --- SRecode templates for "document" applications	1	;; doc-c.srt --- SRecode templates for "document" applications
2		2
3	;; Copyright (C) 2008-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index 646b1416e6d..5612965cb38 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt
@@ -1,6 +1,6 @@
1	;; doc-default.srt --- SRecode templates for "document" applications	1	;; doc-default.srt --- SRecode templates for "document" applications
2		2
3	;; Copyright (C) 2009-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index d05f46a324d..b6f27f564e1 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt
@@ -1,6 +1,6 @@
1	;; doc-java.srt --- SRecode templates for "document" applications	1	;; doc-java.srt --- SRecode templates for "document" applications
2		2
3	;; Copyright (C) 2009-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt index 82c5a842053..a3dc378d2b7 100644 --- a/etc/srecode/ede-autoconf.srt +++ b/etc/srecode/ede-autoconf.srt
@@ -1,6 +1,6 @@
1	;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE	1	;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE
2		2
3	;; Copyright (C) 2010, 2012-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2010, 2012-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt index 7f7f47a3027..8adc76089d1 100644 --- a/etc/srecode/ede-make.srt +++ b/etc/srecode/ede-make.srt
@@ -1,6 +1,6 @@
1	;; ede-make.srt --- SRecode templates for Makefiles used by EDE.	1	;; ede-make.srt --- SRecode templates for Makefiles used by EDE.
2		2
3	;; Copyright (C) 2008-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 14cd738d3ee..a94f7c65288 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt
@@ -1,6 +1,6 @@
1	;;; el.srt --- SRecode templates for Emacs Lisp mode	1	;;; el.srt --- SRecode templates for Emacs Lisp mode
2		2
3	;; Copyright (C) 2007-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric Ludlam <zappo@gnu.org>	5	;; Author: Eric Ludlam <zappo@gnu.org>
6		6


diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt index 4b9d99e124f..7bed0979189 100644 --- a/etc/srecode/getset-cpp.srt +++ b/etc/srecode/getset-cpp.srt
@@ -1,6 +1,6 @@
1	;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.	1	;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.
2		2
3	;; Copyright (C) 2007-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt index be63e6bf702..1f885b2be67 100644 --- a/etc/srecode/java.srt +++ b/etc/srecode/java.srt
@@ -1,6 +1,6 @@
1	;; java.srt	1	;; java.srt
2		2
3	;; Copyright (C) 2009-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt index 79d9feabfcf..761636eb3ac 100644 --- a/etc/srecode/make.srt +++ b/etc/srecode/make.srt
@@ -1,6 +1,6 @@
1	;; make.srt	1	;; make.srt
2		2
3	;; Copyright (C) 2009-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt index 430b78a092a..6b5d1c5bf54 100644 --- a/etc/srecode/template.srt +++ b/etc/srecode/template.srt
@@ -1,6 +1,6 @@
1	;;; template.srt --- Templates for Semantic Recoders	1	;;; template.srt --- Templates for Semantic Recoders
2		2
3	;; Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2005, 2007-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric Ludlam <zappo@gnu.org>	5	;; Author: Eric Ludlam <zappo@gnu.org>
6		6


diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt index c76915a7a16..8d39957e84f 100644 --- a/etc/srecode/test.srt +++ b/etc/srecode/test.srt
@@ -1,6 +1,6 @@
1	;; test.srt --- SRecode templates for testing	1	;; test.srt --- SRecode templates for testing
2		2
3	;; Copyright (C) 2008-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt index aa6fa086a15..f7b5bdf62d5 100644 --- a/etc/srecode/texi.srt +++ b/etc/srecode/texi.srt
@@ -1,6 +1,6 @@
1	;; texi.srt --- SRecode templates for Texinfo	1	;; texi.srt --- SRecode templates for Texinfo
2		2
3	;; Copyright (C) 2008-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2008-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6


diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index 71fb7594483..69159ab7fc4 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt
@@ -1,6 +1,6 @@
1	;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.	1	;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.
2		2
3	;; Copyright (C) 2007-2015 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-2016 Free Software Foundation, Inc.
4		4
5	;; Author: Eric M. Ludlam <eric@siege-engine.com>	5	;; Author: Eric M. Ludlam <eric@siege-engine.com>
6		6