7 files changed, 282 insertions, 44 deletions

diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index 80ae6958dd8a..57d441cff179 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	python-doc-${DOCFORMAT}
-PORTVERSION=	1.5.2p2
+PORTVERSION=	2.0
 CATEGORIES=	lang python
-MASTER_SITES=	http://www.python.org/ftp/python/doc/ \
-		http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/doc/1.5.2p2/
+MASTER_SITES=	http://www.python.org/ftp/python/doc/${PORTVERSION}/ \
+		http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/doc/${PORTVERSION}/
 DISTNAME=	${DOCFORMAT}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
 DIST_SUBDIR=	python
+USE_BZIP2=	yes
 NO_BUILD=	yes
 PLIST=		${PKGDIR}/pkg-plist_${DOCFORMAT}
 
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index 266dedd6e5f8..dde3ec31150b 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -1,5 +1,5 @@
-MD5 (python/html-1.5.2p2.tgz) = 401e1cc5cfb06377dba7d2a5640d286d
-MD5 (python/pdf-a4-1.5.2p2.tgz) = 02f623eef715ceff5e1af49ce6f5560d
-MD5 (python/pdf-letter-1.5.2p2.tgz) = d23c6c67102981488444e1db1b0f300b
-MD5 (python/postscript-a4-1.5.2p2.tgz) = ef422d240719eead77648ef393677763
-MD5 (python/postscript-letter-1.5.2p2.tgz) = 4c6d0b0153f3fcd5b229e61c412463e0
+MD5 (python/html-2.0.tar.bz2) = 7c6979e71828254b1303eadc60257961
+MD5 (python/pdf-a4-2.0.tar.bz2) = f11c5347eed19ffd012fddf1faa9ab22
+MD5 (python/pdf-letter-2.0.tar.bz2) = a0ae00f0e995ad912714ce15ff0ff401
+MD5 (python/postscript-a4-2.0.tar.bz2) = f9c6d47319cd2bb87df678e9fa429d72
+MD5 (python/postscript-letter-2.0.tar.bz2) = 103f3f67b1f4b47aae90fe68bedbd5f7
diff --git a/lang/python-doc-html/pkg-plist_html b/lang/python-doc-html/pkg-plist_html
index 47bd1822cecc..8f85df92944f 100644
--- a/lang/python-doc-html/pkg-plist_html
+++ b/lang/python-doc-html/pkg-plist_html
@@ -1,9 +1,12 @@
+share/doc/python/about.html
+share/doc/python/acks.html
 share/doc/python/api/about.html
 share/doc/python/api/abstract.html
 share/doc/python/api/api.css
 share/doc/python/api/api.html
 share/doc/python/api/buffer-structs.html
 share/doc/python/api/bufferObjects.html
+share/doc/python/api/builtinCodecs.html
 share/doc/python/api/cObjects.html
 share/doc/python/api/common-structs.html
 share/doc/python/api/complexObjects.html
@@ -36,7 +39,9 @@ share/doc/python/api/memoryInterface.html
 share/doc/python/api/memoryOverview.html
 share/doc/python/api/moduleObjects.html
 share/doc/python/api/newTypes.html
-share/doc/python/api/node14.html
+share/doc/python/api/node15.html
+share/doc/python/api/node44.html
+share/doc/python/api/node45.html
 share/doc/python/api/noneObject.html
 share/doc/python/api/number-structs.html
 share/doc/python/api/number.html
@@ -46,7 +51,9 @@ share/doc/python/api/objects.html
 share/doc/python/api/os.html
 share/doc/python/api/otherObjects.html
 share/doc/python/api/processControl.html
+share/doc/python/api/refcountDetails.html
 share/doc/python/api/refcounts.html
+share/doc/python/api/reporting-bugs.html
 share/doc/python/api/sequence-structs.html
 share/doc/python/api/sequence.html
 share/doc/python/api/sequenceObjects.html
@@ -56,8 +63,62 @@ share/doc/python/api/threads.html
 share/doc/python/api/tupleObjects.html
 share/doc/python/api/typeObjects.html
 share/doc/python/api/types.html
+share/doc/python/api/unicodeMethodsAndSlots.html
+share/doc/python/api/unicodeObjects.html
 share/doc/python/api/utilities.html
 share/doc/python/api/veryhigh.html
