Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #11509 -- Modified usage of "Web" to match our style guide in v…

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a904e55859470944c006d87665074e3574da7b52 1 parent 2cadc6b
Russell Keith-Magee authored October 09, 2010

Showing 60 changed files with 92 additions and 92 deletions. Show diff stats Hide diff stats

  1. 2  django/contrib/auth/middleware.py
  2. 2  django/contrib/comments/moderation.py
  3. 2  django/contrib/gis/gdal/srs.py
  4. 2  django/contrib/gis/geometry/regex.py
  5. 2  django/contrib/gis/maps/google/__init__.py
  6. 2  django/contrib/sessions/models.py
  7. 2  django/core/files/storage.py
  8. 2  django/core/handlers/base.py
  9. 2  django/core/servers/fastcgi.py
  10. 4  django/db/models/fields/__init__.py
  11. 2  django/db/transaction.py
  12. 2  django/utils/feedgenerator.py
  13. 2  django/views/csrf.py
  14. 6  docs/howto/deployment/fastcgi.txt
  15. 2  docs/howto/deployment/index.txt
  16. 2  docs/howto/deployment/modpython.txt
  17. 2  docs/howto/error-reporting.txt
  18. 2  docs/howto/jython.txt
  19. 18  docs/internals/committers.txt
  20. 6  docs/internals/svn.txt
  21. 2  docs/intro/index.txt
  22. 2  docs/intro/tutorial01.txt
  23. 2  docs/intro/tutorial03.txt
  24. 4  docs/intro/whatsnext.txt
  25. 2  docs/man/daily_cleanup.1
  26. 2  docs/man/django-admin.1
  27. 2  docs/man/gather_profile_stats.1
  28. 2  docs/misc/api-stability.txt
  29. 2  docs/ref/contrib/comments/moderation.txt
  30. 2  docs/ref/contrib/gis/deployment.txt
  31. 4  docs/ref/contrib/gis/index.txt
  32. 8  docs/ref/contrib/gis/install.txt
  33. 4  docs/ref/contrib/gis/model-api.txt
  34. 8  docs/ref/contrib/gis/tutorial.txt
  35. 2  docs/ref/contrib/gis/utils.txt
  36. 2  docs/ref/contrib/sitemaps.txt
  37. 2  docs/ref/contrib/sites.txt
  38. 4  docs/ref/forms/widgets.txt
  39. 2  docs/ref/middleware.txt
  40. 2  docs/ref/models/instances.txt
  41. 2  docs/ref/models/querysets.txt
  42. 6  docs/ref/request-response.txt
  43. 2  docs/ref/templates/builtins.txt
  44. 2  docs/ref/utils.txt
  45. 2  docs/releases/1.0.txt
  46. 2  docs/releases/1.1-beta-1.txt
  47. 2  docs/releases/1.1.txt
  48. 2  docs/topics/auth.txt
  49. 2  docs/topics/conditional-view-processing.txt
  50. 2  docs/topics/db/optimization.txt
  51. 2  docs/topics/db/queries.txt
  52. 2  docs/topics/email.txt
  53. 4  docs/topics/forms/media.txt
  54. 2  docs/topics/http/middleware.txt
  55. 4  docs/topics/http/urls.txt
  56. 6  docs/topics/install.txt
  57. 2  docs/topics/logging.txt
  58. 4  tests/modeltests/custom_columns/tests.py
  59. 6  tests/regressiontests/custom_columns_regress/tests.py
  60. 2  tests/regressiontests/file_storage/tests.py
2  django/contrib/auth/middleware.py
@@ -19,7 +19,7 @@ def process_request(self, request):
19 19
 
20 20
 class RemoteUserMiddleware(object):
21 21
     """
22  
-    Middleware for utilizing web-server-provided authentication.
  22
+    Middleware for utilizing Web-server-provided authentication.
23 23
 
24 24
     If request.user is not authenticated, then this middleware attempts to
25 25
     authenticate the username passed in the ``REMOTE_USER`` request header.
2  django/contrib/comments/moderation.py
@@ -16,7 +16,7 @@ class you want to use.
16 16
 -------
17 17
 
18 18
 First, we define a simple model class which might represent entries in
19  
-a weblog::
  19
+a Weblog::
20 20
 
21 21
     from django.db import models
22 22
 
2  django/contrib/gis/gdal/srs.py
@@ -37,7 +37,7 @@
37 37
 #### Spatial Reference class. ####
38 38
 class SpatialReference(GDALBase):
39 39
     """
40  
-    A wrapper for the OGRSpatialReference object.  According to the GDAL website,
  40
+    A wrapper for the OGRSpatialReference object.  According to the GDAL Web site,
41 41
     the SpatialReference object "provide[s] services to represent coordinate 
42 42
     systems (projections and datums) and to transform between them."
43 43
     """
2  django/contrib/gis/geometry/regex.py
@@ -2,7 +2,7 @@
2 2
 
3 3
 # Regular expression for recognizing HEXEWKB and WKT.  A prophylactic measure
4 4
 # to prevent potentially malicious input from reaching the underlying C
5  
-# library.  Not a substitute for good web security programming practices.
  5
+# library.  Not a substitute for good Web security programming practices.
6 6
 hex_regex = re.compile(r'^[0-9A-F]+$', re.I)
7 7
 wkt_regex = re.compile(r'^(SRID=(?P<srid>\d+);)?'
8 8
                        r'(?P<wkt>'
2  django/contrib/gis/maps/google/__init__.py
... ...
@@ -1,6 +1,6 @@
1 1
 """
2 2
   This module houses the GoogleMap object, used for generating
3  
-   the needed javascript to embed Google Maps in a webpage.
  3
+   the needed javascript to embed Google Maps in a Web page.
4 4
 
5 5
   Google(R) is a registered trademark of Google, Inc. of Mountain View, California.
6 6
 
2  django/contrib/sessions/models.py
@@ -40,7 +40,7 @@ class Session(models.Model):
40 40
 
41 41
     For complete documentation on using Sessions in your code, consult
42 42
     the sessions documentation that is shipped with Django (also available
43  
-    on the Django website).
  43
