symfony
diff --git a/‎book/doctrine.rst
Lines changed: 8 additions & 8 deletions b/‎book/doctrine.rst
Lines changed: 8 additions & 8 deletions
diff --git a/‎book/forms.rst
Lines changed: 73 additions & 16 deletions b/‎book/forms.rst
Lines changed: 73 additions & 16 deletions
diff --git a/‎book/http_cache.rst
Lines changed: 5 additions & 2 deletions b/‎book/http_cache.rst
Lines changed: 5 additions & 2 deletions
diff --git a/‎book/http_fundamentals.rst
Lines changed: 3 additions & 1 deletion b/‎book/http_fundamentals.rst
Lines changed: 3 additions & 1 deletion
diff --git a/‎book/installation.rst
Lines changed: 28 additions & 7 deletions b/‎book/installation.rst
Lines changed: 28 additions & 7 deletions
@@ -1375,12 +1375,12 @@ For more information about Doctrine, see the *Doctrine* section of the
 
 .. _`Doctrine`: http://www.doctrine-project.org/
 .. _`MongoDB`: http://www.mongodb.org/
-.. _`Basic Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html
-.. _`Query Builder`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/query-builder.html
-.. _`Doctrine Query Language`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/dql-doctrine-query-language.html
-.. _`Association Mapping Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/association-mapping.html
+.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html
+.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/query-builder.html
+.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/dql-doctrine-query-language.html
+.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/association-mapping.html
 .. _`DateTime`: http://php.net/manual/en/class.datetime.php
-.. _`Mapping Types Documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#doctrine-mapping-types
-.. _`Property Mapping documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#property-mapping
-.. _`Lifecycle Events documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/events.html#lifecycle-events
-.. _`Reserved SQL keywords documentation`: http://www.doctrine-project.org/docs/orm/2.0/en/reference/basic-mapping.html#quoting-reserved-words
+.. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#doctrine-mapping-types
+.. _`Property Mapping documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#property-mapping
+.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/events.html#lifecycle-events
+.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#quoting-reserved-words
@@ -356,7 +356,7 @@ corresponding errors printed out with the form.
    a ``required`` attribute on fields that are required. For browsers that
    support HTML5, this will result in a native browser message being displayed
    if the user tries to submit the form with that field blank.
-   
+
    Generated forms take full advantage of this new feature by adding sensible
    HTML attributes that trigger the validation. The client-side validation,
    however, can be disabled by adding the ``novalidate`` attribute to the
@@ -484,13 +484,13 @@ the documentation for each type.
     that HTML5-ready browsers will apply client-side validation if the field
     is left blank. If you don't want this behavior, either set the ``required``
     option on your field to ``false`` or :ref:`disable HTML5 validation<book-forms-html5-validation-disable>`.
-    
+
     Also note that setting the ``required`` option to ``true`` will **not**
     result in server-side validation to be applied. In other words, if a
     user submits a blank value for the field (either with an old browser
     or web service, for example), it will be accepted as a valid value unless
     you use Symfony's ``NotBlank`` or ``NotNull`` validation constraint.
-    
+
     In other words, the ``required`` option is "nice", but true server-side
     validation should *always* be used.
 
@@ -569,7 +569,7 @@ the correct values of a number of field options.
   option can be guessed from the validation constrains (if ``MinLength``
   or ``Min`` is used) or from the Doctrine metadata (via the field's length).
 
-* ``max_length``: Similar to ``min_length``, the maximum length can also 
+* ``max_length``: Similar to ``min_length``, the maximum length can also
   be guessed.
 
 .. note::
@@ -651,11 +651,11 @@ output can be customized on many different levels.
 .. tip::
 
     You can access the current data of your form via ``form.vars.value``:
-    
+
     .. configuration-block::
 
         .. code-block:: jinja
-        
+
             {{ form.vars.value.task }}
 
         .. code-block:: html+php
@@ -725,7 +725,7 @@ specify it:
 
         <?php echo $view['form']->label($form['task'], 'Task Description') ?>
 
-Finally, some field types have additional rendering options that can be passed
+Some field types have additional rendering options that can be passed
 to the widget. These options are documented with each type, but one common
 options is ``attr``, which allows you to modify attributes on the form element.
 The following would add the ``task_field`` class to the rendered input text
@@ -743,6 +743,33 @@ field:
             'attr' => array('class' => 'task_field'),
         )) ?>
 
