diff options
| 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 /admin | |
| parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
| parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) | |
| download | emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip | |
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
Diffstat (limited to 'admin')
41 files changed, 41 insertions, 41 deletions
diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1 index d3fabd4c811..c7cae0cbaca 100644 --- a/admin/ChangeLog.1 +++ b/admin/ChangeLog.1 | |||
| @@ -2577,7 +2577,7 @@ | |||
| 2577 | ;; coding: utf-8 | 2577 | ;; coding: utf-8 |
| 2578 | ;; End: | 2578 | ;; End: |
| 2579 | 2579 | ||
| 2580 | Copyright (C) 2001-2015 Free Software Foundation, Inc. | 2580 | Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 2581 | 2581 | ||
| 2582 | This file is part of GNU Emacs. | 2582 | This file is part of GNU Emacs. |
| 2583 | 2583 | ||
diff --git a/admin/README b/admin/README index b7621ffb62a..71840159958 100644 --- a/admin/README +++ b/admin/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2001-2015 Free Software Foundation, Inc. | 1 | Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/admin/admin.el b/admin/admin.el index 6b213a7e42c..7923f0bb466 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; admin.el --- utilities for Emacs administration | 1 | ;;; admin.el --- utilities for Emacs administration |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2001-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This file is part of GNU Emacs. | 5 | ;; This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index 777c048812c..9f6161ef0d9 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Allocate X colors. Used for testing with dense colormaps. | 1 | /* Allocate X colors. Used for testing with dense colormaps. |
| 2 | 2 | ||
| 3 | Copyright (C) 2001-2015 Free Software Foundation, Inc. | 3 | Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/authors.el b/admin/authors.el index 9903218e2ba..d579c1f0f49 100644 --- a/admin/authors.el +++ b/admin/authors.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; authors.el --- utility for maintaining Emacs's AUTHORS file | 1 | ;;; authors.el --- utility for maintaining Emacs's AUTHORS file |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2000-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2000-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Gerd Moellmann <gerd@gnu.org> | 5 | ;; Author: Gerd Moellmann <gerd@gnu.org> |
| 6 | ;; Maintainer: Kim F. Storm <storm@cua.dk> | 6 | ;; Maintainer: Kim F. Storm <storm@cua.dk> |
diff --git a/admin/build-configs b/admin/build-configs index 55530b360d4..928ea4f2e0b 100755 --- a/admin/build-configs +++ b/admin/build-configs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #! /usr/bin/perl | 1 | #! /usr/bin/perl |
| 2 | # Build Emacs in several different configurations. | 2 | # Build Emacs in several different configurations. |
| 3 | 3 | ||
| 4 | # Copyright (C) 2001-2015 Free Software Foundation, Inc. | 4 | # Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | # This file is part of GNU Emacs. | 6 | # This file is part of GNU Emacs. |
| 7 | 7 | ||
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 1bcbaa24085..1de7bc445e0 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; bzrmerge.el --- help merge one Emacs bzr branch to another | 1 | ;;; bzrmerge.el --- help merge one Emacs bzr branch to another |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: maint | 6 | ;; Keywords: maint |
diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index a5e7212f163..0ca7e14d850 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | # Copyright (C) 2015 Free Software Foundation, Inc. | 3 | # Copyright (C) 2015-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | # National Institute of Advanced Industrial Science and Technology (AIST) | 6 | # National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index 3747ae2ad77..5a72fbd6c79 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | # Copyright (C) 2015 Free Software Foundation, Inc. | 3 | # Copyright (C) 2015-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | # National Institute of Advanced Industrial Science and Technology (AIST) | 6 | # National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index a05e2dab0ff..fb200e59a81 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2009-2015 Free Software Foundation, Inc. | 1 | Copyright (C) 2009-2016 Free Software Foundation, Inc. |
| 2 | Copyright (C) 2009, 2010, 2011 | 2 | Copyright (C) 2009, 2010, 2011 |
| 3 | National Institute of Advanced Industrial Science and Technology (AIST) | 3 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 4 | Registration Number H13PRO009 | 4 | Registration Number H13PRO009 |
diff --git a/admin/cus-test.el b/admin/cus-test.el index c7faedbd35a..3a4fd1237d6 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cus-test.el --- tests for custom types and load problems | 1 | ;;; cus-test.el --- tests for custom types and load problems |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1998, 2000, 2002-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1998, 2000, 2002-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de> | 5 | ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de> |
| 6 | ;; Maintainer: Markus Rost <rost@math.ohio-state.edu> | 6 | ;; Maintainer: Markus Rost <rost@math.ohio-state.edu> |
diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 6a8824f6ad0..ddb107b6af3 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | 2 | ||
| 3 | # Copyright (C) 2001-2015 Free Software Foundation, Inc. | 3 | # Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # This file is part of GNU Emacs. | 5 | # This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/find-gc.el b/admin/find-gc.el index 5c6a45b5871..26bbc5448de 100644 --- a/admin/find-gc.el +++ b/admin/find-gc.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; find-gc.el --- detect functions that call the garbage collector | 1 | ;;; find-gc.el --- detect functions that call the garbage collector |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992, 2001-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992, 2001-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Maintainer: emacs-devel@gnu.org | 5 | ;; Maintainer: emacs-devel@gnu.org |
| 6 | 6 | ||
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 69e4d288522..ae863fdecb5 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; gitmerge.el --- help merge one Emacs branch into another | 1 | ;;; gitmerge.el --- help merge one Emacs branch into another |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Authors: David Engster <deng@randomsample.de> | 5 | ;; Authors: David Engster <deng@randomsample.de> |
| 6 | ;; Stefan Monnier <monnier@iro.umontreal.ca> | 6 | ;; Stefan Monnier <monnier@iro.umontreal.ca> |
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index 6b54ecca237..9037343c81a 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2013-2015 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2013-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 8a3a194b00e..be41bd8d2b6 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; c.by -- LL grammar for C/C++ language specification | 1 | ;;; c.by -- LL grammar for C/C++ language specification |
| 2 | ;; Copyright (C) 1999-2015 Free Software Foundation, Inc. | 2 | ;; Copyright (C) 1999-2016 Free Software Foundation, Inc. |
| 3 | ;; | 3 | ;; |
| 4 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 4 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 5 | ;; David Ponce <david@dponce.com> | 5 | ;; David Ponce <david@dponce.com> |
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index fcb36fdc778..9bac0988c5b 100644 --- a/admin/grammars/grammar.wy +++ b/admin/grammars/grammar.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars | 1 | ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars |
| 2 | ;; | 2 | ;; |
| 3 | ;; Copyright (C) 2002-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2016 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: David Ponce <david@dponce.com> | 5 | ;; Author: David Ponce <david@dponce.com> |
| 6 | ;; Maintainer: David Ponce <david@dponce.com> | 6 | ;; Maintainer: David Ponce <david@dponce.com> |
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy index bc22f4f8311..7284f0242b2 100644 --- a/admin/grammars/java-tags.wy +++ b/admin/grammars/java-tags.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; java-tags.wy -- Semantic LALR grammar for Java | 1 | ;;; java-tags.wy -- Semantic LALR grammar for Java |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2002-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2016 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: David Ponce <david@dponce.com> | 5 | ;; Author: David Ponce <david@dponce.com> |
| 6 | ;; Maintainer: David Ponce <david@dponce.com> | 6 | ;; Maintainer: David Ponce <david@dponce.com> |
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index 1579b0787d7..a49952f52de 100644 --- a/admin/grammars/js.wy +++ b/admin/grammars/js.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; javascript-jv.wy -- LALR grammar for Javascript | 1 | ;;; javascript-jv.wy -- LALR grammar for Javascript |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005-2016 Free Software Foundation, Inc. |
| 4 | ;; Copyright (C) 1998-2011 Ecma International. | 4 | ;; Copyright (C) 1998-2011 Ecma International. |
| 5 | 5 | ||
| 6 | ;; Author: Joakim Verona | 6 | ;; Author: Joakim Verona |
diff --git a/admin/grammars/make.by b/admin/grammars/make.by index be3cc433863..a9a856432d4 100644 --- a/admin/grammars/make.by +++ b/admin/grammars/make.by | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; make.by -- BY notation for Makefiles. | 1 | ;;; make.by -- BY notation for Makefiles. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2016 Free Software Foundation, Inc. |
| 4 | ;; | 4 | ;; |
| 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric M. Ludlam <zappo@gnu.org> |
| 6 | ;; David Ponce <david@dponce.com> | 6 | ;; David Ponce <david@dponce.com> |
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index 9b37a8deaec..4db3548eb09 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; python.wy -- LALR grammar for Python | 1 | ;;; python.wy -- LALR grammar for Python |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2002-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2002-2016 Free Software Foundation, Inc. |
| 4 | ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 4 | ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 5 | ;; 2009, 2010 Python Software Foundation; All Rights Reserved | 5 | ;; 2009, 2010 Python Software Foundation; All Rights Reserved |
| 6 | 6 | ||
diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by index 1b67d624320..c1613c8d63a 100644 --- a/admin/grammars/scheme.by +++ b/admin/grammars/scheme.by | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; scheme.by -- Scheme BNF language specification | 1 | ;;; scheme.by -- Scheme BNF language specification |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2001-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; This file is part of GNU Emacs. | 5 | ;; This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy index 32ef7eac8ad..33c8d24eedb 100644 --- a/admin/grammars/srecode-template.wy +++ b/admin/grammars/srecode-template.wy | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; srecode-template.wy --- Semantic Recoder Template parser | 1 | ;;; srecode-template.wy --- Semantic Recoder Template parser |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric Ludlam <zappo@gnu.org> |
| 6 | ;; Keywords: syntax | 6 | ;; Keywords: syntax |
diff --git a/admin/make-emacs b/admin/make-emacs index 24e9844b72c..6a79cdc7232 100755 --- a/admin/make-emacs +++ b/admin/make-emacs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Build Emacs with various options for profiling, debugging, | 2 | # Build Emacs with various options for profiling, debugging, |
| 3 | # with and without warnings enabled etc. | 3 | # with and without warnings enabled etc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2001-2015 Free Software Foundation, Inc. | 5 | # Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | 8 | ||
diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 818dc1afce9..363bb23d119 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | # | 4 | # |
| 5 | # admin/merge-gnulib | 5 | # admin/merge-gnulib |
| 6 | 6 | ||
| 7 | # Copyright 2012-2015 Free Software Foundation, Inc. | 7 | # Copyright 2012-2016 Free Software Foundation, Inc. |
| 8 | 8 | ||
| 9 | # This file is part of GNU Emacs. | 9 | # This file is part of GNU Emacs. |
| 10 | 10 | ||
diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config index 302937269df..2066c9b4a23 100755 --- a/admin/merge-pkg-config +++ b/admin/merge-pkg-config | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | # | 4 | # |
| 5 | # admin/merge-pkg-config | 5 | # admin/merge-pkg-config |
| 6 | 6 | ||
| 7 | # Copyright 2014-2015 Free Software Foundation, Inc. | 7 | # Copyright 2014-2016 Free Software Foundation, Inc. |
| 8 | 8 | ||
| 9 | # This file is part of GNU Emacs. | 9 | # This file is part of GNU Emacs. |
| 10 | 10 | ||
diff --git a/admin/notes/copyright b/admin/notes/copyright index 3ba9c55d246..2dc33c164a9 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2007-2015 Free Software Foundation, Inc. | 1 | Copyright (C) 2007-2016 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/admin/notes/font-backend b/admin/notes/font-backend index 03663d38cd8..5b65ae5b25a 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2002-2015 Free Software Foundation, Inc. | 1 | Copyright (C) 2002-2016 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/admin/notes/hydra b/admin/notes/hydra index ce4a683f6fe..aadc169018b 100644 --- a/admin/notes/hydra +++ b/admin/notes/hydra | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- mode: outline; coding: utf-8 -*- | 1 | -*- mode: outline; coding: utf-8 -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2013-2015 Free Software Foundation, Inc. | 3 | Copyright (C) 2013-2016 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA | 6 | NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA |
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 868d45138d8..ac1c7b283a1 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- coding: utf-8; mode: text; -*- | 1 | -*- coding: utf-8; mode: text; -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2007-2015 Free Software Foundation, Inc. | 3 | Copyright (C) 2007-2016 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | From README.multi-tty in the multi-tty branch. | 6 | From README.multi-tty in the multi-tty branch. |
diff --git a/admin/notes/unicode b/admin/notes/unicode index 3901f60954f..51314b199f6 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*-mode: text; coding: utf-8;-*- | 1 | -*-mode: text; coding: utf-8;-*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2002-2015 Free Software Foundation, Inc. | 3 | Copyright (C) 2002-2016 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | Importing a new Unicode Standard version into Emacs | 6 | Importing a new Unicode Standard version into Emacs |
diff --git a/admin/notes/www b/admin/notes/www index 27aabe0766c..eddaa91ab3c 100644 --- a/admin/notes/www +++ b/admin/notes/www | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | -*- outline -*- | 1 | -*- outline -*- |
| 2 | 2 | ||
| 3 | Copyright (C) 2013-2015 Free Software Foundation, Inc. | 3 | Copyright (C) 2013-2016 Free Software Foundation, Inc. |
| 4 | See the end of the file for license conditions. | 4 | See the end of the file for license conditions. |
| 5 | 5 | ||
| 6 | NOTES FOR EMACS WWW PAGES | 6 | NOTES FOR EMACS WWW PAGES |
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index f210556372e..3cd25c3a4cc 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2001-2015 Free Software Foundation, Inc. | 1 | Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | Emacs for Windows | 4 | Emacs for Windows |
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index eaee7cb809f..337be1a4567 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2001-2015 Free Software Foundation, Inc. | 1 | Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | Precompiled Distributions of | 4 | Precompiled Distributions of |
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 4de7416e3d6..b1b3793aff0 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly | 2 | ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly |
| 3 | 3 | ||
| 4 | ## Copyright (C) 2001-2015 Free Software Foundation, Inc. | 4 | ## Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## Author: Miles Bader <miles@gnu.org> | 6 | ## Author: Miles Bader <miles@gnu.org> |
| 7 | 7 | ||
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index 954e9faacae..d46420d0a3c 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | # Copyright (C) 2012-2015 Free Software Foundation, Inc. | 3 | # Copyright (C) 2012-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | # National Institute of Advanced Industrial Science and Technology (AIST) | 6 | # National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/unidata/blocks.awk b/admin/unidata/blocks.awk index 892ac58c927..bf9a9424892 100755 --- a/admin/unidata/blocks.awk +++ b/admin/unidata/blocks.awk | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/usr/bin/awk -f | 1 | #!/usr/bin/awk -f |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2015 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2015-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## Author: Glenn Morris <rgm@gnu.org> | 5 | ## Author: Glenn Morris <rgm@gnu.org> |
| 6 | 6 | ||
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index 9e39fd0c00d..043bf2236be 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; unidata-gen.el -- Create files containing character property data. | 1 | ;; unidata-gen.el -- Create files containing character property data. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | ;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | ;; National Institute of Advanced Industrial Science and Technology (AIST) | 6 | ;; National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el index 8d3ffe20699..bd03621905c 100644 --- a/admin/unidata/uvs.el +++ b/admin/unidata/uvs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts. | 1 | ;;; uvs.el --- utility for UVS (format 14) cmap subtables in OpenType fonts. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2014-2015 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2014-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 5 | ;; Author: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 6 | 6 | ||
diff --git a/admin/update-copyright b/admin/update-copyright index 459ee83ac1d..2f6dc11e93e 100755 --- a/admin/update-copyright +++ b/admin/update-copyright | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | # By default, this script uses the local-time calendar year. | 7 | # By default, this script uses the local-time calendar year. |
| 8 | # Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default. | 8 | # Set the UPDATE_COPYRIGHT_YEAR environment variable to override the default. |
| 9 | 9 | ||
| 10 | # Copyright 2013-2015 Free Software Foundation, Inc. | 10 | # Copyright 2013-2016 Free Software Foundation, Inc. |
| 11 | 11 | ||
| 12 | # This file is part of GNU Emacs. | 12 | # This file is part of GNU Emacs. |
| 13 | 13 | ||
diff --git a/admin/update_autogen b/admin/update_autogen index 23e1d4015c6..199a3aad093 100755 --- a/admin/update_autogen +++ b/admin/update_autogen | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | ### update_autogen - update some auto-generated files in the Emacs tree | 2 | ### update_autogen - update some auto-generated files in the Emacs tree |
| 3 | 3 | ||
| 4 | ## Copyright (C) 2011-2015 Free Software Foundation, Inc. | 4 | ## Copyright (C) 2011-2016 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## Author: Glenn Morris <rgm@gnu.org> | 6 | ## Author: Glenn Morris <rgm@gnu.org> |
| 7 | 7 | ||