Merge branch 'master' of /home/chrissi/git/zs - zs - Zeitungsschau rss to email converter
       
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) LICENSE
       ---
 (DIR) commit 12f2f413caba174fb8c631993d2348cd2b11f08c
 (DIR) parent 4367ca12c328ba46f3870016280e39c0ef252a0b
 (HTM) Author: Christoph Lohmann <20h@r-36.net>
       Date:   Fri,  2 Oct 2015 17:00:25 +0200
       
       Merge branch 'master' of /home/chrissi/git/zs
       
       Diffstat:
         README.md                           |      20 ++++++++++++--------
       
       1 file changed, 12 insertions(+), 8 deletions(-)
       ---
 (DIR) diff --git a/README.md b/README.md
       @@ -39,10 +39,6 @@ filtering to specific mailboxes:
                X-RSS-ID        (article ID)
                X-RSS-TAGS        (provided tags in the article or feed)
        
       -## Repetitive run for cron
       -
       -        zs run >/dev/null
       -
        ## Import your old feeds from OPML
        
                zs opmlimport file.opml
       @@ -51,10 +47,18 @@ filtering to specific mailboxes:
        
                zs opmlexport myfeeds.opml
        
       -This  will  output  the stderr to cron and mail it to you. Zeitungsschau
       -ist written in a conservative way to only handle  the  important  excep‐
       -ttions  which are needed. The complexity of Python makes it impossible to
       -know all cases beforehand.
       +## Repetitive run for cron
       +
       +        zs run >/dev/null
       +
       +This  will  output  the stderr to cron and mail it to you.
       +
       +## Exceptions // Bugs
       +
       +Zeitungsschau ist written in a conservative way to only handle  the  im‐
       +portant  exceptions  which are needed. The complexity of  Python   makes
       +it  impossible  to  know all cases beforehand. Please send in patches in
       +case you find bugs.
        
        Please report bugs to 20h@r-36.net.