summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-07-13 22:43:07 -0400
committerChris McDonough <chrism@plope.com>2014-07-13 22:43:07 -0400
commit94f10d8c2f2891205500b03a51af7a2480e8c0cc (patch)
treeb7aa196e46510a44568eb1421f13e8a585f81475 /docs
parentc688c70fb2bf6731bbdbf68682eebb203b540a04 (diff)
parent3f87c228c920edbb85a85f3332a5340063e49b11 (diff)
downloadpyramid-94f10d8c2f2891205500b03a51af7a2480e8c0cc.tar.gz
pyramid-94f10d8c2f2891205500b03a51af7a2480e8c0cc.tar.bz2
pyramid-94f10d8c2f2891205500b03a51af7a2480e8c0cc.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/commandline.rst2
-rw-r--r--docs/narr/logging.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 3cabbd8f4..4f16617c4 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -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.
diff --git a/docs/narr/logging.rst b/docs/narr/logging.rst
index 75428d513..71029bb33 100644
--- a/docs/narr/logging.rst
+++ b/docs/narr/logging.rst
@@ -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