new bootstrap.py to stay in the land of zc.buildout 1.x
docs nitpicking
add comment markers noting which code blocks are recommended and which are not
terminate docstrings with a full-stop
Merge pull request #119 from plone/full_stop

terminate docstrings with a full-stop
Merge pull request #121 from plone/docs_nitpicking

docs nitpicking
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
More information on how to write good docstrings
Guidelines on using quotes

Inspiration from Kai Lautaportti, Enquos Ltd.
Light editing: some typos, some word choices, some markup
Merge pull request #124 from plone/jean-editing

Light editing: some typos, some word choices, some markup
better example on quoting
Merge pull request #122 from plone/more_about_docstrings

More information on how to write good docstrings

Thanks for the contribution!
Merge pull request #123 from plone/quoting

Guidelines on using quotes

good fix!
Merge branch 'master' into issue_114

Conflicts:
	docs/CHANGES.rst