+share/doc/python/dist/about.html
+share/doc/python/dist/bdist-cmds.html
+share/doc/python/dist/build-clib-cmd.html
+share/doc/python/dist/build-cmd.html
+share/doc/python/dist/build-cmds.html
+share/doc/python/dist/build-ext-cmd.html
+share/doc/python/dist/build-py-cmd.html
+share/doc/python/dist/built-dist.html
+share/doc/python/dist/clean-cmd.html
+share/doc/python/dist/concepts.html
+share/doc/python/dist/contents.html
+share/doc/python/dist/creating-dumb.html
+share/doc/python/dist/creating-rpms.html
+share/doc/python/dist/creating-wininst.html
+share/doc/python/dist/describing-extensions.html
+share/doc/python/dist/dist.css
+share/doc/python/dist/dist.html
+share/doc/python/dist/distutils-term.html
+share/doc/python/dist/examples.html
+share/doc/python/dist/extend-existing.html
+share/doc/python/dist/extending.html
+share/doc/python/dist/index.html
+share/doc/python/dist/install-cmd.html
+share/doc/python/dist/install-data-cmd.html
+share/doc/python/dist/install-lib-cmd.html
+share/doc/python/dist/install-scripts-cmd.html
+share/doc/python/dist/intro.html
+share/doc/python/dist/listing-modules.html
+share/doc/python/dist/listing-packages.html
+share/doc/python/dist/manifest-options.html
+share/doc/python/dist/manifest.html
+share/doc/python/dist/multiple-ext.html
+share/doc/python/dist/new-commands.html
+share/doc/python/dist/node11.html
+share/doc/python/dist/node12.html
+share/doc/python/dist/node13.html
+share/doc/python/dist/node14.html
+share/doc/python/dist/node28.html
+share/doc/python/dist/node45.html
+share/doc/python/dist/node46.html
+share/doc/python/dist/node47.html
+share/doc/python/dist/node48.html
+share/doc/python/dist/pure-mod.html
+share/doc/python/dist/pure-pkg.html
+share/doc/python/dist/python-terms.html
+share/doc/python/dist/reference.html
+share/doc/python/dist/sdist-cmd.html
+share/doc/python/dist/setup-config.html
+share/doc/python/dist/setup-script.html
+share/doc/python/dist/simple-example.html
+share/doc/python/dist/single-ext.html
+share/doc/python/dist/source-dist.html
 share/doc/python/doc/about.html
 share/doc/python/doc/classes.html
 share/doc/python/doc/contents.html
@@ -74,14 +135,15 @@ share/doc/python/doc/node10.html
 share/doc/python/doc/node11.html
 share/doc/python/doc/node12.html
 share/doc/python/doc/node13.html
-share/doc/python/doc/node16.html
+share/doc/python/doc/node14.html
 share/doc/python/doc/node17.html
 share/doc/python/doc/node18.html
 share/doc/python/doc/node19.html
 share/doc/python/doc/node2.html
+share/doc/python/doc/node20.html
 share/doc/python/doc/node3.html
 share/doc/python/doc/node6.html
-share/doc/python/doc/node9.html
+share/doc/python/doc/preamble-info.html
 share/doc/python/doc/references.html
 share/doc/python/doc/structured.html
 share/doc/python/ext/about.html
@@ -104,6 +166,7 @@ share/doc/python/ext/ext.html
 share/doc/python/ext/front.html
 share/doc/python/ext/index.html
 share/doc/python/ext/intro.html
+share/doc/python/ext/link-reqs.html
 share/doc/python/ext/methodTable.html
 share/doc/python/ext/module-defn-example.html
 share/doc/python/ext/module-defn-options.html
@@ -113,6 +176,7 @@ share/doc/python/ext/parseTuple.html
 share/doc/python/ext/parseTupleAndKeywords.html
 share/doc/python/ext/refcounts.html
 share/doc/python/ext/refcountsInPython.html
+share/doc/python/ext/reporting-bugs.html
 share/doc/python/ext/simpleExample.html
 share/doc/python/ext/thinIce.html
 share/doc/python/ext/using-cobjects.html
@@ -121,24 +185,53 @@ share/doc/python/ext/win-dlls.html
 share/doc/python/icons/blank.gif
 share/doc/python/icons/contents.gif
 share/doc/python/icons/index.gif
+share/doc/python/icons/labslogo.gif
 share/doc/python/icons/modules.gif
 share/doc/python/icons/next.gif
+share/doc/python/icons/offsite.gif
 share/doc/python/icons/previous.gif
+share/doc/python/icons/pythonlabs.gif
 share/doc/python/icons/up.gif
 share/doc/python/index.html
