diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-16 16:48:11 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-16 16:48:11 -0400 |
| commit | d50edc5807539da66e266a7ed7810f770cee969a (patch) | |
| tree | bd08e5519d77e317fca49a6cfa299dcc136caba0 | |
| parent | 4b3ba9a09ba5491b6752315a9c68189f3a9d1780 (diff) | |
| parent | fcece8fe59e2ba17d54209a296edb70bd0f63b29 (diff) | |
| download | pyramid-d50edc5807539da66e266a7ed7810f770cee969a.tar.gz pyramid-d50edc5807539da66e266a7ed7810f770cee969a.tar.bz2 pyramid-d50edc5807539da66e266a7ed7810f770cee969a.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/narr/commandline.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index b2a921eef..bc210904f 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -332,7 +332,7 @@ framework-related information. This dictionary will always contain a :term:`request` object as its ``request`` key. The following keys are available in the ``info`` dictionary returned by -:func:`~pyramid.paster.bootstrap`: +:func:`pyramid.paster.bootstrap`: request @@ -407,13 +407,13 @@ to bootstrap will imply the ``[app:another]`` section in our configuration file. Therefore, it will not wrap the WSGI application present in the info dictionary as ``app`` using WebError's ``evalerror`` middleware. The ``app`` object present in the info dictionary returned by -:func:`~pyramid.paster.bootstrap` will be a :app:`Pyramid` :term:`router` +:func:`pyramid.paster.bootstrap` will be a :app:`Pyramid` :term:`router` instead. By default, Pyramid will general a request object in the ``info`` dictionary anchored at the root path (``/``). You can alternately supply your own :class:`pyramid.request.Request` instance to the -:func:`~pyramid.paster.bootstrap` function, to set up request parameters +:func:`pyramid.paster.bootstrap` function, to set up request parameters beforehand: .. code-block:: python |