+    on the Django Web site).
44 44
     """
45 45
     session_key = models.CharField(_('session key'), max_length=40,
46 46
                                    primary_key=True)
2  django/core/files/storage.py
@@ -117,7 +117,7 @@ def size(self, name):
117 117
     def url(self, name):
118 118
         """
119 119
         Returns an absolute URL where the file's contents can be accessed
120  
-        directly by a web browser.
  120
+        directly by a Web browser.
121 121
         """
122 122
         raise NotImplementedError()
123 123
 
2  django/core/handlers/base.py
@@ -216,7 +216,7 @@ def get_script_name(environ):
216 216
 
217 217
     # If Apache's mod_rewrite had a whack at the URL, Apache set either
218 218
     # SCRIPT_URL or REDIRECT_URL to the full resource URL before applying any
219  
-    # rewrites. Unfortunately not every webserver (lighttpd!) passes this
  219
+    # rewrites. Unfortunately not every Web server (lighttpd!) passes this
220 220
     # information through all the time, so FORCE_SCRIPT_NAME, above, is still
221 221
     # needed.
222 222
     script_url = environ.get('SCRIPT_URL', u'')
2  django/core/servers/fastcgi.py
@@ -46,7 +46,7 @@
46 46
 
47 47
 Examples:
48 48
   Run a "standard" fastcgi process on a file-descriptor
49  
-  (for webservers which spawn your processes for you)
  49
+  (for Web servers which spawn your processes for you)
50 50
     $ manage.py runfcgi method=threaded
51 51
 
52 52
   Run a scgi server on a TCP host/port
4  django/db/models/fields/__init__.py
@@ -514,7 +514,7 @@ def to_python(self, value):
514 514
         raise exceptions.ValidationError(self.error_messages['invalid'])
515 515
 
516 516
     def get_prep_lookup(self, lookup_type, value):
517  
-        # Special-case handling for filters coming from a web request (e.g. the
  517
+        # Special-case handling for filters coming from a Web request (e.g. the
518 518
         # admin interface). Only works for scalar values (not lists). If you're
519 519
         # passing in a list, you might as well make things the right type when
520 520
         # constructing the list.
@@ -954,7 +954,7 @@ def to_python(self, value):
954 954
         raise exceptions.ValidationError(self.error_messages['invalid'])
955 955
 
956 956
     def get_prep_lookup(self, lookup_type, value):
957  
-        # Special-case handling for filters coming from a web request (e.g. the
  957
+        # Special-case handling for filters coming from a Web request (e.g. the
958 958
         # admin interface). Only works for scalar values (not lists). If you're
959 959
         # passing in a list, you might as well make things the right type when
960 960
         # constructing the list.
2  django/db/transaction.py
@@ -288,7 +288,7 @@ def commit_on_success(using=None):
288 288
     This decorator activates commit on response. This way, if the view function
289 289
     runs successfully, a commit is made; if the viewfunc produces an exception,
290 290
     a rollback is made. This is one of the most common ways to do transaction
291  
-    control in web apps.
  291
+    control in Web apps.
292 292
     """
293 293
     def inner_commit_on_success(func, db=None):
294 294
         def _commit_on_success(*args, **kw):
2  django/utils/feedgenerator.py
@@ -7,7 +7,7 @@
7 7
 >>> feed = feedgenerator.Rss201rev2Feed(
8 8
 ...     title=u"Poynter E-Media Tidbits",
9 9
 ...     link=u"http://www.poynter.org/column.asp?id=31",
10  
-...     description=u"A group weblog by the sharpest minds in online media/journalism/publishing.",
  10
+...     description=u"A group Weblog by the sharpest minds in online media/journalism/publishing.",
11 11
 ...     language=u"en",
12 12
 ... )
