Merge branch '2.0'

Author: weaverryan

book/templating.rst

@@ -1360,7 +1360,7 @@ The templating engine in Symfony is a powerful tool that can be used each time
 you need to generate presentational content in HTML, XML or any other format.
 And though templates are a common way to generate content in a controller,
 their use is not mandatory. The ``Response`` object returned by a controller
-can be created with our without the use of a template::
+can be created with or without the use of a template::
 
     // creates a Response object whose content is the rendered template
     $response = $this->render('AcmeArticleBundle:Article:index.html.twig');

book/testing.rst

@@ -264,7 +264,7 @@ document::
         // Assert that there are exactly 4 h2 tags on the page
         $this->assertCount(4, $crawler->filter('h2')->count());
 
-        // Assert the the "Content-Type" header is "application/json"
+        // Assert that the "Content-Type" header is "application/json"
         $this->assertTrue($client->getResponse()->headers->contains('Content-Type', 'application/json'));
 
         // Assert that the response content matches a regexp.

components/console.rst

@@ -211,14 +211,14 @@ will work:
 
 There are 4 option variants you can use:
 
-===========================  =====================================================
+===========================  =====================================================================================
 Option                       Value
-===========================  =====================================================
-InputOption::VALUE_IS_ARRAY  This option accepts multiple values
+===========================  =====================================================================================
+InputOption::VALUE_IS_ARRAY  This option accepts multiple values (e.g. ``--dir=/foo --dir=/bar``)
 InputOption::VALUE_NONE      Do not accept input for this option (e.g. ``--yell``)
-InputOption::VALUE_REQUIRED  This value is required (e.g. ``iterations=5``)
-InputOption::VALUE_OPTIONAL  This value is optional
-===========================  =====================================================
+InputOption::VALUE_REQUIRED  This value is required (e.g. ``--iterations=5``), the option itself is still optional
+InputOption::VALUE_OPTIONAL  This option may or may not have a value (e.g. ``yell`` or ``yell=loud``)
+===========================  =====================================================================================
 
 You can combine VALUE_IS_ARRAY with VALUE_REQUIRED or VALUE_OPTIONAL like this:
 
@@ -353,8 +353,8 @@ Then, you need to create a new
 options you want to pass to the command.
 
 Eventually, calling the ``run()`` method actually executes the command and
-returns the returned code from the command (``0`` if everything went fine, any
-other integer otherwise).
+returns the returned code from the command (return value from command's
+``execute()`` method).
 
 .. note::
 

components/dependency_injection/parentservices.rst

@@ -539,4 +539,4 @@ will be called twice, resulting in the ``$filters`` array containing both
 ``my_filter`` and ``another_filter`` objects. This is great if you just want
 to add additional filters to the subclasses. If you want to replace the filters
 passed to the subclass, removing the parent setting from the config will 
-prevent the base class from calling to ``setFilter``.
+prevent the base class from calling ``setFilter``.

components/routing.rst

@@ -115,7 +115,7 @@ you can define:
 For example, the following route would only accept requests to /foo with
 the POST method and a secure connection::
 
-   $route = new Route('/foo', array('_method' => 'post', '_scheme' => 'https' ));
+   $route = new Route('/foo', array(), array('_method' => 'post', '_scheme' => 'https' ));
 
 .. tip::
 

contributing/documentation/format.rst

@@ -157,6 +157,9 @@ Installing the Sphinx extensions
 
     # use PHP as the primary domain
     primary_domain = 'php'
+    
+    # set url for API links
+    api_url = 'http://api.symfony.com/master/%s'
 
 .. _reStructuredText:        http://docutils.sf.net/rst.html
 .. _Sphinx:                  http://sphinx.pocoo.org/

cookbook/configuration/pdo_session_storage.rst

@@ -151,7 +151,7 @@ parameter.ini by referencing the database-related parameters defined there:
             <argument>%database_password%</argument>
         </service>
 
