summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-30 18:49:53 -0400
committerChris McDonough <chrism@plope.com>2012-09-30 18:49:53 -0400
commit768ae5b790a70c7d8806798a1a5096088540d558 (patch)
tree2ae69a0bbbe600f10e9983e5f1030e9de1f7b353 /docs
parentd6fb00161a4d482dcfff856ce59b9dc34f78c2b1 (diff)
parent5f0e510c7de2735f8cb84479be07a94a9617b8b8 (diff)
downloadpyramid-768ae5b790a70c7d8806798a1a5096088540d558.tar.gz
pyramid-768ae5b790a70c7d8806798a1a5096088540d558.tar.bz2
pyramid-768ae5b790a70c7d8806798a1a5096088540d558.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/introduction.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 7c0f9223f..b35c61720 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -315,7 +315,7 @@ Rendered views can return dictionaries
If you use a :term:`renderer`, you don't have to return a special kind of
"webby" ``Response`` object from a view. Instead, you can return a
-dictionary instead, and Pyramid will take care of converting that dictionary
+dictionary, and Pyramid will take care of converting that dictionary
to a Response using a template on your behalf. This makes the view easier to
test, because you don't have to parse HTML in your tests; just make an
assertion instead that the view returns "the right stuff" in the dictionary