summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/ini.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-10-08 04:45:14 -0400
committerChris McDonough <chrism@plope.com>2014-10-08 04:45:14 -0400
commitbc328b8ed02a758841f3e900b52e7ef4187792a2 (patch)
tree1b3e4f0e9799331a383385f67b906575612cf152 /docs/quick_tutorial/ini.rst
parent7e9c54ed645db97049a0848eececad3437624163 (diff)
parent03b469479c6a70d89cf18b2fdc91c223c9f6197a (diff)
downloadpyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.tar.gz
pyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.tar.bz2
pyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/quick_tutorial/ini.rst')
-rw-r--r--docs/quick_tutorial/ini.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
index 3402c50e8..b8720711b 100644
--- a/docs/quick_tutorial/ini.rst
+++ b/docs/quick_tutorial/ini.rst
@@ -14,9 +14,9 @@ Pyramid has a first-class concept of
:ref:`configuration <configuration_narr>` distinct from code.
This approach is optional, but its presence makes it distinct from
other Python web frameworks. It taps into Python's ``setuptools``
-library, which establishes conventions for how Python projects can be
-installed and provide "entry points". Pyramid uses an entry point to
-let a Pyramid application it where to find the WSGI app.
+library, which establishes conventions for installing and providing
+"entry points" for Python projects. Pyramid uses an entry point to
+let a Pyramid application know where to find the WSGI app.
Objectives
==========