Merge branch 'main' into use-pipenv

Author: dukecat0

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

@@ -112,9 +112,10 @@ are not automatically included in a source distribution.  For details on
 writing a :file:`MANIFEST.in` file, including a list of what's included by
 default, see ":ref:`Using MANIFEST.in`".
 
-For an example, see the `MANIFEST.in
-<https://github.com/pypa/sampleproject/blob/main/MANIFEST.in>`_ from the `PyPA
-sample project <https://github.com/pypa/sampleproject>`_.
+However, you may not have to use a :file:`MANIFEST.in`. For an example, the `PyPA
+sample project <https://github.com/pypa/sampleproject>`_ has removed its manifest
+file, since all the necessary files have been included by :ref:`setuptools` 43.0.0
+and newer.
 
 .. note:: :file:`MANIFEST.in` does not affect binary distributions such as wheels.
 

source/guides/installing-scientific-packages.rst

@@ -15,7 +15,7 @@ software.
 
 In particular, `NumPy <https://numpy.org/>`__, which provides the basis
 for most of the software in the `scientific Python stack
-<https://web.archive.org/web/https://scipy.org/stackspec.html>`__ can be configured
+<https://scientific-python.org>`_ can be configured
 to interoperate with different FORTRAN libraries, and can take advantage
 of different levels of vectorised instructions available in modern CPUs.
 
@@ -91,15 +91,15 @@ published on python.org.
 
 macOS users also have access to Linux distribution style package managers
 such as ``Homebrew``. The SciPy site has more details on using Homebrew to
-install the `scientific Python stack
-<https://scipy.org/install/>`__.
+`install SciPy on macOS <https://scipy.org/install/#mac>`_.
 
 
 SciPy distributions
 -------------------
 
 The SciPy site lists `several distributions
-<https://scipy.org/install/>`__ that provide the full SciPy stack to
+<https://scipy.org/install/#distributions>`_
+that provide the full SciPy stack to
 end users in an easy to use and update format.
 
 Some of these distributions may not be compatible with the standard ``pip``