merged and resolved a few conflicts #8

README.md

@@ -18,6 +18,9 @@ Once *feediverse* is configured you can add it to your crontab:
 
     */15 * * * * /usr/local/bin/feediverse    
 
+Run `feediverse --help` to show the comand line options.
+
+
 ## Post Format
 
 You can customize the post format by opening the configuration file (default is
@@ -34,6 +37,11 @@ like so:
 `{hashtags}` will look for tags in the feed entry and turn them into a space
 separated list of hashtags. For some feeds (e.g. youtube-rss) you should use `{link}` instead of `{url}`.
 
+`{content}` is the whole content of the feed entry (with html-tags
+stripped). Please be aware that this might easily exceed Mastodon's
+limit of 512 characters.
+
+
 ## Multiple Feeds
 
 Since *feeds* is a list you can add additional feeds to watch if you want.
@@ -44,6 +52,23 @@ Since *feeds* is a list you can add additional feeds to watch if you want.
         template: "dot com: {title} {url}"
       - url: https://example.org/feed/
         template: "dot org: {title} {url}"
+        generator: wordpress
+
+
+## Special Handling for Different Feed Generators
+
+*feediverse* has support for some special cases of some feed
+generators. For example detecting the entries perma-link. Currently
+only Wordpress is handled, but others may follow.
+
+If a feed does not provide a proper *generator* entry, you can set it
+by adding a `generator:` value to the feed's configuration. See the
+seconds one in the example above.
+
+You can check whether feed provides a *generator* entry like this:
+
+  feediverse --verbose --dry-run feedverse-test.rc | grep generator
+
 
 ## Why?