-    .. code-block:: xml
+    .. code-block:: php
 
         $pdoDefinition = new Definition('PDO', array(
             'mysql:dbname=%database_name%',

cookbook/logging/monolog.rst

@@ -161,7 +161,7 @@ Monolog allows to process the record before logging it to add some
 extra data. A processor can be applied for the whole handler stack or
 only for a specific handler.
 
-A processor is simply a callable receiving the record as it's first argument.
+A processor is simply a callable receiving the record as its first argument.
 
 Processors are configured using the ``monolog.processor`` DIC tag. See the
 :ref:`reference about it<dic_tags-monolog-processor>`.

cookbook/request/mime_type.rst

@@ -15,7 +15,7 @@ object. Internally, Symfony contains a map of the most common formats (e.g.
 easily be added. This document will show how you can add the ``jsonp`` format
 and corresponding MIME type.
 
-Create an ``kernel.request`` Listener
+Create a ``kernel.request`` Listener
 -------------------------------------
 
 The key to defining a new MIME type is to create a class that will "listen" to

cookbook/security/entity_provider.rst

@@ -233,7 +233,7 @@ then be checked against our User entity records in the database:
                 - { path: ^/admin, roles: ROLE_ADMIN }
 
 The ``encoders`` section associates the ``sha1`` password encoder to the entity
-class. This means that Symfony will expect the password that's encoded in
+class. This means that Symfony will expect the password that's stored in
 the database to be encoded using this algorithm. For details on how to create
 a new User object with a properly encoded password, see the
 :ref:`book-security-encoding-user-password` section of the security chapter.
@@ -424,7 +424,7 @@ about in this section.
 
 In this example, the ``AcmeUserBundle:User`` entity class defines a
 many-to-many relationship with a ``AcmeUserBundle:Group`` entity class. A user
-can be related several groups and a group can be composed of one or
+can be related to several groups and a group can be composed of one or
 more users. As a group is also a role, the previous ``getRoles()`` method now
 returns the list of related groups::
 

cookbook/security/remember_me.rst

@@ -116,8 +116,8 @@ to access protected resources as if the user had actually authenticated upon
 visiting the site.
 
 In some cases, however, you may want to force the user to actually re-authenticate
-before accessing certain resources. For example, you might allow a "remember me"
-user to see basic account information, but then require them to actually
+before accessing certain resources. For example, you might allow "remember me"
+users to see basic account information, but then require them to actually
 re-authenticate before modifying that information.
 
 The security component provides an easy way to do this. In addition to roles

cookbook/service_container/event_listener.rst

@@ -40,11 +40,11 @@ event is just one of the core kernel events::
 
     Each event receives a slightly different type of ``$event`` object. For
     the ``kernel.exception`` event, it is :class:`Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent`.
-    To see what type of object each event listener receives, see :class:`Symfony\\Component\\HttpKernel\\KernelEvents`,
+    To see what type of object each event listener receives, see :class:`Symfony\\Component\\HttpKernel\\KernelEvents`.
 
 Now that the class is created, we just need to register it as a service and
-and notify Symfony that it is a "listener" on the ``kernel.exception`` event
-by using a special "tag":
+notify Symfony that it is a "listener" on the ``kernel.exception`` event by
+using a special "tag":
 
 .. configuration-block::
 

cookbook/service_container/scopes.rst

@@ -69,7 +69,7 @@ when compiling the container. Read the sidebar below for more details.
 Setting the Scope in the Definition
 -----------------------------------
 
-The scope of a service is defined in the definition of the service:
+The scope of a service is set in the definition of the service:
 
 .. configuration-block::
 
@@ -139,8 +139,8 @@ you have the right instance::
 .. caution::
 
     Take care not to store the request in a property of the object for a
-    future call of the service as it would be the same issue described
-    in the first section (except that symfony cannot detect that you are
+    future call of the service as it would cause the same issue described
+    in the first section (except that Symfony cannot detect that you are
     wrong).
 
 The service config for this class would look something like this:

cookbook/testing/insulating_clients.rst

@@ -17,7 +17,7 @@ chat for instance), create several Clients::
     $this->assertRegExp('/Hello/', $sally->getResponse()->getContent());
 
 This works except when your code maintains a global state or if it depends on
-third-party libraries that has some kind of global state. In such a case, you
+a third-party library that has some kind of global state. In such a case, you
 can insulate your clients::
 
     $harry = static::createClient();

cookbook/workflow/_vendor_deps.rst.inc

@@ -1,8 +1,8 @@
 Managing Vendor Libraries with composer.json
 --------------------------------------------
 
-How does it work ?
-~~~~~~~~~~~~~~~~~~
+How does it work?
+~~~~~~~~~~~~~~~~~
 
 Every Symfony project uses a group of third-party "vendor" libraries. One
 way or another the goal is to download these files into your ``vendor/``