Code

Ticket #11509: 11509.3.diff

File 11509.3.diff, 47.2 KB (added by DrMeers, 4 years ago)

More thorough patch

Line 
1Index: django/db/models/fields/__init__.py
2===================================================================
3--- django/db/models/fields/__init__.py (revision 14041)
4+++ django/db/models/fields/__init__.py (working copy)
5@@ -514,7 +514,7 @@
6         raise exceptions.ValidationError(self.error_messages['invalid'])
7 
8     def get_prep_lookup(self, lookup_type, value):
9-        # Special-case handling for filters coming from a web request (e.g. the
10+        # Special-case handling for filters coming from a Web request (e.g. the
11         # admin interface). Only works for scalar values (not lists). If you're
12         # passing in a list, you might as well make things the right type when
13         # constructing the list.
14@@ -954,7 +954,7 @@
15         raise exceptions.ValidationError(self.error_messages['invalid'])
16 
17     def get_prep_lookup(self, lookup_type, value):
18-        # Special-case handling for filters coming from a web request (e.g. the
19+        # Special-case handling for filters coming from a Web request (e.g. the
20         # admin interface). Only works for scalar values (not lists). If you're
21         # passing in a list, you might as well make things the right type when
22         # constructing the list.
23Index: django/db/transaction.py
24===================================================================
25--- django/db/transaction.py    (revision 14041)
26+++ django/db/transaction.py    (working copy)
27@@ -288,7 +288,7 @@
28     This decorator activates commit on response. This way, if the view function
29     runs successfully, a commit is made; if the viewfunc produces an exception,
30     a rollback is made. This is one of the most common ways to do transaction
31-    control in web apps.
32+    control in Web apps.
33     """
34     def inner_commit_on_success(func, db=None):
35         def _commit_on_success(*args, **kw):
36Index: django/core/servers/fastcgi.py
37===================================================================
38--- django/core/servers/fastcgi.py      (revision 14041)
39+++ django/core/servers/fastcgi.py      (working copy)
40@@ -46,7 +46,7 @@
41 
42 Examples:
43   Run a "standard" fastcgi process on a file-descriptor
44-  (for webservers which spawn your processes for you)
45+  (for Web servers which spawn your processes for you)
46     $ manage.py runfcgi method=threaded
47 
48   Run a scgi server on a TCP host/port
49Index: django/core/handlers/base.py
50===================================================================
51--- django/core/handlers/base.py        (revision 14041)
52+++ django/core/handlers/base.py        (working copy)
53@@ -216,7 +216,7 @@
54 
55     # If Apache's mod_rewrite had a whack at the URL, Apache set either
56     # SCRIPT_URL or REDIRECT_URL to the full resource URL before applying any
57-    # rewrites. Unfortunately not every webserver (lighttpd!) passes this
58+    # rewrites. Unfortunately not every Web server (lighttpd!) passes this
59     # information through all the time, so FORCE_SCRIPT_NAME, above, is still
60     # needed.
61     script_url = environ.get('SCRIPT_URL', u'')
62Index: django/core/files/storage.py
63===================================================================
64--- django/core/files/storage.py        (revision 14041)
65+++ django/core/files/storage.py        (working copy)
66@@ -117,7 +117,7 @@
67     def url(self, name):
68         """
69         Returns an absolute URL where the file's contents can be accessed
70-        directly by a web browser.
71+        directly by a Web browser.
72         """
73         raise NotImplementedError()
74 
75Index: django/views/csrf.py
76===================================================================
77--- django/views/csrf.py        (revision 14041)
78+++ django/views/csrf.py        (working copy)
79@@ -34,7 +34,7 @@
80   <p>CSRF verification failed. Request aborted.</p>
81 {% if no_referer %}
82   <p>You are seeing this message because this HTTPS site requires a 'Referer
83-   header' to be sent by your web browser, but none was sent. This header is
84+   header' to be sent by your Web browser, but none was sent. This header is
85    required for security reasons, to ensure that your browser is not being
86    hijacked by third parties.</p>
87 
88Index: django/utils/feedgenerator.py
89===================================================================
90--- django/utils/feedgenerator.py       (revision 14041)
91+++ django/utils/feedgenerator.py       (working copy)
92@@ -7,7 +7,7 @@
93 >>> feed = feedgenerator.Rss201rev2Feed(
94 ...     title=u"Poynter E-Media Tidbits",
95 ...     link=u"http://www.poynter.org/column.asp?id=31",
96-...     description=u"A group weblog by the sharpest minds in online media/journalism/publishing.",
97+...     description=u"A group Weblog by the sharpest minds in online media/journalism/publishing.",
98 ...     language=u"en",
99 ... )
100 >>> feed.add_item(
101Index: django/contrib/gis/geometry/regex.py
102===================================================================
103--- django/contrib/gis/geometry/regex.py        (revision 14041)
104+++ django/contrib/gis/geometry/regex.py        (working copy)
105@@ -2,7 +2,7 @@
106 
107 # Regular expression for recognizing HEXEWKB and WKT.  A prophylactic measure
108 # to prevent potentially malicious input from reaching the underlying C
109-# library.  Not a substitute for good web security programming practices.
110+# library.  Not a substitute for good Web security programming practices.
111 hex_regex = re.compile(r'^[0-9A-F]+$', re.I)
112 wkt_regex = re.compile(r'^(SRID=(?P<srid>\d+);)?'
113                        r'(?P<wkt>'
114Index: django/contrib/gis/maps/google/__init__.py
115===================================================================
116--- django/contrib/gis/maps/google/__init__.py  (revision 14041)
117+++ django/contrib/gis/maps/google/__init__.py  (working copy)
118@@ -1,6 +1,6 @@
119 """
120   This module houses the GoogleMap object, used for generating
121-   the needed javascript to embed Google Maps in a webpage.
122+   the needed javascript to embed Google Maps in a Web page.
123 
124   Google(R) is a registered trademark of Google, Inc. of Mountain View, California.
125 
126Index: django/contrib/gis/gdal/srs.py
127===================================================================
128--- django/contrib/gis/gdal/srs.py      (revision 14041)
129+++ django/contrib/gis/gdal/srs.py      (working copy)
130@@ -37,7 +37,7 @@
131 #### Spatial Reference class. ####
132 class SpatialReference(GDALBase):
133     """
134-    A wrapper for the OGRSpatialReference object.  According to the GDAL website,
135+    A wrapper for the OGRSpatialReference object.  According to the GDAL Web site,
136     the SpatialReference object "provide[s] services to represent coordinate
137     systems (projections and datums) and to transform between them."
138     """
139Index: django/contrib/comments/moderation.py
140===================================================================
141--- django/contrib/comments/moderation.py       (revision 14041)
142+++ django/contrib/comments/moderation.py       (working copy)
143@@ -16,7 +16,7 @@
144 -------
145 
146 First, we define a simple model class which might represent entries in
147-a weblog::
148+a Weblog::
149 
150     from django.db import models
151 
152Index: django/contrib/auth/middleware.py
153===================================================================
154--- django/contrib/auth/middleware.py   (revision 14041)
155+++ django/contrib/auth/middleware.py   (working copy)
156@@ -19,7 +19,7 @@
157 
158 class RemoteUserMiddleware(object):
159     """
160-    Middleware for utilizing web-server-provided authentication.
161+    Middleware for utilizing Web-server-provided authentication.
162 
163     If request.user is not authenticated, then this middleware attempts to
164     authenticate the username passed in the ``REMOTE_USER`` request header.
165Index: django/contrib/sessions/models.py
166===================================================================
167--- django/contrib/sessions/models.py   (revision 14041)
168+++ django/contrib/sessions/models.py   (working copy)
169@@ -40,7 +40,7 @@
170 
171     For complete documentation on using Sessions in your code, consult
172     the sessions documentation that is shipped with Django (also available
173-    on the Django website).
174+    on the Django Web site).
175     """
176     session_key = models.CharField(_('session key'), max_length=40,
177                                    primary_key=True)
178Index: tests/modeltests/custom_columns/tests.py
179===================================================================
180--- tests/modeltests/custom_columns/tests.py    (revision 14041)
181+++ tests/modeltests/custom_columns/tests.py    (working copy)
182@@ -9,7 +9,7 @@
183         a1 = Author.objects.create(first_name="John", last_name="Smith")
184         a2 = Author.objects.create(first_name="Peter", last_name="Jones")
185 
186-        art = Article.objects.create(headline="Django lets you build web apps easily")
187+        art = Article.objects.create(headline="Django lets you build Web apps easily")
188         art.authors = [a1, a2]
189 
190         # Although the table and column names on Author have been set to custom
191@@ -58,7 +58,7 @@
192         # Get the articles for an author
193         self.assertQuerysetEqual(
194             a.article_set.all(), [
195-                "Django lets you build web apps easily",
196+                "Django lets you build Web apps easily",
197             ],
198             lambda a: a.headline
199         )
200Index: tests/regressiontests/file_storage/tests.py
201===================================================================
202--- tests/regressiontests/file_storage/tests.py (revision 14041)
203+++ tests/regressiontests/file_storage/tests.py (working copy)
204@@ -193,7 +193,7 @@
205 
206     def test_file_url(self):
207         """
208-        File storage returns a url to access a given file from the web.
209+        File storage returns a url to access a given file from the Web.
210         """
211         self.assertEqual(self.storage.url('test.file'),
212             '%s%s' % (self.storage.base_url, 'test.file'))
213Index: tests/regressiontests/custom_columns_regress/tests.py
214===================================================================
215--- tests/regressiontests/custom_columns_regress/tests.py       (revision 14041)
216+++ tests/regressiontests/custom_columns_regress/tests.py       (working copy)
217@@ -22,7 +22,7 @@
218         self.authors = [self.a1, self.a2]
219 
220     def test_basic_creation(self):
221-        art = Article(headline='Django lets you build web apps easily', primary_author=self.a1)
222+        art = Article(headline='Django lets you build Web apps easily', primary_author=self.a1)
223         art.save()
224         art.authors = [self.a1, self.a2]
225 
226@@ -68,7 +68,7 @@
227         )
228 
229     def test_m2m_table(self):
230-        art = Article.objects.create(headline='Django lets you build web apps easily', primary_author=self.a1)
231+        art = Article.objects.create(headline='Django lets you build Web apps easily', primary_author=self.a1)
232         art.authors = self.authors
233         self.assertQuerysetEqual(
234             art.authors.all().order_by('last_name'),
235@@ -76,7 +76,7 @@
236         )
237         self.assertQuerysetEqual(
238             self.a1.article_set.all(),
239-            ['<Article: Django lets you build web apps easily>']
240+            ['<Article: Django lets you build Web apps easily>']
241         )
242         self.assertQuerysetEqual(
243             art.authors.filter(last_name='Jones'),
244Index: docs/intro/tutorial01.txt
245===================================================================
246--- docs/intro/tutorial01.txt   (revision 14049)
247+++ docs/intro/tutorial01.txt   (working copy)
248@@ -263,7 +263,7 @@
249 .. admonition:: Projects vs. apps
250 
251     What's the difference between a project and an app? An app is a Web
252-    application that does something -- e.g., a weblog system, a database of
253+    application that does something -- e.g., a Weblog system, a database of
254     public records or a simple poll app. A project is a collection of
255     configuration and apps for a particular Web site. A project can contain
256     multiple apps. An app can be in multiple projects.
257Index: docs/intro/whatsnext.txt
258===================================================================
259--- docs/intro/whatsnext.txt    (revision 14049)
260+++ docs/intro/whatsnext.txt    (working copy)
261@@ -36,7 +36,7 @@
262 different needs:
263 
264     * The :doc:`introductory material </intro/index>` is designed for people new
265-      to Django -- or to web development in general. It doesn't cover anything
266+      to Django -- or to Web development in general. It doesn't cover anything
267       in depth, but instead gives a high-level overview of how developing in
268       Django "feels".
269 
270@@ -166,7 +166,7 @@
271 
272     * Django's documentation uses a system called Sphinx__ to convert from
273       plain text to HTML. You'll need to install Sphinx by either downloading
274-      and installing the package from the Sphinx website, or by Python's
275+      and installing the package from the Sphinx Web site, or by Python's
276       ``easy_install``:
277 
278       .. code-block:: bash
279Index: docs/intro/tutorial03.txt
280===================================================================
281--- docs/intro/tutorial03.txt   (revision 14049)
282+++ docs/intro/tutorial03.txt   (working copy)
283@@ -10,7 +10,7 @@
284 ==========
285 
286 A view is a "type" of Web page in your Django application that generally serves
287-a specific function and has a specific template. For example, in a weblog
288+a specific function and has a specific template. For example, in a Weblog
289 application, you might have the following views:
290 
291     * Blog homepage -- displays the latest few entries.
292Index: docs/intro/index.txt
293===================================================================
294--- docs/intro/index.txt        (revision 14049)
295+++ docs/intro/index.txt        (working copy)
296@@ -1,7 +1,7 @@
297 Getting started
298 ===============
299 
300-New to Django? Or to web development in general? Well, you came to the right
301+New to Django? Or to Web development in general? Well, you came to the right
302 place: read this material to quickly get up and running.
303 
304 .. toctree::
305Index: docs/misc/api-stability.txt
306===================================================================
307--- docs/misc/api-stability.txt (revision 14049)
308+++ docs/misc/api-stability.txt (working copy)
309@@ -125,7 +125,7 @@
310 
311 While we'll make every effort to keep these APIs stable -- and have no plans to
312 break any contrib apps -- this is an area that will have more flux between
313-releases. As the web evolves, Django must evolve with it.
314+releases. As the Web evolves, Django must evolve with it.
315 
316 However, any changes to contrib apps will come with an important guarantee:
317 we'll make sure it's always possible to use an older version of a contrib app if
318Index: docs/internals/committers.txt
319===================================================================
320--- docs/internals/committers.txt       (revision 14049)
321+++ docs/internals/committers.txt       (working copy)
322@@ -20,10 +20,10 @@
323     Adrian lives in Chicago, USA.
324 
325 `Simon Willison`_
326-    Simon is a well-respected web developer from England. He had a one-year
327+    Simon is a well-respected Web developer from England. He had a one-year
328     internship at World Online, during which time he and Adrian developed Django
329     from scratch. The most enthusiastic Brit you'll ever meet, he's passionate
330-    about best practices in web development and maintains a well-read
331+    about best practices in Web development and maintains a well-read
332     `web-development blog`_.
333 
334     Simon lives in Brighton, England.
335@@ -33,13 +33,13 @@
336     around Django and related open source technologies. A good deal of Jacob's
337     work time is devoted to working on Django. Jacob previously worked at World
338     Online, where Django was invented, where he was the lead developer of
339-    Ellington, a commercial web publishing platform for media companies.
340+    Ellington, a commercial Web publishing platform for media companies.
341 
342     Jacob lives in Lawrence, Kansas, USA.
343 
344 `Wilson Miner`_
345     Wilson's design-fu is what makes Django look so nice. He designed the
346-    website you're looking at right now, as well as Django's acclaimed admin
347+    Web site you're looking at right now, as well as Django's acclaimed admin
348     interface. Wilson is the designer for EveryBlock_.
349 
350     Wilson lives in San Francisco, USA.
351@@ -89,7 +89,7 @@
352     Russell studied physics as an undergraduate, and studied neural networks for
353     his PhD. His first job was with a startup in the defense industry developing
354     simulation frameworks. Over time, mostly through work with Django, he's
355-    become more involved in web development.
356+    become more involved in Web development.
357 
358     Russell has helped with several major aspects of Django, including a
359     couple major internal refactorings, creation of the test system, and more.
360@@ -134,7 +134,7 @@
361 
362 `Brian Rosner`_
363     Brian is currently the tech lead at Eldarion_ managing and developing
364-    Django / Pinax_ based websites. He enjoys learning more about programming
365+    Django / Pinax_ based Web sites. He enjoys learning more about programming
366     languages and system architectures and contributing to open source
367     projects. Brian is the host of the `Django Dose`_ podcasts.
368     
369@@ -180,7 +180,7 @@
370     Karen has a background in distributed operating systems (graduate school),
371     communications software (industry) and crossword puzzle construction
372     (freelance).  The last of these brought her to Django, in late 2006, when
373-    she set out to put a web front-end on her crossword puzzle database.
374+    she set out to put a Web front-end on her crossword puzzle database.
375     That done, she stuck around in the community answering questions, debugging
376     problems, etc. -- because coding puzzles are as much fun as word puzzles.
377 
378@@ -190,7 +190,7 @@
379     Jannis graduated in media design from `Bauhaus-University Weimar`_,
380     is the author of a number of pluggable Django apps and likes to
381     contribute to Open Source projects like Pinax_. He currently works as
382-    a freelance web developer and designer.
383+    a freelance Web developer and designer.
384 
385     Jannis lives in Berlin, Germany.
386 
387@@ -251,7 +251,7 @@
388 `James Bennett`_
389     James is Django's release manager; he also contributes to the documentation.
390 
391-    James came to web development from philosophy when he discovered
392+    James came to Web development from philosophy when he discovered
393     that programmers get to argue just as much while collecting much
394     better pay. He lives in Lawrence, Kansas, where he works for the
395     Journal-World developing Ellington. He `keeps a blog`_, has
396Index: docs/internals/svn.txt
397===================================================================
398--- docs/internals/svn.txt      (revision 14049)
399+++ docs/internals/svn.txt      (working copy)
400@@ -22,7 +22,7 @@
401 to the code over time, so you'll need a copy of the Subversion client
402 (a program called ``svn``) on your computer, and you'll want to
403 familiarize yourself with the basics of how Subversion
404-works. Subversion's web site offers downloads for various operating
405+works. Subversion's Web site offers downloads for various operating
406 systems, and `a free online book`_ is available to help you get up to
407 speed with using Subversion.
408 
409@@ -34,7 +34,7 @@
410 directories: ``django`` contains the full source code for all Django
411 releases, while ``djangoproject.com`` contains the source code and
412 templates for the `djangoproject.com <http://www.djangoproject.com/>`_
413-web site. For trying out in-development Django code, or contributing
414+Web site. For trying out in-development Django code, or contributing
415 to Django, you'll always want to check out code from some location in
416 the ``django`` directory.
417 
418@@ -58,7 +58,7 @@
419 
420 .. _Subversion: http://subversion.tigris.org/
421 .. _a free online book: http://svnbook.red-bean.com/
422-.. _A friendly web-based interface for browsing the code: http://code.djangoproject.com/browser/
423+.. _A friendly Web-based interface for browsing the code: http://code.djangoproject.com/browser/
424 
425 
426 Working with Django's trunk
427Index: docs/howto/deployment/modpython.txt
428===================================================================
429--- docs/howto/deployment/modpython.txt (revision 14049)
430+++ docs/howto/deployment/modpython.txt (working copy)
431@@ -305,7 +305,7 @@
432     import os
433     os.environ['PYTHON_EGG_CACHE'] = '/some/directory'
434 
435-Here, ``/some/directory`` is a directory that the Apache webserver process can
436+Here, ``/some/directory`` is a directory that the Apache Web server process can
437 write to. It will be used as the location for any unpacking of code the eggs
438 need to do.
439 
440Index: docs/howto/deployment/index.txt
441===================================================================
442--- docs/howto/deployment/index.txt     (revision 14049)
443+++ docs/howto/deployment/index.txt     (working copy)
444@@ -1,7 +1,7 @@
445 Deploying Django
446 ================
447 
448-Django's chock-full of shortcuts to make web developer's lives easier, but all
449+Django's chock-full of shortcuts to make Web developer's lives easier, but all
450 those tools are of no use if you can't easily deploy your sites. Since Django's
451 inception, ease of deployment has been a major goal. There's a number of good
452 ways to easily deploy Django:
453Index: docs/howto/deployment/fastcgi.txt
454===================================================================
455--- docs/howto/deployment/fastcgi.txt   (revision 14049)
456+++ docs/howto/deployment/fastcgi.txt   (working copy)
457@@ -22,7 +22,7 @@
458 
459 Like mod_wsgi, FastCGI allows code to stay in memory, allowing requests to be
460 served with no startup time. While mod_wsgi can either be configured embedded
461-in the Apache webserver process or as a separate daemon process, a FastCGI
462+in the Apache Web server process or as a separate daemon process, a FastCGI
463 process never runs inside the Web server process, always in a separate,
464 persistent process.
465 
466@@ -367,14 +367,14 @@
467 ============================================
468 
469 Because many of these fastcgi-based solutions require rewriting the URL at
470-some point inside the webserver, the path information that Django sees may not
471+some point inside the Web server, the path information that Django sees may not
472 resemble the original URL that was passed in. This is a problem if the Django
473 application is being served from under a particular prefix and you want your
474 URLs from the ``{% url %}`` tag to look like the prefix, rather than the
475 rewritten version, which might contain, for example, ``mysite.fcgi``.
476 
477 Django makes a good attempt to work out what the real script name prefix
478-should be. In particular, if the webserver sets the ``SCRIPT_URL`` (specific
479+should be. In particular, if the Web server sets the ``SCRIPT_URL`` (specific
480 to Apache's mod_rewrite), or ``REDIRECT_URL`` (set by a few servers, including
481 Apache + mod_rewrite in some situations), Django will work out the original
482 prefix automatically.
483Index: docs/howto/jython.txt
484===================================================================
485--- docs/howto/jython.txt       (revision 14049)
486+++ docs/howto/jython.txt       (working copy)
487@@ -51,7 +51,7 @@
488 .. _`django-jython`: http://code.google.com/p/django-jython/
489 
490 To install it, follow the `installation instructions`_ detailed on the project
491-website. Also, read the `database backends`_ documentation there.
492+Web site. Also, read the `database backends`_ documentation there.
493 
494 .. _`installation instructions`: http://code.google.com/p/django-jython/wiki/Install
495 .. _`database backends`: http://code.google.com/p/django-jython/wiki/DatabaseBackends
496Index: docs/howto/error-reporting.txt
497===================================================================
498--- docs/howto/error-reporting.txt      (revision 14049)
499+++ docs/howto/error-reporting.txt      (working copy)
500@@ -55,7 +55,7 @@
501 If those conditions are met, Django will e-mail the users listed in the
502 :setting:`MANAGERS` setting whenever your code raises a 404 and the request has
503 a referer. (It doesn't bother to e-mail for 404s that don't have a referer --
504-those are usually just people typing in broken URLs or broken web 'bots).
505+those are usually just people typing in broken URLs or broken Web 'bots).
506 
507 You can tell Django to stop reporting particular 404s by tweaking the
508 :setting:`IGNORABLE_404_ENDS` and :setting:`IGNORABLE_404_STARTS` settings. Both
509Index: docs/topics/auth.txt
510===================================================================
511--- docs/topics/auth.txt        (revision 14049)
512+++ docs/topics/auth.txt        (working copy)
513@@ -658,7 +658,7 @@
514 
515     When you call :func:`~django.contrib.auth.logout()`, the session data for
516     the current request is completely cleaned out. All existing data is
517-    removed. This is to prevent another person from using the same web browser
518+    removed. This is to prevent another person from using the same Web browser
519     to log in and have access to the previous user's session data. If you want
520     to put anything into the session that will be available to the user
521     immediately after logging out, do that *after* calling
522Index: docs/topics/http/urls.txt
523===================================================================
524--- docs/topics/http/urls.txt   (revision 14049)
525+++ docs/topics/http/urls.txt   (working copy)
526@@ -938,10 +938,10 @@
527 :func:`~django.db.models.permalink` to define URLs within your application.
528 However, if your application constructs part of the URL hierarchy itself, you
529 may occasionally need to generate URLs. In that case, you need to be able to
530-find the base URL of the Django project within its web server
531+find the base URL of the Django project within its Web server
532 (normally, :func:`~django.core.urlresolvers.reverse` takes care of this for
533 you). In that case, you can call ``get_script_prefix()``, which will return the
534 script prefix portion of the URL for your Django project. If your Django
535-project is at the root of its webserver, this is always ``"/"``, but it can be
536+project is at the root of its Web server, this is always ``"/"``, but it can be
537 changed, for instance  by using ``django.root`` (see :doc:`How to use
538 Django with Apache and mod_python </howto/deployment/modpython>`).
539Index: docs/topics/http/middleware.txt
540===================================================================
541--- docs/topics/http/middleware.txt     (revision 14049)
542+++ docs/topics/http/middleware.txt     (working copy)
543@@ -152,7 +152,7 @@
544       define ``__init__`` as requiring any arguments.
545 
546     * Unlike the ``process_*`` methods which get called once per request,
547-      ``__init__`` gets called only *once*, when the web server starts up.
548+      ``__init__`` gets called only *once*, when the Web server starts up.
549 
550 Marking middleware as unused
551 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
552Index: docs/topics/install.txt
553===================================================================
554--- docs/topics/install.txt     (revision 14049)
555+++ docs/topics/install.txt     (working copy)
556@@ -28,7 +28,7 @@
557 =============================
558 
559 If you just want to experiment with Django, skip ahead to the next
560-section; Django includes a lightweight web server you can use for
561+section; Django includes a lightweight Web server you can use for
562 testing, so you won't need to set up Apache until you're ready to
563 deploy Django in production.
564 
565@@ -40,9 +40,9 @@
566 life of an Apache process, which leads to significant performance
567 gains over other server arrangements. In daemon mode, mod_wsgi spawns
568 an independent daemon process that handles requests. The daemon
569-process can run as a different user than the webserver, possibly
570+process can run as a different user than the Web server, possibly
571 leading to improved security, and the daemon process can be restarted
572-without restarting the entire Apache webserver, possibly making
573+without restarting the entire Apache Web server, possibly making
574 refreshing your codebase more seamless. Consult the mod_wsgi
575 documentation to determine which mode is right for your setup. Make
576 sure you have Apache installed, with the mod_wsgi module activated.
577Index: docs/topics/db/optimization.txt
578===================================================================
579--- docs/topics/db/optimization.txt     (revision 14049)
580+++ docs/topics/db/optimization.txt     (working copy)
581@@ -68,7 +68,7 @@
582 
583 As well as caching of the whole ``QuerySet``, there is caching of the result of
584 attributes on ORM objects. In general, attributes that are not callable will be
585-cached. For example, assuming the :ref:`example weblog models
586+cached. For example, assuming the :ref:`example Weblog models
587 <queryset-model-example>`:
588 
589   >>> entry = Entry.objects.get(id=1)
590Index: docs/topics/db/queries.txt
591===================================================================
592--- docs/topics/db/queries.txt  (revision 14049)
593+++ docs/topics/db/queries.txt  (working copy)
594@@ -11,7 +11,7 @@
595 details of all the various model lookup options.
596 
597 Throughout this guide (and in the reference), we'll refer to the following
598-models, which comprise a weblog application:
599+models, which comprise a Weblog application:
600 
601 .. _queryset-model-example:
602 
603Index: docs/topics/forms/media.txt
604===================================================================
605--- docs/topics/forms/media.txt (revision 14049)
606+++ docs/topics/forms/media.txt (working copy)
607@@ -1,7 +1,7 @@
608 Form Media
609 ==========
610 
611-Rendering an attractive and easy-to-use web form requires more than just
612+Rendering an attractive and easy-to-use Web form requires more than just
613 HTML - it also requires CSS stylesheets, and if you want to use fancy
614 "Web2.0" widgets, you may also need to include some JavaScript on each
615 page. The exact combination of CSS and JavaScript that is required for
616@@ -14,7 +14,7 @@
617 with the CSS and JavaScript that is required to render the calendar. When
618 the Calendar widget is used on a form, Django is able to identify the CSS and
619 JavaScript files that are required, and provide the list of file names
620-in a form suitable for easy inclusion on your web page.
621+in a form suitable for easy inclusion on your Web page.
622 
623 .. admonition:: Media and Django Admin
624 
625Index: docs/topics/conditional-view-processing.txt
626===================================================================
627--- docs/topics/conditional-view-processing.txt (revision 14049)
628+++ docs/topics/conditional-view-processing.txt (working copy)
629@@ -6,7 +6,7 @@
630 
631 HTTP clients can send a number of headers to tell the server about copies of a
632 resource that they have already seen. This is commonly used when retrieving a
633-web page (using an HTTP ``GET`` request) to avoid sending all the data for
634+Web page (using an HTTP ``GET`` request) to avoid sending all the data for
635 something the client has already retrieved. However, the same headers can be
636 used for all HTTP methods (``POST``, ``PUT``, ``DELETE``, etc).
637 
638Index: docs/topics/logging.txt
639===================================================================
640--- docs/topics/logging.txt     (revision 14049)
641+++ docs/topics/logging.txt     (working copy)
642@@ -383,7 +383,7 @@
643 ===========================
644 
645 Django provides a number of utilities to handle the unique
646-requirements of logging in webserver environment.
647+requirements of logging in Web server environment.
648 
649 Loggers
650 -------
651Index: docs/topics/email.txt
652===================================================================
653--- docs/topics/email.txt       (revision 14049)
654+++ docs/topics/email.txt       (working copy)
655@@ -580,7 +580,7 @@
656 ======================
657 
658 There are times when you do not want Django to send e-mails at
659-all. For example, while developing a website, you probably don't want
660+all. For example, while developing a Web site, you probably don't want
661 to send out thousands of e-mails -- but you may want to validate that
662 e-mails will be sent to the right people under the right conditions,
663 and that those e-mails will contain the correct content.
664Index: docs/releases/1.1-beta-1.txt
665===================================================================
666--- docs/releases/1.1-beta-1.txt        (revision 14049)
667+++ docs/releases/1.1-beta-1.txt        (working copy)
668@@ -142,7 +142,7 @@
669       notably, the memcached backend -- these operations will be atomic, and
670       quite fast.
671 
672-    * Django now can :doc:`easily delegate authentication to the web server
673+    * Django now can :doc:`easily delegate authentication to the Web server
674       </howto/auth-remote-user>` via a new authentication backend that supports
675       the standard ``REMOTE_USER`` environment variable used for this purpose.
676 
677Index: docs/releases/1.0.txt
678===================================================================
679--- docs/releases/1.0.txt       (revision 14049)
680+++ docs/releases/1.0.txt       (working copy)
681@@ -6,7 +6,7 @@
682 
683 We've been looking forward to this moment for over three years, and it's finally
684 here. Django 1.0 represents a the largest milestone in Django's development to
685-date: a web framework that a group of perfectionists can truly be proud of.
686+date: a Web framework that a group of perfectionists can truly be proud of.
687 
688 Django 1.0 represents over three years of community development as an Open
689 Source project. Django's received contributions from hundreds of developers,
690Index: docs/releases/1.1.txt
691===================================================================
692--- docs/releases/1.1.txt       (revision 14049)
693+++ docs/releases/1.1.txt       (working copy)
694@@ -426,7 +426,7 @@
695   notably, the memcached backend -- these operations will be atomic, and
696   quite fast.
697 
698-* Django now can :doc:`easily delegate authentication to the web server
699+* Django now can :doc:`easily delegate authentication to the Web server
700   </howto/auth-remote-user>` via a new authentication backend that supports
701   the standard ``REMOTE_USER`` environment variable used for this purpose.
702 
703Index: docs/man/django-admin.1
704===================================================================
705--- docs/man/django-admin.1     (revision 14049)
706+++ docs/man/django-admin.1     (working copy)
707@@ -1,6 +1,6 @@
708 .TH "django-admin.py" "1" "March 2008" "Django Project" ""
709 .SH "NAME"
710-django\-admin.py \- Utility script for the Django web framework
711+django\-admin.py \- Utility script for the Django Web framework
712 .SH "SYNOPSIS"
713 .B django\-admin.py
714 .I <action>
715Index: docs/man/gather_profile_stats.1
716===================================================================
717--- docs/man/gather_profile_stats.1     (revision 14049)
718+++ docs/man/gather_profile_stats.1     (working copy)
719@@ -1,6 +1,6 @@
720 .TH "gather_profile_stats.py" "1" "August 2007" "Django Project" ""
721 .SH "NAME"
722-gather_profile_stats.py \- Performance analysis tool for the Django web
723+gather_profile_stats.py \- Performance analysis tool for the Django Web
724 framework
725 .SH "SYNOPSIS"
726 .B python gather_profile_stats.py
727Index: docs/man/daily_cleanup.1
728===================================================================
729--- docs/man/daily_cleanup.1    (revision 14049)
730+++ docs/man/daily_cleanup.1    (working copy)
731@@ -1,6 +1,6 @@
732 .TH "daily_cleanup.py" "1" "August 2007" "Django Project" ""
733 .SH "NAME"
734-daily_cleanup.py \- Database clean-up for the Django web framework
735+daily_cleanup.py \- Database clean-up for the Django Web framework
736 .SH "SYNOPSIS"
737 .B daily_cleanup.py
738 
739Index: docs/ref/models/querysets.txt
740===================================================================
741--- docs/ref/models/querysets.txt       (revision 14049)
742+++ docs/ref/models/querysets.txt       (working copy)
743@@ -9,7 +9,7 @@
744 query </topics/db/queries>` guides, so you'll probably want to read and
745 understand those documents before reading this one.
746 
747-Throughout this reference we'll use the :ref:`example weblog models
748+Throughout this reference we'll use the :ref:`example Weblog models
749 <queryset-model-example>` presented in the :doc:`database query guide
750 </topics/db/queries>`.
751 
752Index: docs/ref/models/instances.txt
753===================================================================
754--- docs/ref/models/instances.txt       (revision 14049)
755+++ docs/ref/models/instances.txt       (working copy)
756@@ -9,7 +9,7 @@
757 query </topics/db/queries>` guides, so you'll probably want to read and
758 understand those documents before reading this one.
759 
760-Throughout this reference we'll use the :ref:`example weblog models
761+Throughout this reference we'll use the :ref:`example Weblog models
762 <queryset-model-example>` presented in the :doc:`database query guide
763 </topics/db/queries>`.
764 
765Index: docs/ref/forms/widgets.txt
766===================================================================
767--- docs/ref/forms/widgets.txt  (revision 14049)
768+++ docs/ref/forms/widgets.txt  (working copy)
769@@ -210,7 +210,7 @@
770 When Django renders a widget as HTML, it only renders the bare minimum
771 HTML - Django doesn't add a class definition, or any other widget-specific
772 attributes. This means that all 'TextInput' widgets will appear the same
773-on your web page.
774+on your Web page.
775 
776 If you want to make one widget look different to another, you need to
777 specify additional attributes for each widget. When you specify a
778@@ -235,7 +235,7 @@
779     <tr><th>Comment:</th><td><input type="text" name="comment" /></td></tr>
780 
781 
782-On a real web page, you probably don't want every widget to look the same. You
783+On a real Web page, you probably don't want every widget to look the same. You
784 might want a larger input element for the comment, and you might want the 'name'
785 widget to have some special CSS class. To do this, you use the ``attrs``
786 argument when creating the widget:
787Index: docs/ref/middleware.txt
788===================================================================
789--- docs/ref/middleware.txt     (revision 14049)
790+++ docs/ref/middleware.txt     (working copy)
791@@ -193,7 +193,7 @@
792 ----------------------
793 
794 .. module:: django.middleware.transaction
795-   :synopsis: Middleware binding a database transaction to each web request.
796+   :synopsis: Middleware binding a database transaction to each Web request.
797 
798 .. class:: django.middleware.transaction.TransactionMiddleware
799 
800Index: docs/ref/templates/builtins.txt
801===================================================================
802--- docs/ref/templates/builtins.txt     (revision 14049)
803+++ docs/ref/templates/builtins.txt     (working copy)
804@@ -2102,7 +2102,7 @@
805 django.contrib.webdesign
806 ~~~~~~~~~~~~~~~~~~~~~~~~
807 
808-A collection of template tags that can be useful while designing a website,
809+A collection of template tags that can be useful while designing a Web site,
810 such as a generator of Lorem Ipsum text. See :doc:`/ref/contrib/webdesign`.
811 
812 i18n
813Index: docs/ref/contrib/gis/tutorial.txt
814===================================================================
815--- docs/ref/contrib/gis/tutorial.txt   (revision 14049)
816+++ docs/ref/contrib/gis/tutorial.txt   (working copy)
817@@ -6,8 +6,8 @@
818 ============
819 
820 GeoDjango is an add-on for Django that turns it into a world-class geographic
821-web framework.  GeoDjango strives to make at as simple as possible to create
822-geographic web applications, like location-based services.  Some features include:
823+Web framework.  GeoDjango strives to make at as simple as possible to create
824+geographic Web applications, like location-based services.  Some features include:
825 
826 * Django model fields for `OGC`_ geometries.
827 * Extensions to Django's ORM for the querying and manipulation of spatial data.
828@@ -25,7 +25,7 @@
829     please consult the :ref:`installation documentation <ref-gis-install>`
830     for more details.
831 
832-This tutorial will guide you through the creation of a geographic web
833+This tutorial will guide you through the creation of a geographic Web
834 application for viewing the `world borders`_. [#]_ Some of the code
835 used in this tutorial is taken from and/or inspired by the `GeoDjango
836 basic apps`_ project. [#]_
837@@ -197,7 +197,7 @@
838 ``FIPS: String (2.0)`` indicates that there's a ``FIPS`` character field
839 with a maximum length of 2; similarly, ``LON: Real (8.3)`` is a floating-point
840 field that holds a maximum of 8 digits up to three decimal places.  Although
841-this information may be found right on the `world borders`_ website, this shows
842+this information may be found right on the `world borders`_ Web site, this shows
843 you how to determine this information yourself when such metadata is not
844 provided.
845 
846Index: docs/ref/contrib/gis/install.txt
847===================================================================
848--- docs/ref/contrib/gis/install.txt    (revision 14049)
849+++ docs/ref/contrib/gis/install.txt    (working copy)
850@@ -147,7 +147,7 @@
851 geometries).  Specifically, the C API library is called (e.g., ``libgeos_c.so``)
852 directly from Python using ctypes.
853 
854-First, download GEOS 3.2 from the refractions website and untar the source
855+First, download GEOS 3.2 from the refractions Web site and untar the source
856 archive::
857 
858     $ wget http://download.osgeo.org/geos/geos-3.2.2.tar.bz2
859@@ -640,7 +640,7 @@
860 community!  You can:
861 
862 * Join the ``#geodjango`` IRC channel on FreeNode (may be accessed on the
863-  web via `Mibbit`__).  Please be patient and polite -- while you may not
864+  Web via `Mibbit`__).  Please be patient and polite -- while you may not
865   get an immediate response, someone will attempt to answer your question
866   as soon as they see it.
867 * Ask your question on the `GeoDjango`__ mailing list.
868@@ -1085,7 +1085,7 @@
869 Python
870 ^^^^^^
871 
872-First, download the `Python 2.6 installer`__ from the Python website.  Next,
873+First, download the `Python 2.6 installer`__ from the Python Web site.  Next,
874 execute the installer and use defaults, e.g., keep 'Install for all users'
875 checked and the installation path set as ``C:\Python26``.
876 
877@@ -1101,7 +1101,7 @@
878 ^^^^^^^^^^
879 
880 First, select a mirror and download the latest `PostgreSQL 8.3 installer`__ from
881-the EnterpriseDB website.
882+the EnterpriseDB Web site.
883 
884 .. note::
885 
886Index: docs/ref/contrib/gis/model-api.txt
887===================================================================
888--- docs/ref/contrib/gis/model-api.txt  (revision 14049)
889+++ docs/ref/contrib/gis/model-api.txt  (working copy)
890@@ -97,7 +97,7 @@
891 in the spatial database. [#fnsrid]_  Projection systems give the context to the
892 coordinates that specify a location.  Although the details of `geodesy`__ are
893 beyond the scope of this documentation, the general problem is that the earth
894-is spherical and representations of the earth (e.g., paper maps, web maps)
895+is spherical and representations of the earth (e.g., paper maps, Web maps)
896 are not.
897 
898 Most people are familiar with using latitude and longitude to reference a
899@@ -133,7 +133,7 @@
900 
901 * `spatialreference.org`__: A Django-powered database of spatial reference
902   systems.
903-* `The State Plane Coordinate System`__: A website covering the various
904+* `The State Plane Coordinate System`__: A Web site covering the various
905   projection systems used in the United States.  Much of the U.S. spatial
906   data encountered will be in one of these coordinate systems rather than
907   in a geographic coordinate system such as WGS84.
908Index: docs/ref/contrib/gis/index.txt
909===================================================================
910--- docs/ref/contrib/gis/index.txt      (revision 14049)
911+++ docs/ref/contrib/gis/index.txt      (working copy)
912@@ -9,8 +9,8 @@
913 .. module:: django.contrib.gis
914    :synopsis: Geographic Information System (GIS) extensions for Django
915 
916-GeoDjango intends to be a world-class geographic web framework. Its goal is to
917-make it as easy as possible to build GIS web applications and harness the power
918+GeoDjango intends to be a world-class geographic Web framework. Its goal is to
919+make it as easy as possible to build GIS Web applications and harness the power
920 of spatially enabled data.
921 
922 .. toctree::
923Index: docs/ref/contrib/gis/deployment.txt
924===================================================================
925--- docs/ref/contrib/gis/deployment.txt (revision 14049)
926+++ docs/ref/contrib/gis/deployment.txt (working copy)
927@@ -8,7 +8,7 @@
928     not thread safe at this time.  Thus, it is *highly* recommended
929     to not use threading when deploying -- in other words, use a
930     an appropriate configuration of Apache or the prefork method
931-    when using FastCGI through another web server.
932+    when using FastCGI through another Web server.
933 
934 Apache
935 ======
936Index: docs/ref/contrib/gis/utils.txt
937===================================================================
938--- docs/ref/contrib/gis/utils.txt      (revision 14049)
939+++ docs/ref/contrib/gis/utils.txt      (working copy)
940@@ -8,7 +8,7 @@
941    :synopsis: GeoDjango's collection of utilities.
942 
943 The :mod:`django.contrib.gis.utils` module contains various utilities that are
944-useful in creating geospatial web applications.
945+useful in creating geospatial Web applications.
946 
947 .. toctree::
948    :maxdepth: 2
949Index: docs/ref/contrib/comments/moderation.txt
950===================================================================
951--- docs/ref/contrib/comments/moderation.txt    (revision 14049)
952+++ docs/ref/contrib/comments/moderation.txt    (working copy)
953@@ -29,7 +29,7 @@
954    model class and the class which specifies its moderation options.
955 
956 A simple example is the best illustration of this. Suppose we have the
957-following model, which would represent entries in a weblog::
958+following model, which would represent entries in a Weblog::
959 
960     from django.db import models
961     
962Index: docs/ref/contrib/sitemaps.txt
963===================================================================
964--- docs/ref/contrib/sitemaps.txt       (revision 14049)
965+++ docs/ref/contrib/sitemaps.txt       (working copy)
966@@ -76,7 +76,7 @@
967 A :class:`~django.contrib.sitemaps.Sitemap` class is a simple Python
968 class that represents a "section" of entries in your sitemap. For example,
969 one :class:`~django.contrib.sitemaps.Sitemap` class could represent
970-all the entries of your weblog, while another could represent all of the
971+all the entries of your Weblog, while another could represent all of the
972 events in your events calendar.
973 
974 In the simplest case, all these sections get lumped together into one
975Index: docs/ref/contrib/sites.txt
976===================================================================
977--- docs/ref/contrib/sites.txt  (revision 14049)
978+++ docs/ref/contrib/sites.txt  (working copy)
979@@ -3,7 +3,7 @@
980 =====================
981 
982 .. module:: django.contrib.sites
983-   :synopsis: Lets you operate multiple web sites from the same database and
984+   :synopsis: Lets you operate multiple Web sites from the same database and
985               Django project
986 
987 Django comes with an optional "sites" framework. It's a hook for associating
988Index: docs/ref/request-response.txt
989===================================================================
990--- docs/ref/request-response.txt       (revision 14049)
991+++ docs/ref/request-response.txt       (working copy)
992@@ -37,12 +37,12 @@
993 
994 .. attribute:: HttpRequest.path_info
995 
996-    Under some web server configurations, the portion of the URL after the host
997+    Under some Web server configurations, the portion of the URL after the host
998     name is split up into a script prefix portion and a path info portion
999     (this happens, for example, when using the ``django.root`` option
1000     with the :doc:`modpython handler from Apache </howto/deployment/modpython>`).
1001     The ``path_info`` attribute always contains the path info portion of the
1002-    path, no matter what web server is being used. Using this instead of
1003+    path, no matter what Web server is being used. Using this instead of
1004     attr:`~HttpRequest.path` can make your code much easier to move between test
1005     and deployment servers.
1006 
1007@@ -152,7 +152,7 @@
1008         * ``QUERY_STRING`` -- The query string, as a single (unparsed) string.
1009         * ``REMOTE_ADDR`` -- The IP address of the client.
1010         * ``REMOTE_HOST`` -- The hostname of the client.
1011-        * ``REMOTE_USER`` -- The user authenticated by the web server, if any.
1012+        * ``REMOTE_USER`` -- The user authenticated by the Web server, if any.
1013         * ``REQUEST_METHOD`` -- A string such as ``"GET"`` or ``"POST"``.
1014         * ``SERVER_NAME`` -- The hostname of the server.
1015         * ``SERVER_PORT`` -- The port of the server.
1016Index: docs/ref/utils.txt
1017===================================================================
1018--- docs/ref/utils.txt  (revision 14049)
1019+++ docs/ref/utils.txt  (working copy)
1020@@ -193,7 +193,7 @@
1021     >>> feed = feedgenerator.Rss201rev2Feed(
1022     ...     title=u"Poynter E-Media Tidbits",
1023     ...     link=u"http://www.poynter.org/column.asp?id=31",
1024-    ...     description=u"A group weblog by the sharpest minds in online media/journalism/publishing.",
1025+    ...     description=u"A group Weblog by the sharpest minds in online media/journalism/publishing.",
1026     ...     language=u"en",
1027     ... )
1028     >>> feed.add_item(