Merge branch '2.6' into 2.7

* 2.6: (22 commits)
  Update doctrine.rst
  Doctrine Custom Mapping
  fixing whitespace
  Update NotBlank to reflect the actual validation
  Updated autoload standard to PSR-4.
  remove unnecessary code
  uppercase "dependency injection"
  use "Symfony Framework" instead of "Symfony framework"
  use "Form component" instead of "form framework"
  use "full-stack" instead of "full stack"
  unify exception usages
  unify event subscriber usages
  use "console command" instead of "Console Command"
  unify EventDispatcher/event dispatcher usages
  use boolean instead of Boolean
  use "object-oriented" instead of "object oriented"
  "web debug toolbar" instead of "Web Debug Toolbar"
  use "stylesheet" instead of "Stylesheet"
  unify "Symfony Standard Edition" usages
  consistency, replace "save-handler" with "save handler"
  ...

Author: weaverryan

best_practices/introduction.rst

@@ -4,7 +4,7 @@
 The Symfony Framework Best Practices
 ====================================
 
-The Symfony framework is well-known for being *really* flexible and is used
+The Symfony Framework is well-known for being *really* flexible and is used
 to build micro-sites, enterprise applications that handle billions of connections
 and even as the basis for *other* frameworks. Since its release in July 2011,
 the community has learned a lot about what's possible and how to do things *best*.
@@ -19,7 +19,7 @@ What is this Guide About?
 -------------------------
 
 This guide aims to fix that by describing the **best practices for developing
-web apps with the Symfony full-stack framework**. These are best practices that
+web apps with the Symfony full-stack Framework**. These are best practices that
 fit the philosophy of the framework as envisioned by its original creator
 `Fabien Potencier`_.
 
@@ -32,7 +32,7 @@ fit the philosophy of the framework as envisioned by its original creator
 
 This guide is **specially suited** for:
 
-* Websites and web applications developed with the full-stack Symfony framework.
+* Websites and web applications developed with the full-stack Symfony Framework.
 
 For other situations, this guide might be a good **starting point** that you can
 then **extend and fit to your specific needs**:
@@ -62,8 +62,8 @@ Symfony to follow everything. If you are totally new to Symfony, welcome!
 Start with :doc:`The Quick Tour </quick_tour/the_big_picture>` tutorial first.
 
 We've deliberately kept this guide short. We won't repeat explanations that
-you can find in the vast Symfony documentation, like discussions about dependency
-injection or front controllers. We'll solely focus on explaining how to do
+you can find in the vast Symfony documentation, like discussions about Dependency
+Injection or front controllers. We'll solely focus on explaining how to do
 what you already know.
 
 The Application

book/doctrine.rst

@@ -6,7 +6,7 @@ Databases and Doctrine
 
 One of the most common and challenging tasks for any application
 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 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

book/forms.rst

@@ -198,7 +198,7 @@ it into a format that's suitable for being rendered in an HTML form.
    ``task`` property via the ``getTask()`` and ``setTask()`` methods on the
    ``Task`` class. Unless a property is public, it *must* have a "getter" and
    "setter" method so that the Form component can get and put data onto the
-   property. For a Boolean property, you can use an "isser" or "hasser" method
+   property. For a boolean property, you can use an "isser" or "hasser" method
    (e.g. ``isPublished()`` or ``hasReminder()``) instead of a getter (e.g.
    ``getPublished()`` or ``getReminder()``).
 
@@ -1530,7 +1530,7 @@ file, you can see every block needed to render a form and every default field
 type.
 
 In PHP, the fragments are individual template files. By default they are located in
-the `Resources/views/Form` directory of the framework bundle (`view on GitHub`_).
+the ``Resources/views/Form`` directory of the FrameworkBundle (`view on GitHub`_).
 
 Each fragment name follows the same basic pattern and is broken up into two pieces,
 separated by a single underscore character (``_``). A few examples are:
@@ -1866,7 +1866,7 @@ an array.
 
     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.
+    it's been transformed by the Form component.
 
 Adding Validation
 ~~~~~~~~~~~~~~~~~

book/http_fundamentals.rst

