list -> generator in documentation where appropriate
Merge remote-tracking branch 'github/pr/110' into develop