From 663d17897eb26851cd41de888af41ec824f32fa6 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sun, 9 May 2010 04:23:43 +0000 Subject: [PATCH] Fixed #13497 -- Corrected various typos and markup problems in docs. Thanks to Ramiro Morales for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13144 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/internals/contributing.txt | 4 ++-- docs/ref/contrib/syndication.txt | 2 +- docs/ref/settings.txt | 18 +++++++++--------- docs/topics/i18n/deployment.txt | 2 -- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/docs/internals/contributing.txt b/docs/internals/contributing.txt index de839e5237..c555f205b1 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`. +infrastructure available to Django applications described in the +:ref:`i18n documentation`. 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 5c670c7834..5b251ab8c4 100644 --- a/docs/ref/contrib/syndication.txt +++ b/docs/ref/contrib/syndication.txt @@ -271,7 +271,7 @@ Language Feeds created by the syndication framework automatically include the appropriate ```` 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/ref/settings.txt b/docs/ref/settings.txt index f8d76080e2..23f1df7694 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -411,7 +411,7 @@ DATE_FORMAT Default: ``'N j, Y'`` (e.g. ``Feb. 4, 2003``) The default formatting to use for displaying date fields in any part of the -system. Note that if setting:`USE_L10N` is set to ``True``, then the +system. Note that if :setting:`USE_L10N` is set to ``True``, then the locale-dictated format has higher precedence and will be applied instead. See :ttag:`allowed date format strings `. @@ -451,7 +451,7 @@ DATETIME_FORMAT Default: ``'N j, Y, P'`` (e.g. ``Feb. 4, 2003, 4 p.m.``) The default formatting to use for displaying datetime fields in any part of the -system. Note that if setting:`USE_L10N` is set to ``True``, then the +system. Note that if :setting:`USE_L10N` is set to ``True``, then the locale-dictated format has higher precedence and will be applied instead. See :ttag:`allowed date format strings `. @@ -1341,9 +1341,9 @@ SHORT_DATE_FORMAT Default: ``m/d/Y`` (e.g. ``12/31/2003``) An available formatting that can be used for displaying date fields on -templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding -locale-dictated format has higher precedence and will be applied. See -:ttag:`allowed date format strings `. +templates. Note that if :setting:`USE_L10N` is set to ``True``, then the +corresponding locale-dictated format has higher precedence and will be applied. +See :ttag:`allowed date format strings `. See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``. @@ -1357,9 +1357,9 @@ SHORT_DATETIME_FORMAT Default: ``m/d/Y P`` (e.g. ``12/31/2003 4 p.m.``) An available formatting that can be used for displaying datetime fields on -templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding -locale-dictated format has higher precedence and will be applied. See -:ttag:`allowed date format strings `. +templates. Note that if :setting:`USE_L10N` is set to ``True``, then the +corresponding locale-dictated format has higher precedence and will be applied. +See :ttag:`allowed date format strings `. See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``. @@ -1497,7 +1497,7 @@ TIME_FORMAT Default: ``'P'`` (e.g. ``4 p.m.``) The default formatting to use for displaying time fields in any part of the -system. Note that if setting:`USE_L10N` is set to ``True``, then the +system. Note that if :setting:`USE_L10N` is set to ``True``, then the locale-dictated format has higher precedence and will be applied instead. See :ttag:`allowed date format strings `. diff --git a/docs/topics/i18n/deployment.txt b/docs/topics/i18n/deployment.txt index 6cb772d3ab..1a4f5fa4d5 100644 --- a/docs/topics/i18n/deployment.txt +++ b/docs/topics/i18n/deployment.txt @@ -124,8 +124,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