From c8d970a548cb5cbdad80dbb1b5b4e44ff08662b5 Mon Sep 17 00:00:00 2001 From: pp Date: Sun, 10 Jan 2016 18:16:28 +0100 Subject: [PATCH] Refs #25755 -- Unified a couple more spellings of 'website'. --- django/views/debug.py | 2 +- docs/howto/windows.txt | 8 ++++---- docs/internals/git.txt | 4 ++-- docs/internals/team.txt | 7 +++---- docs/ref/settings.txt | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/django/views/debug.py b/django/views/debug.py index c29b71cce0d..70ee452abb7 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -882,7 +882,7 @@ Exception Type: {{ exception_type|escape }}{% if request %} at {{ request.path_i Exception Value: {{ exception_value|force_escape }}

- + diff --git a/docs/howto/windows.txt b/docs/howto/windows.txt index aa35a4190e8..1c2718b8b69 100644 --- a/docs/howto/windows.txt +++ b/docs/howto/windows.txt @@ -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:: diff --git a/docs/internals/git.txt b/docs/internals/git.txt index 21d110303aa..0e35544eb48 100644 --- a/docs/internals/git.txt +++ b/docs/internals/git.txt @@ -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 `_ web -site can be found at `github.com/django/djangoproject.com +The source code for the `Djangoproject.com `_ +website can be found at `github.com/django/djangoproject.com `_. .. _Git: http://git-scm.com/ diff --git a/docs/internals/team.txt b/docs/internals/team.txt index 7b76254b293..00d77ef0dff 100644 --- a/docs/internals/team.txt +++ b/docs/internals/team.txt @@ -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. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index a5abec51681..10c50759190 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -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.