branch: new-master
commit 6432f8f37a11f69756f9f979b631c81636a909a4
Author: Dmitry Gutov <dgu...@yandex.ru>
Commit: Dmitry Gutov <dgu...@yandex.ru>
Make README more up-to-date
---
README | 54 ++++++++++++++++++------------------------------------
1 file changed, 18 insertions(+), 36 deletions(-)
diff --git a/README b/README
index 7d88946..55106b0 100644
--- a/README
+++ b/README
@@ -7,19 +7,28 @@ OVERVIEW
MMM Mode is a minor mode for Emacs that allows Multiple Major Modes
to coexist in one buffer. It is well-suited to editing:
- * Preprocessed code, such as server-side Perl or PHP embedded in HTML
+ * Preprocessed code, such as server-side Ruby, Perl or PHP embedded in HTML
* Code generating code, such as HTML output by CGI scripts
* Embedded code, such as Javascript in HTML
* Literate programming: code interspersed with documentation, e.g. Noweb
INSTALLATION
- Users of package.el (a.k.a. ELPA) can easily install MMM Mode from the
- Melpa package repository at http://melpa.milkbox.net/ -- this is the
+ Use any of the following options:
+
+ 1. Users of package.el (a.k.a. ELPA) can easily install MMM Mode from
+ the Melpa package repository at http://melpa.milkbox.net/ -- this is the
preferred and best-supported installation mechanism.
- MMM Mode has a standard GNU configure-driven installation. (See the
- file INSTALL for generic instructions, most of which don't apply.)
+ 2. Since currently MMM Mode is written in pure Emacs Lisp, you could just
+ copy all the *.el files in the distribution to a directory in your
+ `load-path', and optionally byte-compile them manually (see the Emacs
+ Manual). The configure installation also installs the MMM Mode info manual
+ in your site info directory, so if you're installing manually, you might
+ want to do that too.
+
+ 3. MMM Mode has a standard GNU configure-driven installation.
+ (See the file INSTALL for generic instructions, most of which don't apply.)
To install in the standard locations, unpack the archive, `cd' to
the mmm-mode-X.X.X directory created, and run these commands:
@@ -28,19 +37,6 @@ INSTALLATION
make
make install
- Alternately, since currently MMM Mode is written in pure Emacs Lisp,
- you could just copy all the *.el files in the distribution to a
- directory in your `load-path', and optionally byte-compile them
- manually (see the Emacs Manual). The configure installation also
- installs the MMM Mode info manual in your site info directory, so if
- you're installing manually, you might want to do that too.
-
- If you're installing from the CVS version, you won't have the
- configure script. If you have the automake/autoconf tools
- installed, you can run the script `autogen.sh' first, and then
- proceed as above. Otherwise, you'll have to copy the *.el files
- manually as described above.
-
If you have more than one version of emacs installed and want to
use MMM in a version other than /usr/bin/emacs, you must set the
environment variable EMACS before running `configure', e.g.
@@ -103,25 +99,11 @@ DOCUMENTATION
UPDATES
The latest version of MMM Mode should always be available from
- http://sourceforge.net/projects/mmm-mode
-
-BUG REPORTS
-
- Bug reports and suggestions can be submitted at
- <http://sourceforge.net/tracker/?group_id=8658&atid=108658>, or
- through email to <viritril...@users.sourceforge.net>.
-
-CONTACT INFO
-
- MMM Mode is written and maintained by Michael Shulman,
- <viritril...@users.sourceforge.net>, and others; a list of some
- contributors can be found on the Sourceforge project.
+ https://github.com/purcell/mmm-mode
-MAILING LIST
+FEEDBACK
- To subscribe to the MMM Mode mailing list, visit
- <http://lists.sourceforge.net/mailman/listinfo/mmm-mode-discuss>.
- The mailing list receives announcements of new releases and provides
- a forum for discussion of bugs and features.
+ Bug reports, suggestions and questions can be submitted at
+ <https://github.com/purcell/mmm-mode/issues>.
Thanks for using MMM Mode!
