Merge branch 'master' into feature/configurable-view-deriver

1 files changed, 35 insertions, 28 deletions

diff --git a/docs/quick_tour/package/development.ini b/docs/quick_tour/package/development.ini
index a3a73e885..20f9817a9 100644
--- a/docs/quick_tour/package/development.ini
+++ b/docs/quick_tour/package/development.ini
@@ -1,37 +1,41 @@
-# Start Includes
-[app:hello_world]
-pyramid.includes = pyramid_debugtoolbar
-# End Includes
+###
+# app configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/1.6-branch/narr/environment.html
+###
+
+[app:main]
 use = egg:hello_world
-reload_templates = true
-debug_authorization = false
-debug_notfound = false
-debug_routematch = false
-debug_templates = true
-default_locale_name = en
-jinja2.directories = hello_world:templates
-
-[pipeline:main]
-pipeline =
-    hello_world
+
+pyramid.reload_templates = true
+pyramid.debug_authorization = false
+pyramid.debug_notfound = false
+pyramid.debug_routematch = false
+pyramid.debug_templates = true
+pyramid.default_locale_name = en
+pyramid.includes =
+    pyramid_debugtoolbar
+
+# By default, the toolbar only appears for clients from IP addresses
+# '127.0.0.1' and '::1'.
+# debugtoolbar.hosts = 127.0.0.1 ::1
+
+###
+# wsgi server configuration
+###
 
 [server:main]
-use = egg:pyramid#wsgiref
-host = 0.0.0.0
+use = egg:waitress#main
+host = 127.0.0.1
 port = 6543
 
-# Begin logging configuration
+###
+# logging configuration
+# http://docs.pylonsproject.org/projects/pyramid/en/1.6-branch/narr/logging.html
+###
 
-# Start Sphinx Include
 [loggers]
 keys = root, hello_world
 
-[logger_hello_world]
-level = DEBUG
-handlers =
-qualname = hello_world
-# End Sphinx Include
-
 [handlers]
 keys = console
 
@@ -42,6 +46,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_hello_world]
+level = DEBUG
+handlers =
+qualname = hello_world
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
@@ -49,6 +58,4 @@ level = NOTSET
 formatter = generic
 
 [formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
-
-# End logging configuration
+format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s