summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-06-05 08:24:53 -0400
committerTim Graham <timograham@gmail.com>2015-06-05 08:38:43 -0400
commita1d8a205bc6428865eec82c555bdacb68bf04c62 (patch)
treef8f8d22857627678074bdb342ed58bdc28394375 /docs
parent8d33889422040351785cd511fe28105c6b5bec71 (diff)
[1.8.x] Capitalized "Python" in docs.
Backport of 2fbea621e68d3365679e45fa17b61d06aa8cdf76 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/contributing/writing-code/submitting-patches.txt2
-rw-r--r--docs/ref/migration-operations.txt2
-rw-r--r--docs/ref/models/database-functions.txt2
-rw-r--r--docs/releases/1.5.txt2
-rw-r--r--docs/topics/db/multi-db.txt2
-rw-r--r--docs/topics/i18n/translation.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt
index 8713a39e3f..826bbfc48c 100644
--- a/docs/internals/contributing/writing-code/submitting-patches.txt
+++ b/docs/internals/contributing/writing-code/submitting-patches.txt
@@ -260,7 +260,7 @@ Compressing JavaScript
~~~~~~~~~~~~~~~~~~~~~~
To simplify the process of providing optimized JavaScript code, Django
-includes a handy python script which should be used to create a "minified"
+includes a handy Python script which should be used to create a "minified"
version. To run it::
python django/contrib/admin/bin/compress.py
diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt
index 9c42f4480e..dc6c90a30a 100644
--- a/docs/ref/migration-operations.txt
+++ b/docs/ref/migration-operations.txt
@@ -314,7 +314,7 @@ model::
This is generally the operation you would use to create
:ref:`data migrations <data-migrations>`, run
custom data updates and alterations, and anything else you need access to an
-ORM and/or python code for.
+ORM and/or Python code for.
If you're upgrading from South, this is basically the South pattern as an
operation - one or two methods for forwards and backwards, with an ORM and
diff --git a/docs/ref/models/database-functions.txt b/docs/ref/models/database-functions.txt
index 717dc94cbf..33b1d9a8dc 100644
--- a/docs/ref/models/database-functions.txt
+++ b/docs/ref/models/database-functions.txt
@@ -57,7 +57,7 @@ Usage examples::
.. warning::
- A python value passed to ``Coalesce`` on MySQL may be converted to an
+ A Python value passed to ``Coalesce`` on MySQL may be converted to an
incorrect type unless explicitly cast to the correct database type:
>>> from django.db.models.expressions import RawSQL
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index 9ed8bf975b..498fa684a1 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -736,7 +736,7 @@ will be handed over to interested members of the community.
~~~~~~~~~~~~~~~~~~~~~~~~~
The markup contrib module has been deprecated and will follow an accelerated
-deprecation schedule. Direct use of python markup libraries or 3rd party tag
+deprecation schedule. Direct use of Python markup libraries or 3rd party tag
libraries is preferred to Django maintaining this functionality in the
framework.
diff --git a/docs/topics/db/multi-db.txt b/docs/topics/db/multi-db.txt
index 521b1ecb69..6b4f6a0a66 100644
--- a/docs/topics/db/multi-db.txt
+++ b/docs/topics/db/multi-db.txt
@@ -359,7 +359,7 @@ from::
return True
Finally, in the settings file, we add the following (substituting
-``path.to.`` with the actual python path to the module(s) where the
+``path.to.`` with the actual Python path to the module(s) where the
routers are defined)::
DATABASE_ROUTERS = ['path.to.AuthRouter', 'path.to.PrimaryReplicaRouter']
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index 8e677bf0f5..f9972ae6f7 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -1829,7 +1829,7 @@ way Django does translation:
* The string domain is ``django`` or ``djangojs``. This string domain is
used to differentiate between different programs that store their data
in a common message-file library (usually ``/usr/share/locale/``). The
- ``django`` domain is used for python and template translation strings
+ ``django`` domain is used for Python and template translation strings
and is loaded into the global translation catalogs. The ``djangojs``
domain is only used for JavaScript translation catalogs to make sure
that those are as small as possible.