Merge commit '6abd4f4fe740054d433d928d90fb1671cce6719c'

diff --combined packages/nameless/README.org
index d427342fe01f67884d2346df3e3fba8d0eed8349,12d5fe5c7324db4ba7e5f918aa8339f7840bea9b..12d5fe5c7324db4ba7e5f918aa8339f7840bea9b
--- 1/packages/nameless/README.org
--- 2/README.org
+++ b/packages/nameless/README.org
@@@ -3,10 -3,11 +3,11 @@@
  * Nameless --- /less is more/
  *Hide package namespaces in your emacs-lisp code.*
  
- Simply put, turn on this minor mode, and you’ll see this
- [[file:example-nameless-on.png]]\\
- instead of this
- [[file:example-nameless-off.png]]
+ Simply put, turn on this minor mode, and the namespace prefix of the
+ package you’re editing will be hidden by a ~:~. Here’s a comparison.
+ The image to the *left* is what you normally see. The image to
+ the *right* has ~nameless-mode~ turned on.\\
+  [[file:example-nameless.png]]
  
  ** Usage
  

diff --combined packages/nameless/example-nameless.png
index 0000000000000000000000000000000000000000,38bea2d5a0f30031e371b2e6e8554a9b7a5c9c67..38bea2d5a0f30031e371b2e6e8554a9b7a5c9c67
mode 000000,100644..100644
Binary files differ

diff --combined packages/nameless/nameless.el
index eb595a308ce168243a962460a608c3f06af7e8c0,6737aa0fcac7567afecc3afffa63b2fe48625561..6737aa0fcac7567afecc3afffa63b2fe48625561
--- 1/packages/nameless/nameless.el
--- 2/nameless.el
+++ b/packages/nameless/nameless.el
@@@ -4,7 -4,7 +4,7 @@@
  
  ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
  ;; Keywords: convenience, lisp
- ;; Version: 0.3
+ ;; Version: 0.3.1
  ;; Package-Requires: ((emacs "24.4"))
  
  ;; This program is free software; you can redistribute it and/or modify
@@@ -66,9 -66,12 +66,12 @@@ automatically insert `font-lock-'.
    :type '(alist string string))
  
  (defvar nameless-aliases nil
-   "Alist from namespaces to aliases.
- Samse syntax as `nameless-global-aliases', but designed to be
- used as a file-local variable.")
+   "Alist from aliases to namespaces.
+ This variable takes the same syntax and has the same effect as
+ `nameless-global-aliases'.  Aliases set here take priority over
+ those in `nameless-global-aliases'.
+ This variable is designed to be used as a file-local or dir-local
+ variable.")
  
  (defface nameless-face
    '((t :inherit font-lock-type-face))