Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit 7f14b3ac47f7 · 2013-07-20T15:34:10.000-05:00
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -960,7 +960,7 @@ To relate the ``Category`` and ``Product`` entities, start by creating a
             <entity name="Acme\StoreBundle\Entity\Category">
                 <!-- ... -->
                 <one-to-many field="products"
-                    target-entity="product"
+                    target-entity="Product"
                     mapped-by="category"
                 />
 
@@ -988,7 +988,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 namespace. To
    relate to an entity defined in a different class or bundle, enter a full
    namespace as the targetEntity.
 
@@ -1038,7 +1038,8 @@ object, you'll want to add a ``$category`` property to the ``Product`` class:
             <entity name="Acme\StoreBundle\Entity\Product">
                 <!-- ... -->
                 <many-to-one field="category"
-                    target-entity="products"
+                    target-entity="Category"
+                    inversed-by="products"
                     join-column="category"
                 >
                     <join-column
@@ -1205,14 +1206,14 @@ to the given ``Category`` object via their ``category_id`` value.
 
     The proxy classes are generated by Doctrine and stored in the cache directory.
     And though you'll probably never even notice that your ``$category``
-    object is actually a proxy object, it's important to keep in mind.
+    object is actually a proxy object, it's important to keep it in mind.
 
     In the next section, when you retrieve the product and category data
     all at once (via a *join*), Doctrine will return the *true* ``Category``
     object, since nothing needs to be lazily loaded.
 
-Joining to Related Records
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+Joining Related Records
+~~~~~~~~~~~~~~~~~~~~~~~
 
 In the above examples, two queries were made - one for the original object
 (e.g. a ``Category``) and one for the related object(s) (e.g. the ``Product``
@@ -1304,7 +1305,7 @@ callbacks. This is not necessary if you're using YAML or XML for your mapping:
     }
 
 Now, you can tell Doctrine to execute a method on any of the available lifecycle
-events. For example, suppose you want to set a ``created`` date column to
+events. For example, suppose you want to set a ``createdAt`` date column to
 the current date, only when the entity is first persisted (i.e. inserted):
 
 .. configuration-block::
@@ -1314,9 +1315,9 @@ the current date, only when the entity is first persisted (i.e. inserted):
         /**
          * @ORM\PrePersist
          */
-        public function setCreatedValue()
+        public function setCreatedAtValue()
         {
-            $this->created = new \DateTime();
+            $this->createdAt = new \DateTime();
         }
 
     .. code-block:: yaml
@@ -1326,7 +1327,7 @@ the current date, only when the entity is first persisted (i.e. inserted):
             type: entity
             # ...
             lifecycleCallbacks:
-                prePersist: [setCreatedValue]
+                prePersist: [setCreatedAtValue]
 
     .. code-block:: xml
 
@@ -1339,18 +1340,18 @@ the current date, only when the entity is first persisted (i.e. inserted):
                     <!-- ... -->
                     <lifecycle-callbacks>
                         <lifecycle-callback type="prePersist"
-                            method="setCreatedValue" />
+                            method="setCreatedAtValue" />
                     </lifecycle-callbacks>
             </entity>
         </doctrine-mapping>
 
 .. note::
 
-    The above example assumes that you've created and mapped a ``created``
+    The above example assumes that you've created and mapped a ``createdAt``
     property (not shown here).
 
 Now, right before the entity is first persisted, Doctrine will automatically
-call this method and the ``created`` field will be set to the current date.
+call this method and the ``createdAt`` field will be set to the current date.
 
 This can be repeated for any of the other lifecycle events, which include:
 
@@ -1368,7 +1369,7 @@ in general, see Doctrine's `Lifecycle Events documentation`_
 
 .. sidebar:: Lifecycle Callbacks and Event Listeners
 
