Browse Source

Fixed #26571 -- Corrected recommendation for converting timestamps to tz-aware datetimes.

Tim Graham 8 years ago
parent
commit
d60386d0f5
1 changed files with 2 additions and 4 deletions
  1. 2 4
      docs/topics/i18n/timezones.txt

+ 2 - 4
docs/topics/i18n/timezones.txt

@@ -151,10 +151,8 @@ used.
     backwards-compatibility with applications that still rely on local time.
     However, :ref:`as explained above <naive-datetime-objects>`, this isn't
     entirely reliable, and you should always work with aware datetimes in UTC
-    in your own code. For instance, use
-    :meth:`~datetime.datetime.utcfromtimestamp` instead of
-    :meth:`~datetime.datetime.fromtimestamp` -- and don't forget to set
-    ``tzinfo`` to :data:`~django.utils.timezone.utc`.
+    in your own code. For instance, use :meth:`~datetime.datetime.fromtimestamp`
+    and set the ``tz`` parameter to :data:`~django.utils.timezone.utc`.
 
 Selecting the current time zone
 -------------------------------