Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Pylons/pyramid
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdonc committed Jul 14, 2014
2 parents c688c70 + 3f87c22 commit 94f10d8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/narr/commandline.rst
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ name ``main`` as a section name:

.. code-block:: text
$ $VENV/bin starter/development.ini#main
$ $VENV/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.
Expand Down
2 changes: 1 addition & 1 deletion docs/narr/logging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ FileHandler to the list of handlers (named ``accesslog``), and ensure that the
[logger_wsgi]
level = INFO
handlers = handler_accesslog
handlers = accesslog
qualname = wsgi
propagate = 0
Expand Down

0 comments on commit 94f10d8

Please sign in to comment.