summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/contributing.txt4
-rw-r--r--docs/ref/contrib/syndication.txt2
-rw-r--r--docs/topics/i18n/deployment.txt2
3 files changed, 3 insertions, 5 deletions
diff --git a/docs/internals/contributing.txt b/docs/internals/contributing.txt
index 83973b44b3..8ead7edc3c 100644
--- a/docs/internals/contributing.txt
+++ b/docs/internals/contributing.txt
@@ -393,8 +393,8 @@ Submitting and maintaining translations
Various parts of Django, such as the admin site and validation error messages,
are internationalized. This means they display different text depending on a
user's language setting. For this, Django uses the same internationalization
-infrastructure that is available to Django applications that is described
-in the :ref:`i18n documentation<topics-i18n>`.
+infrastructure available to Django applications described in the
+:ref:`i18n documentation<topics-i18n>`.
These translations are contributed by Django users worldwide. If you find an
incorrect translation, or if you'd like to add a language that isn't yet
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 43a399a15b..42a23019e6 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -333,7 +333,7 @@ Language
Feeds created by the syndication framework automatically include the
appropriate ``<language>`` tag (RSS 2.0) or ``xml:lang`` attribute (Atom). This
-comes directly from your :setting:`LANGUAGE_CODE setting`.
+comes directly from your :setting:`LANGUAGE_CODE` setting.
URLs
----
diff --git a/docs/topics/i18n/deployment.txt b/docs/topics/i18n/deployment.txt
index 211484a4ee..9947f0b425 100644
--- a/docs/topics/i18n/deployment.txt
+++ b/docs/topics/i18n/deployment.txt
@@ -112,8 +112,6 @@ Notes:
selection to German and English (and any sublanguage, like de-ch or
en-us).
- .. _LANGUAGES setting: ../settings/#languages
-
* If you define a custom ``LANGUAGES`` setting, as explained in the
previous bullet, it's OK to mark the languages as translation strings
-- but use a "dummy" ``ugettext()`` function, not the one in