[1.1.X] Fixed #13497 -- Corrected various typos and markup problems in docs. Thanks to Ramiro Morales for the report and patch.

Backport of r13144 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-05-09 04:32:40 +00:00
parent 947c8ce3b4
commit 0711e1051d
3 changed files with 3 additions and 5 deletions

View File

@ -393,8 +393,8 @@ Submitting and maintaining translations
Various parts of Django, such as the admin site and validation error messages, Various parts of Django, such as the admin site and validation error messages,
are internationalized. This means they display different text depending on a are internationalized. This means they display different text depending on a
user's language setting. For this, Django uses the same internationalization user's language setting. For this, Django uses the same internationalization
infrastructure that is available to Django applications that is described infrastructure available to Django applications described in the
in the :ref:`i18n documentation<topics-i18n>`. :ref:`i18n documentation<topics-i18n>`.
These translations are contributed by Django users worldwide. If you find an 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 incorrect translation, or if you'd like to add a language that isn't yet

View File

@ -333,7 +333,7 @@ Language
Feeds created by the syndication framework automatically include the Feeds created by the syndication framework automatically include the
appropriate ``<language>`` tag (RSS 2.0) or ``xml:lang`` attribute (Atom). This 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 URLs
---- ----

View File

@ -112,8 +112,6 @@ Notes:
selection to German and English (and any sublanguage, like de-ch or selection to German and English (and any sublanguage, like de-ch or
en-us). en-us).
.. _LANGUAGES setting: ../settings/#languages
* If you define a custom ``LANGUAGES`` setting, as explained in the * If you define a custom ``LANGUAGES`` setting, as explained in the
previous bullet, it's OK to mark the languages as translation strings previous bullet, it's OK to mark the languages as translation strings
-- but use a "dummy" ``ugettext()`` function, not the one in -- but use a "dummy" ``ugettext()`` function, not the one in