##// END OF EJS Templates
Merge pull request #8695 from takluyver/rm-notebook-docs...
Min RK -
r21580:9d7973f3 merge
parent child Browse files
Show More
@@ -10,5 +10,3 b' details.'
10
10
11 terminal
11 terminal
12 kernel
12 kernel
13 notebook
14 qtconsole
@@ -25,12 +25,20 b' Contents'
25 whatsnew/index
25 whatsnew/index
26 install/index
26 install/index
27 interactive/index
27 interactive/index
28 notebook/index
29 config/index
28 config/index
30 development/index
29 development/index
31 api/index
30 api/index
32 about/index
31 about/index
33
32
33 .. seealso::
34
35 `Jupyter documentation <http://jupyter.readthedocs.org/en/latest/>`__
36 The Notebook code and many other pieces formerly in IPython are now parts
37 of Project Jupyter.
38 `ipyparallel documentation <http://ipyparallel.readthedocs.org/en/latest/>`__
39 Formerly ``IPython.parallel``.
40
41
34 .. htmlonly::
42 .. htmlonly::
35 * :ref:`genindex`
43 * :ref:`genindex`
36 * :ref:`modindex`
44 * :ref:`modindex`
@@ -14,4 +14,4 b' Using IPython for interactive work'
14
14
15 .. seealso::
15 .. seealso::
16
16
17 :doc:`/notebook/index`
17 `The Jupyter Notebook <http://jupyter-notebook.readthedocs.org/en/latest/>`__
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (502 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now