merged branch aerialls/patch-2 (PR #4597)

fabpot · fabpot · commit b27d9b541aa0 · 2012-06-17T12:40:16.000+02:00
Commits ------- dacd8aa tweaked UPGRADE file Discussion ---------- tweaked UPGRADE file --------------------------------------------------------------------------- by travisbot at 2012-06-16T16:56:55Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1635992) (merged dacd8aa into bc147d3).
diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
@@ -15,7 +15,7 @@
 
 ### Doctrine
 
-    The DoctrineBundle is moved from the Symfony repository to the Doctrine repository.
+  * 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()`
@@ -251,8 +251,6 @@
     }
     ```
 
-    The new method `setDefaultOptions` is described in the section "Deprecations".
-
   * The mapping of property paths to arrays has changed.
 
     Previously, a property path "street" mapped to both a field `$street` of
