[fr][ja] Follow #1853
[zh_CN] done /zh/models/associations-linking-models-together.rst
[zh_CN] add back code block deleted mistakenly
[zh_CN] add back code block deleted mistakenly
Correct isUnique example with multiple fields

Closes https://github.com/cakephp/cakephp/issues/4869
Merge pull request #1863 from cakephp/isunique-multiple-fields-example

Correct isUnique example with multiple fields
Merge pull request #1854 from blackpuppy/zh

[zh_CN] done /zh/models/associations-linking-models-together.rst
[zh_CN] delete original text
[fr] follows #1863
Merge branch 'master' into zh-work

Conflicts:
	zh/models/associations-linking-models-together.rst
resolved!
Merge branch 'zh-work' into oschina