summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-01-09 22:27:12 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-01-09 22:27:12 -0500
commit536e5ceceaf763454f13cf5c896c4f477b06a784 (patch)
treefc0bf537f1784e15d2a5c4c21b6137a2f7a18568
parent331caf11d307430552139c032a822b52da8c1e75 (diff)
parentbb294497558f96c92253a4a68129a7c7984d3af9 (diff)
downloadsqlalchemy-536e5ceceaf763454f13cf5c896c4f477b06a784.tar.gz
Merge remote-tracking branch 'origin/pr/226'
-rw-r--r--doc/build/orm/session_basics.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/build/orm/session_basics.rst b/doc/build/orm/session_basics.rst
index dd1162216..0f96ba50a 100644
--- a/doc/build/orm/session_basics.rst
+++ b/doc/build/orm/session_basics.rst
@@ -247,7 +247,7 @@ While there's no one-size-fits-all recommendation for how transaction
scope should be determined, there are common patterns. Especially
if one is writing a web application, the choice is pretty much established.
-A web application is the easiest case because such an appication is already
+A web application is the easiest case because such an application is already
constructed around a single, consistent scope - this is the **request**,
which represents an incoming request from a browser, the processing
of that request to formulate a response, and finally the delivery of that