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

Fixed 32956 -- Lowercased spelling of "web" and "web framework" where appropriate.

Browse Source
This commit is contained in:
David Smith
2021-07-23 07:48:16 +01:00
committed by Mariusz Felisiak
parent acde917456
commit 1024b5e74a
113 changed files with 265 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/intro/contributing.txt
View File

@@ -208,7 +208,7 @@ Django ``tests/`` directory and then running:
If you encounter an error during the installation, your system might be missing
a dependency for one or more of the Python packages. Consult the failing
package's documentation or search the Web with the error message that you
package's documentation or search the web with the error message that you
encounter.
Now we are ready to run the test suite. If you're using GNU/Linux, macOS, or

2
docs/intro/index.txt
View File

@@ -2,7 +2,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/install.txt
View File

@@ -10,7 +10,7 @@ while you walk through the introduction.
Install Python
==============
Being a Python Web framework, Django requires Python. See
Being a Python web framework, Django requires Python. See
:ref:`faq-python-version-support` for details. Python includes a lightweight
database called SQLite_ so you won't need to set up a database just yet.

6
docs/intro/overview.txt
View File

@@ -3,8 +3,8 @@ Django at a glance
==================
Because Django was developed in a fast-paced newsroom environment, it was
designed to make common Web-development tasks fast and easy. Here's an informal
overview of how to write a database-driven Web app with Django.
designed to make common web development tasks fast and easy. Here's an informal
overview of how to write a database-driven web app with Django.
The goal of this document is to give you enough technical specifics to
understand how Django works, but this isn't intended to be a tutorial or
@@ -176,7 +176,7 @@ start populating data. Then, develop the way data is presented to the public.
Design your URLs
================
A clean, elegant URL scheme is an important detail in a high-quality Web
A clean, elegant URL scheme is an important detail in a high-quality web
application. Django encourages beautiful URL design and doesn't put any cruft
in URLs, like ``.php`` or ``.asp``.

6
docs/intro/reusable-apps.txt
View File

@@ -3,7 +3,7 @@ Advanced tutorial: How to write reusable apps
=============================================
This advanced tutorial begins where :doc:`Tutorial 7 </intro/tutorial07>`
left off. We'll be turning our Web-poll into a standalone Python package
left off. We'll be turning our web-poll into a standalone Python package
you can reuse in new projects and share with other people.
If you haven't recently completed Tutorials 1–7, we encourage you to review
@@ -150,7 +150,7 @@ this. For a small app like polls, this process isn't too difficult.
Polls
=====
Polls is a Django app to conduct Web-based polls. For each question,
Polls is a Django app to conduct web-based polls. For each question,
visitors can choose between a fixed number of answers.
Detailed documentation is in the "docs" directory.
@@ -204,7 +204,7 @@ this. For a small app like polls, this process isn't too difficult.
[metadata]
name = django-polls
version = 0.1
description = A Django app to conduct Web-based polls.
description = A Django app to conduct web-based polls.
long_description = file: README.rst
url = https://www.example.com/
author = Your Name

16
docs/intro/tutorial01.txt
View File

@@ -67,11 +67,11 @@ work, see :ref:`troubleshooting-django-admin`.
.. admonition:: Where should this code live?
If your background is in plain old PHP (with no use of modern frameworks),
you're probably used to putting code under the Web server's document root
you're probably used to putting code under the web server's document root
(in a place such as ``/var/www``). With Django, you don't do that. It's
not a good idea to put any of this Python code within your Web server's
not a good idea to put any of this Python code within your web server's
document root, because it risks the possibility that people may be able
to view your code over the Web. That's not good for security.
to view your code over the web. That's not good for security.
Put your code in some directory **outside** of the document root, such as
:file:`/home/mycode`.
@@ -148,16 +148,16 @@ You'll see the following output on the command line:
Ignore the warning about unapplied database migrations for now; we'll deal
with the database shortly.
You've started the Django development server, a lightweight Web server written
You've started the Django development server, a lightweight web server written
purely in Python. We've included this with Django so you can develop things
rapidly, without having to deal with configuring a production server -- such as
Apache -- until you're ready for production.
Now's a good time to note: **don't** use this server in anything resembling a
production environment. It's intended only for use while developing. (We're in
the business of making Web frameworks, not Web servers.)
the business of making web frameworks, not web servers.)
Now that the server's running, visit http://127.0.0.1:8000/ with your Web
Now that the server's running, visit http://127.0.0.1:8000/ with your web
browser. You'll see a "Congratulations!" page, with a rocket taking off.
It worked!
@@ -206,8 +206,8 @@ 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
What's the difference between a project and an app? An app is a web
application that does something -- e.g., a blog system, a database of
public records or a small poll app. A project is a collection of
configuration and apps for a particular website. A project can contain
multiple apps. An app can be in multiple projects.

