fix merge conflicts

1 files changed, 6 insertions, 5 deletions

diff --git a/docs/quick_tutorial/debugtoolbar.rst b/docs/quick_tutorial/debugtoolbar.rst
index 1c540d8a2..90750c633 100644
--- a/docs/quick_tutorial/debugtoolbar.rst
+++ b/docs/quick_tutorial/debugtoolbar.rst
@@ -71,16 +71,17 @@ supports wiring in add-on configuration via our ``development.ini``
 using ``pyramid.includes``. We use this to load the configuration for
 the debugtoolbar.
 
-You'll now see an attractive (and collapsible) menu in the right of
-your browser, providing introspective access to debugging information.
-Even better, if your web application generates an error,
+You'll now see an attractive button on the right side of
+your browser, which you may click to provide introspective access to debugging 
+information in a new browser tab. Even better, if your web application
+generates an error,
 you will see a nice traceback on the screen. When you want to disable
 this toolbar, no need to change code: you can remove it from
 ``pyramid.includes`` in the relevant ``.ini`` configuration file (thus
 showing why configuration files are handy.)
 
-Note that the toolbar mutates the HTML generated by our app and uses jQuery to
-overlay itself.  If you are using the toolbar while you're developing and you
+Note injects a small amount of html/css into your app just before the closing
+``</body>`` tag in order to display itself. If you
 start to experience otherwise inexplicable client-side weirdness, you can shut
 it off by commenting out the ``pyramid_debugtoolbar`` line in
 ``pyramid.includes`` temporarily.