diff options
| author | Stefan Monnier | 2011-02-01 12:09:25 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-02-01 12:09:25 -0500 |
| commit | 8f1d2ef658f95549eb33fe5265f8f11c5129bece (patch) | |
| tree | b7cd852a1adb423384532cfe22c31547160b22bc /etc/tutorials/TUTORIAL | |
| parent | 590130fb19e1f433965c421d98fedeb2d7c33310 (diff) | |
| parent | 1dc4075fa8809805aed5092e93e225e889725c94 (diff) | |
| download | emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.tar.gz emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.zip | |
Merge from trunk
Diffstat (limited to 'etc/tutorials/TUTORIAL')
| -rw-r--r-- | etc/tutorials/TUTORIAL | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index f566df9735d..ae4cfb93edc 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL | |||
| @@ -1121,8 +1121,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. | |||
| 1121 | This version of the tutorial is a part of GNU Emacs. It is copyrighted | 1121 | This version of the tutorial is a part of GNU Emacs. It is copyrighted |
| 1122 | and comes with permission to distribute copies on certain conditions: | 1122 | and comes with permission to distribute copies on certain conditions: |
| 1123 | 1123 | ||
| 1124 | Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006, | 1124 | Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc. |
| 1125 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 1126 | 1125 | ||
| 1127 | This file is part of GNU Emacs. | 1126 | This file is part of GNU Emacs. |
| 1128 | 1127 | ||
| @@ -1143,4 +1142,3 @@ Please read the file COPYING and then do give copies of GNU Emacs to | |||
| 1143 | your friends. Help stamp out software obstructionism ("ownership") by | 1142 | your friends. Help stamp out software obstructionism ("ownership") by |
| 1144 | using, writing, and sharing free software! | 1143 | using, writing, and sharing free software! |
| 1145 | 1144 | ||
| 1146 | ;;; arch-tag: a0f84628-777f-4238-8865-451a73167f55 | ||