diff options
| author | Georg Brandl <georg@python.org> | 2014-03-18 06:47:35 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-18 06:47:35 (GMT) |
| commit | 3f2350c6477d9bf0a7c7bc07966b58003e1d2edb (patch) | |
| tree | a4997451061317faa5bd95bd1f131d57ba39df6d | |
| parent | b2bef62e9114c2184daba1c8253ea3d1f1dc5976 (diff) | |
| parent | f5c801fdca17eaeeee6c123798462c7838929e99 (diff) | |
| download | cpython-3f2350c6477d9bf0a7c7bc07966b58003e1d2edb.zip cpython-3f2350c6477d9bf0a7c7bc07966b58003e1d2edb.tar.gz cpython-3f2350c6477d9bf0a7c7bc07966b58003e1d2edb.tar.bz2 | |
merge with 3.4
| -rw-r--r-- | Doc/library/compileall.rst | 3 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/susp-ignored.csv | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Doc/library/compileall.rst b/Doc/library/compileall.rst index b12c217..41e9e1b 100644 --- a/Doc/library/compileall.rst +++ b/Doc/library/compileall.rst @@ -20,7 +20,8 @@ compile Python sources. .. program:: compileall -.. cmdoption:: [directory|file]... +.. cmdoption:: directory ... + file ... Positional arguments are files to compile or directories that contain source files, traversed recursively. If no argument is given, behave as if diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv index f9d6bbf..7acc79b 100644 --- a/Doc/tools/sphinxext/susp-ignored.csv +++ b/Doc/tools/sphinxext/susp-ignored.csv @@ -276,10 +276,5 @@ whatsnew/3.2,,:feed,>>> urllib.parse.urlparse('http://[dead:beef:cafe:5417:affe: whatsnew/3.2,,:gz,">>> with tarfile.open(name='myarchive.tar.gz', mode='w:gz') as tf:" whatsnew/3.2,,:location,zope9-location = ${zope9:location} whatsnew/3.2,,:prefix,zope-conf = ${custom:prefix}/etc/zope.conf -whatsnew/changelog,,:platform,:platform: whatsnew/changelog,,:gz,": TarFile opened with external fileobj and ""w:gz"" mode didn't" -whatsnew/changelog,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused" -whatsnew/changelog,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""." whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as" -whatsnew/changelog,,:password,user:password -whatsnew/changelog,,:gz,w:gz |