Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit d8ac9ba6f915 · 2012-10-06T22:03:56.000-05:00
Conflicts:
	book/doctrine.rst
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -34,9 +34,9 @@ persist it to the database and fetch it back out.
 
     If you want to follow along with the example in this chapter, create
     an ``AcmeStoreBundle`` via:
-    
+
     .. code-block:: bash
-    
+
         $ php app/console generate:bundle --namespace=Acme/StoreBundle
 
 Configuring the Database
@@ -63,9 +63,9 @@ information. By convention, this information is usually configured in an
     Defining the configuration via ``parameters.yml`` is just a convention.
     The parameters defined in that file are referenced by the main configuration
     file when setting up Doctrine:
-    
+
     .. code-block:: yaml
-    
+
         # app/config/config.yml
         doctrine:
             dbal:
@@ -74,13 +74,20 @@ information. By convention, this information is usually configured in an
                 dbname:   %database_name%
                 user:     %database_user%
                 password: %database_password%
-    
+
     By separating the database information into a separate file, you can
     easily keep different versions of the file on each server. You can also
     easily store database configuration (or any sensitive information) outside
     of your project, like inside your Apache configuration, for example. For
     more information, see :doc:`/cookbook/configuration/external_parameters`.
 
+Now that Doctrine knows about your database, you can have it create the database
+for you:
+
+.. code-block:: bash
+
+    $ php app/console doctrine:database:create
+
 .. sidebar:: Setting Up The Database
 
     One mistake even seasoned developers make when starting a Symfony2 project
@@ -91,8 +98,8 @@ information. By convention, this information is usually configured in an
 
     .. code-block:: bash
 
-        $ app/console doctrine:database:drop --force
-        $ app/console doctrine:database:create
+        $ php app/console doctrine:database:drop --force
+        $ php app/console doctrine:database:create
 
     There's no way to configure these defaults inside Doctrine, as it tries to be
     as agnostic as possible in terms of environment configuration. One way to solve
@@ -102,17 +109,10 @@ information. By convention, this information is usually configured in an
     your configuration file  (typically ``my.cnf``):
 
     .. code-block:: ini
-    
+
         [mysqld]
         collation-server = utf8_general_ci
-        character-set-server = utf8    
-
-Now that Doctrine knows about your database, you can have it create the database
-for you:
-
-.. code-block:: bash
-
-    $ php app/console doctrine:database:create
+        character-set-server = utf8
 
 Creating an Entity Class
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -143,9 +143,9 @@ just a simple PHP class.
 
     Once you learn the concepts behind Doctrine, you can have Doctrine create
     this entity class for you:
-    
+
     .. code-block:: bash
-        
+
         $ php app/console doctrine:generate:entity --entity="AcmeStoreBundle:Product" --fields="name:string(255) price:float description:text"
 
 .. index::
@@ -442,9 +442,9 @@ Let's walk through this example:
   In fact, since Doctrine is aware of all your managed entities, when you
   call the ``flush()`` method, it calculates an overall changeset and executes
   the most efficient query/queries possible. For example, if you persist a
-  total of 100 ``Product`` objects and then subsequently call ``flush()``, 
-  Doctrine will create a *single* prepared statement and re-use it for each 
-  insert. This pattern is called *Unit of Work*, and it's used because it's 
+  total of 100 ``Product`` objects and then subsequently call ``flush()``,
+  Doctrine will create a *single* prepared statement and re-use it for each
+  insert. This pattern is called *Unit of Work*, and it's used because it's
   fast and efficient.
 
 When creating or updating objects, the workflow is always the same. In the
@@ -469,7 +469,7 @@ on its ``id`` value::
         $product = $this->getDoctrine()
             ->getRepository('AcmeStoreBundle:Product')
             ->find($id);
-        
+
         if (!$product) {
             throw $this->createNotFoundException('No product found for id '.$id);
         }
@@ -591,7 +591,7 @@ You've already seen how the repository object allows you to run basic queries
 without any work::
 
     $repository->find($id);
-    
+
     $repository->findOneByName('Foo');
 
 Of course, Doctrine also allows you to write more complex queries using the
@@ -613,7 +613,7 @@ a controller, do the following::
     $query = $em->createQuery(
         'SELECT p FROM AcmeStoreBundle:Product p WHERE p.price > :price ORDER BY p.price ASC'
     )->setParameter('price', '19.99');
-    
+
     $products = $query->getResult();
 
 If you're comfortable with SQL, then DQL should feel very natural. The biggest
