summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-04-22 16:40:54 -0700
committerTres Seaver <tseaver@palladion.com>2013-04-22 16:40:54 -0700
commitd47cdaa3e5284fc9a17ac5e3f4af99100303ae8e (patch)
tree4ecbeb87155ef44da3997e229eea90e6a7a7bd71
parent1840f20e9e3c20f035c517e9e4804f60778b0105 (diff)
parente09e08ca4d9c55811053d6a0daba924f2f7c85d5 (diff)
downloadpyramid-d47cdaa3e5284fc9a17ac5e3f4af99100303ae8e.tar.gz
pyramid-d47cdaa3e5284fc9a17ac5e3f4af99100303ae8e.tar.bz2
pyramid-d47cdaa3e5284fc9a17ac5e3f4af99100303ae8e.zip
Merge pull request #1000 from tshepang/patch-7
grammar
-rw-r--r--pyramid/config/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 4f7899b54..5bb9987af 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -642,7 +642,7 @@ class Configurator(
argument named ``config``, which will be an instance of a
:term:`Configurator`. However, be warned that it will not be the same
configurator instance on which you call this method. The
- code which runs as the result of calling the callable should invoke
+ code which runs as a result of calling the callable should invoke
methods on the configurator passed to it which add configuration
state. The return value of a callable will be ignored.