From: Georg Brandl <georg@python.org>
Date: Thu, 28 Mar 2013 07:57:50 +0000 (+0100)
Subject: merge with last upstream doc changes in 3.2
X-Git-Tag: v3.2.4~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5390fc162719b9417142bec033f4e25bccb9434;p=thirdparty%2FPython%2Fcpython.git

merge with last upstream doc changes in 3.2
---

f5390fc162719b9417142bec033f4e25bccb9434
diff --cc Doc/tools/sphinxext/susp-ignored.csv
index 58bd9b0806a3,dbf6df1cbe1c..87e05cb1dadc
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@@ -168,12 -168,13 +168,13 @@@ faq/programming,,:reduce,"print((lambd
  faq/programming,,:reduce,"Sx=Sx,Sy=Sy:reduce(lambda x,y:x+y,map(lambda x,xc=Ru,yc=yc,Ru=Ru,Ro=Ro,"
  faq/programming,,:chr,">=4.0) or 1+f(xc,yc,x*x-y*y+xc,2.0*x*y+yc,k-1,f):f(xc,yc,x,y,k,f):chr("
  faq/programming,,::,for x in sequence[::-1]:
 -faq/windows,229,:EOF,@setlocal enableextensions & python -x %~f0 %* & goto :EOF
  faq/windows,,:bd8afb90ebf2,"Python 3.3.0 (v3.3.0:bd8afb90ebf2, Sep 29 2012, 10:55:48) [MSC v.1600 32 bit (Intel)] on win32"
 -faq/windows,393,:REG,.py :REG_SZ: c:\<path to python>\python.exe -u %s %s
 +faq/windows,,:EOF,@setlocal enableextensions & python -x %~f0 %* & goto :EOF
 +faq/windows,,:REG,.py :REG_SZ: c:\<path to python>\python.exe -u %s %s
  library/bisect,32,:hi,all(val >= x for val in a[i:hi])
  library/bisect,42,:hi,all(val > x for val in a[i:hi])
- library/http.client,52,:port,host:port
+ library/http.client,,:port,host:port
+ library/http.cookies,,`,!#$%&'*+-.^_`|~
  library/nntplib,,:bytes,:bytes
  library/nntplib,,:lines,:lines
  library/nntplib,,:lines,"['xref', 'from', ':lines', ':bytes', 'references', 'date', 'message-id', 'subject']"