From 5aca35329cb44f05b3594c311ba4d1bae4f48e12 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Tue, 1 Mar 2011 03:05:57 +0000 Subject: [PATCH] Reverted 'now' template tag documentation changes so it describes the real code implementation regarding (lack of) interaction with L10N machinery. Refs #15263. Thanks danielr for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15678 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/templates/builtins.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 3e27daf095..298331faea 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -678,12 +678,9 @@ See :doc:`Custom tag and filter libraries ` for mor now ~~~ -Display the current date and/or time, according to the given string. - -Given format can be one of the predefined ones ``DATE_FORMAT``, -``DATETIME_FORMAT``, ``SHORT_DATE_FORMAT`` or ``SHORT_DATETIME_FORMAT``, -or a custom format, same as the :tfilter:`date` filter. Note that predefined -formats may vary depending on the current locale. +Display the current date and/or time, using a format according to the given +string. Such string can contain format specifiers characters as described +in the :tfilter:`date` filter section. Example::