Merged revisions 70590,70650,70704,70768-70769,70776,71008,71010-71011 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70590 | skip.montanaro | 2009-03-25 01:52:11 +0100 (Mi, 25 Mär 2009) | 1 line
clarify the type of data returned
........
r70650 | benjamin.peterson | 2009-03-28 20:16:10 +0100 (Sa, 28 Mär 2009) | 1 line
give os.symlink and os.link() better parameter names #5564
........
r70704 | benjamin.peterson | 2009-03-30 04:49:32 +0200 (Mo, 30 Mär 2009) | 1 line
there's actually three methods here #5600
........
r70768 | andrew.kuchling | 2009-03-31 00:29:15 +0200 (Di, 31 Mär 2009) | 1 line
Typo fixes
........
r70769 | andrew.kuchling | 2009-03-31 00:29:53 +0200 (Di, 31 Mär 2009) | 1 line
Remove comment
........
r70776 | andrew.kuchling | 2009-03-31 01:08:24 +0200 (Di, 31 Mär 2009) | 1 line
typo fix
........
r71008 | andrew.kuchling | 2009-04-02 02:02:14 +0200 (Do, 02 Apr 2009) | 1 line
Typo fix
........
r71010 | benjamin.peterson | 2009-04-02 02:11:52 +0200 (Do, 02 Apr 2009) | 1 line
fix markup
........
r71011 | benjamin.peterson | 2009-04-02 02:12:47 +0200 (Do, 02 Apr 2009) | 1 line
this should be :noindex:
........
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index f174550..fa179df 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -915,9 +915,10 @@
.. versionadded:: 2.3
-.. function:: link(src, dst)
+.. function:: link(source, link_name)
- Create a hard link pointing to *src* named *dst*. Availability: Unix.
+ Create a hard link pointing to *source* named *link_name*. Availability:
+ Unix.
.. function:: listdir(path)
@@ -1238,9 +1239,10 @@
Added access to values as attributes of the returned object.
-.. function:: symlink(src, dst)
+.. function:: symlink(source, link_name)
- Create a symbolic link pointing to *src* named *dst*. Availability: Unix.
+ Create a symbolic link pointing to *source* named *link_name*. Availability:
+ Unix.
.. function:: tempnam([dir[, prefix]])