merged branch rouffj/fix-3971 (PR symfony#3998)

Commits ------- 991076a Fix symfony#3971 Discussion ---------- Fix symfony#3971
schmittjoh · Apr 19, 2012 · fd52f93 · fd52f93
2 parents 0cd6385 + 991076a
commit fd52f93
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
@@ -13,6 +13,14 @@
     configuration (i.e. `config.yml`), merging could yield a set of base URL's
     for multiple environments.
 
+### Doctrine
+
+    The DoctrineBundle is moved from the Symfony repository to the Doctrine repository.
+    Therefore you should change the namespace of this bundle in your AppKernel.php:
+
+    Before: `new Symfony\Bundle\DoctrineBundle\DoctrineBundle()`
+    After: `new Doctrine\Bundle\DoctrineBundle\DoctrineBundle()`
+
 ### HttpFoundation
 
   * Locale management was moved from the Session class to the Request class.