Mercurial > emacs
diff etc/tutorials/TUTORIAL.cn @ 87649:107ccd98fa12
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 08 Jan 2008 20:46:54 +0000 |
| parents | a91583da0f8c |
| children | 77dae3f8271b |
line wrap: on
line diff
--- a/etc/tutorials/TUTORIAL.cn Tue Jan 08 20:07:21 2008 +0000 +++ b/etc/tutorials/TUTORIAL.cn Tue Jan 08 20:46:54 2008 +0000 @@ -987,7 +987,7 @@ comes with permission to distribute copies on certain conditions: Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008 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 @@ -1013,7 +1013,7 @@ 本篇文档与 GNU Emacs 一样拥有版权，并允许在下列条件的约束下发行其拷贝： Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006, - 2007 Free Software Foundation, Inc. + 2007, 2008 Free Software Foundation, Inc. 本文档允许在不变更文档内容的情况下由任何人发布在任何媒体上，同时必须 完整保留版权和许可声明，且需给予受众与发行者完全相同的、如本声明所允