Merge from emacs--rel--22

[gnu-emacs] / etc / edt-user.doc

diff --git a/etc/edt-user.doc b/etc/edt-user.doc
index c99bb83a364f148dfc134b612009236e2bd13b31..2403bd3e5b90abca71e2d11215bada6ec120b5d5 100644 (file)
--- a/etc/edt-user.doc
+++ b/etc/edt-user.doc
@@ -3,7 +3,7 @@ File:  edt-user.doc  ---  EDT Emulation User Instructions
                                 For GNU Emacs 19
 
 Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007  Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
@@ -13,7 +13,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
+Foundation; either version 3, or (at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
@@ -824,7 +824,7 @@ G-C-\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
 ;;;                      For GNU Emacs 19 and Above
 ;;;
 ;; Copyright (C) 1986, 1992, 1993, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007  Free Software Foundation, Inc.
+;;   2006, 2007, 2008  Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kgallagh@spd.dsccc.com>
 ;; Maintainer: Kevin Gallagher <kgallagh@spd.dsccc.com>
@@ -832,7 +832,7 @@ G-C-\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,