##// END OF EJS Templates
Merge pull request #4572 from ivanov/magic-docs...
Thomas Kluyver -
r13689:f5b49c87 merge
parent child Browse files
Show More
@@ -305,7 +305,13 b' Currently the magic system has the following functions:""",'
305
305
306 @line_magic
306 @line_magic
307 def profile(self, parameter_s=''):
307 def profile(self, parameter_s=''):
308 """Print your currently active IPython profile."""
308 """Print your currently active IPython profile.
309
310 See Also
311 --------
312 prun : run code using the Python profiler
313 (:meth:`~IPython.core.magics.execution.ExecutionMagics.prun`)
314 """
309 from IPython.core.application import BaseIPythonApplication
315 from IPython.core.application import BaseIPythonApplication
310 if BaseIPythonApplication.initialized():
316 if BaseIPythonApplication.initialized():
311 print(BaseIPythonApplication.instance().profile)
317 print(BaseIPythonApplication.instance().profile)
@@ -497,7 +497,7 b' class NamespaceMagics(Magics):'
497
497
498 See Also
498 See Also
499 --------
499 --------
500 magic_reset_selective : invoked as ``%reset_selective``
500 reset_selective : invoked as ``%reset_selective``
501
501
502 Examples
502 Examples
503 --------
503 --------
@@ -612,7 +612,7 b' class NamespaceMagics(Magics):'
612
612
613 See Also
613 See Also
614 --------
614 --------
615 magic_reset : invoked as ``%reset``
615 reset : invoked as ``%reset``
616
616
617 Examples
617 Examples
618 --------
618 --------
General Comments 0
You need to be logged in to leave comments. Login now