Merged revisions 59245-59254 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59245 | georg.brandl | 2007-11-30 23:04:45 +0100 (Fri, 30 Nov 2007) | 2 lines

  Move lchmod() docs to correct place, and add versionadded tags.
........
  r59249 | christian.heimes | 2007-11-30 23:36:10 +0100 (Fri, 30 Nov 2007) | 2 lines

  Backport of -r59242:59246 from py3k
  Fixed problem with regrtest caused by the additional of objects to _abcoll.
........
  r59253 | christian.heimes | 2007-12-01 02:03:20 +0100 (Sat, 01 Dec 2007) | 1 line

  Although pyconfig.h claims that WIN32 is obsolete it is still required for the locale module. locale.getdefaultlocale() fails silently w/o the WIN32 macro.
........
  r59254 | christian.heimes | 2007-12-01 12:20:10 +0100 (Sat, 01 Dec 2007) | 3 lines

  Feature #1534
  Added PyFloat_GetMax(), PyFloat_GetMin() and PyFloat_GetInfo() to the float API.
  Added a dictionary sys.float_info with information about the internal floating point type to the sys module.
........

1 files changed, 13 insertions, 7 deletions

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index bd8480c..1b5eb49 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -422,6 +422,8 @@ by file descriptors.
    Change the mode of the file given by *fd* to the numeric *mode*.  See the docs
    for :func:`chmod` for possible values of *mode*.  Availability: Unix.
 
+   .. versionadded:: 2.6
+
 
 .. function:: fchown(fd, uid, gid)
 
@@ -429,6 +431,8 @@ by file descriptors.
    and *gid*.  To leave one of the ids unchanged, set it to -1.
    Availability: Unix.
 
+   .. versionadded:: 2.6
+
 
 .. function:: fdatasync(fd)
 
@@ -488,13 +492,6 @@ by file descriptors.
    tty(-like) device, else ``False``. Availability: Macintosh, Unix.
 
 
-.. function:: lchmod(path, mode)
-
-   Change the mode of *path* to the numeric *mode*. If path is a symlink, this
-   affects the symlink rather than the target. See the docs for :func:`chmod`
-   for possible values of *mode*.  Availability: Unix.
-
-
 .. function:: lseek(fd, pos, how)
 
    Set the current position of file descriptor *fd* to position *pos*, modified by
@@ -800,6 +797,15 @@ Files and Directories
    follow symbolic links. Availability: Unix.
 
 
+.. function:: lchmod(path, mode)
+
+   Change the mode of *path* to the numeric *mode*. If path is a symlink, this
+   affects the symlink rather than the target. See the docs for :func:`chmod`
+   for possible values of *mode*.  Availability: Unix.
+
+   .. versionadded:: 2.6
+
+
 .. function:: lchown(path, uid, gid)
 
    Change the owner and group id of *path* to the numeric *uid* and gid. This