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

r0:6f629fcc
r1890:c3323314 merge
Show More
ipython.doc-base
14 lines | 322 B | text/plain | TextLexer
Document: ipython
Title: IPython Manual
Author: Fernando Perez <fperez@colorado.edu>
Abstract: Full documentation on all features of IPython.
Section: devel
Format: pdf
Files: /usr/share/doc/ipython/ipython.pdf
Format: HTML
Index: /usr/share/doc/ipython/manual/index.html
Files: /usr/share/doc/ipython/manual/*.html