diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-29 13:36:07 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-29 13:36:07 -0500 |
| commit | bfe8046689b9f9b4273df773a43be19080958193 (patch) | |
| tree | 1fa043841e64fb861919febbcdfb94ea05fe1f4c /docs/narr/project.rst | |
| parent | 76363823a22a709a15b6895430b4eece67da3b39 (diff) | |
| parent | 71c94c0ae7a36dab1b39585907d8a0c24d377c90 (diff) | |
| download | pyramid-bfe8046689b9f9b4273df773a43be19080958193.tar.gz pyramid-bfe8046689b9f9b4273df773a43be19080958193.tar.bz2 pyramid-bfe8046689b9f9b4273df773a43be19080958193.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs/narr/project.rst')
| -rw-r--r-- | docs/narr/project.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst index 5696b0b73..ea0045ca7 100644 --- a/docs/narr/project.rst +++ b/docs/narr/project.rst @@ -118,11 +118,11 @@ your application, or install your application for deployment or development. A ``.ini`` file named ``development.ini`` will be created in the project directory. You will use this ``.ini`` file to configure a server, to run -your application, and to debug your application. It sports configuration +your application, and to debug your application. It contains configuration that enables an interactive debugger and settings optimized for development. Another ``.ini`` file named ``production.ini`` will also be created in the -project directory. It sports configuration that disables any interactive +project directory. It contains configuration that disables any interactive debugger (to prevent inappropriate access and disclosure), and turns off a number of debugging settings. You can use this file to put your application into production. @@ -709,7 +709,7 @@ also informs Python that the directory which contains it is a *package*. #. Line 1 imports the :term:`Configurator` class from :mod:`pyramid.config` that we use later. -#. Lines 3-16 define a function named ``main`` that returns a :app:`Pyramid` +#. Lines 3-10 define a function named ``main`` that returns a :app:`Pyramid` WSGI application. This function is meant to be called by the :term:`PasteDeploy` framework as a result of running ``pserve``. |