@@ -634,10 +634,10 @@ for just one object, you can use the ``getSingleResult()`` method instead::
     need to wrap it in a try-catch block and ensure that only one result is
     returned (if you're querying on something that could feasibly return
     more than one result)::
-    
+
         $query = $em->createQuery('SELECT ...')
             ->setMaxResults(1);
-        
+
         try {
             $product = $query->getSingleResult();
         } catch (\Doctrine\Orm\NoResultException $e) {
@@ -655,7 +655,7 @@ covered later), group, etc. For more information, see the official Doctrine
     Take note of the ``setParameter()`` method. When working with Doctrine,
     it's always a good idea to set any external values as "placeholders",
     which was done in the above query:
-    
+
     .. code-block:: text
 
         ... WHERE p.price > :price ...
@@ -691,7 +691,7 @@ type the method names. From inside a controller::
         ->setParameter('price', '19.99')
         ->orderBy('p.price', 'ASC')
         ->getQuery();
-    
+
     $products = $query->getResult();
 
 The ``QueryBuilder`` object contains every method necessary to build your
@@ -826,16 +826,16 @@ To relate the ``Category`` and ``Product`` entities, start by creating a
 
         // ...
         use Doctrine\Common\Collections\ArrayCollection;
-        
+
         class Category
         {
             // ...
-            
+
             /**
              * @ORM\OneToMany(targetEntity="Product", mappedBy="category")
              */
             protected $products;
-    
+
             public function __construct()
             {
                 $this->products = new ArrayCollection();
@@ -872,7 +872,7 @@ makes sense in the application for each ``Category`` to hold an array of
 .. tip::
 
    The targetEntity value in the decorator used above can reference any entity
-   with a valid namespace, not just entities defined in the same class. To 
+   with a valid namespace, not just entities defined in the same class. To
    relate to an entity defined in a different class or bundle, enter a full
    namespace as the targetEntity.
 
@@ -886,11 +886,11 @@ object, you'll want to add a ``$category`` property to the ``Product`` class:
         // src/Acme/StoreBundle/Entity/Product.php
 
         // ...
-    
+
         class Product
         {
             // ...
-        
+
             /**
              * @ORM\ManyToOne(targetEntity="Category", inversedBy="products")
              * @ORM\JoinColumn(name="category_id", referencedColumnName="id")
@@ -972,18 +972,18 @@ Now, let's see the code in action. Imagine you're inside a controller::
         {
             $category = new Category();
             $category->setName('Main Products');
-            
+
             $product = new Product();
             $product->setName('Foo');
             $product->setPrice(19.99);
             // relate this product to the category
             $product->setCategory($category);
-            
+
             $em = $this->getDoctrine()->getManager();
             $em->persist($category);
             $em->persist($product);
             $em->flush();
-            
+
             return new Response(
                 'Created product id: '.$product->getId().' and category id: '.$category->getId()
             );
@@ -1009,7 +1009,7 @@ did before. First, fetch a ``$product`` object and then access its related
             ->find($id);
 
         $categoryName = $product->getCategory()->getName();
-        
+
         // ...
     }
 
@@ -1036,7 +1036,7 @@ You can also query in the other direction::
             ->find($id);
 
         $products = $category->getProducts();
-    
+
         // ...
     }
 
@@ -1051,7 +1051,7 @@ to the given ``Category`` object via their ``category_id`` value.
     This "lazy loading" is possible because, when necessary, Doctrine returns
     a "proxy" object in place of the true object. Look again at the above
     example::
-    
+
         $product = $this->getDoctrine()
             ->getRepository('AcmeStoreBundle:Product')
             ->find($id);
@@ -1117,9 +1117,9 @@ object and its related ``Category`` with just one query::
             ->findOneByIdJoinedToCategory($id);
 
         $category = $product->getCategory();
-    
+
         // ...
-    }    
+    }
 
 More Information on Associations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1235,7 +1235,7 @@ in general, see Doctrine's `Lifecycle Events documentation`_
     callbacks should be simple methods that are concerned with internally
     transforming data in the entity (e.g. setting a created/updated field,
     generating a slug value).
-    
+
     If you need to do some heavier lifting - like perform logging or send
     an email - you should register an external class as an event listener
     or subscriber and give it access to whatever resources you need. For
@@ -1302,11 +1302,11 @@ and ``nullable``. Take a few examples:
         /**
          * A string field with length 255 that cannot be null
          * (reflecting the default values for the "type", "length" and *nullable* options)
-         * 
+         *
          * @ORM\Column()
          */
         protected $name;
-    
+
         /**
          * A string field of length 150 that persists to an "email_address" column
          * and has a unique index.
@@ -1366,9 +1366,9 @@ Some notable or interesting tasks include:
 * ``doctrine:ensure-production-settings`` - checks to see if the current
   environment is configured efficiently for production. This should always
   be run in the ``prod`` environment:
-  
+
   .. code-block:: bash
-  
+
     $ php app/console doctrine:ensure-production-settings --env=prod
 
 * ``doctrine:mapping:import`` - allows Doctrine to introspect an existing
diff --git a/book/routing.rst b/book/routing.rst
@@ -755,7 +755,7 @@ routing system can be:
 
 As you've seen, this route will only match if the ``{culture}`` portion of
 the URL is either ``en`` or ``fr`` and if the ``{year}`` is a number. This
-route also shows how you can use a period between placeholders instead of
+route also shows how you can use a dot between placeholders instead of
 a slash. URLs matching this route might look like:
 
 * ``/articles/en/2010/my-post``
diff --git a/components/config/caching.rst b/components/config/caching.rst
@@ -27,7 +27,7 @@ the cache can tell if it is still fresh or that its contents should be regenerat
 
     $cachePath = __DIR__.'/cache/appUserMatcher.php';
 
-    // the second argument indicates whether or not we are in debug mode
+    // the second argument indicates whether or not you want to use debug mode
     $userMatcherCache = new ConfigCache($cachePath, true);
 
     if (!$userMatcherCache->isFresh()) {
diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst
@@ -77,7 +77,7 @@ Then you can set the choice of transport in the container:
     $container->register('mailer', 'Mailer')
         ->addArgument('sendmail');
 
-This class is now much more flexible as we have separated the choice of
+This class is now much more flexible as you have separated the choice of
 transport out of the implementation and into the container.
 
 Which mail transport you have chosen may be something other services need to
@@ -185,9 +185,9 @@ Avoiding Your Code Becoming Dependent on the Container
 ------------------------------------------------------
 
 Whilst you can retrieve services from the container directly it is best
-to minimize this. For example, in the ``NewsletterManager`` we injected
+to minimize this. For example, in the ``NewsletterManager`` you injected
 the ``mailer`` service in rather than asking for it from the container.
-We could have injected the container in and retrieved the ``mailer`` service
+You could have injected the container in and retrieved the ``mailer`` service
 from it but it would then be tied to this particular container making it
 difficult to reuse the class elsewhere.
 
diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst
@@ -248,7 +248,7 @@ a parent for a service.
         $container->setDefinition('my_email_formatter', ...);
         $container->setDefinition('mail_manager', new Definition(
             '%mail_manager.class%'
-        ))->SetAbstract(
+        ))->setAbstract(
             true
         )->addMethodCall('setMailer', array(
             new Reference('my_mailer')
@@ -384,7 +384,7 @@ to the ``NewsletterManager`` class, the config would look like this:
         $container->setDefinition('my_email_formatter', ...);
         $container->setDefinition('mail_manager', new Definition(
             '%mail_manager.class%'
-        ))->SetAbstract(
+        ))->setAbstract(
             true
         )->addMethodCall('setMailer', array(
             new Reference('my_mailer')
@@ -501,7 +501,7 @@ If you had the following config:
         $container->setDefinition('another_filter', ...);
         $container->setDefinition('mail_manager', new Definition(
             '%mail_manager.class%'
-        ))->SetAbstract(
+        ))->setAbstract(
             true
         )->addMethodCall('setFilter', array(
             new Reference('my_filter')
diff --git a/components/dependency_injection/tags.rst b/components/dependency_injection/tags.rst
@@ -67,9 +67,9 @@ Then, define the chain as a service:
 Define Services with a Custom Tag
 ---------------------------------
 
-Now we want several of the ``\Swift_Transport`` classes to be instantiated
+Now you might want several of the ``\Swift_Transport`` classes to be instantiated
 and added to the chain automatically using the ``addTransport()`` method.
-As an example we add the following transports as services:
+For example you may add the following transports as services:
 
 .. configuration-block::
 
@@ -206,7 +206,7 @@ To begin with, change the ``TransportChain`` class::
     }
 
 As you can see, when ``addTransport`` is called, it takes not only a ``Swift_Transport``
-object, but also a string alias for that transport. So, how can we allow
+object, but also a string alias for that transport. So, how can you allow
 each tagged transport service to also supply an alias?
 
 To answer this, change the service declaration:
diff --git a/components/serializer.rst b/components/serializer.rst
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