-    Notice that the ``setCreatedValue()`` method receives no arguments. This
+    Notice that the ``setCreatedAtValue()`` method receives no arguments. This
     is always the case for lifecycle callbacks and is intentional: lifecycle
     callbacks should be simple methods that are concerned with internally
     transforming data in the entity (e.g. setting a created/updated field,
diff --git a/book/templating.rst b/book/templating.rst
@@ -6,7 +6,7 @@ Creating and using Templates
 
 As you know, the :doc:`controller </book/controller>` is responsible for
 handling each request that comes into a Symfony2 application. In reality,
-the controller delegates the most of the heavy work to other places so that
+the controller delegates most of the heavy work to other places so that
 code can be tested and reused. When a controller needs to generate HTML,
 CSS or any other content, it hands the work off to the templating engine.
 In this chapter, you'll learn how to write powerful templates that can be
@@ -204,10 +204,10 @@ First, build a base layout file:
             <body>
                 <div id="sidebar">
                     {% block sidebar %}
-                    <ul>
-                        <li><a href="/">Home</a></li>
-                        <li><a href="/blog">Blog</a></li>
-                    </ul>
+                        <ul>
+                              <li><a href="/">Home</a></li>
+                              <li><a href="/blog">Blog</a></li>
+                        </ul>
                     {% endblock %}
                 </div>
 
@@ -561,8 +561,10 @@ Including this template from any other template is simple:
 
 The template is included using the ``{{ include() }}`` function. Notice that the
 template name follows the same typical convention. The ``articleDetails.html.twig``
-template uses an ``article`` variable. This is passed in by the ``list.html.twig``
-template using the ``with`` command.
+template uses an ``article`` variable, which we pass to it. In this case,
+you could avoid doing this entirely, as all of the variables available in
+``list.html.twig`` are also available in ``articleDetails.html.twig`` (unless
+you set `with_context<twig_include_function>`_ to false).
 
 .. tip::
 
@@ -571,8 +573,9 @@ template using the ``with`` command.
     elements, it would look like this: ``{'foo': foo, 'bar': bar}``.
 
 .. versionadded:: 2.2
-    The ``include()`` function is a new Twig feature that's available in
-    Symfony 2.2. Prior, the ``{% include %}`` tag was used.
+    The `include()<twig_include_function>`_ function is a new Twig feature
+    that's available in Symfony 2.2. Prior, the `{% include %}<twig_include_tag>`_
+    tag was used.
 
 .. index::
    single: Templating; Embedding action
@@ -1391,8 +1394,6 @@ in a JavaScript string, use the ``js`` context:
 .. index::
    single: Templating; Formats
 
-.. _template-formats:
-
 Debugging
 ---------
 
@@ -1434,6 +1435,8 @@ console command:
     # or using the bundle name:
     $ php app/console twig:lint @AcmeArticleBundle
 
+.. _template-formats:
+
 Template Formats
 ----------------
 
@@ -1529,3 +1532,5 @@ Learn more from the Cookbook
 .. _`filters`: http://twig.sensiolabs.org/doc/filters/index.html
 .. _`add your own extensions`: http://twig.sensiolabs.org/doc/advanced.html#creating-an-extension
 .. _`hinclude.js`: http://mnot.github.com/hinclude/
+.. _`twig_include_function`: http://twig.sensiolabs.org/doc/functions/include.html
+.. _`twig_include_tag`: http://twig.sensiolabs.org/doc/tags/include.html
diff --git a/components/dependency_injection/advanced.rst b/components/dependency_injection/advanced.rst
@@ -66,7 +66,7 @@ Synthetic services are services that are injected into the container instead
 of being created by the container.
 
 For example, if you're using the :doc:`HttpKernel</components/http_kernel/introduction>`
-component with the DependencyInjection component, then the the ``request``
+component with the DependencyInjection component, then the ``request``
 service is injected in the
 :method:`ContainerAwareHttpKernel::handle() <Symfony\\Component\\HttpKernel\\DependencyInjection\\ContainerAwareHttpKernel::handle>`
 method when entering the request :doc:`scope </cookbook/service_container/scopes>`.
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -20,7 +20,7 @@ or after a method is executed, without interfering with other plugins. This is
 not an easy problem to solve with single inheritance, and multiple inheritance
 (were it possible with PHP) has its own drawbacks.
 
-The Symfony2 Event Dispatcher component implements the `Observer`_ pattern in
+The Symfony2 Event Dispatcher component implements the `Mediator`_ pattern in
 a simple and effective way to make all these things possible and to make your
 projects truly extensible.
 
@@ -588,7 +588,7 @@ part of the listener's processing logic::
         }
     }
 
-.. _Observer: http://en.wikipedia.org/wiki/Observer_pattern
+.. _Mediator: http://en.wikipedia.org/wiki/Mediator_pattern
 .. _Closures: http://php.net/manual/en/functions.anonymous.php
 .. _PHP callable: http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback
 .. _Packagist: https://packagist.org/packages/symfony/event-dispatcher
diff --git a/cookbook/routing/service_container_parameters.rst b/cookbook/routing/service_container_parameters.rst
@@ -116,3 +116,7 @@ path):
     Just like in normal service container configuration files, if you actually
     need a ``%`` in  your route, you can escape the percent sign by doubling
     it, e.g. ``/score-50%%``, which would resolve to ``/score-50%``.
+    
+    However, as the ``%`` characters included in any URL are automatically encoded,
+    the resulting URL of this example would be ``/score-50%25`` (``%25`` is the
+    result of encoding the ``%`` character).
diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst
@@ -24,6 +24,7 @@ option defaults to 120 years ago to the current year.
 +----------------------+-------------------------------------------------------------------------------+
 | Inherited Options    | - `widget`_                                                                   |
 |                      | - `input`_                                                                    |
+|                      | - `empty_value`_                                                              |  
 |                      | - `months`_                                                                   |
 |                      | - `days`_                                                                     |
 |                      | - `format`_                                                                   |
@@ -61,6 +62,8 @@ These options inherit from the :doc:`date</reference/forms/types/date>` type:
     
 .. include:: /reference/forms/types/options/date_input.rst.inc
 
+.. include:: /reference/forms/types/options/empty_value.rst.inc
+
 .. include:: /reference/forms/types/options/months.rst.inc
 
 .. include:: /reference/forms/types/options/days.rst.inc

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ or after a method is executed, without interfering with other plugins. This is`
`20`	`20`	`not an easy problem to solve with single inheritance, and multiple inheritance`
`21`	`21`	`(were it possible with PHP) has its own drawbacks.`
`22`	`22`
`23`		-The Symfony2 Event Dispatcher component implements the `Observer`_ pattern in
	`23`	+The Symfony2 Event Dispatcher component implements the `Mediator`_ pattern in
`24`	`24`	`a simple and effective way to make all these things possible and to make your`
`25`	`25`	`projects truly extensible.`
`26`	`26`
`@@ -588,7 +588,7 @@ part of the listener's processing logic::`
`588`	`588`	`}`
`589`	`589`	`}`
`590`	`590`
`591`		`-.. _Observer: http://en.wikipedia.org/wiki/Observer_pattern`
	`591`	`+.. _Mediator: http://en.wikipedia.org/wiki/Mediator_pattern`
`592`	`592`	`.. _Closures: http://php.net/manual/en/functions.anonymous.php`
`593`	`593`	`.. _PHP callable: http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback`
`594`	`594`	`.. _Packagist: https://packagist.org/packages/symfony/event-dispatcher`