summaryrefslogtreecommitdiff
path: root/docs/quick_tour.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-10-08 04:45:14 -0400
committerChris McDonough <chrism@plope.com>2014-10-08 04:45:14 -0400
commitbc328b8ed02a758841f3e900b52e7ef4187792a2 (patch)
tree1b3e4f0e9799331a383385f67b906575612cf152 /docs/quick_tour.rst
parent7e9c54ed645db97049a0848eececad3437624163 (diff)
parent03b469479c6a70d89cf18b2fdc91c223c9f6197a (diff)
downloadpyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.tar.gz
pyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.tar.bz2
pyramid-bc328b8ed02a758841f3e900b52e7ef4187792a2.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/quick_tour.rst')
-rw-r--r--docs/quick_tour.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 4ab39bb11..41a0dc8c0 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -700,7 +700,7 @@ we might need to detect situations when other people use the site. We
need *logging*.
Fortunately Pyramid uses the normal Python approach to logging. The
-scaffold generated in your ``development.ini`` a number of lines that
+scaffold generated in your ``development.ini`` has a number of lines that
configure the logging for you to some reasonable defaults. You then see
messages sent by Pyramid (for example, when a new request comes in).