From: Romain Francoise <romain@orebokech.com>
Date: Fri, 12 May 2006 16:01:47 +0000 (+0000)
Subject: ERC is now part of Emacs.
X-Git-Tag: emacs-pretest-22.0.90~2598
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b48100642de81543e62e1b6dc4af6e729896652;p=emacs.git

ERC is now part of Emacs.
Add Emacs Muse.
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 22886b30060..aba795f99c6 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-12  Romain Francoise  <romain@orebokech.com>
+
+	* MORE.STUFF: ERC is now part of Emacs.
+	Add Emacs Muse.
+
 2006-05-12  Ken Manheimer  <ken.manheimer@gmail.com>
 
 	* NEWS (allout): Update.
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index fd98ef06b55..6f895485bb0 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -54,6 +54,9 @@ You might find bug-fixes or enhancements in these places.
  * Eldoc and Rlogin:
    <URL:http://www.splode.com/~friedman/software/emacs-lisp/>
 
+ * ERC: IRC client:
+   <URL:http://www.emacswiki.org/cgi-bin/wiki?EmacsIRCClient>
+
  * EShell: <URL:http://www.newartisans.com/johnw/emacs.html>
 
  * Etags: <URL:ftp://pot.potorti.it/pub/software/unix/etags.tar.gz>
@@ -155,6 +158,9 @@ Several are for Debian GNU/Linux in particular.
  * EMacro: <URL:http://emacro.sourceforge.net/>
    EMacro is a portable configuration file that configures itself.
 
+ * Emacs Muse: <URL:http://www.mwolson.org/projects/MuseMode.html>
+   An authoring and publishing environment for Emacs.
+
  * Emacs speaks statistics (ESS): statistical programming within Emacs
    <URL:http://ess.r-project.org>
 
@@ -168,9 +174,6 @@ Several are for Debian GNU/Linux in particular.
  * Emacs Wiki Mode: <URL:http://mwolson.org/projects/EmacsWiki.html>
    A wiki-like publishing tool and personal information manager
 
- * ERC: IRC client:
-   <URL:http://www.emacswiki.org/cgi-bin/wiki?EmacsIRCClient>
-
  * Gnuserv:
    <URL:http://www.hpl.hp.com/personal/ange/gnuserv/home.html>
    Enhanced emacsclient/emacsserver.  Also available from this Web