Merge branch 'config-manpage'
authorW. Trevor King <wking@tremily.us>
Sun, 28 Sep 2014 18:01:43 +0000 (11:01 -0700)
committerW. Trevor King <wking@tremily.us>
Sun, 28 Sep 2014 18:01:43 +0000 (11:01 -0700)
commit3fb966d6eaff45d8b932e2c19aef91a76d30e006
tree8a93395e1aac753fb667b023a085d3d48cea6225
parentaadecb325440123716c035f7fb6d4b8cc68a5e83
parent183c836c21cca0eab9769116a0542eb7f9834d3c
Merge branch 'config-manpage'

This is not very DRY, but it gets the job done for now.  If it turns
out to be a pain to maintain, I may try to automate the extraction
later.

* config-manpage:
  r2e.1: Fix 'massage' -> 'message' typo
  CHANGELOG: Document this branch
  Document configuration items in manpage

Signed-off-by: W. Trevor King <wking@tremily.us>
CHANGELOG