diff options
| author | Michael Merickel <michael@merickel.org> | 2014-11-10 00:57:29 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-11-10 00:57:29 -0600 |
| commit | d1d3edbbafd5ed0160e70f960025a12fa0783b5b (patch) | |
| tree | d4bbc47ee9c469d3a89cf84f9df27b0edffe0f29 /docs/quick_tutorial/ini.rst | |
| parent | fe83c6bfdab16818cb434d95a09bd6510b43aa24 (diff) | |
| parent | 7dd39020afbd50f6b27e03bb81ace700ae280bef (diff) | |
| download | pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.tar.gz pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.tar.bz2 pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.zip | |
Merge branch 'master' into feature.security-docs-enhancements
Diffstat (limited to 'docs/quick_tutorial/ini.rst')
| -rw-r--r-- | docs/quick_tutorial/ini.rst | 6 |
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 ========== |