##// END OF EJS Templates
Merge pull request #4711 from ivanov/typos...
Thomas Kluyver -
r13882:ba2a9e03 merge
parent child Browse files
Show More
@@ -498,7 +498,7 b' For instance:'
498 # is equivalent to
498 # is equivalent to
499 $ ipcontroller --Application.log_level=DEBUG
499 $ ipcontroller --Application.log_level=DEBUG
500 # and
500 # and
501 $ ipython --matploitlib
501 $ ipython --matplotlib
502 # is equivalent to
502 # is equivalent to
503 $ ipython --matplotlib auto
503 $ ipython --matplotlib auto
504 # or
504 # or
@@ -818,7 +818,7 b' Message type: ``stream``::'
818 Display Data
818 Display Data
819 ------------
819 ------------
820
820
821 This type of message is used to bring back data that should be diplayed (text,
821 This type of message is used to bring back data that should be displayed (text,
822 html, svg, etc.) in the frontends. This data is published to all frontends.
822 html, svg, etc.) in the frontends. This data is published to all frontends.
823 Each message can have multiple representations of the data; it is up to the
823 Each message can have multiple representations of the data; it is up to the
824 frontend to decide which to use and how. A single message should contain all
824 frontend to decide which to use and how. A single message should contain all
@@ -829,7 +829,7 b' Some questions remain about this design:'
829
829
830 * Do we use this message type for pyout/displayhook? Probably not, because
830 * Do we use this message type for pyout/displayhook? Probably not, because
831 the displayhook also has to handle the Out prompt display. On the other hand
831 the displayhook also has to handle the Out prompt display. On the other hand
832 we could put that information into the metadata secion.
832 we could put that information into the metadata section.
833
833
834 Message type: ``display_data``::
834 Message type: ``display_data``::
835
835
@@ -838,7 +838,7 b' Message type: ``display_data``::'
838 # Who create the data
838 # Who create the data
839 'source' : str,
839 'source' : str,
840
840
841 # The data dict contains key/value pairs, where the kids are MIME
841 # The data dict contains key/value pairs, where the keys are MIME
842 # types and the values are the raw data of the representation in that
842 # types and the values are the raw data of the representation in that
843 # format.
843 # format.
844 'data' : dict,
844 'data' : dict,
@@ -7,7 +7,7 b' Parallel Magic Commands'
7 We provide a few IPython magic commands
7 We provide a few IPython magic commands
8 that make it a bit more pleasant to execute Python commands on the engines interactively.
8 that make it a bit more pleasant to execute Python commands on the engines interactively.
9 These are mainly shortcuts to :meth:`.DirectView.execute`
9 These are mainly shortcuts to :meth:`.DirectView.execute`
10 and :meth:`.AsyncResult.display_outputs` methods repsectively.
10 and :meth:`.AsyncResult.display_outputs` methods respectively.
11
11
12 These magics will automatically become available when you create a Client:
12 These magics will automatically become available when you create a Client:
13
13
@@ -70,7 +70,7 b' Since engines are IPython as well, you can even run magics remotely:'
70
70
71 And once in pylab mode with the inline backend,
71 And once in pylab mode with the inline backend,
72 you can make plots and they will be displayed in your frontend
72 you can make plots and they will be displayed in your frontend
73 if it suports the inline figures (e.g. notebook or qtconsole):
73 if it supports the inline figures (e.g. notebook or qtconsole):
74
74
75 .. sourcecode:: ipython
75 .. sourcecode:: ipython
76
76
@@ -170,7 +170,7 b' communication API for engines via its low-level :meth:`send_apply_message` metho'
170 by all higher level methods of its Views.
170 by all higher level methods of its Views.
171
171
172 f : function
172 f : function
173 The fuction to be called remotely
173 The function to be called remotely
174 args : tuple/list
174 args : tuple/list
175 The positional arguments passed to `f`
175 The positional arguments passed to `f`
176 kwargs : dict
176 kwargs : dict
@@ -800,7 +800,7 b' which is a UUID, and thus different every time.'
800
800
801 .. sourcecode:: python
801 .. sourcecode:: python
802
802
803 # To keep persistant task history in MongoDB:
803 # To keep persistent task history in MongoDB:
804 c.MongoDB.database = 'tasks'
804 c.MongoDB.database = 'tasks'
805
805
806 # and in SQLite:
806 # and in SQLite:
@@ -853,7 +853,7 b' mpi4py, add:'
853 c.MPI.use = 'mpi4py'
853 c.MPI.use = 'mpi4py'
854
854
855 In this case, the Engine will use our default mpi4py init script to set up
855 In this case, the Engine will use our default mpi4py init script to set up
856 the MPI environment prior to exection. We have default init scripts for
856 the MPI environment prior to execution. We have default init scripts for
857 mpi4py and pytrilinos. If you want to specify your own code to be run
857 mpi4py and pytrilinos. If you want to specify your own code to be run
858 at the beginning, specify `c.MPI.init_script`.
858 at the beginning, specify `c.MPI.init_script`.
859
859
General Comments 0
You need to be logged in to leave comments. Login now