User manual rewrite
Merge pull request #562 from bmmpxf/manual-squashed

User manual rewrite