diff options
| author | Paul Eggert | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /etc/tutorials/TUTORIAL.cn | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip | |
Merge from origin/emacs-26
2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height. (Bug#33921)
Diffstat (limited to 'etc/tutorials/TUTORIAL.cn')
| -rw-r--r-- | etc/tutorials/TUTORIAL.cn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn index b2efa6ea612..e927ac23e12 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn | |||
| @@ -997,7 +997,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. | |||
| 997 | This version of the tutorial is a part of GNU Emacs. It is copyrighted | 997 | This version of the tutorial is a part of GNU Emacs. It is copyrighted |
| 998 | and comes with permission to distribute copies on certain conditions: | 998 | and comes with permission to distribute copies on certain conditions: |
| 999 | 999 | ||
| 1000 | Copyright (C) 1985, 1996, 1998, 2001-2018 Free Software Foundation, | 1000 | Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, |
| 1001 | Inc. | 1001 | Inc. |
| 1002 | 1002 | ||
| 1003 | This file is part of GNU Emacs. | 1003 | This file is part of GNU Emacs. |
| @@ -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-2018 Free Software Foundation, | 1029 | Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, |
| 1030 | Inc. | 1030 | Inc. |
| 1031 | 1031 | ||
| 1032 | 本文件为 GNU Emacs 的一部分。 | 1032 | 本文件为 GNU Emacs 的一部分。 |