From: W. Trevor King <wking@tremily.us>
Date: Sun, 28 Sep 2014 18:01:43 +0000 (-0700)
Subject: Merge branch 'config-manpage'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3fb966d6eaff45d8b932e2c19aef91a76d30e006;p=rss2email.git

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>
---

3fb966d6eaff45d8b932e2c19aef91a76d30e006
diff --cc CHANGELOG
index f391773,eb1af83..484b600
--- a/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.