Update hash.rst

add example to map
Update hash.rst
[ja] update cakephp-coding-conversions
pear-cakephp/cakephp no longer available

when adding this to require:

    "pear-cakephp/cakephp": ">=2.4.9"

Composer fails, unable to find cakephp. This *may* work after using pear to discover the new package, but should not be necessary to install with composer. After making this change, it worked perfectly.

I also updated the cake version to the latest version recommended by someone in IRC.
updating proper composer source in fr
updating proper composer source in ja
updating proper composer source in sr
Merge pull request #1339 from luckysmack/patch-1

composer pear-cakephp/cakephp no longer available in installation
Merge pull request #1338 from okonomi/ja-cakephp-coding-convertions

[ja] update cakephp-coding-conversions
Update README header casings
Update httpsocket.rst

semblalble => semblable
Merge pull request #1341 from hervethouzard/patch-1

Update httpsocket.rst
Fix names in README
Add note about possible way to add SQL injections by accident.
Updated XML documentation to describe loading the Utility library with App::uses
Merge pull request #1346 from voycey/2.5

Updated XML documentation to describe loading the Utility library with A...
Merge pull request #1299 from DIDoS/patch-1

Update hash.rst
Correct docs around disabling radio legends.

Fixes #1350
fix git conflict