3.0 - Merge variables update

Update the docs following cakephp/cakephp#2922