##// 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
===============================
Configuration and customization
===============================
.. toctree::
:maxdepth: 2
initial_config.txt
customization.txt
new_config.txt