Commits

Anonymous committed 93bc2b0 Merge

Automated merge with ssh://team@pocoo.org/werkzeug-main

Comments (0)

Files changed (3)

werkzeug/local.py

     application is not thread safe any longer.
 
     The python standard library comes with a utility called "thread locals".
-    A thread local is an global object where you can put stuff on and get back
-    later in a thread safe way.  That means whenver you set or get an object
+    A thread local is a global object where you can put stuff on and get back
+    later in a thread safe way.  That means whenever you set or get an object
     to / from a thread local object the thread local object checks in which
     thread you are and delivers the correct value.
 
     This however has a few disadvantages.  For example beside threads there
     are other ways to handle concurrency in Python.  A very popular approach
-    are greenlets.  And also if every request gets its own thread is not
+    are greenlets.  Also, whether every request gets its own thread is not
     guaranteed in WSGI.  It could be that a request is reusing a thread from
     before and data is left in the thread local object.
 

werkzeug/testapp.py

       <h1>WSGI Information</h1>
       <p>
         This page displays all available information about the WSGI server and
-        the underlaying Python interpreter that are available.
+        the underlying Python interpreter that are available.
       </p>
       <h2 id="python-interpreter">Python Interpreter</h2>
       <table>

werkzeug/utils.py

     werkzeug.utils
     ~~~~~~~~~~~~~~
 
-    This module implements various utilities for WSGI applciations.  Most of
-    them are used by the request and response wrappers but espeically for
+    This module implements various utilities for WSGI applications.  Most of
+    them are used by the request and response wrappers but especially for
     middleware development it makes sense to use them without the wrappers.
 
     :copyright: 2007-2008 by Armin Ronacher, Georg Brandl.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.