diff options
| author | Chris McDonough <chrism@plope.com> | 2012-03-02 13:49:29 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-03-02 13:49:29 -0500 |
| commit | 56734324a8550a706320aa784e8435f1cfaf9b50 (patch) | |
| tree | 8ec004917b050348eb54fe3af0d68957c3e9729f /docs | |
| parent | f5a1a3cf957001ee338ee02502a1a0654fb694ca (diff) | |
| parent | 78fd242716d6a1d789244dffe142eef680310181 (diff) | |
| download | pyramid-56734324a8550a706320aa784e8435f1cfaf9b50.tar.gz pyramid-56734324a8550a706320aa784e8435f1cfaf9b50.tar.bz2 pyramid-56734324a8550a706320aa784e8435f1cfaf9b50.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/commandline.rst | 4 | ||||
| -rw-r--r-- | docs/narr/views.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index 95927cfca..886e075e3 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -142,11 +142,11 @@ might have a ``[app:main]`` section that looks like so: pyramid.default_locale_name = en If so, you can use the following command to invoke a debug shell using the -name ``MyProject`` as a section name: +name ``main`` as a section name: .. code-block:: text - chrism@thinko env26]$ bin/pshell starter/development.ini#MyProject + chrism@thinko env26]$ bin/pshell starter/development.ini#main Python 2.6.5 (r265:79063, Apr 29 2010, 00:31:32) [GCC 4.4.3] on linux2 Type "help" for more information. diff --git a/docs/narr/views.rst b/docs/narr/views.rst index dbc702de8..c3bbbd50e 100644 --- a/docs/narr/views.rst +++ b/docs/narr/views.rst @@ -178,7 +178,7 @@ HTTP Exceptions All classes documented in the :mod:`pyramid.httpexceptions` module documented as inheriting from the :class:`pryamid.httpexceptions.HTTPException` are -:term:`http exception` objects. An instances of an HTTP exception object may +:term:`http exception` objects. Instances of an HTTP exception object may either be *returned* or *raised* from within view code. In either case (return or raise) the instance will be used as as the view's response. |