Merge branch '2.0'

dlsniper · Apr 3, 2012 · aa6af43 · aa6af43
2 parents c064fa1 + 245a492
commit aa6af43
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -1276,7 +1276,7 @@ and ``nullable``. Take a few examples:
          * A string field of length 150 that persists to an "email_address" column
          * and has a unique index.
          *
-         * @ORM\Column(name="email_address", unique=true, length="150")
+         * @ORM\Column(name="email_address", unique=true, length=150)
          */
         protected $email;
 

diff --git a/book/security.rst b/book/security.rst
@@ -993,7 +993,7 @@ be stored in the database.
     class User implements UserInterface
     {
         /**
-         * @ORM\Column(type="string", length="255")
+         * @ORM\Column(type="string", length=255)
          */
         protected $username;
 

diff --git a/components/dependency_injection.rst b/components/dependency_injection.rst
@@ -212,7 +212,7 @@ Loading an xml config file:
     use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
     $sc = new ContainerBuilder();
-    $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
+    $loader = new XmlFileLoader($sc, new FileLocator(__DIR__));
     $loader->load('services.xml');
 
 Loading a yaml config file:
@@ -224,7 +224,7 @@ Loading a yaml config file:
     use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
     $sc = new ContainerBuilder();
-    $loader = new YamlFileLoader($container, new FileLocator(__DIR__));
+    $loader = new YamlFileLoader($sc, new FileLocator(__DIR__));
     $loader->load('services.yml');
 
 The ``newsletter_manager`` and ``mailer`` services can be set up using config files: