Merge from emacs--devo--0

[gnu-emacs] / etc / MORE.STUFF

diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index c24a6735bf33bf0a8f07dc97267f4af291f90532..3caae580a5ceb43b97a87c123a2504234a2abdad 100644 (file)
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -1,6 +1,6 @@
 More Neat Stuff for your Emacs
 
-Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
@@ -201,13 +201,6 @@ Several are for Debian GNU/Linux in particular.
  * JDEE: <URL:http://jdee.sunsite.dk/>
    Provides a Java development environment for Emacs.
 
- * Mule-UCS: Universal enCoding System:
-   <URL:ftp://ftp.m17n.org/pub/mule/Mule-UCS/>
-   Extended coding systems for Mule, specifically for reading and
-   writing UTF-8 encoded Unicode.  This probably doesn't have much
-   advantage over the built-in `mule-utf-8' coding system with
-   `utf-translate-cjk' turned on.
-
  * Mailcrypt:
    <URL:http://mailcrypt.sourceforge.net/>
    PGP and GPG support.  PGP isn't free software, but GPG, the GNU
@@ -284,7 +277,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,