add comment markers noting which code blocks are recommended and which are not
Merge branch 'master' into good_bad_markers

Conflicts:
	docs/contribute/conventions.rst
Merge pull request #120 from plone/good_bad_markers

add comment markers noting which code blocks are recommended and which are not