summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-23 14:02:53 -0400
committerChris McDonough <chrism@plope.com>2011-07-23 14:02:53 -0400
commit3835781dab5791282073252d2cee685668bc7b1e (patch)
treee19be2ec32d516b85e2e5a89e7e8935caf517b4a /docs/narr/introduction.rst
parent070bfdbaa6f3cffbda3a0bfe86534e24ea01142c (diff)
parent566a276a37fad8073206b46ec77b27498a126f02 (diff)
downloadpyramid-3835781dab5791282073252d2cee685668bc7b1e.tar.gz
pyramid-3835781dab5791282073252d2cee685668bc7b1e.tar.bz2
pyramid-3835781dab5791282073252d2cee685668bc7b1e.zip
Merge branch 'master' into wrapviews
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 6cc5a87e5..63c31d340 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -30,7 +30,7 @@ create web applications.
own via a set of libraries if the framework provides a set of
facilities that fits your application requirements.
-Pyramid attempts to follow follow these design and engineering principles:
+Pyramid attempts to follow these design and engineering principles:
Simplicity
:app:`Pyramid` takes a *"pay only for what you eat"* approach. You can get