Update to 0.10.

Diff sent by Alexandr Shadchin <ShadchinAV at mail dot ru>. Thanks!

devel/ipython/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2009/03/14 23:13:34 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2009/12/02 17:45:53 wcmaier Exp $
 
 COMMENT=		enhanced interactive Python shell
 
-MODPY_EGG_VERSION=	0.9.1
+MODPY_EGG_VERSION=	0.10
 DISTNAME=		ipython-${MODPY_EGG_VERSION}
-PKGNAME=		${DISTNAME}p0
 CATEGORIES=		devel
 
 HOMEPAGE=		http://ipython.scipy.org/moin/

devel/ipython/distinfo

@@ -1,5 +1,5 @@
-MD5 (ipython-0.9.1.tar.gz) = ihvRqb4nL03fTemeXBrQ3A==
-RMD160 (ipython-0.9.1.tar.gz) = PVIvgCkMqnLhxPxgstVjacjGbro=
-SHA1 (ipython-0.9.1.tar.gz) = LQaUFrMe0D6xytNvhO8jNzYqxqk=
-SHA256 (ipython-0.9.1.tar.gz) = VUC8GgHxHKZsPXwxpDr2cP0PAES4440UJhSHKVZUgAY=
-SIZE (ipython-0.9.1.tar.gz) = 2798383
+MD5 (ipython-0.10.tar.gz) = 3RDNG2IsFsGvyiI5/MDf3w==
+RMD160 (ipython-0.10.tar.gz) = gZYJKYuwAKoBw69q0nF9kdRuOdg=
+SHA1 (ipython-0.10.tar.gz) = F1u6z3TZQzbj/gbjkOBK0r//b9Q=
+SHA256 (ipython-0.10.tar.gz) = YNYCY33F8Hiwg6TKWrZDZLqBa9ckOYRAEu0Row+IIow=
+SIZE (ipython-0.10.tar.gz) = 5829939

devel/ipython/patches/patch-IPython_Extensions_pickleshare_py

@@ -1,15 +0,0 @@
-$OpenBSD: patch-IPython_Extensions_pickleshare_py,v 1.1 2008/12/27 15:29:55 fgsch Exp $
---- IPython/Extensions/pickleshare.py.orig	Mon Jun  2 08:40:12 2008
-+++ IPython/Extensions/pickleshare.py	Mon Dec 15 03:12:11 2008
-@@ -40,7 +40,10 @@ import UserDict
- import warnings
- import glob
- 
--from sets import Set as set
-+try:
-+    set
-+except NameError:
-+    from sets import Set as set
- 
- def gethashfile(key):
-     return ("%02x" % abs(hash(key) % 256))[-2:]

devel/ipython/patches/patch-IPython_Magic_py

