Merge from emacs--rel--22

[gnu-emacs] / etc / DEBUG

diff --git a/etc/DEBUG b/etc/DEBUG
index 3c1912b5d78947c4bf4df222db1235f8b3ec1ee3..bca9b6ac4f640988a6c9dc2ec517c392e1fe885d 100644 (file)
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -1,11 +1,11 @@
 Debugging GNU Emacs
 
 Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-[People who debug Emacs on Windows using native Windows debuggers
+[People who debug Emacs on Windows using Microsoft debuggers
 should read the Windows-specific section near the end of this
 document.]
 
@@ -748,7 +748,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)
+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,