Merge branch '2.5'

* 2.5:
  Removed unused use UsernameNotFoundException
  Minor spelling fix
  [Templating] Added a sentence that explains what a Template Helper is
  Updated Valid constraint reference
  Remove incoherence between Doctrine and Propel introduction paragraphs
  add sidebar for the built-in server in VMs

Conflicts:
	cookbook/web_server/built_in.rst

Author: weaverryan

book/doctrine.rst

@@ -5,11 +5,13 @@ Databases and Doctrine
 ======================
 
 One of the most common and challenging tasks for any application
-involves persisting and reading information to and from a database. Fortunately,
-Symfony comes integrated with `Doctrine`_, a library whose sole goal is to
-give you powerful tools to make this easy. In this chapter, you'll learn the
-basic philosophy behind Doctrine and see how easy working with a database can
-be.
+involves persisting and reading information to and from a database. Although
+the Symfony full-stack framework doesn't integrate any ORM by default,
+the Symfony Standard Edition, which is the most widely used distribution,
+comes integrated with `Doctrine`_, a library whose sole goal is to give
+you powerful tools to make this easy. In this chapter, you'll learn the
+basic philosophy behind Doctrine and see how easy working with a database
+can be.
 
 .. note::
 

book/forms.rst

@@ -6,7 +6,7 @@ Forms
 
 Dealing with HTML forms is one of the most common - and challenging - tasks for
 a web developer. Symfony integrates a Form component that makes dealing with
-forms easy. In this chapter, you'll build a complex form from the ground-up,
+forms easy. In this chapter, you'll build a complex form from the ground up,
 learning the most important features of the form library along the way.
 
 .. note::

book/http_fundamentals.rst

@@ -37,7 +37,7 @@ HTTP is the term used to describe this simple text-based language. And no
 matter how you develop on the web, the goal of your server is *always* to
 understand simple text requests, and return simple text responses.
 
-Symfony is built from the ground-up around that reality. Whether you realize
+Symfony is built from the ground up around that reality. Whether you realize
 it or not, HTTP is something you use everyday. With Symfony, you'll learn
 how to master it.
 

components/templating/introduction.rst

@@ -135,7 +135,8 @@ escaper using the
 Helpers
 -------
 
-The Templating component can be easily extended via helpers. The component has
+The Templating component can be easily extended via helpers. Helpers are PHP objects that 
+provide features useful in a template context. The component has
 2 built-in helpers:
 
 * :doc:`/components/templating/helpers/assetshelper`

cookbook/security/api_key_authentication.rst

@@ -31,7 +31,6 @@ value and then a User object is created::
     use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken;
     use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\Security\Core\User\UserProviderInterface;
-    use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
     use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 
     class ApiKeyAuthenticator implements SimplePreAuthenticatorInterface

cookbook/web_server/built_in.rst

@@ -61,6 +61,23 @@ can change the socket passing an IP address and a port as a command-line argumen
     terminal until you terminate it (this is usually done by pressing Ctrl
     and C).
 
+.. sidebar:: Using the built-in Web Server from inside a Virtual Machine
+
+    If you want to use the built-in web server from inside a virtual machine
+    and then load the site from a browser on your host machine, you'll need
+    to listen on the ``0.0.0.0:8000`` address (i.e. on all IP addresses that
+    are assigned to the virtual machine):
+
+    .. code-block:: bash
+
+        $ php app/console server:start 0.0.0.0:8000
+
+    .. caution::
+
+        You should **NEVER** listen to all interfaces on a computer that is
+        directly accessible from the Internet. The built-in web server is
+        not designed to be used on public networks.
+
 Command Options
 ~~~~~~~~~~~~~~~
 

reference/constraints/Valid.rst

@@ -9,9 +9,9 @@ object and all sub-objects associated with it.
 | Applies to     | :ref:`property or method <validation-property-target>`              |
 +----------------+---------------------------------------------------------------------+
 | Options        | - `traverse`_                                                       |
-|                | - `message`_                                                        |
+|                | - `deep`_                                                           |
 +----------------+---------------------------------------------------------------------+
-| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Type`           |
+| Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Valid`          |
 +----------------+---------------------------------------------------------------------+
 
 .. include:: /reference/forms/types/options/_error_bubbling_hint.rst.inc
@@ -267,9 +267,11 @@ If this constraint is applied to a property that holds an array of objects,
 then each object in that array will be validated only if this option is set
 to ``true``.
 
-message
-~~~~~~~
+deep
+~~~~
 
-**type**: ``string`` **default**: ``This value should be true.``
+**type**: ``boolean`` **default**: ``false``
 
-This is the message that will be shown if the value is false.
+If this constraint is applied to a property that holds an array of objects,
+then each object in that array will be validated recursively if this option is set
+to ``true``.