Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

1 files changed, 14 insertions, 3 deletions

diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 69bdd2d2bfb..b3ccc33dda6 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -1,4 +1,7 @@
 More Neat Stuff for your Emacs
+Copyright (c) 1993, 1999, 2003, 2004, 2005, 2006 
+Free software Foundation, Inc.
+See the end of the file for copying permissions.
 
 This file describes GNU Emacs programs and resources that are
 maintained by other people.  Some of these may become part of the
@@ -117,9 +120,9 @@ the future.
 You might like to check whether they are packaged for your system.
 Several are for Debian GNU/Linux in particular.
 
- * AUCTeX: fancy (La)TeX support: <URL:http://www.gnu.org/software/auctex/>
-   There's an AUCTeX mail list/newsgroup:
-   <URL:news://sunsite.dk/emacs.auctex>.
+ * AUCTeX: <URL:http://www.gnu.org/software/auctex/>
+   An extensible package that supports writing and formatting TeX
+   files (including AMS-TeX, LaTeX, Texinfo, ConTeXt, and docTeX).
 
  * BBDB: personal Info Rolodex integrated with mail/news:
    <URL:http://bbdb.sourceforge.net/>
@@ -269,4 +272,12 @@ mode: view
 eval: (goto-address)
 End:
 
+COPYING PERMISSIONS
+    Permission to use, copy, modify, and distribute this
+    software and its documentation for any purpose and without
+    fee is hereby granted, provided that the above copyright
+    notice appear in all copies and that both that copyright
+    notice and this permission notice appear in supporting
+    documentation.
+
 arch-tag: c1d4e7c8-db85-44e6-909e-659e2b20fefa