Merge branch 'master' into context-mergecontext

Conflicts:
	bottle.py
	test/test_environ.py
	test/test_sendfile.py

1 files changed, 1 insertions, 1 deletions

diff --git a/docs/plugindev.rst b/docs/plugindev.rst
index 1649149..40da98c 100755
--- a/docs/plugindev.rst
+++ b/docs/plugindev.rst
@@ -31,7 +31,7 @@ Of course, this is just a simplification. Plugins can do a lot more than just de
             return body
         return wrapper
 
-    bottle.install(stopwatch)
+    install(stopwatch)
 
 This plugin measures the execution time for each request and adds an appropriate ``X-Exec-Time`` header to the response. As you can see, the plugin returns a wrapper and the wrapper calls the original callback recursively. This is how decorators usually work.