Merge branch '2.8' into 3.0

weaverryan · weaverryan · commit 98e65bf212a9 · 2016-08-20T20:26:45.000-04:00
* 2.8: Update custom_provider.rst [#6892] The provider is called `memory` Fix typos Update templating.rst Update templating.rst Adds bin folder creation instruction service_container : fix php Definition instance [Routing] Fix a route path in a routing example Minor unrelated spacing fixes Update doctrine.rst
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -168,20 +168,25 @@ own a collection of its related ``Product`` objects.
 
 .. note::
 
-    The code in the constructor is important.  Rather than being instantiated
+    The code in the constructor is important. Rather than being instantiated
     as a traditional ``array``, the ``$products`` property must be of a type
     that implements Doctrine's ``Collection`` interface. In this case, an
     ``ArrayCollection`` object is used. This object looks and acts almost
     *exactly* like an array, but has some added flexibility. If this makes
     you uncomfortable, don't worry. Just imagine that it's an ``array``
     and you'll be in good shape.
 
+.. seealso::
+
+    To understand ``inversedBy`` and ``mappedBy`` usage, see Doctrine's
+    `Association Updates` documentation.
+
 .. tip::
 
-   The targetEntity value in the metadata used above can reference any entity
-   with a valid namespace, not just entities defined in the same namespace. To
-   relate to an entity defined in a different class or bundle, enter a full
-   namespace as the targetEntity.
+    The targetEntity value in the metadata used above can reference any entity
+    with a valid namespace, not just entities defined in the same namespace. To
+    relate to an entity defined in a different class or bundle, enter a full
+    namespace as the targetEntity.
 
 Now that you've added new properties to both the ``Product`` and ``Category``
 classes, tell Doctrine to generate the missing getter and setter methods for you:
@@ -407,3 +412,4 @@ Doctrine's `Association Mapping Documentation`_.
     statement, which *imports* the ``ORM`` annotations prefix.
 
 .. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/association-mapping.html
+.. _`Association Updates`: http://docs.doctrine-project.org/en/latest/reference/unitofwork-associations.html
diff --git a/routing.rst b/routing.rst
@@ -333,7 +333,7 @@ By adding a *default* value:
 
         return $collection;
 
-Now, when the user goes to ``/page``, the ``blog_list`` route will match and ``$page``
+Now, when the user goes to ``/blog``, the ``blog_list`` route will match and ``$page``
 will default to a value of ``1``.
 
 .. index::
diff --git a/security/custom_provider.rst b/security/custom_provider.rst
@@ -9,7 +9,7 @@ When a user submits a username and password, the authentication layer asks
 the configured user provider to return a user object for a given username.
 Symfony then checks whether the password of this user is correct and generates
 a security token so the user stays authenticated during the current session.
-Out of the box, Symfony has four user providers: ``in_memory``, ``entity``, 
+Out of the box, Symfony has four user providers: ``memory``, ``entity``, 
 ``ldap`` and ``chain``. In this entry you'll see how you can create your
 own user provider, which could be useful if your users are accessed via a
 custom database, a file, or - as shown in this example - a web service.
diff --git a/service_container/factories.rst b/service_container/factories.rst
@@ -88,7 +88,7 @@ configure the service container to use the
 
         $container->register('app.newsletter_manager_factory', 'AppBundle\Email\NewsletterManagerFactory');
 
-        $newsletterManager = new Definition();
+        $newsletterManager = new Definition('AppBundle\Email\NewsletterManager');
 
         // call a method on the specified service
         $newsletterManager->setFactory(array(
diff --git a/setup.rst b/setup.rst
@@ -22,6 +22,7 @@ executable that needs to be installed on your system only once:
 .. code-block:: bash
 
     # Linux and macOS systems
+    $ sudo mkdir -p /usr/local/bin
     $ sudo curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony
     $ sudo chmod a+x /usr/local/bin/symfony
 
diff --git a/templating.rst b/templating.rst
@@ -108,7 +108,7 @@ with alternating ``odd``, ``even`` classes:
 
 .. code-block:: html+twig
 
-    {% for i in 0..10 %}
+    {% for i in 1..10 %}
         <div class="{{ cycle(['odd', 'even'], i) }}">
           <!-- some HTML here -->
         </div>
