Merge pull request #2390 from wagner-intevation/minor-doc-updates

Minor doc updates

Author: sebix

CHANGELOG.md

@@ -88,7 +88,6 @@ This is short list of the most important known issues. The full list can be retr
 - Turris greylist has been updated (#2167).
 - Spamhaus CERT parser uses wrong field (#2165).
 - Custom headers ignored in HTTPCollectorBot (#2150).
-- Missing commas in SQL query for separate Events table (#2125).
 - intelmqctl log: parsing syslog does not work (#2097).
 - Bash completion scripts depend on old JSON-based configuration files (#2094).
 - Bot configuration examples use JSON instead of YAML (#2066).

docs/dev/release-procedure.rst

@@ -76,7 +76,13 @@ Tarballs and PyPI
    python3 setup.py sdist bdist_wheel
 
 
-* Upload the files including signatures to PyPI with e.g. twine: `twine upload -s dist/intelmq...`
+* Upload the files including signatures to PyPI with e.g. twine: `twine upload -u __token__ -p $APITOKEN dist/intelmq...` (or set the API Token in `.pypirc`).
+
+*************
+Documentation
+*************
+
+Got to `the version settings on readthedocs <https://readthedocs.org/projects/intelmq/versions/>`_ and activate build for the new version.
 
 ********
 Packages

setup.cfg

@@ -44,4 +44,4 @@ maintainer = Wagner Sebastian
 maintainer_email = [email protected]
 url = https://github.com/certtools/intelmq/
 license =  AGPL-3.0-or-later
-license_file = LICENSE
+license_files = LICENSE, LICENSES/*