summaryrefslogtreecommitdiffstats
path: root/Misc/cheatsheet
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-02-21 20:59:32 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-02-21 20:59:32 (GMT)
commit934896dc0977ea25dc37c13117525f2394625cee (patch)
treef4671cebdd730ba732dcae5185548dd35b9ffa72 /Misc/cheatsheet
parent91cf882b367644ece7f121cd22fc43c2f439a2d5 (diff)
downloadcpython-934896dc0977ea25dc37c13117525f2394625cee.zip
cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.gz
cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.bz2
Merged revisions 69846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r69846 | mark.dickinson | 2009-02-21 20:27:01 +0000 (Sat, 21 Feb 2009) | 2 lines Issue #5341: Fix a variety of spelling errors. ........
Diffstat (limited to 'Misc/cheatsheet')
-rw-r--r--Misc/cheatsheet6
1 files changed, 3 insertions, 3 deletions
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index e5d61af..789e9c3 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -476,7 +476,7 @@ s.istitle() return True if string s is a titlecased string, False (7)
s.isupper() return True if all characters in s are uppercase, False (6)
otherwise.
s.join(seq) return a concatenation of the strings in the sequence
- seq, seperated by 's's.
+ seq, separated by 's's.
s.ljust(width) return s left justified in a string of length width. (1),
(8)
s.lower() return a copy of s converted to lowercase.
@@ -1509,10 +1509,10 @@ secs) monday), Julian day(1-366), daylight flag(-1,0 or 1))
asctime(
timeTuple),
strftime(
-format, return a formated string representing time.
+format, return a formatted string representing time.
timeTuple)
mktime(tuple) inverse of localtime(). Return a float.
-strptime( parse a formated string representing time, return tuple as in
+strptime( parse a formatted string representing time, return tuple as in
string[, gmtime().
format])
sleep(secs) Suspend execution for <secs> seconds. <secs> can be a float.