summaryrefslogtreecommitdiff
path: root/docs/narr/hooks.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-03-25 01:27:22 -0400
committerChris McDonough <chrism@plope.com>2011-03-25 01:27:22 -0400
commit661790b6ca014021dd908cd6b93d789fe6c5dda1 (patch)
treea8944b860c10506521a07e6f67f7e5704f2fbd8c /docs/narr/hooks.rst
parentb596e1812627c359908759d7a8d83c339f08e385 (diff)
parent8027adf1e2ffe4498c7eda9a698ed61bec8a8c04 (diff)
downloadpyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.tar.gz
pyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.tar.bz2
pyramid-661790b6ca014021dd908cd6b93d789fe6c5dda1.zip
Merge branch 'jayd3e-master'
Diffstat (limited to 'docs/narr/hooks.rst')
-rw-r--r--docs/narr/hooks.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index d2eaf8215..227db2f0f 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -207,7 +207,7 @@ callable object or a :term:`dotted Python name` representing such a callable.
Such a callback must accept a single positional argument (notionally named
``system``) which will contain the original system values. It must return a
dictionary of values that will be merged into the system dictionary. See
-:ref:`renderer_system_values` for discription of the values present in the
+:ref:`renderer_system_values` for description of the values present in the
system dictionary.
If you're doing imperative configuration, and you'd rather do it after you've