Permalink
Browse files

[1.2.X] Fixed #11509 -- Modified usage of "Web" to match our style gu…

…ide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch

Backport of r14069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent a322ba6 commit 9584b77c35752b76116d34ac9d8b57c560ef5846 @freakboy3742 freakboy3742 committed Oct 9, 2010
Showing with 85 additions and 85 deletions.
  1. +1 −1 django/contrib/auth/middleware.py
  2. +1 −1 django/contrib/comments/moderation.py
  3. +1 −1 django/contrib/gis/gdal/srs.py
  4. +1 −1 django/contrib/gis/geometry/regex.py
  5. +1 −1 django/contrib/gis/maps/google/__init__.py
  6. +1 −1 django/contrib/sessions/models.py
  7. +1 −1 django/core/files/storage.py
  8. +1 −1 django/core/handlers/base.py
  9. +1 −1 django/core/servers/fastcgi.py
  10. +2 −2 django/db/models/fields/__init__.py
  11. +1 −1 django/db/transaction.py
  12. +1 −1 django/utils/feedgenerator.py
  13. +1 −1 django/views/csrf.py
  14. +2 −2 docs/howto/deployment/fastcgi.txt
  15. +1 −1 docs/howto/deployment/index.txt
  16. +1 −1 docs/howto/deployment/modpython.txt
  17. +1 −1 docs/howto/error-reporting.txt
  18. +1 −1 docs/howto/jython.txt
  19. +9 −9 docs/internals/committers.txt
  20. +3 −3 docs/internals/svn.txt
  21. +1 −1 docs/intro/index.txt
  22. +1 −1 docs/intro/tutorial01.txt
  23. +1 −1 docs/intro/tutorial03.txt
  24. +2 −2 docs/intro/whatsnext.txt
  25. +1 −1 docs/man/daily_cleanup.1
  26. +1 −1 docs/man/django-admin.1
  27. +1 −1 docs/man/gather_profile_stats.1
  28. +1 −1 docs/misc/api-stability.txt
  29. +1 −1 docs/ref/contrib/comments/moderation.txt
  30. +1 −1 docs/ref/contrib/gis/deployment.txt
  31. +2 −2 docs/ref/contrib/gis/index.txt
  32. +4 −4 docs/ref/contrib/gis/install.txt
  33. +2 −2 docs/ref/contrib/gis/model-api.txt
  34. +4 −4 docs/ref/contrib/gis/tutorial.txt
  35. +1 −1 docs/ref/contrib/gis/utils.txt
  36. +1 −1 docs/ref/contrib/sitemaps.txt
  37. +1 −1 docs/ref/contrib/sites.txt
  38. +2 −2 docs/ref/forms/widgets.txt
  39. +1 −1 docs/ref/middleware.txt
  40. +1 −1 docs/ref/models/instances.txt
  41. +1 −1 docs/ref/models/querysets.txt
  42. +1 −1 docs/ref/request-response.txt
  43. +1 −1 docs/ref/templates/builtins.txt
  44. +1 −1 docs/ref/utils.txt
  45. +1 −1 docs/releases/1.0.txt
  46. +1 −1 docs/releases/1.1-beta-1.txt
  47. +1 −1 docs/releases/1.1.txt
  48. +1 −1 docs/topics/auth.txt
  49. +1 −1 docs/topics/conditional-view-processing.txt
  50. +1 −1 docs/topics/db/optimization.txt
  51. +1 −1 docs/topics/db/queries.txt
  52. +1 −1 docs/topics/email.txt
  53. +2 −2 docs/topics/forms/media.txt
  54. +1 −1 docs/topics/http/middleware.txt
  55. +2 −2 docs/topics/install.txt
  56. +2 −2 tests/modeltests/custom_columns/tests.py
  57. +3 −3 tests/regressiontests/custom_columns_regress/tests.py
  58. +1 −1 tests/regressiontests/file_storage/tests.py
