diff options
| author | Georg Brandl <georg@python.org> | 2013-10-29 07:17:08 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-29 07:17:08 (GMT) |
| commit | 3a19a89eacdb10407c6d1dc59887d11faea7aa3e (patch) | |
| tree | b5c6316323c377fe9f5799d58463cb86be21b6a3 /Doc/library/datetime.rst | |
| parent | dd371b92c43a98d0df31cd36ed19cf0bb2f94143 (diff) | |
| parent | 3d596fa90b3c862eb2c0fb67aaf42cf1237c3258 (diff) | |
| download | cpython-3a19a89eacdb10407c6d1dc59887d11faea7aa3e.zip cpython-3a19a89eacdb10407c6d1dc59887d11faea7aa3e.tar.gz cpython-3a19a89eacdb10407c6d1dc59887d11faea7aa3e.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc/library/datetime.rst')
| -rw-r--r-- | Doc/library/datetime.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index f9d6918..e4f1eb2 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1898,7 +1898,7 @@ Notes: making assumptions about the output value. Field orderings will vary (for example, "month/day/year" versus "day/month/year"), and the output may contain Unicode characters encoded using the locale's default encoding (for - example, if the current locale is ``js_JP``, the default encoding could be + example, if the current locale is ``ja_JP``, the default encoding could be any one of ``eucJP``, ``SJIS``, or ``utf-8``; use :meth:`locale.getlocale` to determine the current locale's encoding). |