summaryrefslogtreecommitdiff
path: root/docs/topics/http
diff options
context:
space:
mode:
Diffstat (limited to 'docs/topics/http')
-rw-r--r--docs/topics/http/middleware.txt2
-rw-r--r--docs/topics/http/sessions.txt6
-rw-r--r--docs/topics/http/urls.txt2
-rw-r--r--docs/topics/http/views.txt6
4 files changed, 8 insertions, 8 deletions
diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt
index 49fbde9dc4..fa727aed75 100644
--- a/docs/topics/http/middleware.txt
+++ b/docs/topics/http/middleware.txt
@@ -88,7 +88,7 @@ caveats:
so you can't define ``__init__()`` as requiring any other arguments.
* Unlike the ``__call__()`` method which is called once per request,
- ``__init__()`` is called only *once*, when the Web server starts.
+ ``__init__()`` is called only *once*, when the web server starts.
Marking middleware as unused
----------------------------
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index aab8c735b3..9c662b87b5 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -103,7 +103,7 @@ To use file-based sessions, set the :setting:`SESSION_ENGINE` setting to
You might also want to set the :setting:`SESSION_FILE_PATH` setting (which
defaults to output from ``tempfile.gettempdir()``, most likely ``/tmp``) to
-control where Django stores session files. Be sure to check that your Web
+control where Django stores session files. Be sure to check that your web
server has permissions to read and write to this location.
.. _cookie-session-backend:
@@ -264,7 +264,7 @@ You can edit it multiple times.
:class:`~django.contrib.sessions.serializers.PickleSerializer`.
* If ``value`` is ``0``, the user's session cookie will expire
- when the user's Web browser is closed.
+ when the user's web browser is closed.
* If ``value`` is ``None``, the session reverts to using the global
session expiry policy.
@@ -299,7 +299,7 @@ You can edit it multiple times.
.. method:: get_expire_at_browser_close()
Returns either ``True`` or ``False``, depending on whether the user's
- session cookie will expire when the user's Web browser is closed.
+ session cookie will expire when the user's web browser is closed.
.. method:: clear_expired()
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index 6ab915cfd0..d5d732e660 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -2,7 +2,7 @@
URL dispatcher
==============
-A clean, elegant URL scheme is an important detail in a high-quality Web
+A clean, elegant URL scheme is an important detail in a high-quality web
application. Django lets you design URLs however you want, with no framework
limitations.
diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
index 656d1ce155..c1b6e93f34 100644
--- a/docs/topics/http/views.txt
+++ b/docs/topics/http/views.txt
@@ -3,8 +3,8 @@ Writing views
=============
A view function, or *view* for short, is a Python function that takes a
-Web request and returns a Web response. This response can be the HTML contents
-of a Web page, or a redirect, or a 404 error, or an XML document, or an image .
+web request and returns a web response. This response can be the HTML contents
+of a web page, or a redirect, or a 404 error, or an XML document, or an image .
. . or anything, really. The view itself contains whatever arbitrary logic is
necessary to return that response. This code can live anywhere you want, as long
as it's on your Python path. There's no other requirement--no "magic," so to
@@ -137,7 +137,7 @@ template.
Customizing error views
=======================
-The default error views in Django should suffice for most Web applications,
+The default error views in Django should suffice for most web applications,
but can easily be overridden if you need any custom behavior. Specify the
handlers as seen below in your URLconf (setting them anywhere else will have no
effect).