@@ -1,35 +0,0 @@
-$OpenBSD: patch-IPython_Magic_py,v 1.1 2008/12/27 15:29:55 fgsch Exp $
---- IPython/Magic.py.orig	Fri Aug 15 00:59:40 2008
-+++ IPython/Magic.py	Mon Dec 15 03:12:11 2008
-@@ -35,8 +35,12 @@ import textwrap
- from cStringIO import StringIO
- from getopt import getopt,GetoptError
- from pprint import pprint, pformat
--from sets import Set
- 
-+try:
-+    set
-+except NameError:
-+    from sets import Set as set
-+
- # cProfile was added in Python2.5
- try:
-     import cProfile as profile
-@@ -75,7 +79,7 @@ def compress_dhist(dh):
-     head, tail = dh[:-10], dh[-10:]
- 
-     newhead = []
--    done = Set()
-+    done = set()
-     for h in head:
-         if h in done:
-             continue
-@@ -149,7 +153,7 @@ python-profiler package from non-free.""")
-                  filter(inst_magic,self.__dict__.keys()) + \
-                  filter(inst_bound_magic,self.__class__.__dict__.keys())
-         out = []
--        for fn in Set(magics):
-+        for fn in set(magics):
-             out.append(fn.replace('magic_','',1))
-         out.sort()
-         return out

devel/ipython/patches/patch-IPython_external_mglob_py

@@ -1,15 +0,0 @@
-$OpenBSD: patch-IPython_external_mglob_py,v 1.1 2008/12/27 15:29:55 fgsch Exp $
---- IPython/external/mglob.py.orig	Sun Jul 13 07:00:22 2008
-+++ IPython/external/mglob.py	Mon Dec 15 03:12:11 2008
-@@ -73,7 +73,10 @@ __version__ = "0.2"
- 
- 
- import os,glob,fnmatch,sys,re
--from sets import Set as set
-+try:
-+    set
-+except NameError:
-+    from sets import Set as set
- 
-                 
- def expand(flist,exp_dirs = False):

devel/ipython/patches/patch-IPython_iplib_py

@@ -1,24 +0,0 @@
-$OpenBSD: patch-IPython_iplib_py,v 1.4 2008/12/27 15:29:55 fgsch Exp $
---- IPython/iplib.py.orig	Sat Aug 23 17:37:28 2008
-+++ IPython/iplib.py	Mon Dec 15 03:12:11 2008
-@@ -56,7 +56,10 @@ import traceback
- import types
- import warnings
- warnings.filterwarnings('ignore', r'.*sets module*')
--from sets import Set
-+try:
-+    set
-+except NameError:
-+    from sets import Set as set
- from pprint import pprint, pformat
- 
- # IPython's own modules
-@@ -1857,7 +1860,7 @@ want to merge them back into the new files.""" % local
-         """
-         line = fn + " " + rest
-         
--        done = Set()
-+        done = set()
-         while 1:
-             pre,fn,rest = prefilter.splitUserInput(line,
-                                                    prefilter.shell_line_split)

devel/ipython/patches/patch-IPython_kernel_tests_engineservicetest_py

@@ -1,17 +0,0 @@
-$OpenBSD: patch-IPython_kernel_tests_engineservicetest_py,v 1.1 2008/12/27 15:29:55 fgsch Exp $
---- IPython/kernel/tests/engineservicetest.py.orig	Wed Sep 10 23:59:32 2008
-+++ IPython/kernel/tests/engineservicetest.py	Mon Dec 15 03:12:11 2008
-@@ -49,8 +49,11 @@ validCommands = ['a=5',
- time.sleep(0.1)""",
-                 """from math import cos;
- x = 1.0*cos(0.5)""", # Semicolons lead to Discard ast nodes that should be discarded
--                """from sets import Set
--s = Set()
-+                """try:
-+    set
-+except NameError:
-+    from sets import Set as set
-+s = set()
-    """, # Trailing whitespace should be allowed.
-                 """import math
- math.cos(1.0)""", # Test a method call with a discarded return value

devel/ipython/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2008/12/27 15:29:55 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.9 2009/12/02 17:45:53 wcmaier Exp $
 bin/ipcluster
 bin/ipcontroller
 bin/ipengine
@@ -74,12 +74,12 @@ lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_kitcfg.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_kitcfg.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_legacy.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_legacy.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_leo.py
-lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_leo.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_lookfor.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_lookfor.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_p4.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_p4.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_pretty.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_pretty.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_profile_doctest.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_profile_doctest.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_profile_none.py
@@ -173,6 +173,8 @@ lib/python${MODPY_VERSION}/site-packages/IPython/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/background_jobs.py
 lib/python${MODPY_VERSION}/site-packages/IPython/background_jobs.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/clipboard.py
+lib/python${MODPY_VERSION}/site-packages/IPython/clipboard.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/completer.py
 lib/python${MODPY_VERSION}/site-packages/IPython/completer.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/config/
@@ -198,6 +200,8 @@ lib/python${MODPY_VERSION}/site-packages/IPython/external/Itpl.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/Itpl.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/external/argparse.py
+lib/python${MODPY_VERSION}/site-packages/IPython/external/argparse.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/configobj.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/configobj.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/guid.py
@@ -206,6 +210,8 @@ lib/python${MODPY_VERSION}/site-packages/IPython/external/mglob.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/mglob.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/path.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/path.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/external/pretty.py
+lib/python${MODPY_VERSION}/site-packages/IPython/external/pretty.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/simplegeneric.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/simplegeneric.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/validate.py
@@ -213,15 +219,6 @@ lib/python${MODPY_VERSION}/site-packages/IPython/external/validate.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/__init__.py
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/killableprocess.py
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/killableprocess.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/pipedprocess.py
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/pipedprocess.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/winprocess.py
-lib/python${MODPY_VERSION}/site-packages/IPython/frontend/_process/winprocess.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/asyncfrontendbase.py
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/asyncfrontendbase.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/cocoa/
@@ -240,6 +237,15 @@ lib/python${MODPY_VERSION}/site-packages/IPython/frontend/linefrontendbase.py
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/linefrontendbase.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/prefilterfrontend.py
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/prefilterfrontend.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/__init__.py
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/killableprocess.py
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/killableprocess.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/pipedprocess.py
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/pipedprocess.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/winprocess.py
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/process/winprocess.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/__init__.pyc
@@ -247,6 +253,8 @@ lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_asyncfronte
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_asyncfrontendbase.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_frontendbase.py
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_frontendbase.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_linefrontend.py
+lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_linefrontend.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_prefilterfrontend.py
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_prefilterfrontend.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/frontend/tests/test_process.py
@@ -365,8 +373,6 @@ lib/python${MODPY_VERSION}/site-packages/IPython/kernel/core/traceback_formatter
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/core/traceback_formatter.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/core/traceback_trap.py
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/core/traceback_trap.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/kernel/core/ultraTB.py
-lib/python${MODPY_VERSION}/site-packages/IPython/kernel/core/ultraTB.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/core/util.py
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/core/util.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/engineconnector.py
@@ -449,6 +455,8 @@ lib/python${MODPY_VERSION}/site-packages/IPython/kernel/tests/test_task.py
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/tests/test_task.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/tests/test_taskfc.py
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/tests/test_taskfc.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/kernel/tests/test_twistedutil.py
+lib/python${MODPY_VERSION}/site-packages/IPython/kernel/tests/test_twistedutil.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/twistedutil.py
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/twistedutil.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/kernel/util.py
@@ -484,11 +492,12 @@ lib/python${MODPY_VERSION}/site-packages/IPython/testing/decorators.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/decorators.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/decorators_numpy.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/decorators_numpy.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/decorators_trial.py
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/decorators_trial.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/iptest.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/iptest.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/mkdoctests.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/mkdoctests.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/testing/notes.txt
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/parametric.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/parametric.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/
@@ -508,6 +517,8 @@ lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/simple.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/simple.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/simplevars.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/simplevars.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/test_ipdoctest.py
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/test_ipdoctest.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/test_refs.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/plugin/test_refs.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/
@@ -515,15 +526,33 @@ lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/test_decorators.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/test_decorators.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/testing/tutils.py
-lib/python${MODPY_VERSION}/site-packages/IPython/testing/tutils.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/test_decorators_trial.py
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/test_decorators_trial.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/test_tools.py
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/tests/test_tools.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/tools.py
+lib/python${MODPY_VERSION}/site-packages/IPython/testing/tools.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/util.py
 lib/python${MODPY_VERSION}/site-packages/IPython/testing/util.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/tests/
 lib/python${MODPY_VERSION}/site-packages/IPython/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/obj_del.py
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/obj_del.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/refbug.py
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/refbug.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/tclass.py
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/tclass.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_fakemodule.py
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_fakemodule.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_genutils.py
 lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_genutils.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_iplib.py
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_iplib.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_magic.py
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_magic.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_platutils.py
+lib/python${MODPY_VERSION}/site-packages/IPython/tests/test_platutils.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/tools/
 lib/python${MODPY_VERSION}/site-packages/IPython/tools/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/tools/__init__.pyc
@@ -548,17 +577,253 @@ lib/python${MODPY_VERSION}/site-packages/IPython/wildcard.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/winconsole.py
 lib/python${MODPY_VERSION}/site-packages/IPython/winconsole.pyc
 lib/python${MODPY_VERSION}/site-packages/ipython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+@man man/man1/ipcluster.1
+@man man/man1/ipcontroller.1
+@man man/man1/ipengine.1
+@man man/man1/ipython-wx.1
 @man man/man1/ipython.1
+@man man/man1/ipythonx.1
+@man man/man1/irunner.1
 @man man/man1/pycolor.1
 share/doc/ipython/
 share/doc/ipython/extensions/
 share/doc/ipython/extensions/igrid_help.css
 share/doc/ipython/extensions/igrid_help.html
 share/doc/ipython/html/
+share/doc/ipython/html/_images/
+share/doc/ipython/html/_images/inheritance02556f36d9.png
+share/doc/ipython/html/_images/inheritance051f7e48fe.png
+share/doc/ipython/html/_images/inheritance0cb2ae6397.png
+share/doc/ipython/html/_images/inheritance0cfcf4b863.png
+share/doc/ipython/html/_images/inheritance0e68d1e987.png
+share/doc/ipython/html/_images/inheritance0e9fd84c8f.png
+share/doc/ipython/html/_images/inheritance0febb568d3.png
+share/doc/ipython/html/_images/inheritance108f320aef.png
+share/doc/ipython/html/_images/inheritance159f5785c5.png
+share/doc/ipython/html/_images/inheritance169de53b39.png
+share/doc/ipython/html/_images/inheritance1e02d72c2b.png
+share/doc/ipython/html/_images/inheritance269af752ab.png
+share/doc/ipython/html/_images/inheritance27be7de0fd.png
+share/doc/ipython/html/_images/inheritance2804df5722.png
+share/doc/ipython/html/_images/inheritance282b13d4e8.png
+share/doc/ipython/html/_images/inheritance2918b8a868.png
+share/doc/ipython/html/_images/inheritance2c0ade3727.png
+share/doc/ipython/html/_images/inheritance33ca011777.png
+share/doc/ipython/html/_images/inheritance36887168eb.png
+share/doc/ipython/html/_images/inheritance392ae1cfdc.png
+share/doc/ipython/html/_images/inheritance3b193f10c8.png
+share/doc/ipython/html/_images/inheritance3b94a348ff.png
+share/doc/ipython/html/_images/inheritance3d99f26637.png
+share/doc/ipython/html/_images/inheritance3df91234cd.png
+share/doc/ipython/html/_images/inheritance40d133a724.png
+share/doc/ipython/html/_images/inheritance42f7f863ff.png
+share/doc/ipython/html/_images/inheritance44cfd99191.png
+share/doc/ipython/html/_images/inheritance4626574b3b.png
+share/doc/ipython/html/_images/inheritance471b45c3f1.png
+share/doc/ipython/html/_images/inheritance473830e069.png
+share/doc/ipython/html/_images/inheritance476209c6f2.png
+share/doc/ipython/html/_images/inheritance47d10118b5.png
+share/doc/ipython/html/_images/inheritance5268d4be20.png
+share/doc/ipython/html/_images/inheritance55118ebcd0.png
+share/doc/ipython/html/_images/inheritance56ccf738fe.png
+share/doc/ipython/html/_images/inheritance5a8e3af804.png
+share/doc/ipython/html/_images/inheritance5bb63fa034.png
+share/doc/ipython/html/_images/inheritance6139bb4d7a.png
+share/doc/ipython/html/_images/inheritance635b4555f8.png
+share/doc/ipython/html/_images/inheritance6637152827.png
+share/doc/ipython/html/_images/inheritance66590ab664.png
+share/doc/ipython/html/_images/inheritance671e29ab8d.png
+share/doc/ipython/html/_images/inheritance687cd65f16.png
+share/doc/ipython/html/_images/inheritance693b7dcbb3.png
+share/doc/ipython/html/_images/inheritance6bda148fde.png
+share/doc/ipython/html/_images/inheritance6ea4f4b106.png
+share/doc/ipython/html/_images/inheritance71481bf26b.png
+share/doc/ipython/html/_images/inheritance7529eac084.png
+share/doc/ipython/html/_images/inheritance843b3c3e25.png
+share/doc/ipython/html/_images/inheritance8778c83369.png
+share/doc/ipython/html/_images/inheritance87aef75d35.png
+share/doc/ipython/html/_images/inheritance87c89d1076.png
+share/doc/ipython/html/_images/inheritance8a7656f497.png
+share/doc/ipython/html/_images/inheritance8c75f5ebbf.png
+share/doc/ipython/html/_images/inheritance93d59ca023.png
+share/doc/ipython/html/_images/inheritance965bd54b23.png
+share/doc/ipython/html/_images/inheritance968543e0db.png
+share/doc/ipython/html/_images/inheritance99a266d7de.png
+share/doc/ipython/html/_images/inheritance9a60a74ccf.png
+share/doc/ipython/html/_images/inheritance9cc4a3e644.png
+share/doc/ipython/html/_images/inheritancea418e28b1a.png
+share/doc/ipython/html/_images/inheritancea77bab8840.png
+share/doc/ipython/html/_images/inheritanceab5a152275.png
+share/doc/ipython/html/_images/inheritanceb05be293e1.png
+share/doc/ipython/html/_images/inheritanceb1db56fc4c.png
+share/doc/ipython/html/_images/inheritanceb70d8c7897.png
+share/doc/ipython/html/_images/inheritancebbb92aca05.png
+share/doc/ipython/html/_images/inheritancebcafe94cd2.png
+share/doc/ipython/html/_images/inheritancec44c5ec068.png
+share/doc/ipython/html/_images/inheritancec5ebb3f584.png
+share/doc/ipython/html/_images/inheritancec871829103.png
+share/doc/ipython/html/_images/inheritancec99b0098c8.png
+share/doc/ipython/html/_images/inheritancec9c4f04a48.png
+share/doc/ipython/html/_images/inheritanced45c5e1d74.png
+share/doc/ipython/html/_images/inheritanced89a399a0b.png
+share/doc/ipython/html/_images/inheritanced8ce90c5dc.png
+share/doc/ipython/html/_images/inheritanced9568becc5.png
+share/doc/ipython/html/_images/inheritancedd5d2ddcfd.png
+share/doc/ipython/html/_images/inheritancedd88f50245.png
+share/doc/ipython/html/_images/inheritancedda8386c0d.png
+share/doc/ipython/html/_images/inheritancedef30748d8.png
+share/doc/ipython/html/_images/inheritancedfc3392dd1.png
+share/doc/ipython/html/_images/inheritancee34b0e9ff2.png
+share/doc/ipython/html/_images/inheritanceeb128d1208.png
+share/doc/ipython/html/_images/inheritanceeb512baa90.png
+share/doc/ipython/html/_images/inheritanceeb8335e7cd.png
+share/doc/ipython/html/_images/inheritanceee7bf765f2.png
+share/doc/ipython/html/_images/inheritanceefdad02d24.png
+share/doc/ipython/html/_images/inheritancef59cc6f9f1.png
+share/doc/ipython/html/_images/inheritancef64684567c.png
+share/doc/ipython/html/_images/inheritancef8408a73de.png
+share/doc/ipython/html/_images/inheritancefa2646ae9d.png
+share/doc/ipython/html/_images/inheritancefc617353ed.png
+share/doc/ipython/html/_images/inheritancefd542f036c.png
+share/doc/ipython/html/_images/inheritancefd8c8829bf.png
+share/doc/ipython/html/_images/vision_beam_pattern.png
 share/doc/ipython/html/_sources/
 share/doc/ipython/html/_sources/api/
+share/doc/ipython/html/_sources/api/generated/
+share/doc/ipython/html/_sources/api/generated/IPython.ColorANSI.txt
+share/doc/ipython/html/_sources/api/generated/IPython.ConfigLoader.txt
+share/doc/ipython/html/_sources/api/generated/IPython.CrashHandler.txt
+share/doc/ipython/html/_sources/api/generated/IPython.DPyGetOpt.txt
+share/doc/ipython/html/_sources/api/generated/IPython.Debugger.txt
+share/doc/ipython/html/_sources/api/generated/IPython.Itpl.txt
+share/doc/ipython/html/_sources/api/generated/IPython.Logger.txt
+share/doc/ipython/html/_sources/api/generated/IPython.Magic.txt
+share/doc/ipython/html/_sources/api/generated/IPython.OInspect.txt
+share/doc/ipython/html/_sources/api/generated/IPython.OutputTrap.txt
+share/doc/ipython/html/_sources/api/generated/IPython.Prompts.txt
+share/doc/ipython/html/_sources/api/generated/IPython.PyColorize.txt
+share/doc/ipython/html/_sources/api/generated/IPython.Shell.txt
+share/doc/ipython/html/_sources/api/generated/IPython.UserConfig.ipy_user_conf.txt
+share/doc/ipython/html/_sources/api/generated/IPython.background_jobs.txt
+share/doc/ipython/html/_sources/api/generated/IPython.clipboard.txt
+share/doc/ipython/html/_sources/api/generated/IPython.completer.txt
+share/doc/ipython/html/_sources/api/generated/IPython.config.api.txt
+share/doc/ipython/html/_sources/api/generated/IPython.config.cutils.txt
+share/doc/ipython/html/_sources/api/generated/IPython.deep_reload.txt
+share/doc/ipython/html/_sources/api/generated/IPython.demo.txt
+share/doc/ipython/html/_sources/api/generated/IPython.dtutils.txt
+share/doc/ipython/html/_sources/api/generated/IPython.excolors.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.Itpl.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.argparse.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.configobj.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.guid.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.mglob.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.path.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.pretty.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.simplegeneric.txt
+share/doc/ipython/html/_sources/api/generated/IPython.external.validate.txt
+share/doc/ipython/html/_sources/api/generated/IPython.frontend.asyncfrontendbase.txt
+share/doc/ipython/html/_sources/api/generated/IPython.frontend.frontendbase.txt
+share/doc/ipython/html/_sources/api/generated/IPython.frontend.linefrontendbase.txt
+share/doc/ipython/html/_sources/api/generated/IPython.frontend.prefilterfrontend.txt
+share/doc/ipython/html/_sources/api/generated/IPython.frontend.process.pipedprocess.txt
+share/doc/ipython/html/_sources/api/generated/IPython.frontend.wx.console_widget.txt
+share/doc/ipython/html/_sources/api/generated/IPython.frontend.wx.ipythonx.txt
+share/doc/ipython/html/_sources/api/generated/IPython.frontend.wx.wx_frontend.txt
+share/doc/ipython/html/_sources/api/generated/IPython.generics.txt
+share/doc/ipython/html/_sources/api/generated/IPython.genutils.txt
+share/doc/ipython/html/_sources/api/generated/IPython.gui.wx.ipshell_nonblocking.txt
+share/doc/ipython/html/_sources/api/generated/IPython.gui.wx.ipython_history.txt
+share/doc/ipython/html/_sources/api/generated/IPython.gui.wx.ipython_view.txt
+share/doc/ipython/html/_sources/api/generated/IPython.gui.wx.thread_ex.txt
+share/doc/ipython/html/_sources/api/generated/IPython.gui.wx.wxIPython.txt
+share/doc/ipython/html/_sources/api/generated/IPython.history.txt
+share/doc/ipython/html/_sources/api/generated/IPython.hooks.txt
+share/doc/ipython/html/_sources/api/generated/IPython.ipapi.txt
+share/doc/ipython/html/_sources/api/generated/IPython.iplib.txt
+share/doc/ipython/html/_sources/api/generated/IPython.ipmaker.txt
+share/doc/ipython/html/_sources/api/generated/IPython.ipstruct.txt
+share/doc/ipython/html/_sources/api/generated/IPython.irunner.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.client.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.clientconnector.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.clientinterfaces.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.codeutil.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.contexts.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.controllerservice.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.display_formatter.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.display_trap.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.error.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.fd_redirector.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.file_like.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.history.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.interpreter.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.macro.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.magic.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.message_cache.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.notification.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.output_trap.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.prompts.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.redirector_output_trap.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.sync_traceback_trap.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.traceback_formatter.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.traceback_trap.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.core.util.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.engineconnector.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.enginefc.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.engineservice.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.error.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.fcutil.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.magic.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.map.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.mapper.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.multiengine.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.multiengineclient.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.multienginefc.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.newserialized.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.parallelfunction.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.pbutil.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.pendingdeferred.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.pickleutil.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.scripts.ipcluster.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.scripts.ipcontroller.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.scripts.ipengine.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.task.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.taskclient.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.taskfc.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.twistedutil.txt
+share/doc/ipython/html/_sources/api/generated/IPython.kernel.util.txt
+share/doc/ipython/html/_sources/api/generated/IPython.macro.txt
+share/doc/ipython/html/_sources/api/generated/IPython.numutils.txt
+share/doc/ipython/html/_sources/api/generated/IPython.platutils.txt
+share/doc/ipython/html/_sources/api/generated/IPython.platutils_dummy.txt
+share/doc/ipython/html/_sources/api/generated/IPython.platutils_posix.txt
+share/doc/ipython/html/_sources/api/generated/IPython.platutils_win32.txt
+share/doc/ipython/html/_sources/api/generated/IPython.prefilter.txt
+share/doc/ipython/html/_sources/api/generated/IPython.shellglobals.txt
+share/doc/ipython/html/_sources/api/generated/IPython.strdispatch.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.decorator_msim.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.decorators.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.decorators_numpy.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.decorators_trial.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.iptest.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.mkdoctests.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.parametric.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.plugin.dtexample.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.plugin.show_refs.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.plugin.simple.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.plugin.test_ipdoctest.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.plugin.test_refs.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.tools.txt
+share/doc/ipython/html/_sources/api/generated/IPython.testing.util.txt
+share/doc/ipython/html/_sources/api/generated/IPython.tools.growl.txt
+share/doc/ipython/html/_sources/api/generated/IPython.tools.utils.txt
+share/doc/ipython/html/_sources/api/generated/IPython.twshell.txt
+share/doc/ipython/html/_sources/api/generated/IPython.ultraTB.txt
+share/doc/ipython/html/_sources/api/generated/IPython.upgrade_dir.txt
+share/doc/ipython/html/_sources/api/generated/IPython.wildcard.txt
+share/doc/ipython/html/_sources/api/generated/IPython.winconsole.txt
+share/doc/ipython/html/_sources/api/generated/gen.txt
 share/doc/ipython/html/_sources/api/index.txt
-share/doc/ipython/html/_sources/api/ipython_api.txt
 share/doc/ipython/html/_sources/changes.txt
 share/doc/ipython/html/_sources/config/
 share/doc/ipython/html/_sources/config/customization.txt
@@ -567,9 +832,12 @@ share/doc/ipython/html/_sources/config/initial_config.txt
 share/doc/ipython/html/_sources/config/new_config.txt
 share/doc/ipython/html/_sources/credits.txt
 share/doc/ipython/html/_sources/development/
-share/doc/ipython/html/_sources/development/development.txt
+share/doc/ipython/html/_sources/development/coding_guide.txt
+share/doc/ipython/html/_sources/development/config_blueprint.txt
+share/doc/ipython/html/_sources/development/doc_guide.txt
 share/doc/ipython/html/_sources/development/index.txt
 share/doc/ipython/html/_sources/development/notification_blueprint.txt
+share/doc/ipython/html/_sources/development/overview.txt
 share/doc/ipython/html/_sources/development/roadmap.txt
 share/doc/ipython/html/_sources/faq.txt
 share/doc/ipython/html/_sources/history.txt
@@ -590,7 +858,10 @@ share/doc/ipython/html/_sources/parallel/index.txt
 share/doc/ipython/html/_sources/parallel/parallel_intro.txt
 share/doc/ipython/html/_sources/parallel/parallel_mpi.txt
 share/doc/ipython/html/_sources/parallel/parallel_multiengine.txt
+share/doc/ipython/html/_sources/parallel/parallel_process.txt
+share/doc/ipython/html/_sources/parallel/parallel_security.txt
 share/doc/ipython/html/_sources/parallel/parallel_task.txt
+share/doc/ipython/html/_sources/parallel/visionhpc.txt
 share/doc/ipython/html/_static/
 share/doc/ipython/html/_static/contents.png
 share/doc/ipython/html/_static/default.css
@@ -607,8 +878,141 @@ share/doc/ipython/html/_static/sphinxdoc.css
 share/doc/ipython/html/_static/stickysidebar.css
 share/doc/ipython/html/_static/traditional.css
 share/doc/ipython/html/api/
+share/doc/ipython/html/api/generated/
+share/doc/ipython/html/api/generated/IPython.ColorANSI.html
+share/doc/ipython/html/api/generated/IPython.ConfigLoader.html
+share/doc/ipython/html/api/generated/IPython.CrashHandler.html
+share/doc/ipython/html/api/generated/IPython.DPyGetOpt.html
+share/doc/ipython/html/api/generated/IPython.Debugger.html
+share/doc/ipython/html/api/generated/IPython.Itpl.html
+share/doc/ipython/html/api/generated/IPython.Logger.html
+share/doc/ipython/html/api/generated/IPython.Magic.html
+share/doc/ipython/html/api/generated/IPython.OInspect.html
+share/doc/ipython/html/api/generated/IPython.OutputTrap.html
+share/doc/ipython/html/api/generated/IPython.Prompts.html
+share/doc/ipython/html/api/generated/IPython.PyColorize.html
+share/doc/ipython/html/api/generated/IPython.Shell.html
+share/doc/ipython/html/api/generated/IPython.UserConfig.ipy_user_conf.html
+share/doc/ipython/html/api/generated/IPython.background_jobs.html
+share/doc/ipython/html/api/generated/IPython.clipboard.html
+share/doc/ipython/html/api/generated/IPython.completer.html
+share/doc/ipython/html/api/generated/IPython.config.api.html
+share/doc/ipython/html/api/generated/IPython.config.cutils.html
+share/doc/ipython/html/api/generated/IPython.deep_reload.html
+share/doc/ipython/html/api/generated/IPython.demo.html
+share/doc/ipython/html/api/generated/IPython.dtutils.html
+share/doc/ipython/html/api/generated/IPython.excolors.html
+share/doc/ipython/html/api/generated/IPython.external.Itpl.html
+share/doc/ipython/html/api/generated/IPython.external.argparse.html
+share/doc/ipython/html/api/generated/IPython.external.configobj.html
+share/doc/ipython/html/api/generated/IPython.external.guid.html
+share/doc/ipython/html/api/generated/IPython.external.mglob.html
+share/doc/ipython/html/api/generated/IPython.external.path.html
+share/doc/ipython/html/api/generated/IPython.external.pretty.html
+share/doc/ipython/html/api/generated/IPython.external.simplegeneric.html
+share/doc/ipython/html/api/generated/IPython.external.validate.html
+share/doc/ipython/html/api/generated/IPython.frontend.asyncfrontendbase.html
+share/doc/ipython/html/api/generated/IPython.frontend.frontendbase.html
+share/doc/ipython/html/api/generated/IPython.frontend.linefrontendbase.html
+share/doc/ipython/html/api/generated/IPython.frontend.prefilterfrontend.html
+share/doc/ipython/html/api/generated/IPython.frontend.process.pipedprocess.html
+share/doc/ipython/html/api/generated/IPython.frontend.wx.console_widget.html
+share/doc/ipython/html/api/generated/IPython.frontend.wx.ipythonx.html
+share/doc/ipython/html/api/generated/IPython.frontend.wx.wx_frontend.html
+share/doc/ipython/html/api/generated/IPython.generics.html
+share/doc/ipython/html/api/generated/IPython.genutils.html
+share/doc/ipython/html/api/generated/IPython.gui.wx.ipshell_nonblocking.html
+share/doc/ipython/html/api/generated/IPython.gui.wx.ipython_history.html
+share/doc/ipython/html/api/generated/IPython.gui.wx.ipython_view.html
+share/doc/ipython/html/api/generated/IPython.gui.wx.thread_ex.html
+share/doc/ipython/html/api/generated/IPython.gui.wx.wxIPython.html
+share/doc/ipython/html/api/generated/IPython.history.html
+share/doc/ipython/html/api/generated/IPython.hooks.html
+share/doc/ipython/html/api/generated/IPython.ipapi.html
+share/doc/ipython/html/api/generated/IPython.iplib.html
+share/doc/ipython/html/api/generated/IPython.ipmaker.html
+share/doc/ipython/html/api/generated/IPython.ipstruct.html
+share/doc/ipython/html/api/generated/IPython.irunner.html
+share/doc/ipython/html/api/generated/IPython.kernel.client.html
+share/doc/ipython/html/api/generated/IPython.kernel.clientconnector.html
+share/doc/ipython/html/api/generated/IPython.kernel.clientinterfaces.html
+share/doc/ipython/html/api/generated/IPython.kernel.codeutil.html
+share/doc/ipython/html/api/generated/IPython.kernel.contexts.html
+share/doc/ipython/html/api/generated/IPython.kernel.controllerservice.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.display_formatter.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.display_trap.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.error.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.fd_redirector.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.file_like.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.history.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.interpreter.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.macro.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.magic.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.message_cache.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.notification.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.output_trap.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.prompts.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.redirector_output_trap.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.sync_traceback_trap.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.traceback_formatter.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.traceback_trap.html
+share/doc/ipython/html/api/generated/IPython.kernel.core.util.html
+share/doc/ipython/html/api/generated/IPython.kernel.engineconnector.html
+share/doc/ipython/html/api/generated/IPython.kernel.enginefc.html
+share/doc/ipython/html/api/generated/IPython.kernel.engineservice.html
+share/doc/ipython/html/api/generated/IPython.kernel.error.html
+share/doc/ipython/html/api/generated/IPython.kernel.fcutil.html
+share/doc/ipython/html/api/generated/IPython.kernel.magic.html
+share/doc/ipython/html/api/generated/IPython.kernel.map.html
+share/doc/ipython/html/api/generated/IPython.kernel.mapper.html
+share/doc/ipython/html/api/generated/IPython.kernel.multiengine.html
+share/doc/ipython/html/api/generated/IPython.kernel.multiengineclient.html
+share/doc/ipython/html/api/generated/IPython.kernel.multienginefc.html
+share/doc/ipython/html/api/generated/IPython.kernel.newserialized.html
+share/doc/ipython/html/api/generated/IPython.kernel.parallelfunction.html
+share/doc/ipython/html/api/generated/IPython.kernel.pbutil.html
+share/doc/ipython/html/api/generated/IPython.kernel.pendingdeferred.html
+share/doc/ipython/html/api/generated/IPython.kernel.pickleutil.html
+share/doc/ipython/html/api/generated/IPython.kernel.scripts.ipcluster.html
+share/doc/ipython/html/api/generated/IPython.kernel.scripts.ipcontroller.html
+share/doc/ipython/html/api/generated/IPython.kernel.scripts.ipengine.html
+share/doc/ipython/html/api/generated/IPython.kernel.task.html
+share/doc/ipython/html/api/generated/IPython.kernel.taskclient.html
+share/doc/ipython/html/api/generated/IPython.kernel.taskfc.html
+share/doc/ipython/html/api/generated/IPython.kernel.twistedutil.html
+share/doc/ipython/html/api/generated/IPython.kernel.util.html
+share/doc/ipython/html/api/generated/IPython.macro.html
+share/doc/ipython/html/api/generated/IPython.numutils.html
+share/doc/ipython/html/api/generated/IPython.platutils.html
+share/doc/ipython/html/api/generated/IPython.platutils_dummy.html
+share/doc/ipython/html/api/generated/IPython.platutils_posix.html
+share/doc/ipython/html/api/generated/IPython.platutils_win32.html
+share/doc/ipython/html/api/generated/IPython.prefilter.html
+share/doc/ipython/html/api/generated/IPython.shellglobals.html
+share/doc/ipython/html/api/generated/IPython.strdispatch.html
+share/doc/ipython/html/api/generated/IPython.testing.decorator_msim.html
+share/doc/ipython/html/api/generated/IPython.testing.decorators.html
+share/doc/ipython/html/api/generated/IPython.testing.decorators_numpy.html
+share/doc/ipython/html/api/generated/IPython.testing.decorators_trial.html
+share/doc/ipython/html/api/generated/IPython.testing.iptest.html
+share/doc/ipython/html/api/generated/IPython.testing.mkdoctests.html
+share/doc/ipython/html/api/generated/IPython.testing.parametric.html
+share/doc/ipython/html/api/generated/IPython.testing.plugin.dtexample.html
+share/doc/ipython/html/api/generated/IPython.testing.plugin.show_refs.html
+share/doc/ipython/html/api/generated/IPython.testing.plugin.simple.html
+share/doc/ipython/html/api/generated/IPython.testing.plugin.test_ipdoctest.html
+share/doc/ipython/html/api/generated/IPython.testing.plugin.test_refs.html
+share/doc/ipython/html/api/generated/IPython.testing.tools.html
+share/doc/ipython/html/api/generated/IPython.testing.util.html
+share/doc/ipython/html/api/generated/IPython.tools.growl.html
+share/doc/ipython/html/api/generated/IPython.tools.utils.html
+share/doc/ipython/html/api/generated/IPython.twshell.html
+share/doc/ipython/html/api/generated/IPython.ultraTB.html
+share/doc/ipython/html/api/generated/IPython.upgrade_dir.html
+share/doc/ipython/html/api/generated/IPython.wildcard.html
+share/doc/ipython/html/api/generated/IPython.winconsole.html
+share/doc/ipython/html/api/generated/gen.html
 share/doc/ipython/html/api/index.html
-share/doc/ipython/html/api/ipython_api.html
 share/doc/ipython/html/changes.html
 share/doc/ipython/html/config/
 share/doc/ipython/html/config/customization.html
@@ -617,9 +1021,12 @@ share/doc/ipython/html/config/initial_config.html
 share/doc/ipython/html/config/new_config.html
 share/doc/ipython/html/credits.html
 share/doc/ipython/html/development/
-share/doc/ipython/html/development/development.html
+share/doc/ipython/html/development/coding_guide.html
+share/doc/ipython/html/development/config_blueprint.html
+share/doc/ipython/html/development/doc_guide.html
 share/doc/ipython/html/development/index.html
 share/doc/ipython/html/development/notification_blueprint.html
+share/doc/ipython/html/development/overview.html
 share/doc/ipython/html/development/roadmap.html
 share/doc/ipython/html/faq.html
 share/doc/ipython/html/genindex.html
@@ -643,14 +1050,16 @@ share/doc/ipython/html/parallel/index.html
 share/doc/ipython/html/parallel/parallel_intro.html
 share/doc/ipython/html/parallel/parallel_mpi.html
 share/doc/ipython/html/parallel/parallel_multiengine.html
+share/doc/ipython/html/parallel/parallel_process.html
+share/doc/ipython/html/parallel/parallel_security.html
 share/doc/ipython/html/parallel/parallel_task.html
+share/doc/ipython/html/parallel/visionhpc.html
 share/doc/ipython/html/search.html
-share/doc/ipython/html/searchindex.json
+share/doc/ipython/html/searchindex.js
 share/doc/ipython/ipython.pdf
 share/examples/ipython/
 share/examples/ipython/core/
-share/examples/ipython/core/demo_colors_blink.py
-share/examples/ipython/core/embtest.py
+share/examples/ipython/core/demo-exercizer.py
 share/examples/ipython/core/example-demo.py
 share/examples/ipython/core/example-embed-short.py
 share/examples/ipython/core/example-embed.py
@@ -690,5 +1099,6 @@ share/examples/ipython/kernel/task1.py
 share/examples/ipython/kernel/task2.py
 share/examples/ipython/kernel/task_profiler.py
 share/examples/ipython/kernel/taskmap.py
+share/examples/ipython/kernel/taskreject.py
 share/examples/ipython/kernel/wordfreq.py
 share/examples/ipython/kernel/wordfreq_skel.py