diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:07 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:07 -0800 |
| commit | 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch) | |
| tree | fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /etc/tutorials/TUTORIAL.cn | |
| parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
| parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) | |
| download | emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz | |
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
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 6a558c3f4f2..28d71a5e514 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. 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-2015 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1026,7 +1026,7 @@ using, writing, and sharing free software! 本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝： - Copyright (C) 1985, 1996, 1998, 2001-2015 Free Software Foundation, + Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation, Inc. 本文件为 GNU Emacs 的一部分。 |