##// 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:

r1866:bca2d8bf merge
r1890:c3323314 merge
Show More
index.txt
14 lines | 237 B | text/plain | TextLexer
Fernando Perez
More doc updates....
r1754 ===========================
IPython Developer's Guide
===========================
Brian E Granger
Beginning to organize the rst documentation.
r1256
.. toctree::
:maxdepth: 2
Fernando Perez
More doc updates....
r1754 overview.txt
coding_guide.txt
doc_guide.txt
Brian E Granger
Beginning to organize the rst documentation.
r1256 roadmap.txt
Fernando Perez
More doc updates....
r1754
Brian Granger
Changes the docs author to the IPython dev team and fixed a few links.
r1676 notification_blueprint.txt
Brian Granger
Updating docs to reflect recent work on ipcluster....
r1775 config_blueprint.txt