diff -r c3fd4f956020 Doc/library/datetime.rst --- a/Doc/library/datetime.rst Mon Sep 12 21:17:09 2011 +0200 +++ b/Doc/library/datetime.rst Mon Sep 12 22:20:50 2011 +0200 @@ -15,14 +15,14 @@ formatting and manipulation. For related functionality, see also the :mod:`time` and :mod:`calendar` modules. -There are two kinds of date and time objects: "naive" and "aware". This -distinction refers to whether the object has any notion of time zone, daylight -saving time, or other kind of algorithmic or political time adjustment. Whether -a naive :class:`datetime` object represents Coordinated Universal Time (UTC), -local time, or time in some other timezone is purely up to the program, just -like it's up to the program whether a particular number represents metres, -miles, or mass. Naive :class:`datetime` objects are easy to understand and to -work with, at the cost of ignoring some aspects of reality. +Date and time objects are either "naive" or "aware". This distinction refers to +whether the object has any notion of time zone, daylight saving time, or other +kind of algorithmic or political time adjustment. Whether a naive +:class:`datetime` object represents Coordinated Universal Time (UTC), local +time, or time in some other timezone is purely up to the program, just like it's +up to the program whether a particular number represents metres, miles, or mass. +Naive :class:`datetime` objects are easy to understand and to work with, at the +cost of ignoring some aspects of reality. For applications requiring more, :class:`datetime` and :class:`time` objects have an optional time zone information attribute, :attr:`tzinfo`, that can be diff -r c3fd4f956020 Misc/ACKS --- a/Misc/ACKS Mon Sep 12 21:17:09 2011 +0200 +++ b/Misc/ACKS Mon Sep 12 22:20:50 2011 +0200 @@ -1063,3 +1063,4 @@ Peter Åstrand Torsten Becker Pierre Carrier +Jakob Malm