Adding a tip on using doctrine as a service
Changed normal link to special :phpfunction: link
Merge pull request #2234 from richardmiller/adding-doctrine-service-tip2

Adding a tip on using doctrine as a service
Merge pull request #2250 from WouterJ/patch-12

Changed normal link to special :phpfunction: link
Merge branch '2.0' into 2.1