+share/doc/python/inst/about.html
+share/doc/python/inst/alt-install-home.html
+share/doc/python/inst/alt-install-macos.html
+share/doc/python/inst/alt-install-prefix.html
+share/doc/python/inst/alt-install-windows.html
+share/doc/python/inst/alt-install.html
+share/doc/python/inst/building-ext.html
+share/doc/python/inst/config-files.html
+share/doc/python/inst/contents.html
+share/doc/python/inst/custom-install.html
+share/doc/python/inst/how-build-works.html
+share/doc/python/inst/how-install-works.html
+share/doc/python/inst/index.html
+share/doc/python/inst/inst.css
+share/doc/python/inst/inst.html
+share/doc/python/inst/intro.html
+share/doc/python/inst/makefile-pre-in.html
+share/doc/python/inst/manual-install.html
+share/doc/python/inst/new-standard.html
+share/doc/python/inst/non-ms-compilers.html
+share/doc/python/inst/old-way.html
+share/doc/python/inst/platform-variations.html
+share/doc/python/inst/pre-distutils.html
+share/doc/python/inst/splitting-up.html
+share/doc/python/inst/standard-install.html
+share/doc/python/inst/trivial-install.html
+share/doc/python/inst/tweak-flags.html
 share/doc/python/lib/AST_Errors.html
 share/doc/python/lib/AST_Examples.html
 share/doc/python/lib/AST_Objects.html
 share/doc/python/lib/Cmd-objects.html
 share/doc/python/lib/ConfigParser-objects.html
 share/doc/python/lib/Contents_of_Module_re.html
-share/doc/python/lib/Contents_of_Module_regex.html
 share/doc/python/lib/Converting_ASTs.html
 share/doc/python/lib/Creating_ASTs.html
 share/doc/python/lib/Deterministic_Profiling.html
 share/doc/python/lib/FL_Functions.html
 share/doc/python/lib/Functions_in_cgi_module.html
-share/doc/python/lib/HTTP_Example.html
+share/doc/python/lib/HTTP_Examples.html
 share/doc/python/lib/MimeWriter-objects.html
 share/doc/python/lib/MultiFile-objects.html
 share/doc/python/lib/PrettyPrinter_Objects.html
@@ -151,7 +244,6 @@ share/doc/python/lib/Repr-objects.html
 share/doc/python/lib/SMTP-example.html
 share/doc/python/lib/SMTP-objects.html
 share/doc/python/lib/Signal_Example.html
-share/doc/python/lib/Socket_Example.html
 share/doc/python/lib/Urllib_Examples.html
 share/doc/python/lib/Using_the_cgi_module.html
 share/doc/python/lib/Wave-read-objects.html
@@ -162,32 +254,52 @@ share/doc/python/lib/al-config-objects.html
 share/doc/python/lib/al-port-objects.html
 share/doc/python/lib/allos.html
 share/doc/python/lib/asyncore-example.html
+share/doc/python/lib/atexit-example.html
+share/doc/python/lib/attributes-impl-objects.html
+share/doc/python/lib/attributes-ns-impl-objects.html
 share/doc/python/lib/au-read-objects.html
 share/doc/python/lib/au-write-objects.html
 share/doc/python/lib/audio-device-objects.html
 share/doc/python/lib/binhex-notes.html
 share/doc/python/lib/bisect-example.html
+share/doc/python/lib/bitstring-ops.html
+share/doc/python/lib/bltin-code-objects.html
+share/doc/python/lib/bltin-ellipsis-object.html
+share/doc/python/lib/bltin-file-objects.html
+share/doc/python/lib/bltin-null-object.html
+share/doc/python/lib/bltin-type-objects.html
 share/doc/python/lib/boolean.html
+share/doc/python/lib/browser-controllers.html
 share/doc/python/lib/bsddb-objects.html
 share/doc/python/lib/built-in-funcs.html
 share/doc/python/lib/builtin.html
 share/doc/python/lib/bytecodes.html
 share/doc/python/lib/cd-parser-objects.html
 share/doc/python/lib/cgi-intro.html
+share/doc/python/lib/codec-objects.html
 share/doc/python/lib/comparisons.html
 share/doc/python/lib/completer-objects.html
 share/doc/python/lib/condition-objects.html
 share/doc/python/lib/console-objects.html
+share/doc/python/lib/content-handler-objects.html
 share/doc/python/lib/contents.html
+share/doc/python/lib/cookie-example.html
+share/doc/python/lib/cookie-objects.html
 share/doc/python/lib/crypto.html
 share/doc/python/lib/curses-functions.html
+share/doc/python/lib/curses-textpad-objects.html
 share/doc/python/lib/curses-window-objects.html
 share/doc/python/lib/dbhash-objects.html
 share/doc/python/lib/debugger-commands.html
+share/doc/python/lib/dircmp-objects.html
 share/doc/python/lib/dl-objects.html
