diff options
| author | Georg Brandl <georg@python.org> | 2010-03-21 10:03:36 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-03-21 10:03:36 (GMT) |
| commit | 7bc6e4fd068eecfd28196d224b501aad6a506c0f (patch) | |
| tree | fc2ff317387c383c51bc20042c1596a5f1b5ef87 | |
| parent | ff24c8e11ed37f0f5b35791766ba40f5e8a14641 (diff) | |
| download | cpython-7bc6e4fd068eecfd28196d224b501aad6a506c0f.zip cpython-7bc6e4fd068eecfd28196d224b501aad6a506c0f.tar.gz cpython-7bc6e4fd068eecfd28196d224b501aad6a506c0f.tar.bz2 | |
Merged revisions 79184-79185 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79184 | georg.brandl | 2010-03-21 10:58:36 +0100 (So, 21 Mär 2010) | 1 line
Update text for newest US DST regulation. The sample file already has the calculation right.
........
r79185 | georg.brandl | 2010-03-21 11:02:47 +0100 (So, 21 Mär 2010) | 1 line
Include structmember.h correctly.
........
| -rw-r--r-- | Doc/extending/newtypes.rst | 2 | ||||
| -rw-r--r-- | Doc/library/datetime.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst index 0ea2461..069101d 100644 --- a/Doc/extending/newtypes.rst +++ b/Doc/extending/newtypes.rst @@ -236,7 +236,7 @@ This version of the module has a number of changes. We've added an extra include:: - #include "structmember.h" + #include <structmember.h> This include provides declarations that we use to handle attributes, as described a bit later. diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index edcd1f1..65122f2 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1454,8 +1454,8 @@ Example :class:`tzinfo` classes: Note that there are unavoidable subtleties twice per year in a :class:`tzinfo` subclass accounting for both standard and daylight time, at the DST transition points. For concreteness, consider US Eastern (UTC -0500), where EDT begins the -minute after 1:59 (EST) on the first Sunday in April, and ends the minute after -1:59 (EDT) on the last Sunday in October:: +minute after 1:59 (EST) on the second Sunday in March, and ends the minute after +1:59 (EDT) on the first Sunday in November:: UTC 3:MM 4:MM 5:MM 6:MM 7:MM 8:MM EST 22:MM 23:MM 0:MM 1:MM 2:MM 3:MM |