branch: elpa/scala-mode
commit af2dc30226c890ff7d49d727450f8006b90781df
Author: Heikki Vesalainen <heikki.vesalai...@iki.fi>
Commit: Heikki Vesalainen <heikki.vesalai...@iki.fi>
Removed Marmelade from README.md
Fixes #72
---
README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index d3a5706..6129e9e 100644
--- a/README.md
+++ b/README.md
@@ -30,12 +30,12 @@ to the load-path and then to require it. For more
information regarding
manner to install scala-mode2 as it allows for continuous, easy
updating from within Emacs itself.
- Adding the MELPA or Marmalade repository to your emacs
+ Adding the MELPA repository to your emacs
initialization will be required to locate the packages.
Add the following to your emacs config (.emacs, init.el, etc), and
if such a definition already exists, ensure that it contains
- the MELPA or Marmalade declaration, for example:
+ the MELPA declaration, for example:
```lisp
(require 'package)
@@ -52,10 +52,10 @@ to the load-path and then to require it. For more
information regarding
M-x customize-variable [RET] package-archives
```
- and add MELPA or Marmalade, for example:
+ and add MELPA, for example:
```
- marmalade http://marmalade-repo.org/packages/
+ melpa http://melpa.milkbox.net/packages/
```
and then use package install to install it:
@@ -462,4 +462,4 @@ Contributors and valuable feedback:
- Hugh Giddens
- Nic Ferrier
- Tillmann Rendel
-- Jim Powers
\ No newline at end of file
+- Jim Powers
