diff options
| author | Michael Merickel <michael@merickel.org> | 2013-03-12 14:05:06 -0700 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-03-12 14:05:06 -0700 |
| commit | f88ab0e8787d2bc9bba72b47ffbb83b09f0d1a5e (patch) | |
| tree | 133f971c7ee603ff4bd3ff00a4392601922b6f07 /docs | |
| parent | 38ba7f4135c83872d661ea67ea6c7e98700b2e62 (diff) | |
| parent | dd1970db763f3114a77ae1c98a3e529562fbfeb5 (diff) | |
| download | pyramid-f88ab0e8787d2bc9bba72b47ffbb83b09f0d1a5e.tar.gz pyramid-f88ab0e8787d2bc9bba72b47ffbb83b09f0d1a5e.tar.bz2 pyramid-f88ab0e8787d2bc9bba72b47ffbb83b09f0d1a5e.zip | |
Merge pull request #872 from tshepang/virtualenv
virtualenv refers both to the tool and the concept
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/glossary.rst | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 0b802ab51..cc77e0df3 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -146,10 +146,9 @@ Glossary request before it returns a :term:`context` resource. virtualenv - An isolated Python environment. Allows you to control which - packages are used on a particular project by cloning your main - Python. `virtualenv <http://pypi.python.org/pypi/virtualenv>`_ - was created by Ian Bicking. + A term referring both to an isolated Python environment, + or `the leading tool <http://www.virtualenv.org>`_ that allows one to + create such environments. resource An object representing a node in the :term:`resource tree` of an @@ -958,7 +957,7 @@ Glossary console script A script written to the ``bin`` (on UNIX, or ``Scripts`` on Windows) - directory of a Python installation or virtualenv as the result of + directory of a Python installation or :term:`virtualenv` as the result of running ``setup.py install`` or ``setup.py develop``. introspector |