+share/doc/python/lib/dtd-handler-objects.html
 share/doc/python/lib/embedding-locale.html
+share/doc/python/lib/entity-resolver-objects.html
 share/doc/python/lib/event-objects.html
 share/doc/python/lib/examples-imp.html
+share/doc/python/lib/expat-errors.html
+share/doc/python/lib/expat-example.html
 share/doc/python/lib/form-objects.html
 share/doc/python/lib/formatter-impls.html
 share/doc/python/lib/formatter-interface.html
@@ -195,32 +307,40 @@ share/doc/python/lib/forms-objects.html
 share/doc/python/lib/front.html
 share/doc/python/lib/ftp-objects.html
 share/doc/python/lib/genindex.html
+share/doc/python/lib/handle-object.html
 share/doc/python/lib/html-parser-objects.html
 share/doc/python/lib/imap4-example.html
 share/doc/python/lib/imap4-objects.html
 share/doc/python/lib/img1.gif
+share/doc/python/lib/incremental-parser-objects.html
 share/doc/python/lib/index.html
+share/doc/python/lib/input-source-objects.html
 share/doc/python/lib/internet.html
 share/doc/python/lib/interpreter-objects.html
 share/doc/python/lib/intro.html
+share/doc/python/lib/language.html
 share/doc/python/lib/lib.css
 share/doc/python/lib/lib.html
+share/doc/python/lib/locator-objects.html
 share/doc/python/lib/lock-objects.html
 share/doc/python/lib/mailbox-objects.html
+share/doc/python/lib/markup.html
 share/doc/python/lib/match-objects.html
 share/doc/python/lib/matching-searching.html
 share/doc/python/lib/message-objects.html
 share/doc/python/lib/mh-folder-objects.html
 share/doc/python/lib/mh-message-objects.html
 share/doc/python/lib/mh-objects.html
-share/doc/python/lib/mimetools.Message_Methods.html
+share/doc/python/lib/mimetools-message-objects.html
 share/doc/python/lib/misc.html
 share/doc/python/lib/mmedia.html
 share/doc/python/lib/modindex.html
+share/doc/python/lib/module--winreg.html
 share/doc/python/lib/module-BaseHTTPServer.html
 share/doc/python/lib/module-Bastion.html
 share/doc/python/lib/module-CGIHTTPServer.html
 share/doc/python/lib/module-ConfigParser.html
+share/doc/python/lib/module-Cookie.html
 share/doc/python/lib/module-DEVICE.html
 share/doc/python/lib/module-MimeWriter.html
 share/doc/python/lib/module-Queue.html
@@ -230,12 +350,14 @@ share/doc/python/lib/module-StringIO.html
 share/doc/python/lib/module-TERMIOSuppercase.html
 share/doc/python/lib/module-UserDict.html
 share/doc/python/lib/module-UserList.html
+share/doc/python/lib/module-UserString.html
 share/doc/python/lib/module-aifc.html
 share/doc/python/lib/module-al-constants.html
 share/doc/python/lib/module-al.html
 share/doc/python/lib/module-anydbm.html
 share/doc/python/lib/module-array.html
 share/doc/python/lib/module-asyncore.html
+share/doc/python/lib/module-atexit.html
 share/doc/python/lib/module-audioop.html
 share/doc/python/lib/module-base64.html
 share/doc/python/lib/module-binascii.html
@@ -251,9 +373,8 @@ share/doc/python/lib/module-cgi.html
 share/doc/python/lib/module-chunk.html
 share/doc/python/lib/module-cmath.html
 share/doc/python/lib/module-cmd.html
-share/doc/python/lib/module-cmp.html
-share/doc/python/lib/module-cmpcache.html
 share/doc/python/lib/module-code.html
+share/doc/python/lib/module-codecs.html
 share/doc/python/lib/module-codeop.html
 share/doc/python/lib/module-colorsys.html
 share/doc/python/lib/module-commands.html
@@ -261,7 +382,10 @@ share/doc/python/lib/module-compileall.html
 share/doc/python/lib/module-copy.html
 share/doc/python/lib/module-copyreg.html
 share/doc/python/lib/module-crypt.html
+share/doc/python/lib/module-curses.ascii.html
 share/doc/python/lib/module-curses.html
+share/doc/python/lib/module-curses.textpad.html
+share/doc/python/lib/module-curses.wrapper.html
 share/doc/python/lib/module-dbhash.html
 share/doc/python/lib/module-dbm.html
 share/doc/python/lib/module-dircache.html
@@ -271,6 +395,7 @@ share/doc/python/lib/module-dumbdbm.html
 share/doc/python/lib/module-errno.html
 share/doc/python/lib/module-exceptions.html
 share/doc/python/lib/module-fcntl.html