+If you need to render form fields "by hand" then you can access individual
+values for fields such as the ``id``, ``name`` and ``label``. For example
+to get the ``id``:
+
+.. configuration-block::
+
+    .. code-block:: html+jinja
+
+        {{ form.task.vars.id }}
+
+    .. code-block:: html+php
+
+        <?php echo $form['task']->get('id') ?>
+
+To get the value used for the form field's name attribute you need to use
+the ``full_name`` value:
+
+.. configuration-block::
+
+    .. code-block:: html+jinja
+
+        {{ form.task.vars.full_name }}
+
+    .. code-block:: html+php
+
+        <?php echo $form['task']->get('full_name') ?>
+
 Twig Template Function Reference
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -829,6 +856,25 @@ the choice is ultimately up to you.
             );
         }
 
+.. tip::
+
+    When mapping forms to objects, all fields are mapped. Any fields on the
+    form that do not exist on the mapped object will cause an exception to
+    be thrown.
+
+    In cases where you need extra fields in the form (for example: a "do you
+    agree with these terms" checkbox) that will not be mapped to the underlying
+    object, you need to set the property_path option to ``false``::
+
+        public function buildForm(FormBuilder $builder, array $options)
+        {
+            $builder->add('task');
+            $builder->add('dueDate', null, array('property_path' => false));
+        }
+
+    Additionally, if there are any fields on the form that aren't included in
+    the submitted data, those fields will be explicitly set to ``null``.
+
 .. index::
    pair: Forms; Doctrine
 
@@ -1076,6 +1122,8 @@ renders the form:
 
         {% form_theme form 'AcmeTaskBundle:Form:fields.html.twig' %}
 
+        {% form_theme form 'AcmeTaskBundle:Form:fields.html.twig' 'AcmeTaskBundle:Form:fields2.html.twig' %}
+
         <form ...>
 
     .. code-block:: html+php
@@ -1084,6 +1132,8 @@ renders the form:
 
         <?php $view['form']->setTheme($form, array('AcmeTaskBundle:Form')) ?>
 
+        <?php $view['form']->setTheme($form, array('AcmeTaskBundle:Form', 'AcmeTaskBundle:Form')) ?>
+
         <form ...>
 
 The ``form_theme`` tag (in Twig) "imports" the fragments defined in the given
@@ -1092,6 +1142,13 @@ template and uses them when rendering the form. In other words, when the
 block from your custom theme (instead of the default ``field_row`` block
 that ships with Symfony).
 
+Your custom theme does not have to override all the blocks. When rendering a block
+which is not overridden in your custom theme, the theming engine will fall back
+to the global theme (defined at the bundle level).
+
+If several custom themes are provided they will be searched in the listed order
+before falling back to the global theme.
+
 To customize any portion of a form, you just need to override the appropriate
 fragment. Knowing exactly which block or file to override is the subject of
 the next section.
@@ -1339,7 +1396,7 @@ The CSRF token can be customized on a form-by-form basis. For example::
     class TaskType extends AbstractType
     {
         // ...
-    
+
         public function getDefaultOptions(array $options)
         {
             return array(
@@ -1350,7 +1407,7 @@ The CSRF token can be customized on a form-by-form basis. For example::
                 'intention'       => 'task_item',
             );
         }
-        
+
         // ...
     }
 
@@ -1389,14 +1446,14 @@ an array of the submitted data. This is actually really easy::
             ->add('email', 'email')
             ->add('message', 'textarea')
             ->getForm();
-        
+
             if ($request->getMethod() == 'POST') {
                 $form->bindRequest($request);
 
                 // data is an array with "name", "email", and "message" keys
                 $data = $form->getData();
             }
-        
+
         // ... render the form
     }
 
@@ -1416,14 +1473,14 @@ an array.
 
 .. tip::
 
-    You can also access POST values (in this case "name") directly through 
+    You can also access POST values (in this case "name") directly through
     the request object, like so:
 
     .. code-block:: php
 
         $this->get('request')->request->get('name');
 
-    Be advised, however, that in most cases using the getData() method is 
+    Be advised, however, that in most cases using the getData() method is
     a better choice, since it returns the data (usually an object) after
     it's been transformed by the form framework.
 
