summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst74
1 files changed, 60 insertions, 14 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index fc282b2da..e4de15bd6 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -342,14 +342,13 @@ Glossary
file. It was developed by Ian Bicking.
Chameleon
- `chameleon <http://chameleon.repoze.org>`_ is an attribute
- language template compiler which supports both the :term:`ZPT` and
- :term:`Genshi` templating specifications. It is written and
- maintained by Malthe Borch. It has several extensions, such as
- the ability to use bracketed (Genshi-style) ``${name}`` syntax,
- even within ZPT. It is also much faster than the reference
- implementations of both ZPT and Genshi. :app:`Pyramid` offers
- Chameleon templating out of the box in ZPT and text flavors.
+ `chameleon <http://chameleon.repoze.org>`_ is an attribute language
+ template compiler which supports the :term:`ZPT` templating
+ specification. It is written and maintained by Malthe Borch. It has
+ several extensions, such as the ability to use bracketed (Mako-style)
+ ``${name}`` syntax. It is also much faster than the reference
+ implementation of ZPT. :app:`Pyramid` offers Chameleon templating out
+ of the box in ZPT and text flavors.
ZPT
The `Zope Page Template <http://wiki.zope.org/ZPT/FrontPage>`_
@@ -564,9 +563,8 @@ Glossary
also `PEP 318 <http://www.python.org/dev/peps/pep-0318/>`_.
configuration declaration
- An individual method call made to an instance of a :app:`Pyramid`
- :term:`Configurator` object which performs an arbitrary action, such as
- registering a :term:`view configuration` (via the
+ An individual method call made to a :term:`configuration directive`,
+ such as registering a :term:`view configuration` (via the
:meth:`~pyramid.config.Configurator.add_view` method of the
configurator) or :term:`route configuration` (via the
:meth:`~pyramid.config.Configurator.add_route` method of the
@@ -922,7 +920,7 @@ Glossary
database information. :mod:`pyramid_debugtoolbar` is configured into
the ``development.ini`` of all applications which use a Pyramid
:term:`scaffold`. For more information, see
- https://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ .
+ http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/dev/ .
scaffold
A project template that helps users get started writing a Pyramid
@@ -935,5 +933,53 @@ Glossary
used in production applications, because the logger can be configured to
log to a file, to UNIX syslog, to the Windows Event Log, or even to
email. See its `documentation
- <https://docs.pylonsproject.org/projects/pyramid_exclog/dev/>`_.
-
+ <http://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``.
+
+ introspector
+ An object with the methods described by
+ :class:`pyramid.interfaces.IIntrospector` that is available in both
+ configuration code (for registration) and at runtime (for querying) that
+ allows a developer to introspect configuration statements and
+ relationships between those statements.
+
+ conflict resolution
+ Pyramid attempts to resolve ambiguous configuration statements made by
+ application developers via automatic conflict resolution. Automatic
+ conflict resolution is described in
+ :ref:`automatic_conflict_resolution`. If Pyramid cannot resolve
+ ambiguous configuration statements, it is possible to manually resolve
+ them as described in :ref:`manually_resolving_conflicts`.
+
+ configuration directive
+ A method of the :term:`Configurator` which causes a configuration action
+ to occur. The method :meth:`pyramid.config.Configurator.add_view` is a
+ configuration directive, and application developers can add their own
+ directives as necessary (see :ref:`add_directive`).
+
+ action
+ Represents a pending configuration statement generated by a call to a
+ :term:`configuration directive`. The set of pending configuration
+ actions are processed when :meth:`pyramid.config.Configurator.commit` is
+ called.
+
+ discriminator
+ The unique identifier of an :term:`action`.
+
+ introspectable
+ An object which implements the attributes and methods described in
+ :class:`pyramid.interfaces.IIntrospectable`. Introspectables are used
+ by the :term:`introspector` to display configuration information about
+ 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`.