diff options
Diffstat (limited to 'Doc/using')
| -rw-r--r-- | Doc/using/unix.rst | 2 | ||||
| -rw-r--r-- | Doc/using/venv-create.inc | 2 | ||||
| -rw-r--r-- | Doc/using/windows.rst | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst index 0a18344..3f9f136 100644 --- a/Doc/using/unix.rst +++ b/Doc/using/unix.rst @@ -69,7 +69,7 @@ Building Python If you want to compile CPython yourself, first thing you should do is get the `source <https://www.python.org/downloads/source/>`_. You can download either the latest release's source or just grab a fresh `clone -<https://devguide.python.org/setup/#getting-the-source-code>`_. (If you want +<https://devguide.python.org/setup/#get-the-source-code>`_. (If you want to contribute patches, you will need a clone.) The build process consists of the usual commands:: diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc index ddb36f9..b978583 100644 --- a/Doc/using/venv-create.inc +++ b/Doc/using/venv-create.inc @@ -17,7 +17,7 @@ re-used. .. deprecated:: 3.6 ``pyvenv`` was the recommended tool for creating virtual environments for Python 3.3 and 3.4, and is `deprecated in Python 3.6 - <https://docs.python.org/dev/whatsnew/3.6.html#deprecated-features>`_. + <https://docs.python.org/dev/whatsnew/3.6.html#id8>`_. .. versionchanged:: 3.5 The use of ``venv`` is now recommended for creating virtual environments. diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index dcc5337..d7e0a5e 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -513,9 +513,11 @@ key features: Popular scientific modules (such as numpy, scipy and pandas) and the ``conda`` package manager. -`Canopy <https://www.enthought.com/product/canopy/>`_ - A "comprehensive Python analysis environment" with editors and other - development tools. +`Enthought Deployment Manager <https://www.enthought.com/edm/>`_ + "The Next Generation Python Environment and Package Manager". + + Previously Enthought provided Canopy, but it `reached end of life in 2016 + <https://support.enthought.com/hc/en-us/articles/360038600051-Canopy-GUI-end-of-life-transition-to-the-Enthought-Deployment-Manager-EDM-and-Visual-Studio-Code>`_. `WinPython <https://winpython.github.io/>`_ Windows-specific distribution with prebuilt scientific packages and @@ -1170,7 +1172,7 @@ Compiling Python on Windows If you want to compile CPython yourself, first thing you should do is get the `source <https://www.python.org/downloads/source/>`_. You can download either the latest release's source or just grab a fresh `checkout -<https://devguide.python.org/setup/#getting-the-source-code>`_. +<https://devguide.python.org/setup/#get-the-source-code>`_. The source tree contains a build solution and project files for Microsoft Visual Studio, which is the compiler used to build the official Python |