Merged revisions 64982-64983,65004 via svnmerge from

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

........
  r64982 | georg.brandl | 2008-07-16 01:59:15 +0200 (Wed, 16 Jul 2008) | 2 lines

  Move label to correct heading.
........
  r64983 | georg.brandl | 2008-07-16 02:00:04 +0200 (Wed, 16 Jul 2008) | 2 lines

  Keep sorted.
........
  r65004 | martin.v.loewis | 2008-07-16 07:28:26 +0200 (Wed, 16 Jul 2008) | 2 lines

  Add Antoine.
........

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 40417d85b06bdb4d935296681ec4b44a77a51f50..47bf42c73a718e82c5c330117254036da8d8c863 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -421,9 +421,6 @@ Notes:
    overflow check.
 
 
-.. _typeiter:
-
-
 Additional Methods on Float
 ---------------------------
 
@@ -488,6 +485,8 @@ hexadecimal string representing the same number::
    '0x1.d380000000000p+11'
 
 
+.. _typeiter:
+
 Iterator Types
 ==============
 

diff --git a/Misc/ACKS b/Misc/ACKS
index 0a411e76583aef962c14ff4428ffbf1b202dcaca..dd658c76812af10cf29c921040cd996103ccd34c 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -216,6 +216,7 @@ Frederik Fix
 Matt Fleming
 Hernán Martínez Foffani
 Michael Foord
+Amaury Forgeot d'Arc
 Doug Fort
 John Fouhy
 Martin Franklin
@@ -658,6 +659,7 @@ Frank Stajano
 Oliver Steele
 Greg Stein
 Chris Stern
+Victor Stinner
 Richard Stoakley
 Peter Stoehr
 Casper Stoel
@@ -770,7 +772,5 @@ Artur Zaprzala
 Mike Zarnstorff
 Siebren van der Zee
 Uwe Zessin
-Amaury Forgeot d'Arc
-Peter Åstrand
 Tarek Ziad\8e
-Victor Stinner
+Peter Åstrand

diff --git a/Misc/developers.txt b/Misc/developers.txt
index 9db80fb3589a4674ee889437d01bd5df95741b6d..126da54f05486f4c708c9d645d1df037eff93c1e 100644 (file)
--- a/Misc/developers.txt
+++ b/Misc/developers.txt
@@ -17,6 +17,9 @@ the format to accommodate documentation needs as they arise.
 Permissions History
 -------------------
 
+- Antoine Pitrou was given SVN access on July 16 2008, by recommendation
+  from GvR, for general contributions to Python.
+
 - Jesse Noller was given SVN access on 16 June 2008 by Georg Brandl,
   for work on the multiprocessing module.