DOC: minor fixes in shadowserver bots sections

Author: Sebastian Wagner

docs/user/bots.rst

@@ -602,7 +602,7 @@ The Cache is required to memorize which files have already been processed (TTL n
 * `country`: The country you want to download the reports for
 * `apikey`: Your Shadowserver API key
 * `secret`: Your Shadowserver API secret
-* `types`: A list of strings or a string of comma-separated values with the names of report types you want to process. If you leave this empty, all the available reports will be downloaded and processed (i.e. 'scan', 'drones', 'intel', 'sandbox_connection', 'sinkhole_combined'). The possible report types are equivalent to the file names given in the section :ref:`Supported Reports <shadowserver-supported-reports>` of the ShadowServer parser.
+* `types`: A list of strings or a string of comma-separated values with the names of report types you want to process. If you leave this empty, all the available reports will be downloaded and processed (i.e. 'scan', 'drones', 'intel', 'sandbox_connection', 'sinkhole_combined'). The possible report types are equivalent to the file names given in the section :ref:`Supported Reports <shadowserver-supported-reports>` of the Shadowserver parser.
 * **Cache parameters** (see in section :ref:`common-parameters`, the default TTL is set to 10 days)
 
 The resulting reports contain the following special field:
@@ -1456,7 +1456,7 @@ The latter was added in IntelMQ 2.3 and is meant to be used together with the Sh
 
 **Information**
 
-* `name:` intelmq.bots.parsers.shadowserver.parser or intelmq.bots.parsers.shadowserver.parser_json
+* `name:` `intelmq.bots.parsers.shadowserver.parser` (for CSV data) or `intelmq.bots.parsers.shadowserver.parser_json` (for JSON data)
 * `public:` yes
 * `description:` Parses different reports from Shadowserver.
 

intelmq/bots/BOTS

@@ -640,8 +640,8 @@
             "module": "intelmq.bots.parsers.phishtank.parser",
             "parameters": {}
         },
-        "ShadowServer": {
-            "description": "Parse all ShadowServer feeds.",
+        "Shadowserver CSV": {
+            "description": "Parse Shadowserver feeds in CSV format.",
             "module": "intelmq.bots.parsers.shadowserver.parser",
             "parameters": {
                 "feedname": "",

intelmq/etc/feeds.yaml

@@ -1426,7 +1426,7 @@ providers:
       revision: 2018-01-20
       documentation: http://vxvault.net/ViriList.php
       public: yes
-  ShadowServer:
+  Shadowserver:
     Via IMAP:
       description: Shadowserver sends out a variety of reports (see https://www.shadowserver.org/wiki/pmwiki.php/Services/Reports).
       additional_information: The configuration retrieves the data from a e-mails via IMAP from the attachments.