comparison etc/tutorials/TUTORIAL.th @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 376148b31b5e
children ef719132ddfa
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
963 963
964 This version of the tutorial, like GNU Emacs, is copyrighted, and 964 This version of the tutorial, like GNU Emacs, is copyrighted, and
965 comes with permission to distribute copies on certain conditions: 965 comes with permission to distribute copies on certain conditions:
966 966
967 Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004, 967 Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
968 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 968 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
969 969
970 Permission is granted to anyone to make or distribute verbatim copies 970 Permission is granted to anyone to make or distribute verbatim copies
971 of this document as received, in any medium, provided that the 971 of this document as received, in any medium, provided that the
972 copyright notice and permission notice are preserved, 972 copyright notice and permission notice are preserved,
973 and that the distributor grants the recipient permission 973 and that the distributor grants the recipient permission