diff options
| author | Georg Brandl <georg@python.org> | 2011-02-25 09:48:21 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-02-25 09:48:21 (GMT) |
| commit | f6c8fd62b924cf3478a141fba7eb970cf23940bf (patch) | |
| tree | b63fc14e5ef2f5b3bcc86c8728012b49efbf492a /Doc/library/os.rst | |
| parent | 622ce124b6771c27273cf2ff173d44780d775b16 (diff) | |
| download | cpython-f6c8fd62b924cf3478a141fba7eb970cf23940bf.zip cpython-f6c8fd62b924cf3478a141fba7eb970cf23940bf.tar.gz cpython-f6c8fd62b924cf3478a141fba7eb970cf23940bf.tar.bz2 | |
Merged revisions 86537,86867-86868,86881,86887,86913-86915,86931-86933,86960,86964,86974,86980,86996,87008,87050 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r86537 | georg.brandl | 2010-11-19 23:09:04 +0100 (Fr, 19 Nov 2010) | 1 line
Do not put a raw REPLACEMENT CHARACTER in the document.
........
r86867 | georg.brandl | 2010-11-29 15:50:54 +0100 (Mo, 29 Nov 2010) | 1 line
Fix indentation bug.
........
r86868 | georg.brandl | 2010-11-29 15:53:15 +0100 (Mo, 29 Nov 2010) | 1 line
Fix heading style inconsistencies.
........
r86881 | georg.brandl | 2010-11-30 08:43:28 +0100 (Di, 30 Nov 2010) | 1 line
#10584: fix bad links.
........
r86887 | georg.brandl | 2010-11-30 15:57:54 +0100 (Di, 30 Nov 2010) | 1 line
Fix typo.
........
r86913 | georg.brandl | 2010-12-01 16:32:43 +0100 (Mi, 01 Dez 2010) | 1 line
Add missing word, and add a better reference to the actual function.
........
r86914 | georg.brandl | 2010-12-01 16:36:33 +0100 (Mi, 01 Dez 2010) | 1 line
#10594: fix parameter names in PyList API docs.
........
r86915 | georg.brandl | 2010-12-01 16:44:25 +0100 (Mi, 01 Dez 2010) | 1 line
Fix some markup and style in the unittest docs.
........
r86931 | georg.brandl | 2010-12-02 10:06:12 +0100 (Do, 02 Dez 2010) | 1 line
Fix-up documentation of makedirs().
........
r86932 | david.malcolm | 2010-12-02 17:41:00 +0100 (Do, 02 Dez 2010) | 2 lines
Fix spelling of Jamie Zawinski's surname in urllib.parse docstring (issue 10606)
........
r86933 | georg.brandl | 2010-12-02 19:02:01 +0100 (Do, 02 Dez 2010) | 1 line
#10597: fix Py_SetPythonHome docs by pointing to where the meaning of PYTHONHOME is already documented.
........
r86960 | georg.brandl | 2010-12-03 08:55:44 +0100 (Fr, 03 Dez 2010) | 1 line
#10360: catch TypeError in WeakSet.__contains__, just like WeakKeyDictionary does.
........
r86964 | georg.brandl | 2010-12-03 10:58:38 +0100 (Fr, 03 Dez 2010) | 1 line
#10549: fix interface of docclass() for text documenter.
........
r86974 | georg.brandl | 2010-12-03 16:30:09 +0100 (Fr, 03 Dez 2010) | 1 line
Markup consistency fixes.
........
r86980 | georg.brandl | 2010-12-03 18:19:27 +0100 (Fr, 03 Dez 2010) | 1 line
Fix punctuation.
........
r86996 | georg.brandl | 2010-12-03 20:56:42 +0100 (Fr, 03 Dez 2010) | 1 line
Fix indentation.
........
r87008 | georg.brandl | 2010-12-04 10:04:04 +0100 (Sa, 04 Dez 2010) | 1 line
Fix typo.
........
r87050 | georg.brandl | 2010-12-04 18:09:30 +0100 (Sa, 04 Dez 2010) | 1 line
Fix typo.
........
Diffstat (limited to 'Doc/library/os.rst')
| -rw-r--r-- | Doc/library/os.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index b8f1be2..bacb008 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1015,7 +1015,7 @@ Files and Directories Availability: Unix, Windows. -.. function:: makedirs(path[, mode]) +.. function:: makedirs(path, mode=0o777) .. index:: single: directory; creating @@ -1029,8 +1029,8 @@ Files and Directories .. note:: - :func:`makedirs` will become confused if the path elements to create include - :data:`os.pardir`. + :func:`makedirs` will become confused if the path elements to create + include :data:`pardir`. This function handles UNC paths correctly. |