gotchas: fix naming; remove generator in def example
merge upstream
Merge pull request #265 from simon-weber/gotcha_fixes

Fix naming and confusing example in gotchas