+share/doc/python/lib/module-filecmp.html
 share/doc/python/lib/module-fileinput.html
 share/doc/python/lib/module-fl-constants.html
 share/doc/python/lib/module-fl.html
@@ -280,9 +405,11 @@ share/doc/python/lib/module-fnmatch.html
 share/doc/python/lib/module-formatter.html
 share/doc/python/lib/module-fpformat.html
 share/doc/python/lib/module-ftplib.html
+share/doc/python/lib/module-gc.html
 share/doc/python/lib/module-gdbm.html
 share/doc/python/lib/module-getopt.html
 share/doc/python/lib/module-getpass.html
+share/doc/python/lib/module-gettext.html
 share/doc/python/lib/module-gl-constants.html
 share/doc/python/lib/module-gl.html
 share/doc/python/lib/module-glob.html
@@ -311,6 +438,7 @@ share/doc/python/lib/module-mhlib.html
 share/doc/python/lib/module-mimetools.html
 share/doc/python/lib/module-mimetypes.html
 share/doc/python/lib/module-mimify.html
+share/doc/python/lib/module-mmap.html
 share/doc/python/lib/module-mpz.html
 share/doc/python/lib/module-msvcrt.html
 share/doc/python/lib/module-multifile.html
@@ -339,14 +467,14 @@ share/doc/python/lib/module-pycompile.html
 share/doc/python/lib/module-quopri.html
 share/doc/python/lib/module-random.html
 share/doc/python/lib/module-re.html
-share/doc/python/lib/module-regex.html
-share/doc/python/lib/module-regsub.html
+share/doc/python/lib/module-readline.html
 share/doc/python/lib/module-repr.html
 share/doc/python/lib/module-resource.html
 share/doc/python/lib/module-rexec.html
 share/doc/python/lib/module-rfc822.html
 share/doc/python/lib/module-rgbimg.html
 share/doc/python/lib/module-rlcompleter.html
+share/doc/python/lib/module-robotparser.html
 share/doc/python/lib/module-rotor.html
 share/doc/python/lib/module-sched.html
 share/doc/python/lib/module-select.html
@@ -371,6 +499,7 @@ share/doc/python/lib/module-sunaudiodev.html
 share/doc/python/lib/module-symbol.html
 share/doc/python/lib/module-sys.html
 share/doc/python/lib/module-syslog.html
+share/doc/python/lib/module-tabnanny.html
 share/doc/python/lib/module-telnetlib.html
 share/doc/python/lib/module-tempfile.html
 share/doc/python/lib/module-termios.html
@@ -382,17 +511,26 @@ share/doc/python/lib/module-tokenize.html
 share/doc/python/lib/module-traceback.html
 share/doc/python/lib/module-tty.html
 share/doc/python/lib/module-types.html
+share/doc/python/lib/module-unicodedata.html
 share/doc/python/lib/module-urllib.html
 share/doc/python/lib/module-urlparse.html
 share/doc/python/lib/module-user.html
 share/doc/python/lib/module-uu.html
 share/doc/python/lib/module-wave.html
+share/doc/python/lib/module-webbrowser.html
 share/doc/python/lib/module-whichdb.html
 share/doc/python/lib/module-whrandom.html
 share/doc/python/lib/module-winsound.html
 share/doc/python/lib/module-xdrlib.html
+share/doc/python/lib/module-xml.parsers.expat.html
+share/doc/python/lib/module-xml.sax.handler.html
+share/doc/python/lib/module-xml.sax.html
+share/doc/python/lib/module-xml.sax.saxutils.html
+share/doc/python/lib/module-xml.sax.xmlreader.html
 share/doc/python/lib/module-xmllib.html
+share/doc/python/lib/module-zipfile.html
 share/doc/python/lib/module-zlib.html
+share/doc/python/lib/morsel-objects.html
 share/doc/python/lib/msvcrt-console.html
 share/doc/python/lib/msvcrt-files.html
 share/doc/python/lib/msvcrt-other.html
@@ -402,24 +540,39 @@ share/doc/python/lib/netdata.html
 share/doc/python/lib/netrc-objects.html
 share/doc/python/lib/nntp-objects.html
 share/doc/python/lib/node128.html
