diff options
| author | Miles Bader | 2008-01-08 20:46:54 +0000 |
|---|---|---|
| committer | Miles Bader | 2008-01-08 20:46:54 +0000 |
| commit | 59ce725a3b68cbc324f01bc8dc5f9e07286431d1 (patch) | |
| tree | c17b8f002edf6892e273ff53214b1b23c880e69f /etc/tutorials/TUTORIAL.cn | |
| parent | 0664ff722152f34c2e87e9e644bbab401530b9d4 (diff) | |
| parent | bf515869577b12abd42777fb0647259920c862fc (diff) | |
| download | emacs-59ce725a3b68cbc324f01bc8dc5f9e07286431d1.tar.gz emacs-59ce725a3b68cbc324f01bc8dc5f9e07286431d1.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
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 5e318e8ff90..8332850d97c 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn | |||
| @@ -987,7 +987,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and | |||
| 987 | comes with permission to distribute copies on certain conditions: | 987 | comes with permission to distribute copies on certain conditions: |
| 988 | 988 | ||
| 989 | Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, | 989 | Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, |
| 990 | 2005, 2006, 2007 Free Software Foundation, Inc. | 990 | 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 991 | 991 | ||
| 992 | Permission is granted to anyone to make or distribute verbatim copies | 992 | Permission is granted to anyone to make or distribute verbatim copies |
| 993 | of this document as received, in any medium, provided that the | 993 | of this document as received, in any medium, provided that the |
| @@ -1013,7 +1013,7 @@ GNU Emacs to your friends. Help stamp out software obstructionism | |||
| 1013 | 本篇文档与 GNU Emacs 一样拥有版权，并允许在下列条件的约束下发行其拷贝： | 1013 | 本篇文档与 GNU Emacs 一样拥有版权，并允许在下列条件的约束下发行其拷贝： |
| 1014 | 1014 | ||
| 1015 | Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006, | 1015 | Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006, |
| 1016 | 2007 Free Software Foundation, Inc. | 1016 | 2007, 2008 Free Software Foundation, Inc. |
| 1017 | 1017 | ||
| 1018 | 本文档允许在不变更文档内容的情况下由任何人发布在任何媒体上，同时必须 | 1018 | 本文档允许在不变更文档内容的情况下由任何人发布在任何媒体上，同时必须 |
| 1019 | 完整保留版权和许可声明，且需给予受众与发行者完全相同的、如本声明所允 | 1019 | 完整保留版权和许可声明，且需给予受众与发行者完全相同的、如本声明所允 |