Merge branch 'main' into patch-1

Author: codingjoe

doc/user_guide/configuration/all-options.rst

@@ -155,17 +155,7 @@ Standard Checkers
 
 --output-format
 """""""""""""""
-*Set the output format. Available formats are:*
-
-* ``text``
-* ``parseable``
-* ``colorized``
-* ``json2``: improved json format
-* ``json``: old json format
-* ``msvs``: visual studio
-* ``github``: `GitHub action messages <https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions>`_
-
-You can also give a reporter class, e.g. mypackage.mymodule.MyReporterClass.
+*Set the output format. Available formats are: 'text', 'parseable', 'colorized', 'json2' (improved json format), 'json' (old json format), msvs (visual studio) and 'github' (GitHub actions). You can also give a reporter class, e.g. mypackage.mymodule.MyReporterClass.*
 
 **Default:**  ``text``
 

pylint/lint/base_options.py

@@ -102,9 +102,9 @@ def _make_linter_options(linter: PyLinter) -> Options:
                 "metavar": "<format>",
                 "short": "f",
                 "group": "Reports",
-                "help": "Set the output format. Available formats are: text, "
-                "parseable, colorized, json2 (improved json format), json "
-                "(old json format) and msvs (visual studio). "
+                "help": "Set the output format. Available formats are: 'text', "
+                "'parseable', 'colorized', 'json2' (improved json format), 'json' "
+                "(old json format), msvs (visual studio) and 'github' (GitHub actions). "
                 "You can also give a reporter class, e.g. mypackage.mymodule."
                 "MyReporterClass.",
                 "kwargs": {"linter": linter},