##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.

File last commit:

r1753:7cbac8c0
r1890:c3323314 merge
Show More
index.txt
10 lines | 105 B | text/plain | TextLexer
Brian E Granger
Updated the main introduction to IPython in the Sphinx docs.
r1400 .. _install_index:
Fernando Perez
Documentation updates....
r1753 ============
Brian E Granger
Massive reorganization of the IPython documentation. It is now ready to be hacked on by users. ...
r1258 Installation
Fernando Perez
Documentation updates....
r1753 ============
Brian E Granger
Beginning to organize the rst documentation.
r1256
.. toctree::
:maxdepth: 2
Brian Granger
Merging upstream work, and fixing installation docs....
r1675 install.txt