-share/doc/python/lib/node181.html
-share/doc/python/lib/node182.html
-share/doc/python/lib/node190.html
-share/doc/python/lib/node207.html
-share/doc/python/lib/node209.html
-share/doc/python/lib/node210.html
-share/doc/python/lib/node211.html
-share/doc/python/lib/node212.html
-share/doc/python/lib/node213.html
-share/doc/python/lib/node218.html
-share/doc/python/lib/node289.html
-share/doc/python/lib/node335.html
-share/doc/python/lib/node342.html
-share/doc/python/lib/node343.html
-share/doc/python/lib/node344.html
-share/doc/python/lib/node345.html
-share/doc/python/lib/node347.html
-share/doc/python/lib/node74.html
+share/doc/python/lib/node141.html
+share/doc/python/lib/node144.html
+share/doc/python/lib/node145.html
+share/doc/python/lib/node146.html
+share/doc/python/lib/node147.html
+share/doc/python/lib/node148.html
+share/doc/python/lib/node149.html
+share/doc/python/lib/node150.html
+share/doc/python/lib/node151.html
+share/doc/python/lib/node152.html
+share/doc/python/lib/node153.html
+share/doc/python/lib/node154.html
+share/doc/python/lib/node155.html
+share/doc/python/lib/node215.html
+share/doc/python/lib/node216.html
+share/doc/python/lib/node222.html
+share/doc/python/lib/node241.html
+share/doc/python/lib/node243.html
+share/doc/python/lib/node244.html
+share/doc/python/lib/node245.html
+share/doc/python/lib/node246.html
+share/doc/python/lib/node247.html
+share/doc/python/lib/node252.html
+share/doc/python/lib/node366.html
+share/doc/python/lib/node376.html
+share/doc/python/lib/node377.html
+share/doc/python/lib/node413.html
+share/doc/python/lib/node422.html
+share/doc/python/lib/node423.html
+share/doc/python/lib/node424.html
+share/doc/python/lib/node425.html
+share/doc/python/lib/node427.html
+share/doc/python/lib/node80.html
 share/doc/python/lib/obsolete-modules.html
 share/doc/python/lib/os-fd-ops.html
 share/doc/python/lib/os-file-dir.html
@@ -429,6 +582,7 @@ share/doc/python/lib/os-process.html
 share/doc/python/lib/os-procinfo.html
 share/doc/python/lib/pickle-example.html
 share/doc/python/lib/player-objects.html
+share/doc/python/lib/poll-objects.html
 share/doc/python/lib/pop3-example.html
 share/doc/python/lib/pop3-objects.html
 share/doc/python/lib/popen3-objects.html
@@ -443,19 +597,29 @@ share/doc/python/lib/profile-stats.html
 share/doc/python/lib/profile.html
 share/doc/python/lib/pyclbr-class-objects.html
 share/doc/python/lib/python.html
+share/doc/python/lib/pyzipfile-objects.html
 share/doc/python/lib/re-objects.html
 share/doc/python/lib/re-syntax.html
+share/doc/python/lib/readline-example.html
+share/doc/python/lib/reporting-bugs.html
 share/doc/python/lib/restricted.html
 share/doc/python/lib/rlock-objects.html
 share/doc/python/lib/rng-objects.html
+share/doc/python/lib/sax-exception-objects.html
 share/doc/python/lib/scheduler-objects.html
 share/doc/python/lib/semaphore-objects.html
 share/doc/python/lib/sgi.html
 share/doc/python/lib/shlex-objects.html
 share/doc/python/lib/shutil-example.html
+share/doc/python/lib/socket-example.html
 share/doc/python/lib/socket-objects.html
 share/doc/python/lib/someos.html
 share/doc/python/lib/specialattrs.html
+share/doc/python/lib/stream-reader-objects.html
+share/doc/python/lib/stream-reader-writer.html
+share/doc/python/lib/stream-recoder-objects.html
+share/doc/python/lib/stream-writer-objects.html
+share/doc/python/lib/string-methods.html
 share/doc/python/lib/strings.html
 share/doc/python/lib/subclassing-reprs.html
 share/doc/python/lib/sunos.html
@@ -467,10 +631,18 @@ share/doc/python/lib/thread-objects.html
 share/doc/python/lib/traceback-example.html
 share/doc/python/lib/truth.html
 share/doc/python/lib/types.html
+share/doc/python/lib/typesfunctions.html
+share/doc/python/lib/typesinternal.html
 share/doc/python/lib/typesmapping.html
+share/doc/python/lib/typesmethods.html
+share/doc/python/lib/typesmodules.html
 share/doc/python/lib/typesnumeric.html
+share/doc/python/lib/typesobjects.html
 share/doc/python/lib/typesother.html
+share/doc/python/lib/typesseq-mutable.html
 share/doc/python/lib/typesseq-strings.html
