summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2011-09-28 10:53:32 -0700
committerMarcel Hellkamp <marc@gsites.de>2011-09-28 10:53:32 -0700
commita99fd20c8533e32371647bc18e1b26064716921d (patch)
tree876cff6e7c3080a102c7ef0e21b0fde1c23ff905
parent37b61c1d3831b4425f00cdbbe5cd93fae5d2c353 (diff)
parent665be8ee095ca1569bc883e187e60c12cfa0893d (diff)
downloadbottle-a99fd20c8533e32371647bc18e1b26064716921d.tar.gz
Merge pull request #233 from iurisilvio/master
docs: Two small issues
-rwxr-xr-xdocs/stpl.rst2
-rwxr-xr-xdocs/tutorial.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/stpl.rst b/docs/stpl.rst
index cc48989..5835581 100755
--- a/docs/stpl.rst
+++ b/docs/stpl.rst
@@ -137,7 +137,7 @@ A more complex scenario involves chained rebases and multiple content blocks. Th
%def rightblock():
Right block content.
%end
- %rebase columns left=leftblock, right=rightblock, title=title
+ %rebase columns leftblock=leftblock, rightblock=rightblock, title=title
The ``columns.tpl`` base-template uses the two callables to render the content of the left and right column. It then wraps itself with the ``layout.tpl`` template defined earlier::
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 0f4340d..2cc8b97 100755
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -613,7 +613,7 @@ Other plugin may populate the thread-safe :data:`local` object, change details o
Application-wide Installation
--------------------------------------------------------------------------------
-Plugins can be installed application-wide or just to some specific routes that need additional functionality. Most plugins are save to be installed to all routes and are smart enough to not add overhead to callbacks that do not need their functionality.
+Plugins can be installed application-wide or just to some specific routes that need additional functionality. Most plugins can safely be installed to all routes and are smart enough to not add overhead to callbacks that do not need their functionality.
Let us take the 'sqlite' plugin for example. It only affects route callbacks that need a database connection. Other routes are left alone. Because of this, we can install the plugin application-wide with no additional overhead.