summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-01-02 06:31:44 +0100
committerStefan Kangas <stefan@marxist.se>2022-01-02 06:31:44 +0100
commitad125a99273c7bd81d02d388af3c69125dfe27ee (patch)
treebc693786881845334f6d3652d0ba613628e453b1 /etc
parent96212e1a270d9ba665bf33aec8a404979afb896b (diff)
parentefb1c7ec379430f560c5b801969ae43023c52734 (diff)
downloademacs-ad125a99273c7bd81d02d388af3c69125dfe27ee.tar.gz
emacs-ad125a99273c7bd81d02d388af3c69125dfe27ee.tar.bz2
emacs-ad125a99273c7bd81d02d388af3c69125dfe27ee.zip
Merge from origin/emacs-28
efb1c7ec37 ; * admin/notes/years: More known problems. f475c5823a ; Copyright year fixes 2684def348 ; Run set-copyright from admin.el 2558b37b5e ; * admin/notes/years: Mention known problems with 'update...
Diffstat (limited to 'etc')
-rw-r--r--etc/images/README6
-rw-r--r--etc/images/checked.xpm2
-rw-r--r--etc/images/gnus/README4
-rw-r--r--etc/images/icons/README6
-rw-r--r--etc/images/mh-logo.xpm2
-rw-r--r--etc/images/unchecked.xpm2
-rw-r--r--etc/refcards/README2
-rw-r--r--etc/tutorials/TUTORIAL.cn2
-rw-r--r--etc/tutorials/TUTORIAL.nl2
-rw-r--r--etc/tutorials/TUTORIAL.ro2
10 files changed, 15 insertions, 15 deletions
diff --git a/etc/images/README b/etc/images/README
index 2e745d52ba1..72da92427b4 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -31,15 +31,15 @@ File: mh-logo.xpm
Files: gnus.pbm
Author: Luis Fernandes <elf@ee.ryerson.ca>
- Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ Copyright (C) 2001-2022 Free Software Foundation, Inc.
Files: splash.png, splash.svg, splash.pbm, splash.xpm
Author: Francesc Rocher <francesc.rocher@gmail.com>
- Copyright (C) 2008-2021 Free Software Foundation, Inc.
+ Copyright (C) 2008-2022 Free Software Foundation, Inc.
Files: checked.xpm, unchecked.xpm
Author: Chong Yidong <cyd@stupidchicken.com>
- Copyright (C) 2010-2021 Free Software Foundation, Inc.
+ Copyright (C) 2010-2022 Free Software Foundation, Inc.
* The following icons are from GTK+ 2.x. They are not part of Emacs, but
diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm
index 3e7e76f254e..aefa9dd5da0 100644
--- a/etc/images/checked.xpm
+++ b/etc/images/checked.xpm
@@ -1,5 +1,5 @@
/* XPM */
-/* Copyright (C) 2010-2021 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2022 Free Software Foundation, Inc.
*
* Author: Chong Yidong <cyd@stupidchicken.com>
*
diff --git a/etc/images/gnus/README b/etc/images/gnus/README
index 092b6cce2eb..db039d792dc 100644
--- a/etc/images/gnus/README
+++ b/etc/images/gnus/README
@@ -21,11 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm
uu-post.pbm uu-post.xpm
Author: Luis Fernandes <elf@ee.ryerson.ca>
-Copyright (C) 2001-2021 Free Software Foundation, Inc.
+Copyright (C) 2001-2022 Free Software Foundation, Inc.
Files: gnus.png, gnus.svg
Author: Francesc Rocher <rocher@member.fsf.org>
- Copyright (C) 2008-2021 Free Software Foundation, Inc.
+ Copyright (C) 2008-2022 Free Software Foundation, Inc.
* The following icons are from GNOME 2.x. They are not part of Emacs,
diff --git a/etc/images/icons/README b/etc/images/icons/README
index 514797a7377..ca2d3733ed6 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -14,7 +14,7 @@ Files: hicolor/16x16/apps/emacs23.png hicolor/24x24/apps/emacs23.png
hicolor/128x128/apps/emacs23.png hicolor/scalable/apps/emacs23.svg
Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
-Copyright (C) 2007-2021 Free Software Foundation, Inc.
+Copyright (C) 2007-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
@@ -22,7 +22,7 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
-Copyright (C) 2005-2021 Free Software Foundation, Inc.
+Copyright (C) 2005-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
Files: allout-widgets-dark-bg/closed.png
@@ -71,5 +71,5 @@ Files: allout-widgets-dark-bg/closed.png
allout-widgets-light-bg/through-descender.xpm
Author: Ken Manheimer <ken.manheimer@gmail.com>
-Copyright (C) 2011-2021 Free Software Foundation, Inc.
+Copyright (C) 2011-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm
index fd7598d5a6b..846859e0584 100644
--- a/etc/images/mh-logo.xpm
+++ b/etc/images/mh-logo.xpm
@@ -1,7 +1,7 @@
/* XPM */
/* MH-E Logo
*
- * Copyright (C) 2003-2021 Free Software Foundation, Inc.
+ * Copyright (C) 2003-2022 Free Software Foundation, Inc.
*
* Author: Satyaki Das
*
diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm
index 5e18534e77e..b758346b96f 100644
--- a/etc/images/unchecked.xpm
+++ b/etc/images/unchecked.xpm
@@ -1,5 +1,5 @@
/* XPM */
-/* Copyright (C) 2010-2021 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2022 Free Software Foundation, Inc.
*
* Author: Chong Yidong <cyd@stupidchicken.com>
*
diff --git a/etc/refcards/README b/etc/refcards/README
index 1cdcc91cc8c..8e5eb5c89c8 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -77,7 +77,7 @@ it is reproduced here for convenience.
File: gnus-logo.eps, gnus-logo.pdf
Author: Luis Fernandes <elf@ee.ryerson.ca>
- Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ Copyright (C) 2001-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index 4b820fdf5ac..5d03014e41a 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -1026,7 +1026,7 @@ using, writing, and sharing free software!
本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝:
- Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation,
+ Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation,
Inc.
本文件为 GNU Emacs 的一部分。
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl
index b5edab0ea29..2ec3fac11bd 100644
--- a/etc/tutorials/TUTORIAL.nl
+++ b/etc/tutorials/TUTORIAL.nl
@@ -1239,7 +1239,7 @@ Engels origineel van de copyrightmelding en condities:
This version of the tutorial is a part of GNU Emacs. It is copyrighted
and comes with permission to distribute copies on certain conditions:
- Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro
index e0c293657b3..1f1dc325609 100644
--- a/etc/tutorials/TUTORIAL.ro
+++ b/etc/tutorials/TUTORIAL.ro
@@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză.
This version of the tutorial, like GNU Emacs, is copyrighted, and
comes with permission to distribute copies on certain conditions:
-Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc.
+Copyright (C) 1998, 2001-2022 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the