summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-04 09:34:59 -0800
committerChris McDonough <chrism@plope.com>2012-02-04 09:34:59 -0800
commit3135ec1d85a7f07393eabc180362b3889ad57d25 (patch)
treef672215c25b5e3088bb32c551f737d4655bd35c6 /docs
parent7cf063bdf49c07debd4e9e961ee0b6670b9d1685 (diff)
parent4d7bdd57015da80f52cb4a05c26ba23e8b05f127 (diff)
downloadpyramid-3135ec1d85a7f07393eabc180362b3889ad57d25.tar.gz
pyramid-3135ec1d85a7f07393eabc180362b3889ad57d25.tar.bz2
pyramid-3135ec1d85a7f07393eabc180362b3889ad57d25.zip
Merge pull request #423 from hynek/patch-1
Remove superfluous 's' in "should returns", add comma in enumeration
Diffstat (limited to 'docs')
-rw-r--r--docs/designdefense.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 59b0e5a2d..84b6be907 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -219,7 +219,7 @@ is this:
Using such wrappers, we strive to always hide the ZCA API from application
developers. Application developers should just never know about the ZCA API:
they should call a Python function with some object germane to the domain as
-an argument, and it should returns a result. A corollary that follows is
+an argument, and it should return a result. A corollary that follows is
that any reader of an application that has been written using :app:`Pyramid`
needn't understand the ZCA API either.
@@ -720,7 +720,7 @@ microframeworks and Django boast.
The :mod:`zope.component`, package on which :app:`Pyramid` depends has
transitive dependencies on several other packages (:mod:`zope.event`, and
:mod:`zope.interface`). :app:`Pyramid` also has its own direct dependencies,
-such as :term:`PasteDeploy`, :term:`Chameleon`, :term:`Mako` :term:`WebOb`,
+such as :term:`PasteDeploy`, :term:`Chameleon`, :term:`Mako`, :term:`WebOb`,
:mod:`zope.deprecation` and some of these in turn have their own transitive
dependencies.