branch: elpa/popup
commit d1dd7c4b5f517e82de4a2bc8f1c75c9cf77f6843
Merge: b8874a4 895d031
Author: Syohei YOSHIDA <[email protected]>
Commit: Syohei YOSHIDA <[email protected]>
Merge pull request #81 from auto-complete/fix-readme-about-installation
Fix readme about installation
---
README.md | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 5da6d2f..beb4117 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
popup.el
========
-[](http://travis-ci.org/auto-complete/popup-el)
+[](http://travis-ci.org/auto-complete/popup-el)
[![melpa badge][melpa-badge]][melpa-link] [![melpa stable
badge][melpa-stable-badge]][melpa-stable-link]
Overview
--------
@@ -28,16 +28,8 @@ Screenshots
Installation
------------
-Install `popup.el` into your `load-path` directory. If you have
-`install-elisp` or `auto-install`, you also be able to install
-`popup.el` like:
-
- ;; install-elisp
- (install-elisp "https://github.com/m2ym/popup-el/raw/master/popup.el";)
- ;; auto-install
- (auto-install-from-url
"https://github.com/m2ym/popup-el/raw/master/popup.el";)
-
-popwin is tested under GNU Emacs 22 or later.
+You can install `popup.el` from [MELPA](http://melpa.org/) with package.el.
+popwin is tested under GNU Emacs 24 or later.
Popup Items
-----------
@@ -341,3 +333,8 @@ Here is an example:
----
Copyright (C) 2011 Tomohiro Matsuyama <<[email protected]>>
+
+[melpa-link]: http://melpa.org/#/popup
+[melpa-stable-link]: http://melpa.org/#/popup
+[melpa-badge]: http://melpa.org/packages/popup-badge.svg
+[melpa-stable-badge]: http://stable.melpa.org/packages/popup-badge.svg
