##// END OF EJS Templates
fix mistakes introduced, and a few additional words
Mark Schmitz -
Show More
@@ -59,7 +59,7 b' All the following constructs are valid IPython syntax:'
59
59
60
60
61 Each of these constructs is compiled by IPython into valid python code and will
61 Each of these constructs is compiled by IPython into valid python code and will
62 do most of the time what you expect it will do. Let see each of these examples
62 do most of the time what you expect it will do. Let's see each of these examples
63 in more detail.
63 in more detail.
64
64
65
65
@@ -90,7 +90,7 b' shortcut to get help. A question mark alone will bring up the IPython help:'
90 ...
90 ...
91
91
92 A single question mark before or after an object available in the current
92 A single question mark before or after an object available in the current
93 name-space will show help relative to this object:
93 namespace will show help relative to this object:
94
94
95 .. code-block:: ipython
95 .. code-block:: ipython
96
96
@@ -126,8 +126,8 b' and if possible display the python source code of this object.'
126
126
127
127
128
128
129 If you are looking for an object the use of wildcards ``*`` in conjunction
129 If you are looking for an object, the use of wildcards ``*`` in conjunction
130 with a question mark will allow you to search the current name-space for objects with
130 with a question mark will allow you to search the current namespace for objects with
131 matching names:
131 matching names:
132
132
133 .. code-block:: ipython
133 .. code-block:: ipython
@@ -142,7 +142,7 b' Shell Assignment'
142 ================
142 ================
143
143
144
144
145 When doing interactive computing it is a common need is accessing the underlying shell.
145 When doing interactive computing it is a common need to access the underlying shell.
146 This is doable through the use of the exclamation mark ``!`` (or bang).
146 This is doable through the use of the exclamation mark ``!`` (or bang).
147
147
148 This allows to execute simple commands when present in beginning of the line:
148 This allows to execute simple commands when present in beginning of the line:
@@ -202,12 +202,12 b' You can combine the different possibilities in for loops, conditions, functions.'
202 Magics
202 Magics
203 ------
203 ------
204
204
205 Magics function are often present in the form of shell-like syntax, but they are
205 Magic functions (magics) are often present in the form of shell-like syntax, but they are
206 python functions under the hood. The syntax and assignment possibilities are
206 python functions under the hood. The syntax and assignment possibilities are
207 similar to the one with the bang (``!``) syntax, but with more flexibility and
207 similar to the one with the bang (``!``) syntax, but with more flexibility and
208 power. Magic functions start with a percent sign (``%``) or double percent (``%%``).
208 power. Magic functions start with a percent sign (``%``) or double percent signs (``%%``).
209
209
210 A magic call with a percent sign will act only on one line:
210 A magic call with a single percent sign will act only on one line:
211
211
212 .. code-block:: ipython
212 .. code-block:: ipython
213
213
General Comments 0
You need to be logged in to leave comments. Login now