Merge branch '2.1' into 2.2

Author: weaverryan

book/doctrine.rst

@@ -142,44 +142,43 @@ for you:
         collation-server = utf8_general_ci
         character-set-server = utf8
 
-Using SQLite
-~~~~~~~~~~~~
+.. note::
 
-If you want to use SQLite as your database, you need to set the path
-where your database file should be stored:
+    If you want to use SQLite as your database, you need to set the path
+    where your database file should be stored:
 
-.. configuration-block::
+    .. configuration-block::
 
-    .. code-block:: yaml
+        .. code-block:: yaml
 
-        # app/config/config.yml
-        doctrine:
-            dbal:
-                driver: pdo_sqlite
-                path: "%kernel.root_dir%/sqlite.db"
-                charset: UTF8
+            # app/config/config.yml
+            doctrine:
+                dbal:
+                    driver: pdo_sqlite
+                    path: "%kernel.root_dir%/sqlite.db"
+                    charset: UTF8
 
-    .. code-block:: xml
+        .. code-block:: xml
 
-        <!-- app/config/config.xml -->
-        <doctrine:config
-            driver="pdo_sqlite"
-            path="%kernel.root_dir%/sqlite.db"
-            charset="UTF-8"
-        >
-            <!-- ... -->
-        </doctrine:config>
-
-    .. code-block:: php
-
-        // app/config/config.php
-        $container->loadFromExtension('doctrine', array(
-            'dbal' => array(
-                'driver'  => 'pdo_sqlite',
-                'path'    => '%kernel.root_dir%/sqlite.db',
-                'charset' => 'UTF-8',
-            ),
-        ));
+            <!-- app/config/config.xml -->
+            <doctrine:config
+                driver="pdo_sqlite"
+                path="%kernel.root_dir%/sqlite.db"
+                charset="UTF-8"
+            >
+                <!-- ... -->
+            </doctrine:config>
+
+        .. code-block:: php
+
+            // app/config/config.php
+            $container->loadFromExtension('doctrine', array(
+                'dbal' => array(
+                    'driver'  => 'pdo_sqlite',
+                    'path'    => '%kernel.root_dir%/sqlite.db',
+                    'charset' => 'UTF-8',
+                ),
+            ));
 
 Creating an Entity Class
 ~~~~~~~~~~~~~~~~~~~~~~~~

book/propel.rst

@@ -7,7 +7,7 @@ Databases and Propel
 One of the most common and challenging tasks for any application
 involves persisting and reading information to and from a database. Symfony2
 does not come integrated with any ORMs but the Propel integration is easy.
-To get started, read `Working With Symfony2`_.
+To install Propel, read `Working With Symfony2`_ on the Propel documentation.
 
 A Simple Example: A Product
 ---------------------------
@@ -28,7 +28,7 @@ Configuring the Database
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 Before you can start, you'll need to configure your database connection
-information.  By convention, this information is usually configured in an
+information. By convention, this information is usually configured in an
 ``app/config/parameters.yml`` file:
 
 .. code-block:: yaml
@@ -48,14 +48,17 @@ information.  By convention, this information is usually configured in an
     parameters defined in that file are referenced by the main configuration
     file when setting up Propel:
 
-    .. code-block:: yaml
+These parameters defined in ``parameters.yml`` can now be included in the
+configuration file (``config.yml``):
 
-        propel:
-            dbal:
-                driver:     "%database_driver%"
-                user:       "%database_user%"
-                password:   "%database_password%"
-                dsn:        "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
+.. code-block:: yaml
+
+    propel:
+        dbal:
+            driver:     "%database_driver%"
+            user:       "%database_user%"
+            password:   "%database_password%"
+            dsn:        "%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
 
 Now that Propel knows about your database, Symfony2 can create the database for
 you:
@@ -88,12 +91,28 @@ of your ``AcmeStoreBundle``:
 .. code-block:: xml
 
     <?xml version="1.0" encoding="UTF-8"?>
-    <database name="default" namespace="Acme\StoreBundle\Model" defaultIdMethod="native">
+    <database name="default"
+        namespace="Acme\StoreBundle\Model"
+        defaultIdMethod="native"
+    >
         <table name="product">
-            <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-            <column name="name" type="varchar" primaryString="true" size="100" />
-            <column name="price" type="decimal" />
-            <column name="description" type="longvarchar" />
+            <column name="id"
+                type="integer"
+                required="true"
+                primaryKey="true"
+                autoIncrement="true"
+            />
+            <column name="name"
+                type="varchar"
+                primaryString="true"
+                size="100"
+            />
+            <column name="price"
+                type="decimal"
+            />
+            <column name="description"
+                type="longvarchar"
+            />
         </table>
     </database>
 