2
docs/intro/tutorial02.txt
View File

@@ -613,7 +613,7 @@ If the server is not running start it like so:
$ python manage.py runserver
Now, open a Web browser and go to "/admin/" on your local domain -- e.g.,
Now, open a web browser and go to "/admin/" on your local domain -- e.g.,
http://127.0.0.1:8000/admin/. You should see the admin's login screen:
.. image:: _images/admin01.png

4
docs/intro/tutorial03.txt
View File

@@ -3,7 +3,7 @@ Writing your first Django app, part 3
=====================================
This tutorial begins where :doc:`Tutorial 2 </intro/tutorial02>` left off. We're
continuing the Web-poll application and will focus on creating the public
continuing the web-poll application and will focus on creating the public
interface -- "views."
.. admonition:: Where to get help:
@@ -14,7 +14,7 @@ interface -- "views."
Overview
========
A view is a "type" of Web page in your Django application that generally serves
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 blog
application, you might have the following views:

8
docs/intro/tutorial04.txt
View File

@@ -3,7 +3,7 @@ Writing your first Django app, part 4
=====================================
This tutorial begins where :doc:`Tutorial 3 </intro/tutorial03>` left off. We're
continuing the Web-poll application and will focus on form processing and
continuing the web-poll application and will focus on form processing and
cutting down our code.
.. admonition:: Where to get help:
@@ -47,7 +47,7 @@ A quick rundown:
``method="get"``) is very important, because the act of submitting this
form will alter data server-side. Whenever you create a form that alters
data server-side, use ``method="post"``. This tip isn't specific to
Django; it's good Web development practice in general.
Django; it's good web development practice in general.
* ``forloop.counter`` indicates how many times the :ttag:`for` tag has gone
through its loop
@@ -126,7 +126,7 @@ This code includes a few things we haven't covered yet in this tutorial:
As the Python comment above points out, you should always return an
:class:`~django.http.HttpResponseRedirect` after successfully dealing with
POST data. This tip isn't specific to Django; it's good Web development
POST data. This tip isn't specific to Django; it's good web development
practice in general.
* We are using the :func:`~django.urls.reverse` function in the
@@ -204,7 +204,7 @@ The ``detail()`` (from :doc:`Tutorial 3 </intro/tutorial03>`) and ``results()``
views are very short -- and, as mentioned above, redundant. The ``index()``
view, which displays a list of polls, is similar.
These views represent a common case of basic Web development: getting data from
These views represent a common case of basic web development: getting data from
the database according to a parameter passed in the URL, loading a template and
returning the rendered template. Because this is so common, Django provides a
shortcut, called the "generic views" system.

2
docs/intro/tutorial05.txt
View File

@@ -3,7 +3,7 @@ Writing your first Django app, part 5
=====================================
This tutorial begins where :doc:`Tutorial 4 </intro/tutorial04>` left off.
We've built a Web-poll application, and we'll now create some automated tests
We've built a web-poll application, and we'll now create some automated tests
for it.
.. admonition:: Where to get help:

2
docs/intro/tutorial06.txt
View File

@@ -3,7 +3,7 @@ Writing your first Django app, part 6
=====================================
This tutorial begins where :doc:`Tutorial 5 </intro/tutorial05>` left off.
We've built a tested Web-poll application, and we'll now add a stylesheet and
We've built a tested web-poll application, and we'll now add a stylesheet and
an image.
Aside from the HTML generated by the server, web applications generally need

2
docs/intro/tutorial07.txt
View File

@@ -3,7 +3,7 @@ Writing your first Django app, part 7
=====================================
This tutorial begins where :doc:`Tutorial 6 </intro/tutorial06>` left off. We're
continuing the Web-poll application and will focus on customizing Django's
continuing the web-poll application and will focus on customizing Django's
automatically-generated admin site that we first explored in :doc:`Tutorial 2
</intro/tutorial02>`.

8
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".
@@ -106,7 +106,7 @@ Where to get it
You can read Django documentation in several ways. They are, in order of
preference:
On the Web
On the web
----------
The most recent version of the Django documentation lives at
@@ -215,8 +215,8 @@ We follow this policy:
Django is :ref:`no longer supported<supported-versions-policy>`, that version
of the docs won't get any further updates.
* The `main documentation Web page`_ includes links to documentation for
* The `main documentation web page`_ includes links to documentation for
previous versions. Be sure you are using the version of the docs
corresponding to the version of Django you are using!
.. _main documentation Web page: https://docs.djangoproject.com/en/dev/
.. _main documentation web page: https://docs.djangoproject.com/en/dev/