+share/doc/python/lib/typesseq-xrange.html
+share/doc/python/lib/typesseq.html
 share/doc/python/lib/undoc.html
 share/doc/python/lib/unix.html
 share/doc/python/lib/urlopener-objs.html
@@ -480,47 +652,101 @@ share/doc/python/lib/xdr-exceptions.html
 share/doc/python/lib/xdr-packer-objects.html
 share/doc/python/lib/xdr-unpacker-objects.html
 share/doc/python/lib/xml-namespace.html
+share/doc/python/lib/xmlreader-objects.html
+share/doc/python/lib/zipfile-objects.html
+share/doc/python/lib/zipinfo-objects.html
+share/doc/python/mac/EditPythonPrefs.html
+share/doc/python/mac/IDE.html
+share/doc/python/mac/IDEapplet.html
+share/doc/python/mac/IDEexecution.html
+share/doc/python/mac/IDEwrite.html
 share/doc/python/mac/about.html
 share/doc/python/mac/aeserver-objects.html
 share/doc/python/mac/alias-objects.html
 share/doc/python/mac/application-objects.html
+share/doc/python/mac/argv.html
+share/doc/python/mac/configuration.html
 share/doc/python/mac/connection-object.html
 share/doc/python/mac/contents.html
 share/doc/python/mac/controlswindow-object.html
+share/doc/python/mac/creator-code.html
+share/doc/python/mac/defaults.html
 share/doc/python/mac/dialogwindow-objects.html
 share/doc/python/mac/dnr-result-object.html
 share/doc/python/mac/finfo-objects.html
 share/doc/python/mac/front.html
 share/doc/python/mac/fsspec-objects.html
 share/doc/python/mac/genindex.html
+share/doc/python/mac/getting.html
 share/doc/python/mac/index.html
-share/doc/python/mac/intro.html
+share/doc/python/mac/interpreter.html
 share/doc/python/mac/mac.css
 share/doc/python/mac/mac.html
+share/doc/python/mac/macpython-modules.html
 share/doc/python/mac/modindex.html
+share/doc/python/mac/module-AE.html
+share/doc/python/mac/module-Cm.html
+share/doc/python/mac/module-Ctl.html
+share/doc/python/mac/module-Dlg.html
 share/doc/python/mac/module-EasyDialogs.html
+share/doc/python/mac/module-Evt.html
+share/doc/python/mac/module-Fm.html
 share/doc/python/mac/module-FrameWork.html
+share/doc/python/mac/module-List.html
 share/doc/python/mac/module-MacOS.html
+share/doc/python/mac/module-Menu.html
 share/doc/python/mac/module-MiniAEFrame.html
+share/doc/python/mac/module-PixMapWrapper.html
+share/doc/python/mac/module-Qd.html
+share/doc/python/mac/module-Qt.html
+share/doc/python/mac/module-Res.html
+share/doc/python/mac/module-Scrap.html
+share/doc/python/mac/module-Snd.html
+share/doc/python/mac/module-TE.html
+share/doc/python/mac/module-W.html
+share/doc/python/mac/module-Win.html
+share/doc/python/mac/module-aepack.html
+share/doc/python/mac/module-aetypes.html
+share/doc/python/mac/module-buildtools.html
+share/doc/python/mac/module-cfmfile.html
 share/doc/python/mac/module-ctb.html
 share/doc/python/mac/module-findertools.html
 share/doc/python/mac/module-ic.html
+share/doc/python/mac/module-icopen.html
 share/doc/python/mac/module-mac.html
-share/doc/python/mac/module-macconsole.html
 share/doc/python/mac/module-macdnr.html
+share/doc/python/mac/module-macerrors.html
 share/doc/python/mac/module-macfs.html
+share/doc/python/mac/module-macfsn.html
 share/doc/python/mac/module-macostools.html
 share/doc/python/mac/module-macpath.html
 share/doc/python/mac/module-macspeech.html
 share/doc/python/mac/module-mactcp.html
+share/doc/python/mac/module-mactty.html
+share/doc/python/mac/module-nsremote.html
+share/doc/python/mac/module-preferences.html
+share/doc/python/mac/module-pyresource.html
+share/doc/python/mac/module-pythonprefs.html
+share/doc/python/mac/module-quietconsole.html
+share/doc/python/mac/module-waste.html
 share/doc/python/mac/node10.html
-share/doc/python/mac/node18.html
+share/doc/python/mac/node11.html
+share/doc/python/mac/node12.html
+share/doc/python/mac/node15.html
 share/doc/python/mac/node23.html
