summaryrefslogtreecommitdiff
path: root/docs/designdefense.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-24 14:52:17 -0500
committerChris McDonough <chrism@plope.com>2012-02-24 14:52:17 -0500
commit905bcaaec5f71f9b2df4204ed91c1628f854e0ff (patch)
treeb4838a2baf1a1ca9d40173a76da6c40315e0fa2a /docs/designdefense.rst
parentf5b9e9c6708e4176231c45f5e478d56bba4b42e6 (diff)
parent3a8cee594c3e42dd23cde72310c71aa816e3a966 (diff)
downloadpyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.tar.gz
pyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.tar.bz2
pyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.zip
Merge branch 'master' into 1.3-branch
Diffstat (limited to 'docs/designdefense.rst')
-rw-r--r--docs/designdefense.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 84b6be907..bbcf9c2ec 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -1386,7 +1386,7 @@ predictability.
actually the best-case circumstance for double-imports; if a module only
mutates itself and its contents at import time, if it is imported twice,
that's OK, because each decorator invocation will always be mutating an
- independent copy of the object its attached to, not a shared resource like
+ independent copy of the object it's attached to, not a shared resource like
a registry in another module. This has the effect that
double-registrations will never be performed.
@@ -1727,7 +1727,7 @@ reads something like this:
(Paraphrased from a real email, actually.)
-Let's take this criticism point-by point.
+Let's take this criticism point-by-point.
Too Complex
+++++++++++