Ticket #13497: 13497.diff

docs/internals/contributing.txt

@@ -393 +393 @@
 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

docs/ref/contrib/syndication.txt

@@ -271 +271 @@
 
 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
 ----

docs/ref/settings.txt

@@ -411 +411 @@
 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 <now>`.
 
@@ -451 +451 @@
 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 <now>`.
 
@@ -1341 +1341 @@
 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 <now>`.
+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 <now>`.
 
 See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
 
@@ -1357 +1357 @@
 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 <now>`.
+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 <now>`.
 
 See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
 
@@ -1497 +1497 @@
 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 <now>`.
 

docs/topics/i18n/deployment.txt

@@ -124 +124 @@
       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