summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2014-09-06 10:40:00 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2014-09-06 10:40:00 (GMT)
commit4a4b67951570a8a0452c77a5ebaa98b9ef9fb712 (patch)
tree00295b38c39daad16d5636098402affecda6adef /Doc/glossary.rst
parente0047ccdd2b547c12e157bb39fc531b3fe261cbe (diff)
parent1d52096d1466ed771c22a2d97e8cae6935fcdf8e (diff)
downloadcpython-4a4b67951570a8a0452c77a5ebaa98b9ef9fb712.zip
cpython-4a4b67951570a8a0452c77a5ebaa98b9ef9fb712.tar.gz
cpython-4a4b67951570a8a0452c77a5ebaa98b9ef9fb712.tar.bz2
Merge issue #22295 fix from 3.4
Diffstat (limited to 'Doc/glossary.rst')
-rw-r--r--Doc/glossary.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 4411bf8..21d1673 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -858,6 +858,14 @@ Glossary
dictionary view to become a full list use ``list(dictview)``. See
:ref:`dict-views`.
+ virtual environment
+ A cooperatively isolated runtime environment that allows Python users
+ and applications to install and upgrade Python distribution packages
+ without interfering with the behaviour of other Python applications
+ running on the same system.
+
+ See also :ref:`scripts-pyvenv`
+
virtual machine
A computer defined entirely in software. Python's virtual machine
executes the :term:`bytecode` emitted by the bytecode compiler.