Improved wording
Removed ``@author`` from list of allowed annotations
Removed ``@example`` from list of allowed annotations
Removed ``@version`` from list of allowed annotations

Not used anymore after https://github.com/cakephp/cakephp/pull/4561
Moved note about comments in English to new "Language" section
Removed example that makes no sense anymore
Rewritten Commenting Code section of the coding conventions
Added fixes mentioned by @dereuromark
add ja/core-libraries/helpers/form.rst
[zh_CN] done /zh/models/retrieving-your-data.rst
Merge pull request #1890 from blackpuppy/zh

[zh_CN] done /zh/models/retrieving-your-data.rst
Minor modifications
[fr] typos in contributing documentation
Merge pull request #1882 from hotta/add_form

add ja/core-libraries/helpers/form.rst
Removed phpcs standard invalid whitespaces

It might be a bit less readable but we shouldn't display code examples that violate our own phpcs standard. ;-/

Most of that code will be copy & pasted by people, who later find their code violate the phpcs CakePHP sniff "Dobule space found".
Merge pull request #1711 from cakephp/2.0-docblock-coding-conventions

2.0 docblock coding conventions
follow #1711
done zh/models/virtual-fields.rst
Merge pull request #1904 from mafeifan/zh

done zh/models/virtual-fields.rst
[fr] typo in cakephp-coding-conventions