summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-04-12 03:00:56 -0700
committerSteve Piercy <web@stevepiercy.com>2016-04-12 03:00:56 -0700
commit278afff7a9bbb42d96ac2199689c3141b9463b9c (patch)
tree2579157b840714e00202a1c7bb730d6849e4d7b6 /docs/glossary.rst
parentf4013e4ed87d1ebec94756e07220b7ee273727b4 (diff)
parentb485166239091c620c96ca71369c69f6fa7a8be7 (diff)
downloadpyramid-278afff7a9bbb42d96ac2199689c3141b9463b9c.tar.gz
pyramid-278afff7a9bbb42d96ac2199689c3141b9463b9c.tar.bz2
pyramid-278afff7a9bbb42d96ac2199689c3141b9463b9c.zip
Merge pull request #2479 from stevepiercy/docs/easy-install-to-pip.2104
Docs/easy install to pip.2104
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst16
1 files changed, 11 insertions, 5 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 1d8e0de1b..fd32ed796 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -1100,10 +1100,16 @@ Glossary
checker, and applying a renderer to a dictionary returned from the view.
pip
- The `Python Packaging Authority <https://www.pypa.io/>`_ recommended tool
- for installing Python packages.
+ The `Python Packaging Authority's <https://www.pypa.io/>`_ recommended
+ tool for installing Python packages.
pyvenv
- The Python Packaging Authority's recommended command for `creating
- virtual environments on Python 3.4 and greater
- <https://packaging.python.org/en/latest/installing/#creating-virtual-environments>`_.
+ The Python Packaging Authority formerly recommended using this command
+ for `creating virtual environments on Python 3.4 and 3.5
+ <https://packaging.python.org/en/latest/installing/#creating-virtual-environments>`_,
+ but it is deprecated in 3.6 in favor of ``python3 -m venv`` which is
+ backward compatible.
+
+ venv
+ The `Python Packaging Authority's <https://www.pypa.io/>`_ recommended
+ tool for creating virtual environments.