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>

diff --cc CHANGELOG
index f3917733bdffa3402025f4772e0067788fff6123,eb1af836f3970b3b5d00f375ba391476d92285aa..484b600c4cb513579ffbfa1c87095ee3b170e707
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,5 -1,5 +1,6 @@@
  v3.10 (unreleased)
+     * Add a manually extracted list of config options to r2e.1.
 +    * Add a redirect post-process module.
  
  v3.9 (2014-09-01)
      * Catch and error out if a user adds a feed with a duplicate name.