@@ -1456,7 +1513,7 @@ but here's a short example::
         // ...
     ;
 
-Now, when you call `$form->isValid()`, the constraints setup here are run
+Now, when you call `$form->bindRequest($request)`, the constraints setup here are run
 against your form's data. If you're using a form class, override the ``getDefaultOptions``
 method to specify the option::
 
@@ -1478,15 +1535,15 @@ method to specify the option::
                 'name' => new MinLength(5),
                 'email' => new Email(array('message' => 'Invalid email address')),
             ));
-        
+
             return array('validation_constraint' => $collectionConstraint);
         }
     }
 
 Now, you have the flexibility to create forms - with validation - that return
 an array of data, instead of an object. In most cases, it's better - and
 certainly more robust - to bind your form to an object. But for simple forms,
-this is a great approach. 
+this is a great approach.
 
 Final Thoughts
 --------------
 
@@ -173,7 +173,10 @@ finely tuned via a set of options you can set by overriding the ``getOptions()``
 method::
 
     // app/AppCache.php
-    class AppCache extends Cache
+
+    use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+
+    class AppCache extends HttpCache
     {
         protected function getOptions()
         {
@@ -654,7 +657,7 @@ exposing a simple and efficient pattern::
         } else {
             // do more work here - like retrieving more data
             $comments = // ...
-            
+
             // or render a template with the $response you've already started
             return $this->render(
                 'MyBundle:MyController:article.html.twig',
 
@@ -263,6 +263,8 @@ the user is connecting via a secured connection (i.e. ``https``).
     In fact, every public property used in the previous example is some instance
     of the ParameterBag.
 
+    .. _book-fundamentals-attributes:
+    
     The Request class also has a public ``attributes`` property, which holds
     special data related to how the application works internally. For the
     Symfony2 framework, the ``attributes`` holds the values returned by the
@@ -490,7 +492,7 @@ regardless of how your project is developed. To name a few:
   should be handled (e.g. execute the ``contactAction()`` method);
 
 * `Form`_ - A full-featured and flexible framework for creating forms and
-  handing form submissions;
+  handling form submissions;
 
 * `Validator`_ A system for creating rules about data and then validating
   whether or not user-submitted data follows those rules;
 
@@ -71,20 +71,40 @@ something like this:
                 app.php
                 ...
 
+.. _installation-updating-vendors:
+
 Updating Vendors
 ~~~~~~~~~~~~~~~~
 
-Finally, if you downloaded the archive "without vendors", install the vendors
-by running the following command from the command line:
+Step 1: Get `Composer`_ (The great new PHP packaging system)
+
+.. code-block:: bash
+
+    curl -s http://getcomposer.org/installer | php
+
+Make sure you download ``composer.phar`` in the same folder where
+the ``composer.json`` file is located (this is your Symfony project
+root by default).
+
+Step 2: Install vendors
 
 .. code-block:: bash
 
-    php bin/vendors install
+    php composer.phar install
 
 This command downloads all of the necessary vendor libraries - including
-Symfony itself - into the ``vendor/`` directory. For more information on
-how third-party vendor libraries are managed inside Symfony2, see
-":ref:`cookbook-managing-vendor-libraries`".
+Symfony itself - into the ``vendor/`` directory.
+
+.. note::
+
+	If you don't have ``curl`` installed, you can also just download the ``installer``
+	file manually at http://getcomposer.org/installer. Place this file into your
+	project and then run:
+
+	.. code-block:: bash
+
+		php installer
+		php composer.phar install
 
 Configuration and Setup
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -206,10 +226,11 @@ file:
 
 Now, the vendor directory won't be committed to source control. This is fine
 (actually, it's great!) because when someone else clones or checks out the
-project, he/she can simply run the ``php bin/vendors install`` script to
+project, he/she can simply run the ``php composer.phar install`` script to
 download all the necessary vendor libraries.
 
 .. _`enable ACL support`: https://help.ubuntu.com/community/FilePermissions#ACLs
 .. _`http://symfony.com/download`: http://symfony.com/download
 .. _`Git`: http://git-scm.com/
 .. _`GitHub Bootcamp`: http://help.github.com/set-up-git-redirect
+.. _`Composer`: http://getcomposer.org/