diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2010-12-02 22:05:31 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2010-12-02 22:05:31 -0700 |
| commit | 2ad17f46ff810b90c46359402cbdaebdd5f7ec36 (patch) | |
| tree | 92fd102e282dd070a10553d0dc52973e28a5aaba | |
| parent | ba5fffc0dc64ec3958233b342f63fd214f5c4472 (diff) | |
| parent | 1220f3b8f869e4caf298d9acb5e5fffe0a86129e (diff) | |
| download | pyramid-2ad17f46ff810b90c46359402cbdaebdd5f7ec36.tar.gz pyramid-2ad17f46ff810b90c46359402cbdaebdd5f7ec36.tar.bz2 pyramid-2ad17f46ff810b90c46359402cbdaebdd5f7ec36.zip | |
Merge https://github.com/Pylons/pyramid
| -rw-r--r-- | docs/narr/environment.rst | 5 | ||||
| -rw-r--r-- | docs/narr/hybrid.rst | 2 | ||||
| -rw-r--r-- | docs/narr/urldispatch.rst | 9 |
3 files changed, 12 insertions, 4 deletions
diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst index af03077af..44e75542c 100644 --- a/docs/narr/environment.rst +++ b/docs/narr/environment.rst @@ -38,7 +38,10 @@ application-specific configuration settings. Reloading Templates ------------------- -When this value is true, reload templates without a restart. +When this value is true, reload templates without a restart, so you can see +changes to templates take effect immediately during development. This flag +is meaningful to Chameleon and Mako templates, as well as most third-party +template rendering extensions. +---------------------------------+-----------------------------+ | Environment Variable Name | Config File Setting Name | diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst index a6b1eb217..4acedc124 100644 --- a/docs/narr/hybrid.rst +++ b/docs/narr/hybrid.rst @@ -266,7 +266,7 @@ thing to do. :class:`pyramid.configuration.Configurator` constructor, instead of associating it with a particular route inside the route's configuration. Every hybrid route configuration that is matched but - which does *not* name a ``factory``` attribute will use the use + which does *not* name a ``factory`` attribute will use the use global ``root_factory`` function to generate a root object. When the route configuration named ``home`` above is matched during a diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index cc03acb37..209c4f4d2 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -838,8 +838,8 @@ strings. The values will be Unicode objects. .. note:: - If no route URL pattern matches, no ``matchdict`` is attached to - the request. + If no route URL pattern matches, the ``matchdict`` object attached to the + request will be ``None``. .. index:: single: matched_route @@ -857,6 +857,11 @@ an attribute of the :term:`request` object. Thus, request. The most useful attribute of the route object is ``name``, which is the name of the route that matched. +.. note:: + + If no route URL pattern matches, the ``matched_route`` object attached to + the request will be ``None``. + Routing Examples ---------------- |