Doc fixes taken from chise.org

See also http://git.chise.org/gitweb/?p=elisp/semi.git