Update from 0518c43: the user manual and the wiki pages
Update from 1d8b761: the user manual and the wiki pages