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

r1788:1dce0b73
r1890:c3323314 merge
Show More
index.txt
10 lines | 188 B | text/plain | TextLexer
Brian E Granger
Massive reorganization of the IPython documentation. It is now ready to be hacked on by users. ...
r1258 ===============================
Configuration and customization
===============================
.. toctree::
Brian Granger
Update of docs to reflect the new ipcluster version....
r1788 :maxdepth: 2
Brian E Granger
Massive reorganization of the IPython documentation. It is now ready to be hacked on by users. ...
r1258
initial_config.txt
customization.txt
new_config.txt