diff options
| author | Paul Eggert | 2020-01-01 01:08:16 +0000 |
|---|---|---|
| committer | Paul Eggert | 2020-01-01 01:08:16 +0000 |
| commit | c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch) | |
| tree | ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /doc/man | |
| parent | 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff) | |
| parent | 186152ba400b58d2d278c52d2e3d896decae767e (diff) | |
| download | emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip | |
Merge from origin/emacs-27
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3
4cd143aded Fix copyright years by hand
365e01cc9f Update copyright year to 2020
cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac...
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
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 68e411232ab..5e23bb3e305 100644 --- a/doc/man/ChangeLog.1 +++ b/doc/man/ChangeLog.1 | |||
| @@ -176,7 +176,7 @@ | |||
| 176 | ;; coding: utf-8 | 176 | ;; coding: utf-8 |
| 177 | ;; End: | 177 | ;; End: |
| 178 | 178 | ||
| 179 | Copyright (C) 2007-2019 Free Software Foundation, Inc. | 179 | Copyright (C) 2007-2020 Free Software Foundation, Inc. |
| 180 | 180 | ||
| 181 | This file is part of GNU Emacs. | 181 | This file is part of GNU Emacs. |
| 182 | 182 | ||
diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index b0448d48981..686658b20f8 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 | |||
| @@ -82,7 +82,7 @@ should give you access to the complete manual. | |||
| 82 | was written by Gerd Moellmann. | 82 | was written by Gerd Moellmann. |
| 83 | . | 83 | . |
| 84 | .SH COPYING | 84 | .SH COPYING |
| 85 | Copyright 2008-2019 Free Software Foundation, Inc. | 85 | Copyright 2008-2020 Free Software Foundation, Inc. |
| 86 | .PP | 86 | .PP |
| 87 | Permission is granted to make and distribute verbatim copies of this | 87 | Permission is granted to make and distribute verbatim copies of this |
| 88 | document provided the copyright notice and this permission notice are | 88 | 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 5fe12aed95d..e1190cf4604 100644 --- a/doc/man/emacs.1.in +++ b/doc/man/emacs.1.in | |||
| @@ -657,7 +657,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual. | |||
| 657 | . | 657 | . |
| 658 | . | 658 | . |
| 659 | .SH COPYING | 659 | .SH COPYING |
| 660 | Copyright 1995, 1999-2019 Free Software Foundation, Inc. | 660 | Copyright 1995, 1999-2020 Free Software Foundation, Inc. |
| 661 | .PP | 661 | .PP |
| 662 | Permission is granted to make and distribute verbatim copies of this | 662 | Permission is granted to make and distribute verbatim copies of this |
| 663 | document provided the copyright notice and this permission notice are | 663 | document provided the copyright notice and this permission notice are |
diff --git a/doc/man/etags.1 b/doc/man/etags.1 index d1453ca969a..e10fb840caf 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 | |||
| @@ -281,7 +281,7 @@ Stallman. | |||
| 281 | .BR vi ( 1 ). | 281 | .BR vi ( 1 ). |
| 282 | 282 | ||
| 283 | .SH COPYING | 283 | .SH COPYING |
| 284 | Copyright 1992, 1999, 2001-2019 Free Software Foundation, Inc. | 284 | Copyright 1992, 1999, 2001-2020 Free Software Foundation, Inc. |
| 285 | .PP | 285 | .PP |
| 286 | Permission is granted to make and distribute verbatim copies of this | 286 | Permission is granted to make and distribute verbatim copies of this |
| 287 | document provided the copyright notice and this permission notice are | 287 | document provided the copyright notice and this permission notice are |