@@ -19,7 +19,7 @@ def process_request(self, request):
class RemoteUserMiddleware(object):
"""
- 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.
@@ -16,7 +16,7 @@ class you want to use.
-------
First, we define a simple model class which might represent entries in
-a weblog::
+a Weblog::
from django.db import models
@@ -37,7 +37,7 @@
#### Spatial Reference class. ####
class SpatialReference(GDALBase):
"""
- A wrapper for the OGRSpatialReference object. According to the GDAL website,
+ 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."
"""
@@ -2,7 +2,7 @@
# 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 = re.compile(r'^[0-9A-F]+$', re.I)
wkt_regex = re.compile(r'^(SRID=(?P<srid>\d+);)?'
r'(?P<wkt>'
@@ -1,6 +1,6 @@
"""
This module houses the GoogleMap object, used for generating
- the needed javascript to embed Google Maps in a webpage.
+ the needed javascript to embed Google Maps in a Web page.
Google(R) is a registered trademark of Google, Inc. of Mountain View, California.
@@ -40,7 +40,7 @@ class Session(models.Model):
For complete documentation on using Sessions in your code, consult
the sessions documentation that is shipped with Django (also available
- on the Django website).
+ on the Django Web site).
"""
session_key = models.CharField(_('session key'), max_length=40,
primary_key=True)
@@ -116,7 +116,7 @@ def size(self, name):
def url(self, name):
"""
Returns an absolute URL where the file's contents can be accessed
- directly by a web browser.
+ directly by a Web browser.
"""
raise NotImplementedError()
@@ -208,7 +208,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 webserver (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 = environ.get('SCRIPT_URL', u'')
@@ -46,7 +46,7 @@
Examples:
Run a "standard" fastcgi process on a file-descriptor
- (for webservers which spawn your processes for you)
+ (for Web servers which spawn your processes for you)
$ manage.py runfcgi method=threaded
Run a scgi server on a TCP host/port
@@ -514,7 +514,7 @@ def to_python(self, value):
raise exceptions.ValidationError(self.error_messages['invalid'])
def get_prep_lookup(self, lookup_type, value):
- # Special-case handling for filters coming from a web request (e.g. the
+ # Special-case handling for filters coming from a Web request (e.g. the
# admin interface). Only works for scalar values (not lists). If you're
# passing in a list, you might as well make things the right type when
# constructing the list.
@@ -954,7 +954,7 @@ def to_python(self, value):
raise exceptions.ValidationError(self.error_messages['invalid'])
def get_prep_lookup(self, lookup_type, value):
- # Special-case handling for filters coming from a web request (e.g. the
+ # Special-case handling for filters coming from a Web request (e.g. the
# admin interface). Only works for scalar values (not lists). If you're
# passing in a list, you might as well make things the right type when
# constructing the list.
@@ -288,7 +288,7 @@ def commit_on_success(using=None):
This decorator activates commit on response. This way, if the view function
runs successfully, a commit is made; if the viewfunc produces an exception,
a rollback is made. This is one of the most common ways to do transaction
- control in web apps.
+ control in Web apps.
"""
def inner_commit_on_success(func, db=None):
def _commit_on_success(*args, **kw):
@@ -7,7 +7,7 @@
>>> feed = feedgenerator.Rss201rev2Feed(
... title=u"Poynter E-Media Tidbits",
... link=u"http://www.poynter.org/column.asp?id=31",
-... description=u"A group weblog by the sharpest minds in online media/journalism/publishing.",
+... description=u"A group Weblog by the sharpest minds in online media/journalism/publishing.",
... language=u"en",
... )
>>> feed.add_item(
@@ -34,7 +34,7 @@
<p>CSRF verification failed. Request aborted.</p>
{% if no_referer %}
<p>You are seeing this message because this HTTPS site requires a 'Referer
- header' to be sent by your web browser, but none was sent. This header is
+ 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.</p>
@@ -368,14 +368,14 @@ Forcing the URL prefix to a particular value
============================================
Because many of these fastcgi-based solutions require rewriting the URL at
-some point inside the webserver, the path information that Django sees may not
+some point inside the Web server, the path information that Django sees may not
resemble the original URL that was passed in. This is a problem if the Django
application is being served from under a particular prefix and you want your
URLs from the ``{% url %}`` tag to look like the prefix, rather than the
rewritten version, which might contain, for example, ``mysite.fcgi``.
Django makes a good attempt to work out what the real script name prefix
-should be. In particular, if the webserver sets the ``SCRIPT_URL`` (specific
+should be. In particular, if the Web server sets the ``SCRIPT_URL`` (specific
to Apache's mod_rewrite), or ``REDIRECT_URL`` (set by a few servers, including
Apache + mod_rewrite in some situations), Django will work out the original
prefix automatically.
@@ -1,7 +1,7 @@
Deploying Django
================
-Django's chock-full of shortcuts to make web developer's lives easier, but all
+Django's chock-full of shortcuts to make Web developer's lives easier, but all
those tools are of no use if you can't easily deploy your sites. Since Django's
inception, ease of deployment has been a major goal. There's a number of good
ways to easily deploy Django:
@@ -317,7 +317,7 @@ project (or somewhere else) that contains something like the following:
import os
os.environ['PYTHON_EGG_CACHE'] = '/some/directory'
-Here, ``/some/directory`` is a directory that the Apache webserver process can
+Here, ``/some/directory`` is a directory that the Apache Web server process can
write to. It will be used as the location for any unpacking of code the eggs
need to do.
@@ -55,7 +55,7 @@ not found" errors). Django sends emails about 404 errors when:
If those conditions are met, Django will e-mail the users listed in the
:setting:`MANAGERS` setting whenever your code raises a 404 and the request has
a referer. (It doesn't bother to e-mail for 404s that don't have a referer --
-those are usually just people typing in broken URLs or broken web 'bots).
+those are usually just people typing in broken URLs or broken Web 'bots).
You can tell Django to stop reporting particular 404s by tweaking the
:setting:`IGNORABLE_404_ENDS` and :setting:`IGNORABLE_404_STARTS` settings. Both
@@ -51,7 +51,7 @@ on top of Jython.
.. _`django-jython`: http://code.google.com/p/django-jython/
To install it, follow the `installation instructions`_ detailed on the project
-website. Also, read the `database backends`_ documentation there.
+Web site. Also, read the `database backends`_ documentation there.
.. _`installation instructions`: http://code.google.com/p/django-jython/wiki/Install
.. _`database backends`: http://code.google.com/p/django-jython/wiki/DatabaseBackends
@@ -20,10 +20,10 @@ Journal-World`_ of Lawrence, Kansas, USA.
Adrian lives in Chicago, USA.
`Simon Willison`_
- Simon is a well-respected web developer from England. He had a one-year
+ Simon is a well-respected Web developer from England. He had a one-year
internship at World Online, during which time he and Adrian developed Django
from scratch. The most enthusiastic Brit you'll ever meet, he's passionate
- about best practices in web development and maintains a well-read
+ about best practices in Web development and maintains a well-read
`web-development blog`_.
Simon lives in Brighton, England.
@@ -33,13 +33,13 @@ Journal-World`_ of Lawrence, Kansas, USA.
around Django and related open source technologies. A good deal of Jacob's
work time is devoted to working on Django. Jacob previously worked at World
Online, where Django was invented, where he was the lead developer of
- Ellington, a commercial web publishing platform for media companies.
+ Ellington, a commercial Web publishing platform for media companies.
Jacob lives in Lawrence, Kansas, USA.
`Wilson Miner`_
Wilson's design-fu is what makes Django look so nice. He designed the
- website you're looking at right now, as well as Django's acclaimed admin
+ Web site you're looking at right now, as well as Django's acclaimed admin
interface. Wilson is the designer for EveryBlock_.
Wilson lives in San Francisco, USA.
@@ -89,7 +89,7 @@ and have free rein to hack on all parts of Django.
Russell studied physics as an undergraduate, and studied neural networks for
his PhD. His first job was with a startup in the defense industry developing
simulation frameworks. Over time, mostly through work with Django, he's
- become more involved in web development.
+ become more involved in Web development.
Russell has helped with several major aspects of Django, including a
couple major internal refactorings, creation of the test system, and more.
@@ -134,7 +134,7 @@ Joseph Kocherhans
`Brian Rosner`_
Brian is currently the tech lead at Eldarion_ managing and developing
- Django / Pinax_ based websites. He enjoys learning more about programming
+ Django / Pinax_ based Web sites. He enjoys learning more about programming
languages and system architectures and contributing to open source
projects. Brian is the host of the `Django Dose`_ podcasts.
@@ -180,7 +180,7 @@ Karen Tracey
Karen has a background in distributed operating systems (graduate school),
communications software (industry) and crossword puzzle construction
(freelance). The last of these brought her to Django, in late 2006, when
- she set out to put a web front-end on her crossword puzzle database.
+ she set out to put a Web front-end on her crossword puzzle database.
That done, she stuck around in the community answering questions, debugging
problems, etc. -- because coding puzzles are as much fun as word puzzles.
@@ -190,7 +190,7 @@ Karen Tracey
Jannis graduated in media design from `Bauhaus-University Weimar`_,
is the author of a number of pluggable Django apps and likes to
contribute to Open Source projects like Pinax_. He currently works as
- a freelance web developer and designer.
+ a freelance Web developer and designer.
Jannis lives in Berlin, Germany.
@@ -262,7 +262,7 @@ Specialists
`James Bennett`_
James is Django's release manager; he also contributes to the documentation.
- James came to web development from philosophy when he discovered
+ James came to Web development from philosophy when he discovered
that programmers get to argue just as much while collecting much
better pay. He lives in Lawrence, Kansas, where he works for the
Journal-World developing Ellington. He `keeps a blog`_, has
@@ -22,7 +22,7 @@ The Django source code repository uses `Subversion`_ to track changes
to the code over time, so you'll need a copy of the Subversion client
(a program called ``svn``) on your computer, and you'll want to
familiarize yourself with the basics of how Subversion
-works. Subversion's web site offers downloads for various operating
+works. Subversion's Web site offers downloads for various operating
systems, and `a free online book`_ is available to help you get up to
speed with using Subversion.
@@ -34,7 +34,7 @@ repository address instead. At the top level of the repository are two
directories: ``django`` contains the full source code for all Django
releases, while ``djangoproject.com`` contains the source code and
templates for the `djangoproject.com <http://www.djangoproject.com/>`_
-web site. For trying out in-development Django code, or contributing
+Web site. For trying out in-development Django code, or contributing
to Django, you'll always want to check out code from some location in
the ``django`` directory.
@@ -58,7 +58,7 @@ into three areas:
.. _Subversion: http://subversion.tigris.org/
.. _a free online book: http://svnbook.red-bean.com/
-.. _A friendly web-based interface for browsing the code: http://code.djangoproject.com/browser/
+.. _A friendly Web-based interface for browsing the code: http://code.djangoproject.com/browser/
Working with Django's trunk
@@ -1,7 +1,7 @@
Getting started
===============
-New to Django? Or to web development in general? Well, you came to the right
+New to Django? Or to Web development in general? Well, you came to the right
place: read this material to quickly get up and running.
.. toctree::
@@ -263,7 +263,7 @@ so you can focus on writing code rather than creating directories.
.. admonition:: Projects vs. apps
What's the difference between a project and an app? An app is a Web
- application that does something -- e.g., a weblog system, a database of
+ application that does something -- e.g., a Weblog system, a database of
public records or a simple poll app. A project is a collection of
configuration and apps for a particular Web site. A project can contain
multiple apps. An app can be in multiple projects.
@@ -10,7 +10,7 @@ Philosophy
==========
A view is a "type" of Web page in your Django application that generally serves
-a specific function and has a specific template. For example, in a weblog
+a specific function and has a specific template. For example, in a Weblog
application, you might have the following views:
* Blog homepage -- displays the latest few entries.
@@ -36,7 +36,7 @@ Django's main documentation is broken up into "chunks" designed to fill
different needs:
* The :doc:`introductory material </intro/index>` is designed for people new
- to Django -- or to web development in general. It doesn't cover anything
+ to Django -- or to Web development in general. It doesn't cover anything
in depth, but instead gives a high-level overview of how developing in
Django "feels".
@@ -166,7 +166,7 @@ You can get a local copy of the HTML documentation following a few easy steps:
* Django's documentation uses a system called Sphinx__ to convert from
plain text to HTML. You'll need to install Sphinx by either downloading
- and installing the package from the Sphinx website, or by Python's
+ and installing the package from the Sphinx Web site, or by Python's
``easy_install``:
.. code-block:: bash
@@ -1,6 +1,6 @@
.TH "daily_cleanup.py" "1" "August 2007" "Django Project" ""
.SH "NAME"
-daily_cleanup.py \- Database clean-up for the Django web framework
+daily_cleanup.py \- Database clean-up for the Django Web framework
.SH "SYNOPSIS"
.B daily_cleanup.py
@@ -1,6 +1,6 @@
.TH "django-admin.py" "1" "March 2008" "Django Project" ""
.SH "NAME"
-django\-admin.py \- Utility script for the Django web framework
+django\-admin.py \- Utility script for the Django Web framework
.SH "SYNOPSIS"
.B django\-admin.py
.I <action>
@@ -1,6 +1,6 @@
.TH "gather_profile_stats.py" "1" "August 2007" "Django Project" ""
.SH "NAME"
-gather_profile_stats.py \- Performance analysis tool for the Django web
+gather_profile_stats.py \- Performance analysis tool for the Django Web
framework
.SH "SYNOPSIS"
.B python gather_profile_stats.py
@@ -125,7 +125,7 @@ Contributed applications (``django.contrib``)
While we'll make every effort to keep these APIs stable -- and have no plans to
break any contrib apps -- this is an area that will have more flux between
-releases. As the web evolves, Django must evolve with it.
+releases. As the Web evolves, Django must evolve with it.
However, any changes to contrib apps will come with an important guarantee:
we'll make sure it's always possible to use an older version of a contrib app if
@@ -29,7 +29,7 @@ and uses a two-step process to enable moderation for any given model:
model class and the class which specifies its moderation options.
A simple example is the best illustration of this. Suppose we have the
-following model, which would represent entries in a weblog::
+following model, which would represent entries in a Weblog::
from django.db import models
@@ -8,7 +8,7 @@ Deploying GeoDjango
not thread safe at this time. Thus, it is *highly* recommended
to not use threading when deploying -- in other words, use a
an appropriate configuration of Apache or the prefork method
- when using FastCGI through another web server.
+ when using FastCGI through another Web server.
Apache
======
@@ -9,8 +9,8 @@ GeoDjango
.. module:: django.contrib.gis
:synopsis: Geographic Information System (GIS) extensions for Django
-GeoDjango intends to be a world-class geographic web framework. Its goal is to
-make it as easy as possible to build GIS web applications and harness the power
+GeoDjango intends to be a world-class geographic Web framework. Its goal is to
+make it as easy as possible to build GIS Web applications and harness the power
of spatially enabled data.
.. toctree::
Oops, something went wrong.

0 comments on commit 9584b77

Please sign in to comment.