13 13
 >>> feed.add_item(
2  django/views/csrf.py
@@ -34,7 +34,7 @@
34 34
   <p>CSRF verification failed. Request aborted.</p>
35 35
 {% if no_referer %}
36 36
   <p>You are seeing this message because this HTTPS site requires a 'Referer
37  
-   header' to be sent by your web browser, but none was sent. This header is
  37
+   header' to be sent by your Web browser, but none was sent. This header is
38 38
    required for security reasons, to ensure that your browser is not being
39 39
    hijacked by third parties.</p>
40 40
 
6  docs/howto/deployment/fastcgi.txt
@@ -22,7 +22,7 @@ to the Web server, which, in turn, passes it back to the client's Web browser.
22 22
 
23 23
 Like mod_wsgi, FastCGI allows code to stay in memory, allowing requests to be
24 24
 served with no startup time. While mod_wsgi can either be configured embedded
25  
-in the Apache webserver process or as a separate daemon process, a FastCGI
  25
+in the Apache Web server process or as a separate daemon process, a FastCGI
26 26
 process never runs inside the Web server process, always in a separate,
27 27
 persistent process.
28 28
 
@@ -367,14 +367,14 @@ Forcing the URL prefix to a particular value
367 367
 ============================================
368 368
 
369 369
 Because many of these fastcgi-based solutions require rewriting the URL at
370  
-some point inside the webserver, the path information that Django sees may not
  370
+some point inside the Web server, the path information that Django sees may not
371 371
 resemble the original URL that was passed in. This is a problem if the Django
372 372
 application is being served from under a particular prefix and you want your
373 373
 URLs from the ``{% url %}`` tag to look like the prefix, rather than the
374 374
 rewritten version, which might contain, for example, ``mysite.fcgi``.
375 375
 
376 376
 Django makes a good attempt to work out what the real script name prefix
377  
-should be. In particular, if the webserver sets the ``SCRIPT_URL`` (specific
  377
+should be. In particular, if the Web server sets the ``SCRIPT_URL`` (specific
378 378
 to Apache's mod_rewrite), or ``REDIRECT_URL`` (set by a few servers, including
379 379
 Apache + mod_rewrite in some situations), Django will work out the original
380 380
 prefix automatically.
2  docs/howto/deployment/index.txt
... ...
@@ -1,7 +1,7 @@
1 1
 Deploying Django
2 2
 ================
3 3
 
4  
-Django's chock-full of shortcuts to make web developer's lives easier, but all
  4
+Django's chock-full of shortcuts to make Web developer's lives easier, but all
5 5
 those tools are of no use if you can't easily deploy your sites. Since Django's
6 6
 inception, ease of deployment has been a major goal. There's a number of good
7 7
 ways to easily deploy Django:
2  docs/howto/deployment/modpython.txt
@@ -317,7 +317,7 @@ project (or somewhere else) that contains something like the following:
317 317
     import os
318 318
     os.environ['PYTHON_EGG_CACHE'] = '/some/directory'
319 319
 
320  
-Here, ``/some/directory`` is a directory that the Apache webserver process can
  320
+Here, ``/some/directory`` is a directory that the Apache Web server process can
321 321
 write to. It will be used as the location for any unpacking of code the eggs
322 322
 need to do.
323 323
 
2  docs/howto/error-reporting.txt
@@ -55,7 +55,7 @@ not found" errors). Django sends emails about 404 errors when:
55 55
 If those conditions are met, Django will e-mail the users listed in the
56 56
 :setting:`MANAGERS` setting whenever your code raises a 404 and the request has
57 57
 a referer. (It doesn't bother to e-mail for 404s that don't have a referer --
58  
-those are usually just people typing in broken URLs or broken web 'bots).
  58
+those are usually just people typing in broken URLs or broken Web 'bots).
59 59
 
60 60
 You can tell Django to stop reporting particular 404s by tweaking the
61 61
 :setting:`IGNORABLE_404_ENDS` and :setting:`IGNORABLE_404_STARTS` settings. Both
2  docs/howto/jython.txt
@@ -51,7 +51,7 @@ on top of Jython.
51 51
 .. _`django-jython`: http://code.google.com/p/django-jython/
52 52
 
53 53
 To install it, follow the `installation instructions`_ detailed on the project
54  
-website. Also, read the `database backends`_ documentation there.
  54
+Web site. Also, read the `database backends`_ documentation there.
55 55
 
56 56
 .. _`installation instructions`: http://code.google.com/p/django-jython/wiki/Install
57 57
 .. _`database backends`: http://code.google.com/p/django-jython/wiki/DatabaseBackends
18  docs/internals/committers.txt
@@ -20,10 +20,10 @@ Journal-World`_ of Lawrence, Kansas, USA.
20 20
     Adrian lives in Chicago, USA.
21 21
 
22 22
 `Simon Willison`_
23  
-    Simon is a well-respected web developer from England. He had a one-year
  23
+    Simon is a well-respected Web developer from England. He had a one-year
24 24
     internship at World Online, during which time he and Adrian developed Django
25 25
     from scratch. The most enthusiastic Brit you'll ever meet, he's passionate
26  
-    about best practices in web development and maintains a well-read
  26
+    about best practices in Web development and maintains a well-read
27 27
     `web-development blog`_.
28 28
 
29 29
     Simon lives in Brighton, England.
@@ -33,13 +33,13 @@ Journal-World`_ of Lawrence, Kansas, USA.
33 33
     around Django and related open source technologies. A good deal of Jacob's
34 34
     work time is devoted to working on Django. Jacob previously worked at World
35 35
     Online, where Django was invented, where he was the lead developer of
36  
-    Ellington, a commercial web publishing platform for media companies.
  36
+    Ellington, a commercial Web publishing platform for media companies.
37 37
 
38 38
     Jacob lives in Lawrence, Kansas, USA.
39 39
 
40 40
 `Wilson Miner`_
41 41
     Wilson's design-fu is what makes Django look so nice. He designed the
42  
-    website you're looking at right now, as well as Django's acclaimed admin
  42
+    Web site you're looking at right now, as well as Django's acclaimed admin
43 43
     interface. Wilson is the designer for EveryBlock_.
44 44
 
45 45
     Wilson lives in San Francisco, USA.
@@ -89,7 +89,7 @@ and have free rein to hack on all parts of Django.
89 89
     Russell studied physics as an undergraduate, and studied neural networks for
90 90
     his PhD. His first job was with a startup in the defense industry developing
91 91
     simulation frameworks. Over time, mostly through work with Django, he's
92  
-    become more involved in web development.
  92
+    become more involved in Web development.
93 93
 
94 94
     Russell has helped with several major aspects of Django, including a
95 95
     couple major internal refactorings, creation of the test system, and more.
@@ -134,7 +134,7 @@ Joseph Kocherhans
134 134
 
135 135
 `Brian Rosner`_
136 136
     Brian is currently the tech lead at Eldarion_ managing and developing
137  
-    Django / Pinax_ based websites. He enjoys learning more about programming
  137
+    Django / Pinax_ based Web sites. He enjoys learning more about programming
138 138
     languages and system architectures and contributing to open source
139 139
     projects. Brian is the host of the `Django Dose`_ podcasts.
140 140
 
@@ -180,7 +180,7 @@ Karen Tracey
180 180
     Karen has a background in distributed operating systems (graduate school),
181 181
     communications software (industry) and crossword puzzle construction
182 182
     (freelance).  The last of these brought her to Django, in late 2006, when
183  
-    she set out to put a web front-end on her crossword puzzle database.
  183
+    she set out to put a Web front-end on her crossword puzzle database.
184 184
     That done, she stuck around in the community answering questions, debugging
185 185
     problems, etc. -- because coding puzzles are as much fun as word puzzles.
186 186
 
@@ -190,7 +190,7 @@ Karen Tracey
190 190
     Jannis graduated in media design from `Bauhaus-University Weimar`_,
191 191
     is the author of a number of pluggable Django apps and likes to
192 192
     contribute to Open Source projects like Pinax_. He currently works as
193  
-    a freelance web developer and designer.
  193
+    a freelance Web developer and designer.
194 194
 
195 195
     Jannis lives in Berlin, Germany.
196 196
 
@@ -262,7 +262,7 @@ Specialists
262 262
 `James Bennett`_
263 263
     James is Django's release manager; he also contributes to the documentation.
264 264
 
265  
-    James came to web development from philosophy when he discovered
  265
+    James came to Web development from philosophy when he discovered
266 266
     that programmers get to argue just as much while collecting much
267 267
     better pay. He lives in Lawrence, Kansas, where he works for the
268 268
     Journal-World developing Ellington. He `keeps a blog`_, has
6  docs/internals/svn.txt
@@ -22,7 +22,7 @@ The Django source code repository uses `Subversion`_ to track changes
22 22
 to the code over time, so you'll need a copy of the Subversion client
23 23
 (a program called ``svn``) on your computer, and you'll want to
24 24
 familiarize yourself with the basics of how Subversion
25  
-works. Subversion's web site offers downloads for various operating
  25
+works. Subversion's Web site offers downloads for various operating
26 26
 systems, and `a free online book`_ is available to help you get up to
27 27
 speed with using Subversion.
28 28
 
@@ -34,7 +34,7 @@ repository address instead. At the top level of the repository are two
34 34
 directories: ``django`` contains the full source code for all Django
35 35
 releases, while ``djangoproject.com`` contains the source code and
36 36
 templates for the `djangoproject.com <http://www.djangoproject.com/>`_
37  
-web site. For trying out in-development Django code, or contributing
  37
+Web site. For trying out in-development Django code, or contributing
38 38
 to Django, you'll always want to check out code from some location in
39 39
 the ``django`` directory.
40 40
 
@@ -58,7 +58,7 @@ into three areas:
58 58
 
59 59
 .. _Subversion: http://subversion.tigris.org/
60 60
 .. _a free online book: http://svnbook.red-bean.com/
61  
-.. _A friendly web-based interface for browsing the code: http://code.djangoproject.com/browser/
  61
+.. _A friendly Web-based interface for browsing the code: http://code.djangoproject.com/browser/
62 62
 
63 63
 
64 64
 Working with Django's trunk
2  docs/intro/index.txt
... ...
@@ -1,7 +1,7 @@
1 1
 Getting started
2 2
 ===============
3 3
 
4  
-New to Django? Or to web development in general? Well, you came to the right
  4
+New to Django? Or to Web development in general? Well, you came to the right
5 5
 place: read this material to quickly get up and running.
6 6
 
7 7
 .. toctree::
2  docs/intro/tutorial01.txt
@@ -263,7 +263,7 @@ so you can focus on writing code rather than creating directories.
263 263
 .. admonition:: Projects vs. apps
264 264
 
265 265
     What's the difference between a project and an app? An app is a Web
266  
-    application that does something -- e.g., a weblog system, a database of
  266
+    application that does something -- e.g., a Weblog system, a database of
267 267
     public records or a simple poll app. A project is a collection of
268 268
     configuration and apps for a particular Web site. A project can contain
269 269
     multiple apps. An app can be in multiple projects.
2  docs/intro/tutorial03.txt
@@ -10,7 +10,7 @@ Philosophy
10 10
 ==========
11 11
 
12 12
 A view is a "type" of Web page in your Django application that generally serves
13  
-a specific function and has a specific template. For example, in a weblog
  13
+a specific function and has a specific template. For example, in a Weblog
14 14
 application, you might have the following views:
15 15
 
16 16
     * Blog homepage -- displays the latest few entries.
4  docs/intro/whatsnext.txt
@@ -36,7 +36,7 @@ Django's main documentation is broken up into "chunks" designed to fill
36 36
 different needs:
37 37
 
38 38
     * The :doc:`introductory material </intro/index>` is designed for people new
39  
-      to Django -- or to web development in general. It doesn't cover anything
  39
+      to Django -- or to Web development in general. It doesn't cover anything
40 40
       in depth, but instead gives a high-level overview of how developing in
41 41
       Django "feels".
42 42
 
@@ -166,7 +166,7 @@ You can get a local copy of the HTML documentation following a few easy steps:
166 166
 
167 167
     * Django's documentation uses a system called Sphinx__ to convert from
168 168
       plain text to HTML. You'll need to install Sphinx by either downloading
169  
-      and installing the package from the Sphinx website, or by Python's
  169
+      and installing the package from the Sphinx Web site, or by Python's
170 170
       ``easy_install``:
171 171
 
172 172
       .. code-block:: bash
2  docs/man/daily_cleanup.1
... ...
@@ -1,6 +1,6 @@
1 1
 .TH "daily_cleanup.py" "1" "August 2007" "Django Project" ""
2 2
 .SH "NAME"
3  
-daily_cleanup.py \- Database clean-up for the Django web framework
  3
+daily_cleanup.py \- Database clean-up for the Django Web framework
4 4
 .SH "SYNOPSIS"
5 5
 .B daily_cleanup.py
6 6
 
2  docs/man/django-admin.1
... ...
@@ -1,6 +1,6 @@
1 1
 .TH "django-admin.py" "1" "March 2008" "Django Project" ""
2 2
 .SH "NAME"
3  
-django\-admin.py \- Utility script for the Django web framework
  3
+django\-admin.py \- Utility script for the Django Web framework
4 4
 .SH "SYNOPSIS"
5 5
 .B django\-admin.py
6 6
 .I <action>
2  docs/man/gather_profile_stats.1
... ...
@@ -1,6 +1,6 @@
1 1
 .TH "gather_profile_stats.py" "1" "August 2007" "Django Project" ""
2 2
 .SH "NAME"
3  
-gather_profile_stats.py \- Performance analysis tool for the Django web
  3
+gather_profile_stats.py \- Performance analysis tool for the Django Web
4 4
 framework
5 5
 .SH "SYNOPSIS"
6 6
 .B python gather_profile_stats.py
2  docs/misc/api-stability.txt
@@ -125,7 +125,7 @@ Contributed applications (``django.contrib``)
125 125
 
126 126
 While we'll make every effort to keep these APIs stable -- and have no plans to
127 127
 break any contrib apps -- this is an area that will have more flux between
128  
-releases. As the web evolves, Django must evolve with it.
  128
+releases. As the Web evolves, Django must evolve with it.
129 129
 
130 130
 However, any changes to contrib apps will come with an important guarantee:
131 131
 we'll make sure it's always possible to use an older version of a contrib app if
2  docs/ref/contrib/comments/moderation.txt
@@ -29,7 +29,7 @@ and uses a two-step process to enable moderation for any given model:
29 29
    model class and the class which specifies its moderation options.
30 30
 
31 31
 A simple example is the best illustration of this. Suppose we have the
32  
-following model, which would represent entries in a weblog::
  32
+following model, which would represent entries in a Weblog::
33 33
 
34 34
     from django.db import models
35 35
     
2  docs/ref/contrib/gis/deployment.txt
@@ -8,7 +8,7 @@ Deploying GeoDjango
8 8
     not thread safe at this time.  Thus, it is *highly* recommended
9 9
     to not use threading when deploying -- in other words, use a
10 10
     an appropriate configuration of Apache or the prefork method
11  
-    when using FastCGI through another web server.
  11
+    when using FastCGI through another Web server.
12 12
 
13 13
 Apache
14 14
 ======
4  docs/ref/contrib/gis/index.txt
@@ -9,8 +9,8 @@ GeoDjango
9 9
 .. module:: django.contrib.gis
10 10
    :synopsis: Geographic Information System (GIS) extensions for Django
11 11
 
12  
-GeoDjango intends to be a world-class geographic web framework. Its goal is to
13  
-make it as easy as possible to build GIS web applications and harness the power
  12
+GeoDjango intends to be a world-class geographic Web framework. Its goal is to
  13
+make it as easy as possible to build GIS Web applications and harness the power
14 14
 of spatially enabled data.
15 15
 
16 16
 .. toctree::
8  docs/ref/contrib/gis/install.txt
@@ -147,7 +147,7 @@ internal geometry representation used by GeoDjango (it's behind the "lazy"
147 147
 geometries).  Specifically, the C API library is called (e.g., ``libgeos_c.so``)
148 148
 directly from Python using ctypes.
149 149
 
150  
-First, download GEOS 3.2 from the refractions website and untar the source
  150
+First, download GEOS 3.2 from the refractions Web site and untar the source
151 151
 archive::
152 152
 
153 153
     $ wget http://download.osgeo.org/geos/geos-3.2.2.tar.bz2
@@ -640,7 +640,7 @@ If you can't find the solution to your problem here then participate in the
640 640
 community!  You can:
641 641
 
642 642
 * Join the ``#geodjango`` IRC channel on FreeNode (may be accessed on the
643  
-  web via `Mibbit`__).  Please be patient and polite -- while you may not
  643
+  Web via `Mibbit`__).  Please be patient and polite -- while you may not
644 644
   get an immediate response, someone will attempt to answer your question
645 645
   as soon as they see it.
646 646
 * Ask your question on the `GeoDjango`__ mailing list.
@@ -1085,7 +1085,7 @@ Windows XP
1085 1085
 Python
1086 1086
 ^^^^^^
1087 1087
 
1088  
-First, download the `Python 2.6 installer`__ from the Python website.  Next,
  1088
+First, download the `Python 2.6 installer`__ from the Python Web site.  Next,
1089 1089
 execute the installer and use defaults, e.g., keep 'Install for all users'
1090 1090
 checked and the installation path set as ``C:\Python26``.
1091 1091
 
@@ -1101,7 +1101,7 @@ PostgreSQL
1101 1101
 ^^^^^^^^^^
1102 1102
 
1103 1103
 First, select a mirror and download the latest `PostgreSQL 8.3 installer`__ from
1104  
-the EnterpriseDB website.
  1104
+the EnterpriseDB Web site.
1105 1105
 
1106 1106
 .. note::
1107 1107
 
4  docs/ref/contrib/gis/model-api.txt
@@ -97,7 +97,7 @@ corresponds to the projection system that will be used to interpret the data
97 97
 in the spatial database. [#fnsrid]_  Projection systems give the context to the
98 98
 coordinates that specify a location.  Although the details of `geodesy`__ are
99 99
 beyond the scope of this documentation, the general problem is that the earth
100  
-is spherical and representations of the earth (e.g., paper maps, web maps)
  100
+is spherical and representations of the earth (e.g., paper maps, Web maps)
101 101
 are not.
102 102
 
103 103
 Most people are familiar with using latitude and longitude to reference a
@@ -133,7 +133,7 @@ Additional Resources:
133 133
 
134 134
 * `spatialreference.org`__: A Django-powered database of spatial reference
135 135
   systems.
136  
-* `The State Plane Coordinate System`__: A website covering the various
  136
+* `The State Plane Coordinate System`__: A Web site covering the various
137 137
   projection systems used in the United States.  Much of the U.S. spatial
138 138
   data encountered will be in one of these coordinate systems rather than
139 139
   in a geographic coordinate system such as WGS84.
8  docs/ref/contrib/gis/tutorial.txt
@@ -6,8 +6,8 @@ Introduction
6 6
 ============
7 7
 
8 8
 GeoDjango is an add-on for Django that turns it into a world-class geographic
9  
-web framework.  GeoDjango strives to make at as simple as possible to create
10  
-geographic web applications, like location-based services.  Some features include:
  9
+Web framework.  GeoDjango strives to make at as simple as possible to create
  10
+geographic Web applications, like location-based services.  Some features include:
11 11
 
12 12
 * Django model fields for `OGC`_ geometries.
13 13
 * Extensions to Django's ORM for the querying and manipulation of spatial data.
@@ -25,7 +25,7 @@ yourself with basic Django concepts.
25 25
     please consult the :ref:`installation documentation <ref-gis-install>`
26 26
     for more details.
27 27
 
28  
-This tutorial will guide you through the creation of a geographic web
  28
+This tutorial will guide you through the creation of a geographic Web
29 29
 application for viewing the `world borders`_. [#]_ Some of the code
30 30
 used in this tutorial is taken from and/or inspired by the `GeoDjango
31 31
 basic apps`_ project. [#]_
@@ -197,7 +197,7 @@ as well as detailed information for each attribute field.  For example,
197 197
 ``FIPS: String (2.0)`` indicates that there's a ``FIPS`` character field
198 198
 with a maximum length of 2; similarly, ``LON: Real (8.3)`` is a floating-point
199 199
 field that holds a maximum of 8 digits up to three decimal places.  Although
200  
-this information may be found right on the `world borders`_ website, this shows
  200
+this information may be found right on the `world borders`_ Web site, this shows
201 201
 you how to determine this information yourself when such metadata is not
202 202
 provided.
203 203
 
2  docs/ref/contrib/gis/utils.txt
@@ -8,7 +8,7 @@ GeoDjango Utilities
8 8
    :synopsis: GeoDjango's collection of utilities.
9 9
 
10 10
 The :mod:`django.contrib.gis.utils` module contains various utilities that are
11  
-useful in creating geospatial web applications.
  11
+useful in creating geospatial Web applications.
12 12
 
13 13
 .. toctree::
14 14
    :maxdepth: 2
2  docs/ref/contrib/sitemaps.txt
@@ -76,7 +76,7 @@ Sitemap classes
76 76
 A :class:`~django.contrib.sitemaps.Sitemap` class is a simple Python
77 77
 class that represents a "section" of entries in your sitemap. For example,
78 78
 one :class:`~django.contrib.sitemaps.Sitemap` class could represent
79  
-all the entries of your weblog, while another could represent all of the
  79
+all the entries of your Weblog, while another could represent all of the
80 80
 events in your events calendar.
81 81
 
82 82
 In the simplest case, all these sections get lumped together into one
2  docs/ref/contrib/sites.txt
@@ -3,7 +3,7 @@ The "sites" framework
3 3
 =====================
4 4
 
5 5
 .. module:: django.contrib.sites
6  
-   :synopsis: Lets you operate multiple web sites from the same database and
  6
+   :synopsis: Lets you operate multiple Web sites from the same database and
7 7
               Django project
8 8
 
9 9
 Django comes with an optional "sites" framework. It's a hook for associating
4  docs/ref/forms/widgets.txt
@@ -210,7 +210,7 @@ Customizing widget instances
210 210
 When Django renders a widget as HTML, it only renders the bare minimum
211 211
 HTML - Django doesn't add a class definition, or any other widget-specific
212 212
 attributes. This means that all 'TextInput' widgets will appear the same
213  
-on your web page.
  213
+on your Web page.
214 214
 
215 215
 If you want to make one widget look different to another, you need to
216 216
 specify additional attributes for each widget. When you specify a
@@ -235,7 +235,7 @@ each widget will be rendered exactly the same::
235 235
     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
236 236
 
237 237
 
238  
-On a real web page, you probably don't want every widget to look the same. You
  238
+On a real Web page, you probably don't want every widget to look the same. You
239 239
 might want a larger input element for the comment, and you might want the 'name'
240 240
 widget to have some special CSS class. To do this, you use the ``attrs``
241 241
 argument when creating the widget:
2  docs/ref/middleware.txt
@@ -193,7 +193,7 @@ Transaction middleware
193 193
 ----------------------
194 194
 
195 195
 .. module:: django.middleware.transaction
196  
-   :synopsis: Middleware binding a database transaction to each web request.
  196
+   :synopsis: Middleware binding a database transaction to each Web request.
197 197
 
198 198
 .. class:: django.middleware.transaction.TransactionMiddleware
199 199
 
2  docs/ref/models/instances.txt
@@ -9,7 +9,7 @@ material presented in the :doc:`model </topics/db/models>` and :doc:`database
9 9
 query </topics/db/queries>` guides, so you'll probably want to read and
10 10
 understand those documents before reading this one.
11 11
 
12  
-Throughout this reference we'll use the :ref:`example weblog models
  12
+Throughout this reference we'll use the :ref:`example Weblog models
13 13
 <queryset-model-example>` presented in the :doc:`database query guide
14 14
 </topics/db/queries>`.
15 15
 
2  docs/ref/models/querysets.txt
@@ -9,7 +9,7 @@ material presented in the :doc:`model </topics/db/models>` and :doc:`database
9 9
 query </topics/db/queries>` guides, so you'll probably want to read and
10 10
 understand those documents before reading this one.
11 11
 
12  
-Throughout this reference we'll use the :ref:`example weblog models
  12
+Throughout this reference we'll use the :ref:`example Weblog models
13 13
 <queryset-model-example>` presented in the :doc:`database query guide
14 14
 </topics/db/queries>`.
15 15
 
6  docs/ref/request-response.txt
@@ -37,12 +37,12 @@ All attributes except ``session`` should be considered read-only.
37 37
 
38 38
 .. attribute:: HttpRequest.path_info
39 39
 
40  
-    Under some web server configurations, the portion of the URL after the host
  40
+    Under some Web server configurations, the portion of the URL after the host
41 41
     name is split up into a script prefix portion and a path info portion
42 42
     (this happens, for example, when using the ``django.root`` option
43 43
     with the :doc:`modpython handler from Apache </howto/deployment/modpython>`).
44 44
     The ``path_info`` attribute always contains the path info portion of the
45  
-    path, no matter what web server is being used. Using this instead of
  45
+    path, no matter what Web server is being used. Using this instead of
46 46
     attr:`~HttpRequest.path` can make your code much easier to move between test
47 47
     and deployment servers.
48 48
 
@@ -152,7 +152,7 @@ All attributes except ``session`` should be considered read-only.
152 152
         * ``QUERY_STRING`` -- The query string, as a single (unparsed) string.
153 153
         * ``REMOTE_ADDR`` -- The IP address of the client.
154 154
         * ``REMOTE_HOST`` -- The hostname of the client.
155  
-        * ``REMOTE_USER`` -- The user authenticated by the web server, if any.
  155
+        * ``REMOTE_USER`` -- The user authenticated by the Web server, if any.
156 156
         * ``REQUEST_METHOD`` -- A string such as ``"GET"`` or ``"POST"``.
157 157
         * ``SERVER_NAME`` -- The hostname of the server.
158 158
         * ``SERVER_PORT`` -- The port of the server.
2  docs/ref/templates/builtins.txt
@@ -2102,7 +2102,7 @@ See the :doc:`markup documentation </ref/contrib/markup>`.
2102 2102
 django.contrib.webdesign
2103 2103
 ~~~~~~~~~~~~~~~~~~~~~~~~
2104 2104
 
2105  
-A collection of template tags that can be useful while designing a website,
  2105
+A collection of template tags that can be useful while designing a Web site,
2106 2106
 such as a generator of Lorem Ipsum text. See :doc:`/ref/contrib/webdesign`.
2107 2107
 
2108 2108
 i18n
2  docs/ref/utils.txt
@@ -193,7 +193,7 @@ Sample usage::
193 193
     >>> feed = feedgenerator.Rss201rev2Feed(
194 194
     ...     title=u"Poynter E-Media Tidbits",
195 195
     ...     link=u"http://www.poynter.org/column.asp?id=31",
196  
-    ...     description=u"A group weblog by the sharpest minds in online media/journalism/publishing.",
  196
+    ...     description=u"A group Weblog by the sharpest minds in online media/journalism/publishing.",
197 197
     ...     language=u"en",
198 198
     ... )
199 199
     >>> feed.add_item(
2  docs/releases/1.0.txt
@@ -6,7 +6,7 @@ Welcome to Django 1.0!
6 6
 
7 7
 We've been looking forward to this moment for over three years, and it's finally
8 8
 here. Django 1.0 represents a the largest milestone in Django's development to
9  
-date: a web framework that a group of perfectionists can truly be proud of.
  9
+date: a Web framework that a group of perfectionists can truly be proud of.
10 10
 
11 11
 Django 1.0 represents over three years of community development as an Open
12 12
 Source project. Django's received contributions from hundreds of developers,
2  docs/releases/1.1-beta-1.txt
@@ -142,7 +142,7 @@ release, including:
142 142
       notably, the memcached backend -- these operations will be atomic, and
143 143
       quite fast.
144 144
 
145  
-    * Django now can :doc:`easily delegate authentication to the web server
  145
+    * Django now can :doc:`easily delegate authentication to the Web server
146 146
       </howto/auth-remote-user>` via a new authentication backend that supports
147 147
       the standard ``REMOTE_USER`` environment variable used for this purpose.
148 148
 
2  docs/releases/1.1.txt
@@ -426,7 +426,7 @@ Other new features and changes introduced since Django 1.0 include:
426 426
   notably, the memcached backend -- these operations will be atomic, and
427 427
   quite fast.
428 428
 
429  
-* Django now can :doc:`easily delegate authentication to the web server
  429
+* Django now can :doc:`easily delegate authentication to the Web server
430 430
   </howto/auth-remote-user>` via a new authentication backend that supports
431 431
   the standard ``REMOTE_USER`` environment variable used for this purpose.
432 432
 
2  docs/topics/auth.txt
@@ -658,7 +658,7 @@ How to log a user out
658 658
 
659 659
     When you call :func:`~django.contrib.auth.logout()`, the session data for
660 660
     the current request is completely cleaned out. All existing data is
661  
-    removed. This is to prevent another person from using the same web browser
  661
+    removed. This is to prevent another person from using the same Web browser
662 662
     to log in and have access to the previous user's session data. If you want
663 663
     to put anything into the session that will be available to the user
664 664
     immediately after logging out, do that *after* calling
2  docs/topics/conditional-view-processing.txt
@@ -6,7 +6,7 @@ Conditional View Processing
6 6
 
7 7
 HTTP clients can send a number of headers to tell the server about copies of a
8 8
 resource that they have already seen. This is commonly used when retrieving a
9  
-web page (using an HTTP ``GET`` request) to avoid sending all the data for
  9
+Web page (using an HTTP ``GET`` request) to avoid sending all the data for
10 10
 something the client has already retrieved. However, the same headers can be
11 11
 used for all HTTP methods (``POST``, ``PUT``, ``DELETE``, etc).
12 12
 
2  docs/topics/db/optimization.txt
@@ -68,7 +68,7 @@ Understand cached attributes
68 68
 
69 69
 As well as caching of the whole ``QuerySet``, there is caching of the result of
70 70
 attributes on ORM objects. In general, attributes that are not callable will be
71  
-cached. For example, assuming the :ref:`example weblog models
  71
+cached. For example, assuming the :ref:`example Weblog models
72 72
 <queryset-model-example>`:
73 73
 
74 74
   >>> entry = Entry.objects.get(id=1)
2  docs/topics/db/queries.txt
@@ -11,7 +11,7 @@ API. Refer to the :doc:`data model reference </ref/models/index>` for full
11 11
 details of all the various model lookup options.
12 12
 
13 13
 Throughout this guide (and in the reference), we'll refer to the following
14  
-models, which comprise a weblog application:
  14
+models, which comprise a Weblog application:
15 15
 
16 16
 .. _queryset-model-example:
17 17
 
2  docs/topics/email.txt
@@ -580,7 +580,7 @@ Testing e-mail sending
580 580
 ======================
581 581
 
582 582
 There are times when you do not want Django to send e-mails at
583  
-all. For example, while developing a website, you probably don't want
  583
+all. For example, while developing a Web site, you probably don't want
584 584
 to send out thousands of e-mails -- but you may want to validate that
585 585
 e-mails will be sent to the right people under the right conditions,
586 586
 and that those e-mails will contain the correct content.
4  docs/topics/forms/media.txt
... ...
@@ -1,7 +1,7 @@
1 1
 Form Media
2 2
 ==========
3 3
 
4  
-Rendering an attractive and easy-to-use web form requires more than just
  4
+Rendering an attractive and easy-to-use Web form requires more than just
5 5
 HTML - it also requires CSS stylesheets, and if you want to use fancy
6 6
 "Web2.0" widgets, you may also need to include some JavaScript on each
7 7
 page. The exact combination of CSS and JavaScript that is required for
@@ -14,7 +14,7 @@ you can define a custom Calendar widget. This widget can then be associated
14 14
 with the CSS and JavaScript that is required to render the calendar. When
15 15
 the Calendar widget is used on a form, Django is able to identify the CSS and
16 16
 JavaScript files that are required, and provide the list of file names
17  
-in a form suitable for easy inclusion on your web page.
  17
+in a form suitable for easy inclusion on your Web page.
18 18
 
19 19
 .. admonition:: Media and Django Admin
20 20
 
2  docs/topics/http/middleware.txt
@@ -152,7 +152,7 @@ of caveats:
152 152
       define ``__init__`` as requiring any arguments.
153 153
 
154 154
     * Unlike the ``process_*`` methods which get called once per request,
155  
-      ``__init__`` gets called only *once*, when the web server starts up.
  155
+      ``__init__`` gets called only *once*, when the Web server starts up.
156 156
 
157 157
 Marking middleware as unused
158 158
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4  docs/topics/http/urls.txt
@@ -938,10 +938,10 @@ Normally, you should always use :func:`~django.core.urlresolvers.reverse` or
938 938
 :func:`~django.db.models.permalink` to define URLs within your application.
939 939
 However, if your application constructs part of the URL hierarchy itself, you
940 940
 may occasionally need to generate URLs. In that case, you need to be able to
941  
-find the base URL of the Django project within its web server
  941
+find the base URL of the Django project within its Web server
942 942
 (normally, :func:`~django.core.urlresolvers.reverse` takes care of this for
943 943
 you). In that case, you can call ``get_script_prefix()``, which will return the
944 944
 script prefix portion of the URL for your Django project. If your Django
945  
-project is at the root of its webserver, this is always ``"/"``, but it can be
  945
+project is at the root of its Web server, this is always ``"/"``, but it can be
946 946
 changed, for instance  by using ``django.root`` (see :doc:`How to use
947 947
 Django with Apache and mod_python </howto/deployment/modpython>`).
6  docs/topics/install.txt
@@ -28,7 +28,7 @@ Install Apache and mod_wsgi
28 28
 =============================
29 29
 
30 30
 If you just want to experiment with Django, skip ahead to the next
31  
-section; Django includes a lightweight web server you can use for
  31
+section; Django includes a lightweight Web server you can use for
32 32
 testing, so you won't need to set up Apache until you're ready to
33 33
 deploy Django in production.
34 34
 
@@ -40,9 +40,9 @@ memory when the server starts. Code stays in memory throughout the
40 40
 life of an Apache process, which leads to significant performance
41 41
 gains over other server arrangements. In daemon mode, mod_wsgi spawns
42 42
 an independent daemon process that handles requests. The daemon
43  
-process can run as a different user than the webserver, possibly
  43
+process can run as a different user than the Web server, possibly
44 44
 leading to improved security, and the daemon process can be restarted
45  
-without restarting the entire Apache webserver, possibly making
  45
+without restarting the entire Apache Web server, possibly making
46 46
 refreshing your codebase more seamless. Consult the mod_wsgi
47 47
 documentation to determine which mode is right for your setup. Make
48 48
 sure you have Apache installed, with the mod_wsgi module activated.
2  docs/topics/logging.txt
@@ -383,7 +383,7 @@ Django's logging extensions
383 383
 ===========================
384 384
 
385 385
 Django provides a number of utilities to handle the unique
386  
-requirements of logging in webserver environment.
  386
+requirements of logging in Web server environment.
387 387
 
388 388
 Loggers
389 389
 -------
4  tests/modeltests/custom_columns/tests.py
@@ -9,7 +9,7 @@ def test_db_column(self):
9 9
         a1 = Author.objects.create(first_name="John", last_name="Smith")
10 10
         a2 = Author.objects.create(first_name="Peter", last_name="Jones")
11 11
 
12  
-        art = Article.objects.create(headline="Django lets you build web apps easily")
  12
+        art = Article.objects.create(headline="Django lets you build Web apps easily")
13 13
         art.authors = [a1, a2]
14 14
 
15 15
         # Although the table and column names on Author have been set to custom
@@ -58,7 +58,7 @@ def test_db_column(self):
58 58
         # Get the articles for an author
59 59
         self.assertQuerysetEqual(
60 60
             a.article_set.all(), [
61  
-                "Django lets you build web apps easily",
  61
+                "Django lets you build Web apps easily",
62 62
             ],
63 63
             lambda a: a.headline
64 64
         )
6  tests/regressiontests/custom_columns_regress/tests.py
@@ -22,7 +22,7 @@ def setUp(self):
22 22
         self.authors = [self.a1, self.a2]
23 23
 
24 24
     def test_basic_creation(self):
25  
-        art = Article(headline='Django lets you build web apps easily', primary_author=self.a1)
  25
+        art = Article(headline='Django lets you build Web apps easily', primary_author=self.a1)
26 26
         art.save()
27 27
         art.authors = [self.a1, self.a2]
28 28
 
@@ -68,7 +68,7 @@ def test_author_get_attributes(self):
68 68
         )
69 69
 
70 70
     def test_m2m_table(self):
71  
-        art = Article.objects.create(headline='Django lets you build web apps easily', primary_author=self.a1)
  71
+        art = Article.objects.create(headline='Django lets you build Web apps easily', primary_author=self.a1)
72 72
         art.authors = self.authors
73 73
         self.assertQuerysetEqual(
74 74
             art.authors.all().order_by('last_name'),
@@ -76,7 +76,7 @@ def test_m2m_table(self):
76 76
         )
77 77
         self.assertQuerysetEqual(
78 78
             self.a1.article_set.all(),
79  
-            ['<Article: Django lets you build web apps easily>']
  79
+            ['<Article: Django lets you build Web apps easily>']
80 80
         )
81 81
         self.assertQuerysetEqual(
82 82
             art.authors.filter(last_name='Jones'),
2  tests/regressiontests/file_storage/tests.py
@@ -193,7 +193,7 @@ def test_file_path(self):
193 193
 
194 194
     def test_file_url(self):
195 195
         """
196  
-        File storage returns a url to access a given file from the web.
  196
+        File storage returns a url to access a given file from the Web.
197 197
         """
198 198
         self.assertEqual(self.storage.url('test.file'),
199 199
             '%s%s' % (self.storage.base_url, 'test.file'))

0 notes on commit a904e55

Please sign in to comment.
Something went wrong with that request. Please try again.