From 1deabdefa6d7fc4f758c217f964437f736a08be3 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@uos.de>
Date: Wed, 20 Aug 2014 18:23:26 +0200
Subject: [PATCH 1/4] [Reference] fix namespace in Expression constraint

---
 reference/constraints/Expression.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/reference/constraints/Expression.rst b/reference/constraints/Expression.rst
index d491adea2db..018d9549917 100644
--- a/reference/constraints/Expression.rst
+++ b/reference/constraints/Expression.rst
@@ -73,7 +73,7 @@ One way to accomplish this is with the Expression constraint:
     .. code-block:: php-annotations
 
         // src/Acme/DemoBundle/Model/BlogPost.php
-        namespace Acme\DemoBundle\Model\BlogPost;
+        namespace Acme\DemoBundle\Model;
         
         use Symfony\Component\Validator\Constraints as Assert;
 
@@ -102,11 +102,10 @@ One way to accomplish this is with the Expression constraint:
             </constraint>
         </class>
 
-
     .. code-block:: php
 
         // src/Acme/DemoBundle/Model/BlogPost.php
-        namespace Acme\DemoBundle\Model\BlogPost;
+        namespace Acme\DemoBundle\Model;
         
         use Symfony\Component\Validator\Mapping\ClassMetadata;
         use Symfony\Component\Validator\Constraints as Assert;

From 93bbd14e74d403464757075eb87a4ca158ffd5a7 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Sun, 17 Aug 2014 20:19:07 +0200
Subject: [PATCH 2/4] tweaks for the web server configuration chapter

---
 .../web_server_configuration.rst              | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst
index 6bd96876195..9c9fcfb4af8 100644
--- 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
 -----
 

From a49c892d0802d7ee2e011e9ade955bc883cf9204 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Fri, 22 Aug 2014 14:48:15 -0400
Subject: [PATCH 3/4] Removing extra whitespace

---
 reference/forms/types/options/attr.rst.inc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/reference/forms/types/options/attr.rst.inc b/reference/forms/types/options/attr.rst.inc
index eff44141f4e..03a13d4b9b6 100644
--- 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'),
     ));
-
-
-

From 8c96e42151eaad5ab2eeb76fd5f99f7d5f99ab9d Mon Sep 17 00:00:00 2001
From: Peter Rehm <peter.rehm@renvest.de>
Date: Wed, 20 Aug 2014 08:30:31 +0200
Subject: [PATCH 4/4] Added the schema_filter option to the reference

---
 reference/configuration/doctrine.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
index 40a291a2076..0390098bdab 100644
--- 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: