Be more and more explicit about how to do things correctly
Merge pull request #236 from alex/safer-docs

Be more and more explicit about how to do things correctly