Merge pull request #222 from iurisilvio/master

Changing thread-save to thread-safe.

2 files changed, 4 insertions, 4 deletions

diff --git a/bottle.py b/bottle.py
index 74f945f..ab75dc5 100755
--- a/bottle.py
+++ b/bottle.py
@@ -2770,13 +2770,13 @@ ERROR_PAGE_TEMPLATE = """
 %end
 """
 
-#: A thread-save instance of :class:`Request` representing the `current` request.
+#: A thread-safe instance of :class:`Request` representing the `current` request.
 request = Request()
 
-#: A thread-save instance of :class:`Response` used to build the HTTP response.
+#: A thread-safe instance of :class:`Response` used to build the HTTP response.
 response = Response()
 
-#: A thread-save namepsace. Not used by Bottle.
+#: A thread-safe namespace. Not used by Bottle.
 local = threading.local()
 
 # Initialize app stack (create first empty Bottle app)
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 3bb508a..0f4340d 100755
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -607,7 +607,7 @@ The effects and APIs of plugins are manifold and depend on the specific plugin.
             completely. '''
         return template('contact')
 
-Other plugin may populate the thread-save :data:`local` object, change details of the :data:`request` object, filter the data returned by the callback or bypass the callback completely. An "auth" plugin for example could check for a valid session and return a login page instead of calling the original callback. What happens exactly depends on the plugin.
+Other plugin may populate the thread-safe :data:`local` object, change details of the :data:`request` object, filter the data returned by the callback or bypass the callback completely. An "auth" plugin for example could check for a valid session and return a login page instead of calling the original callback. What happens exactly depends on the plugin.
 
 
 Application-wide Installation