symfony · weaverryan · May 22, 2015 · Jul 20, 2014 · Jul 20, 2014 · Jul 20, 2014
diff --git a/best_practices/introduction.rst b/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

diff --git a/book/doctrine.rst b/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

diff --git a/book/forms.rst b/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()``).
 
@@ -1526,7 +1526,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:
@@ -1867,7 +1867,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
 ~~~~~~~~~~~~~~~~~

diff --git a/book/http_fundamentals.rst b/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:
 

diff --git a/book/installation.rst b/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
@@ -321,7 +321,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.
 

diff --git a/book/internals.rst b/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.
 
@@ -238,8 +238,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::
@@ -351,7 +351,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.
@@ -396,7 +396,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;
@@ -433,8 +433,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,
@@ -455,7 +457,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.
 
@@ -481,7 +483,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::

diff --git a/book/page_creation.rst b/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``

diff --git a/book/performance.rst b/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.

diff --git a/book/propel.rst b/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.
 

diff --git a/book/routing.rst b/book/routing.rst
@@ -1419,7 +1419,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:
 

diff --git a/book/service_container.rst b/book/service_container.rst
@@ -461,7 +461,7 @@ In other words, a service container extension configures the services for
 a bundle on your behalf. And as you'll see in a moment, the extension provides
 a sensible, high-level interface for configuring the bundle.
 
-Take the FrameworkBundle - the core Symfony framework bundle - as an
+Take the FrameworkBundle - the core Symfony Framework bundle - as an
 example. The presence of the following code in your application configuration
 invokes the service container extension inside the FrameworkBundle:
 
@@ -516,7 +516,7 @@ can handle the ``framework`` configuration directive. The extension in question,
 which lives in the FrameworkBundle, is invoked and the service configuration
 for the FrameworkBundle is loaded. If you remove the ``framework`` key
 from your application configuration file entirely, the core Symfony services
-won't be loaded. The point is that you're in control: the Symfony framework
+won't be loaded. The point is that you're in control: the Symfony Framework
 doesn't contain any magic or perform any actions that you don't have control
 over.
 

diff --git a/book/templating.rst b/book/templating.rst
@@ -1345,7 +1345,7 @@ subdirectory.
 Overriding Core Templates
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Since the Symfony framework itself is just a bundle, core templates can be
+Since the Symfony Framework itself is just a bundle, core templates can be
 overridden in the same way. For example, the core TwigBundle contains
 a number of different "exception" and "error" templates that can be overridden
 by copying each from the ``Resources/views/Exception`` directory of the

diff --git a/book/testing.rst b/book/testing.rst
@@ -455,8 +455,8 @@ Accessing the Container
 
 It's highly recommended that a functional test only tests the Response. But
 under certain very rare circumstances, you might want to access some internal
-objects to write assertions. In such cases, you can access the dependency
-injection container::
+objects to write assertions. In such cases, you can access the Dependency
+Injection Container::
 
     $container = $client->getContainer();
 

diff --git a/book/translation.rst b/book/translation.rst
@@ -27,7 +27,7 @@ into the language of the user::
     *country* code (e.g. ``fr_FR`` for French/France) is recommended.
 
 In this chapter, you'll learn how to use the Translation component in the
-Symfony framework. You can read the
+Symfony Framework. You can read the
 :doc:`Translation component documentation </components/translation/usage>`
 to learn even more. Overall, the process has several steps:
 
@@ -573,7 +573,7 @@ the framework:
 Translating Constraint Messages
 -------------------------------
 
-If you're using validation constraints with the form framework, then translating
+If you're using validation constraints with the Form component, then translating
 the error messages is easy: simply create a translation resource for the
 ``validators`` :ref:`domain <using-message-domains>`.
 

diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -99,6 +99,8 @@ node definition. Node types are available for:
 
 * scalar (generic type that includes booleans, strings, integers, floats and ``null``)
 * boolean
+* scalar
+* boolean
 * integer (new in 2.2)
 * float (new in 2.2)
 * enum (new in 2.1) (similar to scalar, but it only allows a finite set of values)

diff --git a/components/console/helpers/dialoghelper.rst b/components/console/helpers/dialoghelper.rst
@@ -95,7 +95,7 @@ convenient for passwords::
     When you ask for a hidden response, Symfony will use either a binary, change
     stty mode or use another trick to hide the response. If none is available,
     it will fallback and allow the response to be visible unless you pass ``false``
-    as the third argument like in the example above. In this case, a RuntimeException
+    as the third argument like in the example above. In this case, a ``RuntimeException``
     would be thrown.
 
 Validating the Answer

diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst
@@ -207,7 +207,7 @@ The XML version of the config would then look like this:
 
 .. note::
 
-    In the Symfony full stack framework there is a base Extension class which
+    In the Symfony full-stack Framework there is a base Extension class which
     implements these methods as well as a shortcut method for processing the
     configuration. See :doc:`/cookbook/bundles/extension` for more details.
 
@@ -347,9 +347,9 @@ will then be called when the container is compiled::
 
 .. note::
 
-    Compiler passes are registered differently if you are using the full
-    stack framework, see :doc:`/cookbook/service_container/compiler_passes`
-    for more details.
+    Compiler passes are registered differently if you are using the full-stack
+    framework, see :doc:`/cookbook/service_container/compiler_passes` for
+    more details.
 
 Controlling the Pass Ordering
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -510,5 +510,5 @@ to see if the files have changed, if they have the cache will be considered stal
 
 .. note::
 
-    In the full stack framework the compilation and caching of the container
+    In the full-stack framework the compilation and caching of the container
     is taken care of for you.
diff --git a/components/dependency_injection/tags.rst b/components/dependency_injection/tags.rst
@@ -173,9 +173,9 @@ run when the container is compiled::
 
 .. note::
 
-    Compiler passes are registered differently if you are using the full
-    stack framework. See :doc:`/cookbook/service_container/compiler_passes`
-    for more details.
+    Compiler passes are registered differently if you are using the full-stack
+    framework. See :doc:`/cookbook/service_container/compiler_passes` for
+    more details.
 
 Adding additional Attributes on Tags
 ------------------------------------

diff --git a/components/dependency_injection/workflow.rst b/components/dependency_injection/workflow.rst
@@ -8,11 +8,11 @@ In the preceding pages of this section, there has been little to say about
 where the various files and classes should be located. This is because this
 depends on the application, library or framework in which you want to use
 the container. Looking at how the container is configured and built in the
-Symfony full stack framework will help you see how this all fits together,
-whether you are using the full stack framework or looking to use the service
+Symfony full-stack Framework will help you see how this all fits together,
+whether you are using the full-stack framework or looking to use the service
 container in another application.
 
-The full stack framework uses the HttpKernel component to manage the loading
+The full-stack framework uses the HttpKernel component to manage the loading
 of the service container configuration from the application and bundles and
 also handles the compilation and caching. Even if you are not using HttpKernel,
 it should give you an idea of one way of organizing configuration in a modular