##// END OF EJS Templates
Merge pull request #13139 from meeseeksmachine/auto-backport-of-pr-13138-on-7.x...
Blazej Michalik -
r26772:bf0ef17d merge
parent child Browse files
Show More
@@ -5,4 +5,4 b' Connection Diagrams of The IPython ZMQ Cluster'
5 ==============================================
5 ==============================================
6
6
7 IPython parallel has moved to ipyparallel -
7 IPython parallel has moved to ipyparallel -
8 see :ref:`ipyparallel:parallel_connections` for the documentation.
8 see :ref:`ipyparallel:/reference/connections.md` for the documentation.
@@ -5,4 +5,4 b' Messaging for Parallel Computing'
5 ================================
5 ================================
6
6
7 IPython parallel has moved to ipyparallel -
7 IPython parallel has moved to ipyparallel -
8 see :ref:`ipyparallel:parallel_messages` for the documentation.
8 see :ref:`ipyparallel:/reference/messages.md` for the documentation.
@@ -309,7 +309,7 b' be started by calling ``ipython qtconsole``. The protocol is :ref:`documented'
309 <messaging>`.
309 <messaging>`.
310
310
311 The parallel computing framework has also been rewritten using ZMQ. The
311 The parallel computing framework has also been rewritten using ZMQ. The
312 protocol is described :ref:`here <parallel_messages>`, and the code is in the
312 protocol is described :ref:`here <ipyparallel:/reference/messages.md>`, and the code is in the
313 new :mod:`IPython.parallel` module.
313 new :mod:`IPython.parallel` module.
314
314
315 .. _python3_011:
315 .. _python3_011:
General Comments 0
You need to be logged in to leave comments. Login now