summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-03-23 23:31:02 +0000
committerEzio Melotti <ezio.melotti@gmail.com>2010-03-23 23:31:02 +0000
commita89918aeb25ed7def89d7bec15e6b0364eefc145 (patch)
tree6d5e0984629ee75e94896c7c349069219064c72a
parente7e59c270d6a7935a2c396303b49b4038fed4abb (diff)
downloadcpython-git-a89918aeb25ed7def89d7bec15e6b0364eefc145.tar.gz
Merged revisions 79360 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79360 | ezio.melotti | 2010-03-24 01:29:39 +0200 (Wed, 24 Mar 2010) | 9 lines Merged revisions 79358 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79358 | ezio.melotti | 2010-03-24 01:26:21 +0200 (Wed, 24 Mar 2010) | 1 line #8217: typo. ........ ................
-rw-r--r--Doc/howto/webservers.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/howto/webservers.rst b/Doc/howto/webservers.rst
index d005103ea4..f1e24e8170 100644
--- a/Doc/howto/webservers.rst
+++ b/Doc/howto/webservers.rst
@@ -38,7 +38,7 @@ The low-level view
When a user enters a web site, his browser makes a connection to the site's
webserver (this is called the *request*). The server looks up the file in the
file system and sends it back to the user's browser, which displays it (this is
-the *response*). This is roughly how the unterlying protocol, HTTP works.
+the *response*). This is roughly how the underlying protocol, HTTP, works.
Now, dynamic web sites are not files in the file system, but rather programs
which are run by the web server when a request comes in. They can do all sorts