summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-11-28 16:19:04 -0500
committerChris McDonough <chrism@plope.com>2011-11-28 16:19:04 -0500
commitdafb0b3271f525fb8552d155a4dd840ced1656c8 (patch)
tree786cccbf8f2287be8e2fa43afd33e503b5366739 /docs/glossary.rst
parent8786a5719950900ba7a8390323476076e737ac9e (diff)
parent14e5fa938b5354154f724101f444b1826b01aa3a (diff)
downloadpyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.tar.gz
pyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.tar.bz2
pyramid-dafb0b3271f525fb8552d155a4dd840ced1656c8.zip
merge master to feature.introspection
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index c98637698..39933cf4c 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -936,3 +936,8 @@ Glossary
email. See its `documentation
<https://docs.pylonsproject.org/projects/pyramid_exclog/dev/>`_.
+ 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
+ running ``setup.py install`` or ``setup.py develop``.
+