-share/doc/python/mac/node24.html
-share/doc/python/mac/node25.html
-share/doc/python/mac/node9.html
+share/doc/python/mac/node36.html
+share/doc/python/mac/node41.html
+share/doc/python/mac/node42.html
+share/doc/python/mac/node43.html
+share/doc/python/mac/node6.html
+share/doc/python/mac/node7.html
+share/doc/python/mac/scripting-with-BBedit.html
 share/doc/python/mac/scrolledwindow-object.html
+share/doc/python/mac/search-path.html
 share/doc/python/mac/speech-channel-objects.html
+share/doc/python/mac/toolbox.html
+share/doc/python/mac/undocumented-modules.html
+share/doc/python/mac/using.html
 share/doc/python/mac/voice-objects.html
 share/doc/python/mac/window-objects.html
 share/doc/python/modindex.html
@@ -532,6 +758,7 @@ share/doc/python/ref/atom-literals.html
 share/doc/python/ref/atoms.html
 share/doc/python/ref/attribute-access.html
 share/doc/python/ref/attribute-references.html
+share/doc/python/ref/augassign.html
 share/doc/python/ref/binary.html
 share/doc/python/ref/bitwise.html
 share/doc/python/ref/blank-lines.html
@@ -618,6 +845,7 @@ share/doc/python/ref/types.html
 share/doc/python/ref/unary.html
 share/doc/python/ref/while.html
 share/doc/python/ref/whitespace.html
+share/doc/python/tut/about.html
 share/doc/python/tut/index.html
 share/doc/python/tut/node1.html
 share/doc/python/tut/node10.html
@@ -639,8 +867,10 @@ share/doc/python/tut/tut.html
 @dirrm share/doc/python/ref
 @dirrm share/doc/python/mac
 @dirrm share/doc/python/lib
+@dirrm share/doc/python/inst
 @dirrm share/doc/python/icons
 @dirrm share/doc/python/ext
 @dirrm share/doc/python/doc
+@dirrm share/doc/python/dist
 @dirrm share/doc/python/api
 @unexec rmdir %D/share/doc/python 2>/dev/null || true
diff --git a/lang/python-doc-html/pkg-plist_pdf-a4 b/lang/python-doc-html/pkg-plist_pdf-a4
index 2c058962489e..81fc89f7e0d7 100644
--- a/lang/python-doc-html/pkg-plist_pdf-a4
+++ b/lang/python-doc-html/pkg-plist_pdf-a4
@@ -1,6 +1,8 @@
 share/doc/python/api.pdf
+share/doc/python/dist.pdf
 share/doc/python/doc.pdf
 share/doc/python/ext.pdf
+share/doc/python/inst.pdf
 share/doc/python/lib.pdf
 share/doc/python/mac.pdf
 share/doc/python/ref.pdf
diff --git a/lang/python-doc-html/pkg-plist_pdf-letter b/lang/python-doc-html/pkg-plist_pdf-letter
index 2c058962489e..81fc89f7e0d7 100644
--- a/lang/python-doc-html/pkg-plist_pdf-letter
+++ b/lang/python-doc-html/pkg-plist_pdf-letter
@@ -1,6 +1,8 @@
 share/doc/python/api.pdf
+share/doc/python/dist.pdf
 share/doc/python/doc.pdf
 share/doc/python/ext.pdf
+share/doc/python/inst.pdf
 share/doc/python/lib.pdf
 share/doc/python/mac.pdf
 share/doc/python/ref.pdf
diff --git a/lang/python-doc-html/pkg-plist_postscript-a4 b/lang/python-doc-html/pkg-plist_postscript-a4
index 3b704d57782b..f23b39ebed79 100644
--- a/lang/python-doc-html/pkg-plist_postscript-a4
+++ b/lang/python-doc-html/pkg-plist_postscript-a4
@@ -1,6 +1,8 @@
 share/doc/python/api.ps
+share/doc/python/dist.ps
 share/doc/python/doc.ps
 share/doc/python/ext.ps
+share/doc/python/inst.ps
 share/doc/python/lib.ps
 share/doc/python/mac.ps
 share/doc/python/ref.ps
diff --git a/lang/python-doc-html/pkg-plist_postscript-letter b/lang/python-doc-html/pkg-plist_postscript-letter
index 3b704d57782b..f23b39ebed79 100644
--- a/lang/python-doc-html/pkg-plist_postscript-letter
+++ b/lang/python-doc-html/pkg-plist_postscript-letter
@@ -1,6 +1,8 @@
 share/doc/python/api.ps
+share/doc/python/dist.ps
 share/doc/python/doc.ps
 share/doc/python/ext.ps
+share/doc/python/inst.ps
 share/doc/python/lib.ps
 share/doc/python/mac.ps
 share/doc/python/ref.ps