Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.2.X] Fixed #14463 -- Fixed links to new location of date/time form…

…at specifiers docs.

Thanks epicserve for the report.

Backport of [14325] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 67ba914b8718b00b44c07d5350ee8e468a92a9e2 1 parent f6de03b
Ramiro Morales authored October 23, 2010

Showing 1 changed file with 9 additions and 9 deletions. Show diff stats Hide diff stats

  1. 18  docs/ref/settings.txt
18  docs/ref/settings.txt
@@ -96,9 +96,9 @@ APPEND_SLASH
96 96
 
97 97
 Default: ``True``
98 98
 
99  
-When set to ``True``, if the request URL does not match any of the patterns 
  99
+When set to ``True``, if the request URL does not match any of the patterns
100 100
 in the URLconf and it doesn't end in a slash, an HTTP redirect is issued to the
101  
-same URL with a slash appended. Note that the redirect may cause any data 
  101
+same URL with a slash appended. Note that the redirect may cause any data
102 102
 submitted in a POST request to be lost.
103 103
 
104 104
 The ``APPEND_SLASH`` setting is only used if
@@ -447,7 +447,7 @@ Default: ``'N j, Y'`` (e.g. ``Feb. 4, 2003``)
447 447
 The default formatting to use for displaying date fields in any part of the
448 448
 system. Note that if :setting:`USE_L10N` is set to ``True``, then the
449 449
 locale-dictated format has higher precedence and will be applied instead. See
450  
-:ttag:`allowed date format strings <now>`.
  450
+:tfilter:`allowed date format strings <date>`.
451 451
 
452 452
 .. versionchanged:: 1.2
453 453
     This setting can now be overriden by setting ``USE_L10N`` to ``True``.
@@ -487,7 +487,7 @@ Default: ``'N j, Y, P'`` (e.g. ``Feb. 4, 2003, 4 p.m.``)
487 487
 The default formatting to use for displaying datetime fields in any part of the
488 488
 system. Note that if :setting:`USE_L10N` is set to ``True``, then the
489 489
 locale-dictated format has higher precedence and will be applied instead. See
490  
-:ttag:`allowed date format strings <now>`.
  490
+:tfilter:`allowed date format strings <date>`.
491 491
 
492 492
 .. versionchanged:: 1.2
493 493
     This setting can now be overriden by setting ``USE_L10N`` to ``True``.
@@ -1161,7 +1161,7 @@ drilldown, the header for a given day displays the day and month. Different
1161 1161
 locales have different formats. For example, U.S. English would say
1162 1162
 "January 1," whereas Spanish might say "1 Enero."
1163 1163
 
1164  
-See :ttag:`allowed date format strings <now>`. See also ``DATE_FORMAT``,
  1164
+See :tfilter:`allowed date format strings <date>`. See also ``DATE_FORMAT``,
1165 1165
 ``DATETIME_FORMAT``, ``TIME_FORMAT`` and ``YEAR_MONTH_FORMAT``.
1166 1166
 
1167 1167
 .. setting:: NUMBER_GROUPING
@@ -1403,7 +1403,7 @@ Default: ``m/d/Y`` (e.g. ``12/31/2003``)
1403 1403
 An available formatting that can be used for displaying date fields on
1404 1404
 templates. Note that if :setting:`USE_L10N` is set to ``True``, then the
1405 1405
 corresponding locale-dictated format has higher precedence and will be applied.
1406  
-See :ttag:`allowed date format strings <now>`.
  1406
+See :tfilter:`allowed date format strings <date>`.
1407 1407
 
1408 1408
 See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
1409 1409
 
@@ -1419,7 +1419,7 @@ Default: ``m/d/Y P`` (e.g. ``12/31/2003 4 p.m.``)
1419 1419
 An available formatting that can be used for displaying datetime fields on
1420 1420
 templates. Note that if :setting:`USE_L10N` is set to ``True``, then the
1421 1421
 corresponding locale-dictated format has higher precedence and will be applied.
1422  
-See :ttag:`allowed date format strings <now>`.
  1422
+See :tfilter:`allowed date format strings <date>`.
1423 1423
 
1424 1424
 See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
1425 1425
 
@@ -1559,7 +1559,7 @@ Default: ``'P'`` (e.g. ``4 p.m.``)
1559 1559
 The default formatting to use for displaying time fields in any part of the
1560 1560
 system. Note that if :setting:`USE_L10N` is set to ``True``, then the
1561 1561
 locale-dictated format has higher precedence and will be applied instead. See
1562  
-:ttag:`allowed date format strings <now>`.
  1562
+:tfilter:`allowed date format strings <date>`.
1563 1563
 
1564 1564
 .. versionchanged:: 1.2
1565 1565
     This setting can now be overriden by setting ``USE_L10N`` to ``True``.
@@ -1713,7 +1713,7 @@ drilldown, the header for a given month displays the month and the year.
1713 1713
 Different locales have different formats. For example, U.S. English would say
1714 1714
 "January 2006," whereas another locale might say "2006/January."
1715 1715
 
1716  
-See :ttag:`allowed date format strings <now>`. See also ``DATE_FORMAT``,
  1716
+See :tfilter:`allowed date format strings <date>`. See also ``DATE_FORMAT``,
1717 1717
 ``DATETIME_FORMAT``, ``TIME_FORMAT`` and ``MONTH_DAY_FORMAT``.
1718 1718
 
1719 1719
 Deprecated settings

0 notes on commit 67ba914

Please sign in to comment.
Something went wrong with that request. Please try again.