Update files

1 files changed, 76 insertions, 29 deletions

diff --git a/site/projects/dispass.el.org b/site/projects/dispass.el.org
index 548878a..18fced2 100644
--- a/site/projects/dispass.el.org
+++ b/site/projects/dispass.el.org
@@ -1,9 +1,7 @@
 #+TITLE: dispass.el
-#+LINK_UP: ../index.html
-#+LINK_HOME: http://ryuslash.org
-#+LINK: src    https://github.com/ryuslash/dispass.el
-#+LINK: tar_gz https://github.com/ryuslash/dispass.el/tarball/master
-#+LINK: zip    https://github.com/ryuslash/dispass.el/zipball/master
+#+LINK: src    http://code.ryuslash.org/cgit.cgi/emacs/dispass.el/
+#+LINK: tar_gz http://code.ryuslash.org/cgit.cgi/emacs/dispass.el/snapshot/dispass.el-master.tar.gz
+#+LINK: zip    http://code.ryuslash.org/cgit.cgi/emacs/dispass.el/snapshot/dispass.el-master.zip
 #+LINK: dispass http://dispass.babab.nl
 #+STARTUP: showall
 
@@ -22,37 +20,86 @@
   [[dispass][DisPass]] is a passphrase generator.  ~dispass.el~ is an [[emacs][Emacs]] wrapper
   for [[dispass][DisPass]].
 
-** Features
+  | Status   | Active     |
+  | Language | Emacs Lisp |
+  | License  | ISC        |
 
-   - Copy passwords directly to the clipboard, no need for manual
-     selection and copying.
-   - Specify the length of the passphrase by using a numeric prefix
-     argument.
+* Why?
 
-** Requirements
+  [[dispass][DisPass]] is written by a [[http://babab.nl][friend]] of mine and I really liked the idea
+  of it.  But the interface he had for it was not to my liking, it
+  was not Emacs.
 
-   - [[emacs][Emacs]]
-   - [[dispass][DisPass]]
+** Why the license?
 
-* Usage
+   Since [[dispass][DisPass]] uses the ISC license, I thought it would be polite
+   to use the same license.
+
+* Features
+
+  - Copy passwords directly to the clipboard, no need for manual
+    selection and copying.
+  - Specify the length of the passphrase by using a numeric prefix
+    argument.
+  - Input completion for labels.
+  - Some label management (adding, removing).
+
+* Dependencies
+
+  - [[emacs][Emacs]] :: Probably version 24+, since that is what it's being
+             developed on.
+  - [[dispass][DisPass]] :: At least v0.1a8, best is a recent git version.
+
+* Download
+
+  There are download links for a ~tar.gz~ and a ~zip~ file of the latest
+  development version at the top of this page.
+
+  ~dispass.el~ is both in the [[http://marmalade-repo.org/][Marmalade]] and the [[http://melpa.milkbox.net/][MELPA]] repo.  The MELPA
+  version is a direct checkout of the latest development version and
+  the Marmalade version is an older, possibly more stable, version.
+
+* Install
 
-  First place ~dispass.el~ somewhere in your load path, or add its
-  location to your load path:
+  Once you have [[Download][downloaded]] ~dispass.el~ you have at least 2 choices for
+  installation.
 
-  #+begin_src emacs-lisp
-    (add-to-list 'load-path "~/location/of/dispass.el")
-  #+end_src
+** package.el
 
-  Then you need to load it up:
+   If you have Emacs v24+ or [[http://tromey.com/elpa/install.html][package.el]] and either Marmalade or MELPA
+   configured, you can just:
 
-  #+begin_src emacs-lisp
-    (require 'dispass)
-  #+end_src
+   #+BEGIN_SRC emacs-lisp
+     (package-install "dispass")
+   #+END_SRC
 
-  After that everything should be simple, either call =dispass= or
-  =dispass-create= to generate the passphrase. =dispass-create= will ask
-  for your password twice, for confirmation purposes.
+** manual
+
+   Otherwise you have to [[Download][dowload]] it and then put it somewhere in your
+   =load-path=, or add that location to your =load-path=:
+
+   #+begin_src emacs-lisp
+     (add-to-list 'load-path "~/location/of/dispass.el")
+   #+end_src
+
+   After which you can either ~require~ the package in your Emacs init
+   file:
+
+   #+BEGIN_SRC emacs-lisp
+     (require 'dispass)
+   #+END_SRC
+
+   Or set-up some autoloads:
+
+   #+BEGIN_SRC emacs-lisp
+     (autoload 'dispass "dispass" nil t)
+     (autoload 'dispass-create "dispass" nil t)
+     (autoload 'dispass-list-labels "dispass" nil t)
+   #+END_SRC
+
+* Usage
 
-  To specify a length of the generated passphrase, use numeric prefix
-  arguments: =C-8 M-x dispass <RET>= to create a passphrase of 8
-  characters.
+  Once installed you can use ~dispass~ to (re)generate passphrases,
+  ~dispass-create~ to generate a new one (it asks for confirmation on
+  the password) and ~dispass-list-labels~ to view a list of stored
+  labels and manage them a little.