symfony · jasonbouffard · Jul 6, 2014 · Aug 18, 2014 · Aug 17, 2014 · Aug 18, 2014
diff --git a/book/validation.rst b/book/validation.rst
@@ -1115,7 +1115,7 @@ provides a sequence of groups to be validated:
 
         # src/Acme/DemoBundle/Resources/config/validation.yml
         Acme\DemoBundle\Entity\User:
-            group_sequence_provider: ~
+            group_sequence_provider: true
 
     .. code-block:: php-annotations
 

diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst
@@ -90,7 +90,7 @@ Loader too. The default loaders are:
 
 .. versionadded:: 2.1
     The ``IcuDatFileLoader``, ``IcuResFileLoader``, ``IniFileLoader``,
-    ``MofileLoader``, ``PoFileLoader`` and ``QtFileLoader`` were introduced
+    ``MoFileLoader``, ``PoFileLoader`` and ``QtFileLoader`` were introduced
     in Symfony 2.1.
 
 All file loaders require the :doc:`Config component </components/config/index>`.

diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst
@@ -4,12 +4,28 @@
 Configuring a Web Server
 ========================
 
-The web directory is the home of all of your application's public and static
-files. Including images, stylesheets and JavaScript files. It is also where the
-front controllers live. For more details, see the :ref:`the-web-directory`.
+The preferred way to develop your Symfony2 application is to use
+:doc:`PHP's internal web server </cookbook/web_server/built_in>`. However,
+when using an older PHP version or when running the application in the production
+environment, you'll need to use a fully-featured web server. This article
+describes several ways to use Symfony with Apache2 or Nginx.
 
-The web directory services as the document root when configuring your web
-server. In the examples below, this directory is in ``/var/www/project/web/``.
+When using Apache2, you can configure PHP as an
+:ref:`Apache module <web-server-apache-mod-php>` or with FastCGI using
+:ref:`PHP FPM <web-server-apache-fpm>`. FastCGI also is the preferred way
+to use PHP :ref:`with Nginx <web-server-nginx>`.
+
+.. sidebar:: The Web Directory
+
+    The web directory is the home of all of your application's public and
+    static files, including images, stylesheets and JavaScript files. It is
+    also where the front controllers live. For more details, see the :ref:`the-web-directory`.
+
+    The web directory services as the document root when configuring your
+    web server. In the examples below, the ``web/`` directory will be the
+    document root. This directory is ``/var/www/project/web/``.
+
+.. _web-server-apache-mod-php:
 
 Apache2 with mod_php/PHP-CGI
 ----------------------------
@@ -63,6 +79,8 @@ following configuration snippet:
             Require all granted
         </Directory>
 
+.. _web-server-apache-fpm:
+
 Apache2 with PHP-FPM
 --------------------
 
@@ -164,6 +182,8 @@ instead:
 
     FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
 
+.. _web-server-nginx:
+
 Nginx
 -----
 

diff --git a/cookbook/deployment/tools.rst b/cookbook/deployment/tools.rst
@@ -106,6 +106,12 @@ as you normally do:
     ensures that development packages are not installed in the production
     environment.
 
+.. caution::
+
+    If you get a "class not found" error during this step, you may need to
+    run ``export SYMFONY_ENV=prod`` before running this command so that
+    the ``post-install-cmd`` scripts run in the ``prod`` environment.
+
 D) Clear your Symfony Cache
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/cookbook/logging/monolog_email.rst b/cookbook/logging/monolog_email.rst
@@ -56,11 +56,20 @@ it is broken down.
                 />
                 <monolog:handler
                     name="swift"
+                    type="swift_mailer"
                     from-email="error@example.com"
-                    to-email="error@example.com"
                     subject="An Error Occurred!"
-                    level="debug"
-                />
+                    level="debug">
+
+                    <monolog:to-email>error@example.com</monolog:to-email>
+
+                    <!-- or multiple to-email elements -->
+                    <!--
+                    <monolog:to-email>dev1@example.com</monolog:to-email>
+                    <monolog:to-email>dev2@example.com</monolog:to-email>
+                    ...
+                    -->
+                </monolog:handler>
             </monolog:config>
         </container>
 

diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -21,6 +21,9 @@ Full default configuration
                     some_custom_type:
                         class:                Acme\HelloBundle\MyCustomType
                         commented:            true
+                # If enabled all tables not prefixed with sf2_ will be ignored by the schema
+                # tool. This is for custom tables which should not be altered automatically.
+                #schema_filter:        ^sf2_ 
 
                 connections:
                     default:

diff --git a/reference/forms/types/options/attr.rst.inc b/reference/forms/types/options/attr.rst.inc
@@ -10,6 +10,3 @@ as keys. This can be useful when you need to set a custom class for some widget:
     $builder->add('body', 'textarea', array(
         'attr' => array('class' => 'tinymce'),
     ));
-
-
-
diff --git a/reference/forms/types/options/inherit_data.rst.inc b/reference/forms/types/options/inherit_data.rst.inc
@@ -8,5 +8,5 @@ inherit_data
 **type**: ``boolean`` **default**: ``false``
 
 This option determines if the form will inherit data from its parent form.
-This can be useful is you have a set of fields that are duplicated across
+This can be useful if you have a set of fields that are duplicated across
 multiple forms. See :doc:`/cookbook/form/inherit_data_option`.
diff --git a/reference/forms/types/textarea.rst b/reference/forms/types/textarea.rst
@@ -9,8 +9,9 @@ Renders a ``textarea`` HTML element.
 +-------------+------------------------------------------------------------------------+
 | Rendered as | ``textarea`` tag                                                       |
 +-------------+------------------------------------------------------------------------+
-| Inherited   | - `data`_                                                              |
-| options     | - `disabled`_                                                          |
+| Inherited   | - `attr`_                                                              |
+| options     | - `data`_                                                              |
+|             | - `disabled`_                                                          |
 |             | - `empty_data`_                                                        |
 |             | - `error_bubbling`_                                                    |
 |             | - `error_mapping`_                                                     |
@@ -32,6 +33,8 @@ Inherited Options
 
 These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
+.. include:: /reference/forms/types/options/attr.rst.inc
+
 .. include:: /reference/forms/types/options/data.rst.inc
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,3 @@ as keys. This can be useful when you need to set a custom class for some widget:
		$builder->add('body', 'textarea', array(
		'attr' => array('class' => 'tinymce'),
		));