summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/ini.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
commit5d0b1beaf3b09045fd3dd71244938ee6e391ebf3 (patch)
tree2fd3a374d4c937184497e5589bcf93391833949a /docs/quick_tutorial/ini.rst
parent650d3d5fa383d89a3b28029162d6ef4d58be3da1 (diff)
parentc0f1fc8d31df45371d5ae6689d3e0a39c058c3ac (diff)
downloadpyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.gz
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.bz2
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.zip
Merge branch 'master' into feature.override-asset-with-absolute-path
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
==========