Merge remote-tracking branch 'origin/1.0'

Author: wouterj

bundles/menu/introduction.rst

@@ -27,7 +27,7 @@ Installation
 You can install this bundle `with composer`_ using the
 `symfony-cmf/menu-bundle`_ package.
 
-Creating a Simple Persistant Menu
+Creating a Simple Persistent Menu
 ---------------------------------
 
 A menu created using the KnpMenuBundle is made up of a hierarchy of class

bundles/menu/menu_factory.rst

@@ -26,7 +26,7 @@ A menu item should have a URL associated with it. The CMF provides the
   from the ``content`` and ``routeParameters`` options when using the
   :ref:`dynamic router <bundles-routing-dynamic-generator>`.
 
-The ``content`` option, if specified, must contain an class which implements
+The ``content`` option, if specified, must contain a class which implements
 the ``RouteReferrersInterface``, see the :ref:`dynamic router
 <bundles-routing-dynamic-generator>` documentation for more information.
 

bundles/routing_auto/customization.rst

@@ -117,7 +117,7 @@ It is registered in the DI configuration as follows:
                 class: Symfony\Cmf\Bundle\RoutingAutoBundle\RoutingAuto\PathNotExists\ThrowException
                 scope: prototype
                 tags:
-                    - { name: cmf_routing_auto.provider, alias: "throw_exception"}
+                    - { name: cmf_routing_auto.not_exists_action, alias: "throw_exception"}
 
     .. code-block:: xml