aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-05-28 21:12:29 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-05-28 21:12:29 -0400
commit11b6f07e612d447ec38a04f56aac079068cffb1d (patch)
tree9a55ca6412cf8e3edefa38b61e2e053ef68cb593
parent620b20a73c488350169d650cf1f0103bf8814515 (diff)
parenta5c5a33e3746e21082d9e0dd73fedd70eada107f (diff)
downloadexternal_python_setuptools-11b6f07e612d447ec38a04f56aac079068cffb1d.tar.gz
external_python_setuptools-11b6f07e612d447ec38a04f56aac079068cffb1d.tar.bz2
external_python_setuptools-11b6f07e612d447ec38a04f56aac079068cffb1d.zip
Merge branch 'master' of https://github.com/pypa/setuptools
-rw-r--r--changelog.d/2156.doc.rst1
-rw-r--r--docs/developer-guide.txt10
2 files changed, 6 insertions, 5 deletions
diff --git a/changelog.d/2156.doc.rst b/changelog.d/2156.doc.rst
new file mode 100644
index 00000000..8d604979
--- /dev/null
+++ b/changelog.d/2156.doc.rst
@@ -0,0 +1 @@
+Update mailing list pointer in developer docs
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index e6171e4e..4a78e22e 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -23,16 +23,16 @@ contribution.
Project Management
------------------
-Setuptools is maintained primarily in Github at `this home
+Setuptools is maintained primarily in GitHub at `this home
<https://github.com/pypa/setuptools>`_. Setuptools is maintained under the
Python Packaging Authority (PyPA) with several core contributors. All bugs
-for Setuptools are filed and the canonical source is maintained in Github.
+for Setuptools are filed and the canonical source is maintained in GitHub.
User support and discussions are done through the issue tracker (for specific)
-issues, through the distutils-sig mailing list, or on IRC (Freenode) at
+issues, through the `distutils-sig mailing list <https://mail.python.org/mailman3/lists/distutils-sig.python.org/>`_, or on IRC (Freenode) at
#pypa.
-Discussions about development happen on the pypa-dev mailing list or on
+Discussions about development happen on the distutils-sig mailing list or on
`Gitter <https://gitter.im/pypa/setuptools>`_.
-----------------
@@ -44,7 +44,7 @@ describing the motivation behind making changes. First search to see if a
ticket already exists for your issue. If not, create one. Try to think from
the perspective of the reader. Explain what behavior you expected, what you
got instead, and what factors might have contributed to the unexpected
-behavior. In Github, surround a block of code or traceback with the triple
+behavior. In GitHub, surround a block of code or traceback with the triple
backtick "\`\`\`" so that it is formatted nicely.
Filing a ticket provides a forum for justification, discussion, and