summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-26 01:13:43 -0500
committerChris McDonough <chrism@plope.com>2010-12-26 01:13:43 -0500
commitc22259e410a6f40d7c48985941e0fc970b6e3d5d (patch)
tree071849da804f113e59abbb3c1fa271dc8138ce51 /docs
parente1a7e0679759da628676f3c73c34875e9b2b6a43 (diff)
parentea32d63773bec2493326c04c896f224e25c532c4 (diff)
downloadpyramid-c22259e410a6f40d7c48985941e0fc970b6e3d5d.tar.gz
pyramid-c22259e410a6f40d7c48985941e0fc970b6e3d5d.tar.bz2
pyramid-c22259e410a6f40d7c48985941e0fc970b6e3d5d.zip
Merge branch 'master' of github.com:Pylons/pyramid
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 b1e869a12..db399fffa 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -90,7 +90,7 @@ libraries, each built upon a specific low level stack that is incompatible
with the other. We'll also shrink the choice of credible Python web
frameworks down by at least one. We're also hoping to attract users from
other communities (such as Zope's and TurboGears') by providing the features
-they requre, while allowing enough flexibility to do things in a familiar
+they require, while allowing enough flexibility to do things in a familiar
fashion. Some overlap of functionality to achieve these goals is expected
and unavoidable, at least if we aim to prevent pointless duplication at
higher levels. If we've done our job well enough, the various audiences will
@@ -260,7 +260,7 @@ ZCA registry gives us, and we have long-ago borne the weight of understanding
what it does and how it works. The authors of :app:`Pyramid` understand the
ZCA deeply and can read code that uses it as easily as any other code.
-But we recognize that developers who my want to extend the framework are not
+But we recognize that developers who might want to extend the framework are not
as comfortable with the ZCA registry API as the original developers are with
it. So, for the purposes of being kind to third-party :app:`Pyramid`
framework developers in, we've drawn some lines in the sand.