summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/class-based-views/generic-display.txt6
-rw-r--r--docs/topics/db/models.txt14
-rw-r--r--docs/topics/i18n/index.txt6
3 files changed, 13 insertions, 13 deletions
diff --git a/docs/topics/class-based-views/generic-display.txt b/docs/topics/class-based-views/generic-display.txt
index b734eb5d2b..8e39ad6c14 100644
--- a/docs/topics/class-based-views/generic-display.txt
+++ b/docs/topics/class-based-views/generic-display.txt
@@ -172,9 +172,9 @@ they're dealing with publishers here.
Well, if you're dealing with a model object, this is already done for you. When
you are dealing with an object or queryset, Django is able to populate the
-context using the lower cased version of the model class' name. This is
-provided in addition to the default ``object_list`` entry, but contains exactly
-the same data, i.e. ``publisher_list``.
+context using the lowercased version of the model class' name. This is provided
+in addition to the default ``object_list`` entry, but contains exactly the same
+data, i.e. ``publisher_list``.
If this still isn't a good match, you can manually set the name of the
context variable. The ``context_object_name`` attribute on a generic view
diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
index 248c7dc5b9..441d7c8079 100644
--- a/docs/topics/db/models.txt
+++ b/docs/topics/db/models.txt
@@ -981,11 +981,11 @@ To work around this problem, when you are using
class (only), part of the value should contain ``'%(app_label)s'`` and
``'%(class)s'``.
-- ``'%(class)s'`` is replaced by the lower-cased name of the child class
- that the field is used in.
-- ``'%(app_label)s'`` is replaced by the lower-cased name of the app the child
- class is contained within. Each installed application name must be unique
- and the model class names within each app must also be unique, therefore the
+- ``'%(class)s'`` is replaced by the lowercased name of the child class that
+ the field is used in.
+- ``'%(app_label)s'`` is replaced by the lowercased name of the app the child
+ class is contained within. Each installed application name must be unique and
+ the model class names within each app must also be unique, therefore the
resulting name will end up being different.
For example, given an app ``common/models.py``::
@@ -1065,8 +1065,8 @@ possible::
>>> Restaurant.objects.filter(name="Bob's Cafe")
If you have a ``Place`` that is also a ``Restaurant``, you can get from the
-``Place`` object to the ``Restaurant`` object by using the lower-case version
-of the model name::
+``Place`` object to the ``Restaurant`` object by using the lowercase version of
+the model name::
>>> p = Place.objects.get(id=12)
# If p is a Restaurant object, this will give the child class:
diff --git a/docs/topics/i18n/index.txt b/docs/topics/i18n/index.txt
index 9b169f41e1..5aad659033 100644
--- a/docs/topics/i18n/index.txt
+++ b/docs/topics/i18n/index.txt
@@ -67,14 +67,14 @@ Here are some other terms that will help us to handle a common language:
A locale name, either a language specification of the form ``ll`` or a
combined language and country specification of the form ``ll_CC``.
Examples: ``it``, ``de_AT``, ``es``, ``pt_BR``. The language part is
- always in lower case and the country part in upper case. The separator
- is an underscore.
+ always in lowercase and the country part in upper case. The separator is
+ an underscore.
language code
Represents the name of a language. Browsers send the names of the
languages they accept in the ``Accept-Language`` HTTP header using this
format. Examples: ``it``, ``de-at``, ``es``, ``pt-br``. Language codes
- are generally represented in lower-case, but the HTTP ``Accept-Language``
+ are generally represented in lowercase, but the HTTP ``Accept-Language``
header is case-insensitive. The separator is a dash.
message file