diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
| commit | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch) | |
| tree | dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /doc/man | |
| parent | 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff) | |
| parent | 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff) | |
| download | emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.bz2 emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip | |
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | doc/man/ebrowse.1 | 2 | ||||
| -rw-r--r-- | doc/man/emacs.1.in | 2 | ||||
| -rw-r--r-- | doc/man/etags.1 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/man/ChangeLog.1 b/doc/man/ChangeLog.1 index d5a277111c3..aa863ff72ba 100644 --- a/doc/man/ChangeLog.1 +++ b/doc/man/ChangeLog.1 @@ -176,7 +176,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index efbb95b2f7d..ad347d13a2b 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 @@ -85,7 +85,7 @@ was written by Gerd Moellmann. Copyright .if t \(co .if n (C) -2008-2016 Free Software Foundation, Inc. +2008-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 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 diff --git a/doc/man/etags.1 b/doc/man/etags.1 index 83b970f906c..ee3971cb760 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -284,7 +284,7 @@ Stallman. Copyright .if t \(co .if n (C) -1992, 1999, 2001-2016 Free Software Foundation, Inc. +1992, 1999, 2001-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 |