summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/conf/global_settings.py2
-rw-r--r--django/contrib/admin/templates/registration/logged_out.html2
-rw-r--r--django/contrib/admin/utils.py2
-rw-r--r--django/contrib/auth/middleware.py4
-rw-r--r--django/contrib/gis/gdal/srs.py2
-rw-r--r--django/contrib/gis/geometry.py2
-rw-r--r--django/contrib/sessions/models.py2
-rw-r--r--django/contrib/staticfiles/management/commands/runserver.py2
-rw-r--r--django/core/files/storage.py2
-rw-r--r--django/core/handlers/wsgi.py2
-rw-r--r--django/core/management/commands/runserver.py2
-rw-r--r--django/test/client.py6
-rw-r--r--django/utils/datastructures.py2
-rw-r--r--django/utils/feedgenerator.py2
-rw-r--r--django/views/csrf.py2
15 files changed, 18 insertions, 18 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index d9272f6cc1..b9541d81b5 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -471,7 +471,7 @@ SESSION_COOKIE_HTTPONLY = True
SESSION_COOKIE_SAMESITE = 'Lax'
# Whether to save the session data on every request.
SESSION_SAVE_EVERY_REQUEST = False
-# Whether a user's session cookie expires when the Web browser is closed.
+# Whether a user's session cookie expires when the web browser is closed.
SESSION_EXPIRE_AT_BROWSER_CLOSE = False
# The module to store session data
SESSION_ENGINE = 'django.contrib.sessions.backends.db'
diff --git a/django/contrib/admin/templates/registration/logged_out.html b/django/contrib/admin/templates/registration/logged_out.html
index 460e17eafd..e9a5545024 100644
--- a/django/contrib/admin/templates/registration/logged_out.html
+++ b/django/contrib/admin/templates/registration/logged_out.html
@@ -7,7 +7,7 @@
{% block content %}
-<p>{% translate "Thanks for spending some quality time with the Web site today." %}</p>
+<p>{% translate "Thanks for spending some quality time with the web site today." %}</p>
<p><a href="{% url 'admin:index' %}">{% translate 'Log in again' %}</a></p>
diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py
index 7eea70b194..5821db5ffe 100644
--- a/django/contrib/admin/utils.py
+++ b/django/contrib/admin/utils.py
@@ -69,7 +69,7 @@ def quote(s):
Ensure that primary key values do not confuse the admin URLs by escaping
any '/', '_' and ':' and similarly problematic characters.
Similar to urllib.parse.quote(), except that the quoting is slightly
- different so that it doesn't get automatically unquoted by the Web browser.
+ different so that it doesn't get automatically unquoted by the web browser.
"""
return s.translate(QUOTE_MAP) if isinstance(s, str) else s
diff --git a/django/contrib/auth/middleware.py b/django/contrib/auth/middleware.py
index 1cd84f1cc9..89699a7f82 100644
--- a/django/contrib/auth/middleware.py
+++ b/django/contrib/auth/middleware.py
@@ -27,7 +27,7 @@ class AuthenticationMiddleware(MiddlewareMixin):
class RemoteUserMiddleware(MiddlewareMixin):
"""
- Middleware for utilizing Web-server-provided authentication.
+ Middleware for utilizing web-server-provided authentication.
If request.user is not authenticated, then this middleware attempts to
authenticate the username passed in the ``REMOTE_USER`` request header.
@@ -113,7 +113,7 @@ class RemoteUserMiddleware(MiddlewareMixin):
class PersistentRemoteUserMiddleware(RemoteUserMiddleware):
"""
- Middleware for Web-server provided authentication on logon pages.
+ Middleware for web-server provided authentication on logon pages.
Like RemoteUserMiddleware but keeps the user authenticated even if
the header (``REMOTE_USER``) is not found in the request. Useful
diff --git a/django/contrib/gis/gdal/srs.py b/django/contrib/gis/gdal/srs.py
index fd6509600c..5df8b54ab2 100644
--- a/django/contrib/gis/gdal/srs.py
+++ b/django/contrib/gis/gdal/srs.py
@@ -43,7 +43,7 @@ class AxisOrder(IntEnum):
class SpatialReference(GDALBase):
"""
- A wrapper for the OGRSpatialReference object. According to the GDAL Web site,
+ A wrapper for the OGRSpatialReference object. According to the GDAL web site,
the SpatialReference object "provide[s] services to represent coordinate
systems (projections and datums) and to transform between them."
"""
diff --git a/django/contrib/gis/geometry.py b/django/contrib/gis/geometry.py
index 815d8257d7..d92a17c964 100644
--- a/django/contrib/gis/geometry.py
+++ b/django/contrib/gis/geometry.py
@@ -4,7 +4,7 @@ from django.utils.regex_helper import _lazy_re_compile
# Regular expression for recognizing HEXEWKB and WKT. A prophylactic measure
# to prevent potentially malicious input from reaching the underlying C
-# library. Not a substitute for good Web security programming practices.
+# library. Not a substitute for good web security programming practices.
hex_regex = _lazy_re_compile(r'^[0-9A-F]+$', re.I)
wkt_regex = _lazy_re_compile(
r'^(SRID=(?P<srid>\-?\d+);)?'
diff --git a/django/contrib/sessions/models.py b/django/contrib/sessions/models.py
index a744267927..cb7a3f7c2f 100644
--- a/django/contrib/sessions/models.py
+++ b/django/contrib/sessions/models.py
@@ -22,7 +22,7 @@ class Session(AbstractBaseSession):
For complete documentation on using Sessions in your code, consult
the sessions documentation that is shipped with Django (also available
- on the Django Web site).
+ on the Django web site).
"""
objects = SessionManager()
diff --git a/django/contrib/staticfiles/management/commands/runserver.py b/django/contrib/staticfiles/management/commands/runserver.py
index fe050f4dfa..cf9605ee97 100644
--- a/django/contrib/staticfiles/management/commands/runserver.py
+++ b/django/contrib/staticfiles/management/commands/runserver.py
@@ -6,7 +6,7 @@ from django.core.management.commands.runserver import (
class Command(RunserverCommand):
- help = "Starts a lightweight Web server for development and also serves static files."
+ help = "Starts a lightweight web server for development and also serves static files."
def add_arguments(self, parser):
super().add_arguments(parser)
diff --git a/django/core/files/storage.py b/django/core/files/storage.py
index fcc382b6fc..8ee6443d2b 100644
--- a/django/core/files/storage.py
+++ b/django/core/files/storage.py
@@ -154,7 +154,7 @@ class Storage:
def url(self, name):
"""
Return an absolute URL where the file's contents can be accessed
- directly by a Web browser.
+ directly by a web browser.
"""
raise NotImplementedError('subclasses of Storage must provide a url() method')
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index 2c1c4db241..dc65f114e5 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -169,7 +169,7 @@ def get_script_name(environ):
# If Apache's mod_rewrite had a whack at the URL, Apache set either
# SCRIPT_URL or REDIRECT_URL to the full resource URL before applying any
- # rewrites. Unfortunately not every Web server (lighttpd!) passes this
+ # rewrites. Unfortunately not every web server (lighttpd!) passes this
# information through all the time, so FORCE_SCRIPT_NAME, above, is still
# needed.
script_url = get_bytes_from_wsgi(environ, 'SCRIPT_URL', '') or get_bytes_from_wsgi(environ, 'REDIRECT_URL', '')
diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
index 1e8f4d3b25..66f5217820 100644
--- a/django/core/management/commands/runserver.py
+++ b/django/core/management/commands/runserver.py
@@ -22,7 +22,7 @@ naiveip_re = _lazy_re_compile(r"""^(?:
class Command(BaseCommand):
- help = "Starts a lightweight Web server for development."
+ help = "Starts a lightweight web server for development."
# Validation is called explicitly each time the server is reloaded.
requires_system_checks = []
diff --git a/django/test/client.py b/django/test/client.py
index b4c091aa5c..dd735dd833 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -98,7 +98,7 @@ def closing_iterator_wrapper(iterable, close):
def conditional_content_removal(request, response):
"""
- Simulate the behavior of most Web servers by removing the content of
+ Simulate the behavior of most web servers by removing the content of
responses for HEAD requests, 1xx, 204, and 304 responses. Ensure
compliance with RFC 7230, section 3.3.3.
"""
@@ -144,7 +144,7 @@ class ClientHandler(BaseHandler):
# Request goes through middleware.
response = self.get_response(request)
- # Simulate behaviors of most Web servers.
+ # Simulate behaviors of most web servers.
conditional_content_removal(request, response)
# Attach the originating request to the response so that it could be
@@ -190,7 +190,7 @@ class AsyncClientHandler(BaseHandler):
request._dont_enforce_csrf_checks = not self.enforce_csrf_checks
# Request goes through middleware.
response = await self.get_response_async(request)
- # Simulate behaviors of most Web servers.
+ # Simulate behaviors of most web servers.
conditional_content_removal(request, response)
# Attach the originating ASGI request to the response so that it could
# be later retrieved.
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index e605ce0720..f1e9986ca1 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -65,7 +65,7 @@ class MultiValueDict(dict):
>>> d.setlist('lastname', ['Holovaty', 'Willison'])
This class exists to solve the irritating problem raised by cgi.parse_qs,
- which returns a list for every key, even though most Web forms submit
+ which returns a list for every key, even though most web forms submit
single name-value pairs.
"""
def __init__(self, key_to_list_mapping=()):
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index 50ede4dd21..857beff13a 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -7,7 +7,7 @@ Sample usage:
>>> feed = feedgenerator.Rss201rev2Feed(
... title="Poynter E-Media Tidbits",
... link="http://www.poynter.org/column.asp?id=31",
-... description="A group Weblog by the sharpest minds in online media/journalism/publishing.",
+... description="A group blog by the sharpest minds in online media/journalism/publishing.",
... language="en",
... )
>>> feed.add_item(
diff --git a/django/views/csrf.py b/django/views/csrf.py
index 72ac8ba4d6..f40f776701 100644
--- a/django/views/csrf.py
+++ b/django/views/csrf.py
@@ -113,7 +113,7 @@ def csrf_failure(request, reason="", template_name=CSRF_FAILURE_TEMPLATE_NAME):
'no_referer': reason == REASON_NO_REFERER,
'no_referer1': _(
'You are seeing this message because this HTTPS site requires a '
- '“Referer header” to be sent by your Web browser, but none was '
+ '“Referer header” to be sent by your web browser, but none was '
'sent. This header is required for security reasons, to ensure '
'that your browser is not being hijacked by third parties.'),
'no_referer2': _(
generated by cgit v1.3 (git 2.53.0) at 2026-05-02 07:35:51 +0000