p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #25755 -- Unified a couple more spellings of 'website'.

This commit is contained in:
pp 2016-01-10 18:16:28 +01:00 committed by Tim Graham
parent 4a03e6f272
commit c8d970a548
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/views/debug.py
View File

@ -882,7 +882,7 @@ Exception Type: {{ exception_type|escape }}{% if request %} at {{ request.path_i
Exception Value: {{ exception_value|force_escape }}
</textarea>
<br><br>
<input type="submit" value="Share this traceback on a public Web site">
<input type="submit" value="Share this traceback on a public website">
</div>
</form>
</div>

8
docs/howto/windows.txt
View File

@ -19,10 +19,10 @@ Install Python
Django is a Python web framework, thus requiring Python to be installed on your
machine. At the time of writing, Python 3.5 is the latest version.
To install Python on your machine go to https://python.org/downloads/. The Web
site should offer you a download button for the latest Python version. Download
the executable installer and run it. Check the box next to ``Add Python 3.5 to
PATH`` and then click ``Install Now``.
To install Python on your machine go to https://python.org/downloads/. The
website should offer you a download button for the latest Python version.
Download the executable installer and run it. Check the box next to ``Add
Python 3.5 to PATH`` and then click ``Install Now``.
After installation, open the command prompt and check that the Python version
matches the version you installed by executing::

4
docs/internals/git.txt
View File

@ -48,8 +48,8 @@ The Git repository includes several `branches`_:
The Git repository also contains `tags`_. These are the exact revisions from
which packaged Django releases were produced, since version 1.0.
The source code for the `Djangoproject.com <https://www.djangoproject.com/>`_ web
site can be found at `github.com/django/djangoproject.com
The source code for the `Djangoproject.com <https://www.djangoproject.com/>`_
website can be found at `github.com/django/djangoproject.com
<https://github.com/django/djangoproject.com>`_.
.. _Git: http://git-scm.com/

7
docs/internals/team.txt
View File

@ -39,10 +39,9 @@ Journal-World`_ of Lawrence, Kansas, USA.
`Wilson Miner`_
Wilson's design-fu is what makes Django look so nice. He created the design
that was used for nearly the first ten years on the Django Project Web
site, as well as the current design for Django's acclaimed admin interface.
Wilson was the designer for EveryBlock and Rdio_. He now designs for
Facebook.
that was used for nearly the first ten years on the Django Project website,
as well as the current design for Django's acclaimed admin interface. Wilson
was the designer for EveryBlock and Rdio_. He now designs for Facebook.
Wilson lives in San Francisco, USA.

4
docs/ref/settings.txt
View File

@ -1564,8 +1564,8 @@ It serves two purposes:
* If the locale middleware isn't in use, it decides which translation is served
to all users.
* If the locale middleware is active, it provides a fallback language in case the
user's preferred language can't be determined or is not supported by the Web
site. It also provides the fallback translation when a translation for a
user's preferred language can't be determined or is not supported by the
website. It also provides the fallback translation when a translation for a
given literal doesn't exist for the user's preferred language.
See :ref:`how-django-discovers-language-preference` for more details.