mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch

Browse Source 
Backport of r14069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2010-10-09 08:25:01 +00:00
parent a322ba66a1
commit 9584b77c35
58 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/intro/index.txt
View File

@@ -1,7 +1,7 @@
Getting started
===============
New to Django? Or to web development in general? Well, you came to the right
New to Django? Or to Web development in general? Well, you came to the right
place: read this material to quickly get up and running.
.. toctree::

2
docs/intro/tutorial01.txt
View File

@@ -263,7 +263,7 @@ so you can focus on writing code rather than creating directories.
.. admonition:: Projects vs. apps
What's the difference between a project and an app? An app is a Web
application that does something -- e.g., a weblog system, a database of
application that does something -- e.g., a Weblog system, a database of
public records or a simple poll app. A project is a collection of
configuration and apps for a particular Web site. A project can contain
multiple apps. An app can be in multiple projects.

2
docs/intro/tutorial03.txt
View File

@@ -10,7 +10,7 @@ Philosophy
==========
A view is a "type" of Web page in your Django application that generally serves
a specific function and has a specific template. For example, in a weblog
a specific function and has a specific template. For example, in a Weblog
application, you might have the following views:
* Blog homepage -- displays the latest few entries.

4
docs/intro/whatsnext.txt
View File

@@ -36,7 +36,7 @@ Django's main documentation is broken up into "chunks" designed to fill
different needs:
* The :doc:`introductory material </intro/index>` is designed for people new
to Django -- or to web development in general. It doesn't cover anything
to Django -- or to Web development in general. It doesn't cover anything
in depth, but instead gives a high-level overview of how developing in
Django "feels".
@@ -166,7 +166,7 @@ You can get a local copy of the HTML documentation following a few easy steps:
* Django's documentation uses a system called Sphinx__ to convert from
plain text to HTML. You'll need to install Sphinx by either downloading
and installing the package from the Sphinx website, or by Python's
and installing the package from the Sphinx Web site, or by Python's
``easy_install``:
.. code-block:: bash