summaryrefslogtreecommitdiff
path: root/doc/man/emacs.1.in
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-01-01 01:10:47 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2017-01-01 01:10:47 -0800
commitbcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch)
treedc5dde303bce1fbe4f04300c3691cc1ee5874f43 /doc/man/emacs.1.in
parent772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff)
parent2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff)
downloademacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
Diffstat (limited to 'doc/man/emacs.1.in')
-rw-r--r--doc/man/emacs.1.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/man/emacs.1.in b/doc/man/emacs.1.in
index 73bc38d7984..6807e866526 100644
--- a/doc/man/emacs.1.in
+++ b/doc/man/emacs.1.in
@@ -653,7 +653,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual.
Copyright
.if t \(co
.if n (C)
-1995, 1999-2016 Free Software Foundation, Inc.
+1995, 1999-2017 Free Software Foundation, Inc.
.PP
Permission is granted to make and distribute verbatim copies of this
document provided the copyright notice and this permission notice are