@@ -217,15 +236,15 @@ have a route that maps a product id to an update action in a controller::
 
 Updating an object involves just three steps:
 
-#. fetching the object from Propel;
-#. modifying the object;
-#. saving it.
+#. fetching the object from Propel (line 6 - 13);
+#. modifying the object (line 15);
+#. saving it (line 16).
 
 Deleting an Object
 ~~~~~~~~~~~~~~~~~~
 
-Deleting an object is very similar, but requires a call to the ``delete()``
-method on the object::
+Deleting an object is very similar to updating, but requires a call to the
+``delete()`` method on the object::
 
     $product->delete();
 

book/service_container.rst

@@ -863,8 +863,8 @@ the framework.
 
 .. tip::
 
-    Be sure that ``swiftmailer`` entry appears in your application
-    configuration. As you mentioned in :ref:`service-container-extension-configuration`,
+    Be sure that the ``swiftmailer`` entry appears in your application
+    configuration. As was mentioned in :ref:`service-container-extension-configuration`,
     the ``swiftmailer`` key invokes the service extension from the
     ``SwiftmailerBundle``, which registers the ``mailer`` service.
 

book/testing.rst

@@ -345,7 +345,7 @@ or perform more complex requests::
     // Directly submit a form (but using the Crawler is easier!)
     $client->request('POST', '/submit', array('name' => 'Fabien'));
 
-    // Submit a raw JSON string in the requst body
+    // Submit a raw JSON string in the request body
     $client->request(
         'POST',
         '/submit',

components/yaml/yaml_format.rst

@@ -114,7 +114,7 @@ Numbers
 Nulls
 ~~~~~
 
-Nulls in YAML can be expressed with ``null`` or ``-``.
+Nulls in YAML can be expressed with ``null`` or ``~``.
 
 Booleans
 ~~~~~~~~
@@ -268,4 +268,4 @@ Comments can be added in YAML by prefixing them with a hash mark (``#``):
     Comments are simply ignored by the YAML parser and do not need to be
     indented according to the current level of nesting in a collection.
 
-.. _YAML: http://yaml.org/
+.. _YAML: http://yaml.org/

contributing/community/irc.rst

@@ -14,7 +14,7 @@ time for at least 4 topics.
 
 .. caution::
 
-    Note that its not the expected goal of them meeting to find final
+    Note that it's not the expected goal of the meeting to find final
     solutions, but more to ensure that there is a common understanding of the
     issue at hand and move the discussion forward in ways which are hard to
     achieve with less real time communication tools.

cookbook/doctrine/file_uploads.rst

@@ -321,7 +321,7 @@ object, which is what's returned after a ``file`` field is submitted::
         $this->path = $this->getFile()->getClientOriginalName();
 
         // clean up the file property as you won't need it anymore
-        $this->setFile(null);
+        $this->file = null;
     }
 
 Using Lifecycle Callbacks
@@ -407,15 +407,14 @@ Next, refactor the ``Document`` class to take advantage of these callbacks::
             // the entity from being persisted to the database on error
             $this->getFile()->move($this->getUploadRootDir(), $this->path);
 
-            $this->setFile(null);
-
             // check if we have an old image
             if (isset($this->temp)) {
                 // delete the old image
                 unlink($this->getUploadRootDir().'/'.$this->temp);
                 // clear the temp image path
                 $this->temp = null;
             }
+            $this->file = null;
         }
 
         /**

cookbook/form/form_collections.rst

@@ -274,7 +274,7 @@ Allowing "new" tags with the "prototype"
 
 Allowing the user to dynamically add new tags means that you'll need to
 use some JavaScript. Previously you added two tags to your form in the controller.
-Now to let the user add as many tag forms as he needs directly in the browser.
+Now let the user add as many tag forms as he needs directly in the browser.
 This will be done through a bit of JavaScript.
 
 The first thing you need to do is to let the form collection know that it will

reference/forms/twig_reference.rst

@@ -220,7 +220,7 @@ object:
 
         <label for="{{ form.name.vars.id }}"
             class="{{ form.name.vars.required ? 'required' : '' }}">
-            {{ form.name.label }}
+            {{ form.name.vars.label }}
         </label>
 
     .. code-block:: html+php