summaryrefslogtreecommitdiff
path: root/docs/designdefense.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-12 01:19:38 -0500
committerChris McDonough <chrism@plope.com>2013-01-12 01:19:38 -0500
commit3ac960c7d1a77d89d84931c34dbed5ab57cdbe66 (patch)
tree59bb15ff08231e4986b9d0f66903a894d60f11b5 /docs/designdefense.rst
parent99ca9e74cc119328987fc1cd0c377b8380beccdf (diff)
parent464ddc91ea47e3d6ba8fe30b8e9381cd395bb1d9 (diff)
downloadpyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.tar.gz
pyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.tar.bz2
pyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/designdefense.rst')
-rw-r--r--docs/designdefense.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 96e1001e6..f51ef10a9 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -38,7 +38,7 @@ forking is also a Zope derivative.
Implementations of these features were *required* to allow the :app:`Pyramid`
authors to build the bread-and-butter CMS-type systems for customers in the
-way they were accustomed to building them. No other system save Zope itself
+way they were accustomed to building them. No other system, save for Zope itself,
had such features. And Zope itself was beginning to show signs of its age.
We were becoming hampered by consequences of its early design mistakes.
Zope's lack of documentation was also difficult to work around: it was hard
@@ -55,7 +55,7 @@ existing frameworks had good, and sometimes very compelling ideas. In
particular, :term:`URL dispatch` is a more direct mechanism to map URLs to
code.
-So although we couldn't find a framework save for Zope that fit our needs,
+So, although we couldn't find a framework, save for Zope, that fit our needs,
and while we incorporated a lot of Zope ideas into BFG, we also emulated the
features we found compelling in other frameworks (such as :term:`url
dispatch`). After the initial public release of BFG, as time went on,
@@ -1536,7 +1536,7 @@ comments take into account what we've discussed in the
.. code-block:: python
:linenos:
- from pyramid.response import Response # explicit response, no TL
+ from pyramid.response import Response # explicit response, no thread local
from wsgiref.simple_server import make_server # explicitly WSGI
def hello_world(request): # accepts a request; no request thread local reqd