Add when/generator docs
Merge branch 'dev' into when3