##// END OF EJS Templates
Merge pull request #2186 from cqmckay/oct2pydocfix...
Min RK -
r8010:1e0263de merge
parent child Browse files
Show More
@@ -8,8 +8,8 b' Magics for interacting with Octave via oct2py.'
8
8
9 .. note::
9 .. note::
10
10
11 The ``oct2py`` module needs to be installed separately, and in turn depends
11 The ``oct2py`` module needs to be installed separately and
12 on ``h5py``. Both can be obtained using ``easy_install`` or ``pip``.
12 can be obtained using ``easy_install`` or ``pip``.
13
13
14 Usage
14 Usage
15 =====
15 =====
@@ -27,7 +27,7 b''
27 "cell_type": "markdown",
27 "cell_type": "markdown",
28 "metadata": {},
28 "metadata": {},
29 "source": [
29 "source": [
30 "The `octavemagic` extension provides the ability to interact with Octave. It depends on the `oct2py` and `h5py` packages,\n",
30 "The `octavemagic` extension provides the ability to interact with Octave. It depends on the `oct2py` package,\n",
31 "which may be installed using `easy_install`.\n",
31 "which may be installed using `easy_install`.\n",
32 "\n",
32 "\n",
33 "To enable the extension, load it as follows:"
33 "To enable the extension, load it as follows:"
@@ -304,7 +304,7 b' extremely useful. The following extensions are provided:'
304 or whole blocks of Octave code, capture both output and figures inline
304 or whole blocks of Octave code, capture both output and figures inline
305 (just like matplotlib plots), and have variables automatically converted
305 (just like matplotlib plots), and have variables automatically converted
306 between the two languages. To use this extension, you must have Octave
306 between the two languages. To use this extension, you must have Octave
307 installed as well as the oct2py_ and h5py_ packages. The examples
307 installed as well as the oct2py_ package. The examples
308 directory in the source distribution ships with a full notebook
308 directory in the source distribution ships with a full notebook
309 demonstrating these capabilities:
309 demonstrating these capabilities:
310
310
@@ -316,7 +316,6 b' extremely useful. The following extensions are provided:'
316
316
317 .. _octave: http://www.gnu.org/software/octave
317 .. _octave: http://www.gnu.org/software/octave
318 .. _oct2py: http://pypi.python.org/pypi/oct2py
318 .. _oct2py: http://pypi.python.org/pypi/oct2py
319 .. _h5py: http://code.google.com/p/h5py
320
319
321 **R magics** (extension :ref:`rmagic <extensions_rmagic>`)
320 **R magics** (extension :ref:`rmagic <extensions_rmagic>`)
322 This extension provides several magics that support calling code written in
321 This extension provides several magics that support calling code written in
General Comments 0
You need to be logged in to leave comments. Login now