@@ -266,7 +266,7 @@ the user is connecting via a secured connection (i.e. HTTPS).
 
     The Request class also has a public ``attributes`` property, which holds
     special data related to how the application works internally. For the
-    Symfony framework, the ``attributes`` holds the values returned by the
+    Symfony Framework, the ``attributes`` holds the values returned by the
     matched route, like ``_controller``, ``id`` (if you have an ``{id}``
     wildcard), and even the name of the matched route (``_route``). The
     ``attributes`` property exists entirely to be a place where you can
@@ -500,7 +500,7 @@ emails, validating user input and handling security.
 The good news is that none of these problems is unique. Symfony provides
 a framework full of tools that allow you to build your application, not your
 tools. With Symfony, nothing is imposed on you: you're free to use the full
-Symfony framework, or just one piece of Symfony all by itself.
+Symfony Framework, or just one piece of Symfony all by itself.
 
 .. index::
    single: Symfony Components
@@ -542,9 +542,9 @@ regardless of how your project is developed. To name a few:
 :doc:`Translation </components/translation/introduction>`
     A framework for translating strings in your application.
 
-Each one of these components is decoupled and can be used in *any*
-PHP project, regardless of whether or not you use the Symfony framework.
-Every part is made to be used if needed and replaced when necessary.
+Each one of these components is decoupled and can be used in *any* PHP project,
+regardless of whether or not you use the Symfony Framework. Every part is
+made to be used if needed and replaced when necessary.
 
 .. _the-full-solution-the-symfony2-framework:
 

book/installation.rst

@@ -126,7 +126,7 @@ you can create Symfony applications using the alternative installation method
 based on `Composer`_.
 
 Composer is the dependency manager used by modern PHP applications and it can
-also be used to create new applications based on the Symfony framework. If you
+also be used to create new applications based on the Symfony Framework. If you
 don't have installed it globally, start by reading the next section.
 
 Installing Composer Globally
@@ -333,7 +333,7 @@ applications:
 * The `Symfony CMF Standard Edition`_ is the best distribution to get started
   with the `Symfony CMF`_ project, which is a project that makes it easier for
   developers to add CMS functionality to applications built with the Symfony
-  framework.
+  Framework.
 * The `Symfony REST Edition`_ shows how to build an application that provides a
   RESTful API using the FOSRestBundle and several other related bundles.
 

book/internals.rst

@@ -55,7 +55,7 @@ On top of HttpFoundation is the :namespace:`Symfony\\Component\\HttpKernel`
 component. HttpKernel handles the dynamic part of HTTP; it is a thin wrapper
 on top of the Request and Response classes to standardize the way requests are
 handled. It also provides extension points and tools that makes it the ideal
-starting point to create a Web framework without too much overhead.
+starting point to create a web framework without too much overhead.
 
 It also optionally adds configurability and extensibility, thanks to the
 DependencyInjection component and a powerful plugin system (bundles).
@@ -177,12 +177,12 @@ Event):
 #. Listeners of the ``kernel.terminate`` event can perform tasks after the
    Response has been served.
 
-If an Exception is thrown during processing, the ``kernel.exception`` is
-notified and listeners are given a chance to convert the Exception to a
+If an exception is thrown during processing, the ``kernel.exception`` is
+notified and listeners are given a chance to convert the exception into a
 Response. If that works, the ``kernel.response`` event is notified; if not, the
 Exception is re-thrown.
 
-If you don't want Exceptions to be caught (for embedded requests for
+If you don't want exceptions to be caught (for embedded requests for
 instance), disable the ``kernel.exception`` event by passing ``false`` as the
 third argument to the ``handle()`` method.
 
@@ -241,8 +241,8 @@ add the following code at the beginning of your listener method::
 
 .. tip::
 
-    If you are not yet familiar with the Symfony EventDispatcher, read the
-    :doc:`EventDispatcher component documentation </components/event_dispatcher/introduction>`
+    If you are not yet familiar with the Symfony EventDispatcher component,
+    read :doc:`its documentation </components/event_dispatcher/introduction>`
     section first.
 
 .. index::
