summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-08 04:26:36 -0500
committerChris McDonough <chrism@plope.com>2011-12-08 04:26:36 -0500
commit099a33c78f95b83feab7b76846df918c019a1bc9 (patch)
tree3459444e6c27303505695f24d014a32b33036587 /docs/glossary.rst
parent101e0964d2c51404cdd71a28fad45921858e7191 (diff)
parent56df902d0a5bcd29a2b4c3dfafab9a09d6f0c29d (diff)
downloadpyramid-099a33c78f95b83feab7b76846df918c019a1bc9.tar.gz
pyramid-099a33c78f95b83feab7b76846df918c019a1bc9.tar.bz2
pyramid-099a33c78f95b83feab7b76846df918c019a1bc9.zip
Merge branch 'feature.resolvers'
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 399b78cdf..e4de15bd6 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -977,3 +977,9 @@ Glossary
a running Pyramid application. An introspectable is associated with a
:term:`action` by virtue of the
:meth:`pyramid.config.Configurator.action` method.
+
+ asset descriptor
+ An instance representing an :term:`asset specification` provided by the
+ :meth:`pyramid.path.AssetResolver.resolve` method. It supports the
+ methods and attributes documented in
+ :class:`pyramid.interfaces.IAssetDescriptor`.