Author: russellm
Date: 2010-05-08 23:32:40 -0500 (Sat, 08 May 2010)
New Revision: 13150
Modified:
django/branches/releases/1.1.X/docs/internals/contributing.txt
django/branches/releases/1.1.X/docs/ref/contrib/syndication.txt
django/branches/releases/1.1.X/docs/topics/i18n/deployment.txt
Log:
[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.
Modified: django/branches/releases/1.1.X/docs/internals/contributing.txt
===================================================================
--- django/branches/releases/1.1.X/docs/internals/contributing.txt
2010-05-09 04:31:49 UTC (rev 13149)
+++ django/branches/releases/1.1.X/docs/internals/contributing.txt
2010-05-09 04:32:40 UTC (rev 13150)
@@ -393,8 +393,8 @@
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
Modified: django/branches/releases/1.1.X/docs/ref/contrib/syndication.txt
===================================================================
--- django/branches/releases/1.1.X/docs/ref/contrib/syndication.txt
2010-05-09 04:31:49 UTC (rev 13149)
+++ django/branches/releases/1.1.X/docs/ref/contrib/syndication.txt
2010-05-09 04:32:40 UTC (rev 13150)
@@ -333,7 +333,7 @@
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
----
Modified: django/branches/releases/1.1.X/docs/topics/i18n/deployment.txt
===================================================================
--- django/branches/releases/1.1.X/docs/topics/i18n/deployment.txt
2010-05-09 04:31:49 UTC (rev 13149)
+++ django/branches/releases/1.1.X/docs/topics/i18n/deployment.txt
2010-05-09 04:32:40 UTC (rev 13150)
@@ -112,8 +112,6 @@
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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
