diff options
| author | Stefan Kangas | 2022-01-02 06:31:44 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2022-01-02 06:31:44 +0100 |
| commit | ad125a99273c7bd81d02d388af3c69125dfe27ee (patch) | |
| tree | bc693786881845334f6d3652d0ba613628e453b1 /etc/tutorials | |
| parent | 96212e1a270d9ba665bf33aec8a404979afb896b (diff) | |
| parent | efb1c7ec379430f560c5b801969ae43023c52734 (diff) | |
| download | emacs-ad125a99273c7bd81d02d388af3c69125dfe27ee.tar.gz 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/tutorials')
| -rw-r--r-- | etc/tutorials/TUTORIAL.cn | 2 | ||||
| -rw-r--r-- | etc/tutorials/TUTORIAL.nl | 2 | ||||
| -rw-r--r-- | etc/tutorials/TUTORIAL.ro | 2 |
3 files changed, 3 insertions, 3 deletions
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! | |||
| 1026 | 1026 | ||
| 1027 | 本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝: | 1027 | 本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝: |
| 1028 | 1028 | ||
| 1029 | Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, | 1029 | Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation, |
| 1030 | Inc. | 1030 | Inc. |
| 1031 | 1031 | ||
| 1032 | 本文件为 GNU Emacs 的一部分。 | 1032 | 本文件为 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: | |||
| 1239 | This version of the tutorial is a part of GNU Emacs. It is copyrighted | 1239 | This version of the tutorial is a part of GNU Emacs. It is copyrighted |
| 1240 | and comes with permission to distribute copies on certain conditions: | 1240 | and comes with permission to distribute copies on certain conditions: |
| 1241 | 1241 | ||
| 1242 | Copyright (C) 1985, 1996, 1998, 2001-2021 Free Software Foundation, Inc. | 1242 | Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation, Inc. |
| 1243 | 1243 | ||
| 1244 | This file is part of GNU Emacs. | 1244 | This file is part of GNU Emacs. |
| 1245 | 1245 | ||
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ă. | |||
| 1082 | This version of the tutorial, like GNU Emacs, is copyrighted, and | 1082 | This version of the tutorial, like GNU Emacs, is copyrighted, and |
| 1083 | comes with permission to distribute copies on certain conditions: | 1083 | comes with permission to distribute copies on certain conditions: |
| 1084 | 1084 | ||
| 1085 | Copyright (C) 1998, 2001-2021 Free Software Foundation, Inc. | 1085 | Copyright (C) 1998, 2001-2022 Free Software Foundation, Inc. |
| 1086 | 1086 | ||
| 1087 | Permission is granted to anyone to make or distribute verbatim copies | 1087 | Permission is granted to anyone to make or distribute verbatim copies |
| 1088 | of this document as received, in any medium, provided that the | 1088 | of this document as received, in any medium, provided that the |