@@ -354,7 +354,7 @@ The FrameworkBundle registers several listeners:
     Collects data for the current request.
 
 :class:`Symfony\\Bundle\\WebProfilerBundle\\EventListener\\WebDebugToolbarListener`
-    Injects the Web Debug Toolbar.
+    Injects the web debug toolbar.
 
 :class:`Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener`
     Fixes the Response ``Content-Type`` based on the request format.
@@ -412,7 +412,7 @@ forwards the ``Request`` to a given Controller (the value of the
 ``class::method`` notation).
 
 A listener on this event can create and set a ``Response`` object, create
-and set a new ``Exception`` object, or do nothing::
+and set a new ``Exception`` object or do nothing::
 
     use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
     use Symfony\Component\HttpFoundation\Response;
@@ -452,8 +452,10 @@ and set a new ``Exception`` object, or do nothing::
 .. index::
    single: EventDispatcher
 
-The EventDispatcher
--------------------
+.. _the-eventdispatcher:
+
+The EventDispatcher Component
+-----------------------------
 
 The EventDispatcher is a standalone component that is responsible for much
 of the underlying logic and flow behind a Symfony request. For more information,
@@ -474,7 +476,7 @@ enhance performance; use it in the production environment to explore problems
 after the fact.
 
 You rarely have to deal with the profiler directly as Symfony provides
-visualizer tools like the Web Debug Toolbar and the Web Profiler. If you use
+visualizer tools like the web debug toolbar and the web profiler. If you use
 the Symfony Standard Edition, the profiler, the web debug toolbar, and the
 web profiler are all already configured with sensible settings.
 
@@ -500,7 +502,7 @@ bottom of all pages. It displays a good summary of the profiling data that
 gives you instant access to a lot of useful information when something does
 not work as expected.
 
-If the summary provided by the Web Debug Toolbar is not enough, click on the
+If the summary provided by the web debug toolbar is not enough, click on the
 token link (a string made of 13 random characters) to access the Web Profiler.
 
 .. note::

book/page_creation.rst

@@ -763,7 +763,7 @@ of the most common elements of a bundle:
     Contains the controllers of the bundle (e.g. ``RandomController.php``).
 
 ``DependencyInjection/``
-    Holds certain dependency injection extension classes, which may import service
+    Holds certain Dependency Injection Extension classes, which may import service
     configuration, register compiler passes or more (this directory is not
     necessary).
 
@@ -1082,7 +1082,7 @@ in mind:
   and ``vendor/`` (third-party code) (there's also a ``bin/`` directory that's
   used to help updated vendor libraries);
 
-* Each feature in Symfony (including the Symfony framework core) is organized
+* Each feature in Symfony (including the Symfony Framework core) is organized
   into a *bundle*, which is a structured set of files for that feature;
 
 * The **configuration** for each bundle lives in the ``Resources/config``

book/performance.rst

@@ -46,7 +46,7 @@ your ``php.ini`` configuration.
 Use Composer's Class Map Functionality
 --------------------------------------
 
-By default, the Symfony standard edition uses Composer's autoloader
+By default, the Symfony Standard Edition uses Composer's autoloader
 in the `autoload.php`_ file. This autoloader is easy to use, as it will
 automatically find any new classes that you've placed in the registered
 directories.

book/propel.rst

@@ -288,8 +288,8 @@ from cheapest to most expensive. From inside a controller, do the following::
         ->orderByPrice()
         ->find();
 
-In one line, you get your products in a powerful oriented object way. No need
-to waste your time with SQL or whatever, Symfony offers fully object oriented
+In one line, you get your products in a powerful object-oriented way. No need
+to waste your time with SQL or whatever, Symfony offers fully object-oriented
 programming and Propel respects the same philosophy by providing an awesome
 abstraction layer.
 

book/routing.rst

@@ -1495,7 +1495,7 @@ In an upcoming section, you'll learn how to generate URLs from inside templates.
 
 .. tip::
 
-    If the frontend of your application uses Ajax requests, you might want
+    If the front-end of your application uses Ajax requests, you might want
     to be able to generate URLs in JavaScript based on your routing configuration.
     By using the `FOSJsRoutingBundle`_, you can do exactly that: