Fixed most of the examples. A few still don't work, but this is a start.

docs/examples/kernel/asyncmultiengine1.py

@@ -5,7 +5,7 b''
 # asynchronous manner.  The TaskClient also works in this mode.
 
 from twisted.internet import reactor, defer
-from ipython1.kernel import asyncclient
+from IPython.kernel import asyncclient
 
 def printer(r):
     print r

docs/examples/kernel/asynctask1.py

@@ -2,12 +2,13 b''
 # encoding: utf-8
 
 # This example shows how the AsynTaskClient can be used
+# This example is currently broken
 
 from twisted.internet import reactor, defer
-from ipython1.kernel import asynclient
+from IPython.kernel import asyncclient
 
-mec = asynclient.AsynMultiEngineClient(('localhost', 10105))
-tc = asynclient.AsynTaskClient(('localhost',10113))
+mec = asyncclient.AsyncMultiEngineClient(('localhost', 10105))
+tc = asyncclient.AsyncTaskClient(('localhost',10113))
 
 cmd1 = """\
 a = 5
@@ -15,7 +16,7 b' b = 10*d'
 c = a*b*d
 """
 
-t1 = asynclient.Task(cmd1, clear_before=False, clear_after=True, pull=['a','b','c'])
+t1 = asyncclient.Task(cmd1, clear_before=False, clear_after=True, pull=['a','b','c'])
 
 d = mec.push(dict(d=30))
 

docs/examples/kernel/fetchparse.py

@@ -9,7 +9,7 b' and some engines using something like::'
     ipcluster -n 4
 """
 from twisted.python.failure import Failure
-from ipython1.kernel import client
+from IPython.kernel import client
 import time
 
 fetchParse = """

docs/examples/kernel/helloworld.py

@@ -2,7 +2,7 b''
 A Distributed Hello world
 Ken Kinder <[e-mail]>
 """
-from ipython1.kernel import client
+from IPython.kernel import client
 
 tc = client.TaskClient()
 mec = client.MultiEngineClient()

docs/examples/kernel/mcdriver.py

@@ -2,7 +2,7 b''
 # encoding: utf-8
 """Run a Monte-Carlo options pricer in parallel."""
 
-from ipython1.kernel import client
+from IPython.kernel import client
 import numpy as N
 from mcpricer import MCOptionPricer
 

docs/examples/kernel/multiengine1.ipy

@@ -5,9 +5,9 b''
 import time
 import numpy
 
-import ipython1.kernel.magic
-from ipython1.kernel import client
-from ipython1.kernel.error import *
+import IPython.kernel.magic
+from IPython.kernel import client
+from IPython.kernel.error import *
 
 mec = client.MultiEngineClient()
 

docs/examples/kernel/multiengine2.ipy

@@ -5,9 +5,9 b''
 import time
 import numpy
 
-import ipython1.kernel.magic
-from ipython1.kernel import client
-from ipython1.kernel.error import *
+import IPython.kernel.magic
+from IPython.kernel import client
+from IPython.kernel.error import *
 
 mec = client.MultiEngineClient()
 

docs/examples/kernel/nwmerge.py

@@ -4,7 +4,7 b''
 # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/511509
 
 import heapq
-from ipython1.kernel.error import CompositeError
+from IPython.kernel.error import CompositeError
 
 def mergesort(list_of_lists, key=None):
     """ Perform an N-way merge operation on sorted lists.
@@ -91,7 +91,7 b' def remote_iterator(rc,engine,name):'
 # Main, interactive testing
 if __name__ == '__main__':
 
-    from ipython1.kernel import client
+    from IPython.kernel import client
     ipc = client.MultiEngineClient()
     print 'Engine IDs:',ipc.get_ids()
 

docs/examples/kernel/parallel_pylab.ipy

@@ -20,7 +20,7 b' example.'
 
 import numpy as N
 from pylab import *
-from ipython1.kernel import client
+from IPython.kernel import client
 
 # Get an IPython1 client
 rc = client.MultiEngineClient()

docs/examples/kernel/plotting_frontend.py

@@ -18,7 +18,7 b' are available in IPython, so for example you can make additional plots.'
 
 import numpy as N
 from pylab import *
-from ipython1.kernel import client
+from IPython.kernel import client
 
 # Get an IPython1 client
 rc = client.MultiEngineClient()

docs/examples/kernel/pwordfreq.py

@@ -25,7 +25,7 b' def pwordfreq(rc, text):'
 
 if __name__ == '__main__':
     # Create a MultiEngineClient
-    from ipython1.kernel import client
+    from IPython.kernel import client
     ipc = client.MultiEngineClient()
     
     # Run the wordfreq script on the engines.

docs/examples/kernel/pwordfreq_skel.py

@@ -14,7 +14,7 b' def pwordfreq(rc, text):'
 
 if __name__ == '__main__':
     # Create a MultiEngineClient
-    from ipython1.kernel import client
+    from IPython.kernel import client
     ipc = client.MultiEngineClient()
     
     # Run the wordfreq script on the engines.

docs/examples/kernel/rmt.ipy

@@ -7,7 +7,7 b''
 # doing run rmt.ipy.
 
 from rmtkernel import *
-from ipython1.kernel import client
+from IPython.kernel import client
 
 
 def wignerDistribution(s):

docs/examples/kernel/task1.py

@@ -1,4 +1,4 b''
-from ipython1.kernel import client
+from IPython.kernel import client
 
 tc = client.TaskClient()
 rc = client.MultiEngineClient()

docs/examples/kernel/task2.py

@@ -1,7 +1,7 b''
 #!/usr/bin/env python
 # encoding: utf-8
 
-from ipython1.kernel import client
+from IPython.kernel import client
 import time
 
 tc = client.TaskClient()

docs/examples/kernel/task_profiler.py

@@ -19,7 +19,7 b' import random, sys'
 from optparse import OptionParser
 
 from IPython.genutils import time
-from ipython1.kernel import client
+from IPython.kernel import client
 
 def main():
     parser = OptionParser()

docs/source/config/new_config.txt

@@ -18,7 +18,7 b' configuration files are (in your ``~/.ipython`` directory):'
 
 To create these files for the first time, do the following::
 
-	from ipython1.kernel.config import config_manager as kernel_config
+	from IPython.kernel.config import config_manager as kernel_config
 	kernel_config.write_default_config_file()
 
 But, you should only need to do this if you need to modify the defaults. If needed

docs/source/parallel/parallel_intro.txt

@@ -217,7 +217,7 b' Once you have started the IPython controller and one or more engines, you'
 are ready to use the engines to do somnething useful. To make sure
 everything is working correctly, try the following commands::
 
-	In [1]: from ipython1.kernel import client
+	In [1]: from IPython.kernel import client
 	
 	In [2]: mec = client.MultiEngineClient()    # This looks for .furl files in ~./ipython
 	

docs/source/parallel/parallel_multiengine.txt

@@ -30,7 +30,7 b' Creating a ``MultiEngineClient`` instance'
 
 The first step is to import the IPython ``client`` module and then create a ``MultiEngineClient`` instance::
 
-	In [1]: from ipython1.kernel import client
+	In [1]: from IPython.kernel import client
 	
 	In [2]: mec = client.MultiEngineClient()
 
@@ -303,7 +303,7 b' The ``%autopx`` magic switches to a mode where everything you type is executed o'
 	Type %autopx to disable
 
 	In [32]: max_evals = []
-	<ipython1.kernel.multiengineclient.PendingResult object at 0x17b8a70>
+	<IPython.kernel.multiengineclient.PendingResult object at 0x17b8a70>
 
 	In [33]: for i in range(100):
 	   ....:     a = numpy.random.rand(10,10)
@@ -312,7 +312,7 b' The ``%autopx`` magic switches to a mode where everything you type is executed o'
 	   ....:     max_evals.append(evals[0].real)
 	   ....:
 	   ....:
-	<ipython1.kernel.multiengineclient.PendingResult object at 0x17af8f0>
+	<IPython.kernel.multiengineclient.PendingResult object at 0x17af8f0>
 
 	In [34]: %autopx
 	Auto Parallel Disabled

docs/source/parallel/parallel_task.txt

@@ -27,7 +27,7 b' QuickStart Task Farming'
 First, a quick example of how to start running the most basic Tasks.
 The first step is to import the IPython ``client`` module and then create a ``TaskClient`` instance::
     
-    In [1]: from ipython1.kernel import client
+    In [1]: from IPython.kernel import client
     
     In [2]: tc = client.TaskClient()
 
@@ -90,7 +90,7 b' The TaskClient'
 
 The ``TaskClient`` is the object the user use to connect to the ``Controller`` that is managing the user's Tasks.  It is the analog of the ``MultiEngineClient`` for the standard IPython multiplexing interface.  As with all client interfaces, the first step is to import the IPython Client Module::
 
-    In [1]: from ipython1.kernel import client
+    In [1]: from IPython.kernel import client
 
 Just as with the ``MultiEngineClient``, the user create the ``TaskClient`` with a tuple, containing the ip-address and port of the ``Controller``.  the ``client`` module conveniently has the default address of the ``Task`` interface of the controller.  Creating a default ``TaskClient`` object would be done with this::