diff options
| author | Chris McDonough <chrism@plope.com> | 2013-04-03 03:58:34 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-04-03 03:58:34 -0400 |
| commit | 2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (patch) | |
| tree | f3a290b6e0a21549703050a33433dffef2acc87d /docs/narr/commandline.rst | |
| parent | dacbe656d8851580234214fb655b60d24f5800fb (diff) | |
| parent | f8afd1638456fc89bc3d17858f309686b40a40a4 (diff) | |
| download | pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.gz pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.tar.bz2 pyramid-2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/commandline.rst')
| -rw-r--r-- | docs/narr/commandline.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index 07c892439..e1347f3ca 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -172,8 +172,8 @@ name ``main`` as a section name: The WSGI application that is loaded will be available in the shell as the ``app`` global. Also, if the application that is loaded is the :app:`Pyramid` -app with no surrounding middleware, the ``root`` object returned by the -default :term:`root factory`, ``registry``, and ``request`` will be +app with no surrounding :term:`middleware`, the ``root`` object returned by +the default :term:`root factory`, ``registry``, and ``request`` will be available. You can also simply rely on the ``main`` default section name by omitting any @@ -572,8 +572,8 @@ configuration implied by the ``[pipeline:main]`` section of your configuration file by default. Specifying ``/path/to/my/development.ini`` is logically equivalent to specifying ``/path/to/my/development.ini#main``. In this case, we'll be using a configuration that includes an ``app`` object -which is wrapped in the Paste "translogger" middleware (which logs requests -to the console). +which is wrapped in the Paste "translogger" :term:`middleware` (which logs +requests to the console). You can also specify a particular *section* of the PasteDeploy ``.ini`` file to load instead of ``main``: |