From 08c2217e7f831379016e1ddee0b5d51eeca53878 Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Tue, 1 Jan 2013 23:56:02 +0200 Subject: eliminate repeated "the" words --- docs/designdefense.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/designdefense.rst') diff --git a/docs/designdefense.rst b/docs/designdefense.rst index b468ddac6..96e1001e6 100644 --- a/docs/designdefense.rst +++ b/docs/designdefense.rst @@ -873,7 +873,7 @@ means: #) When I use the security proxy machinery, I can have a view that conditionally displays certain HTML elements (like form fields) or - prevents certain attributes from being modified depending on the the + prevents certain attributes from being modified depending on the permissions that the accessing user possesses with respect to a context object. -- cgit v1.2.3 From 1c65db8c7176ce2b2bf2c85de3721164deb27b6c Mon Sep 17 00:00:00 2001 From: Mike Naberezny Date: Sun, 6 Jan 2013 15:25:35 -0800 Subject: Clarify "TL". Fixes #777 --- docs/designdefense.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/designdefense.rst') diff --git a/docs/designdefense.rst b/docs/designdefense.rst index 96e1001e6..dec33bd1a 100644 --- a/docs/designdefense.rst +++ b/docs/designdefense.rst @@ -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 -- cgit v1.2.3 From 2e54b81ff69fc39d42783fffe98a4bb81d28ac97 Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Fri, 11 Jan 2013 19:02:30 +0200 Subject: add missing commas --- docs/designdefense.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/designdefense.rst') diff --git a/docs/designdefense.rst b/docs/designdefense.rst index 96e1001e6..6ff686a95 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, -- cgit v1.2.3 From 40dbf42a2df1783c3d803adf950380c21512bb91 Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Wed, 30 Jan 2013 00:41:23 +0200 Subject: use the more appropriate directives --- docs/designdefense.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/designdefense.rst') diff --git a/docs/designdefense.rst b/docs/designdefense.rst index f51ef10a9..69a921498 100644 --- a/docs/designdefense.rst +++ b/docs/designdefense.rst @@ -919,7 +919,7 @@ creating a more Zope3-like environment without much effort. Pyramid Uses its Own HTTP Exception Class Hierarchy Rather Than ``webob.exc`` ----------------------------------------------------------------------------- -.. note:: This defense is new as of Pyramid 1.1. +.. versionadded:: 1.1 The HTTP exception classes defined in :mod:`pyramid.httpexceptions` are very much like the ones defined in ``webob.exc`` -- cgit v1.2.3