Merge branch 'main' into prune-project-links

Author: bhrutledge

source/guides/distributing-packages-using-setuptools.rst

@@ -773,7 +773,7 @@ If your project is pure Python then you'll be creating a
 If your project contains compiled extensions, then you'll be creating what's
 called a :ref:`*Platform Wheel* (see section below) <Platform Wheels>`.
 
-.. note:: If your project also supports Python 2 _and_ contains no C extensions,
+.. note:: If your project also supports Python 2 *and* contains no C extensions,
   then you should create what's called a *Universal Wheel* by adding the
   following to your :file:`setup.cfg` file:
 
@@ -782,7 +782,7 @@ called a :ref:`*Platform Wheel* (see section below) <Platform Wheels>`.
      [bdist_wheel]
      universal=1
 
-  Only use this setting if your project does not have any C extesions _and_
+  Only use this setting if your project does not have any C extensions *and*
   supports Python 2 and 3.
 
 

source/support.rst

@@ -5,5 +5,7 @@ How to Get Support
 For support related to a specific project, see the links on the :doc:`Projects
 <key_projects>` page.
 
-For something more general, or when you're just not sure, use the `distutils-sig
-<http://mail.python.org/mailman/listinfo/distutils-sig>`_ list.
+For something more general, or when you're just not sure, please
+`open an issue <https://github.com/pypa/packaging-problems/issues/new>`_ on
+the `packaging-problems <https://github.com/pypa/packaging-problems>`_
+repository on GitHub.