summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-12-20 15:59:49 -0500
committerJason R. Coombs <jaraco@jaraco.com>2020-12-20 15:59:49 -0500
commita2487bbcae85d70e47d4e46257e5193ab7e05ab6 (patch)
treebac1311d37f59b9b224d8f2491ba8f237d9991b3 /README.rst
parentcabb200e590955eee70b67787eaa5597d4d0ff19 (diff)
parentfb8d9c43500c06f6f2286ea7c7ae452d41cce412 (diff)
downloadpython-setuptools-git-a2487bbcae85d70e47d4e46257e5193ab7e05ab6.tar.gz
Merge https://github.com/jaraco/tidelift into main
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst21
1 files changed, 13 insertions, 8 deletions
diff --git a/README.rst b/README.rst
index e9de2e16..2273dcd8 100644
--- a/README.rst
+++ b/README.rst
@@ -34,9 +34,13 @@ Bug reports and especially tested patches may be
submitted directly to the `bug tracker
<https://github.com/pypa/setuptools/issues>`_.
-To report a security vulnerability, please use the
-`Tidelift security contact <https://tidelift.com/security>`_.
-Tidelift will coordinate the fix and disclosure.
+
+Code of Conduct
+===============
+
+Everyone interacting in the setuptools project's codebases, issue trackers,
+chat rooms, and mailing lists is expected to follow the
+`PSF Code of Conduct <https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md>`_.
For Enterprise
@@ -48,9 +52,10 @@ Setuptools and the maintainers of thousands of other packages are working with T
`Learn more <https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=referral&utm_campaign=github>`_.
-Code of Conduct
-===============
-Everyone interacting in the setuptools project's codebases, issue trackers,
-chat rooms, and mailing lists is expected to follow the
-`PSF Code of Conduct <https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md>`_.
+Security Contact
+================
+
+To report a security vulnerability, please use the
+`Tidelift security contact <https://tidelift.com/security>`_.
+Tidelift will coordinate the fix and disclosure.